From 25feec7f59f4bd418369e513e9e49391262cb6f3 Mon Sep 17 00:00:00 2001 From: "Alexie (Boyong) Madolid" Date: Wed, 20 Mar 2024 19:06:35 +0800 Subject: [PATCH] [BLACK]: Update to latest version --- .pre-commit-config.yaml | 2 +- .../_inactive/bi_ner/datamodel/example.py | 28 +++++++++++-------- .../_inactive/bi_ner/model/ph_model.py | 12 ++++---- .../jac_misc/jac_misc/openai/main.py | 1 + .../jac_nlp/jac_nlp/bi_enc/poly_enc.py | 1 + .../jac_vision/jac_vision/rftm/model.py | 1 - jaseci_core/jaseci/cli_tools/book_tools.py | 20 ++++++------- jaseci_core/jaseci/extens/act_lib/djson.py | 1 + jaseci_core/jaseci/extens/act_lib/file.py | 1 + .../jaseci/extens/act_lib/file_handler.py | 1 + jaseci_core/jaseci/extens/act_lib/internal.py | 1 + jaseci_core/jaseci/extens/act_lib/jaseci.py | 1 + jaseci_core/jaseci/extens/act_lib/net.py | 1 + jaseci_core/jaseci/extens/act_lib/rand.py | 1 + jaseci_core/jaseci/extens/act_lib/request.py | 1 + jaseci_core/jaseci/extens/act_lib/stripe.py | 1 + jaseci_core/jaseci/extens/act_lib/task.py | 1 + jaseci_core/jaseci/extens/act_lib/url.py | 1 + jaseci_core/jaseci/extens/act_lib/vector.py | 1 + jaseci_core/jaseci/extens/act_lib/webtool.py | 1 + jaseci_core/jaseci/extens/act_lib/zip.py | 1 + jaseci_core/jaseci/extens/api/actions_api.py | 1 + jaseci_core/jaseci/extens/api/alias_api.py | 1 + .../jaseci/extens/api/architype_api.py | 1 + jaseci_core/jaseci/extens/api/global_api.py | 1 + jaseci_core/jaseci/extens/api/graph_api.py | 1 + jaseci_core/jaseci/extens/api/health_api.py | 1 + jaseci_core/jaseci/extens/api/interface.py | 1 + jaseci_core/jaseci/extens/api/jac_api.py | 1 + jaseci_core/jaseci/extens/api/jsorc_api.py | 1 + jaseci_core/jaseci/extens/api/logger_api.py | 1 + jaseci_core/jaseci/extens/api/master_api.py | 1 + jaseci_core/jaseci/extens/api/object_api.py | 1 + .../jaseci/extens/api/prometheus_api.py | 1 + jaseci_core/jaseci/extens/api/queue_api.py | 1 + jaseci_core/jaseci/extens/api/sentinel_api.py | 1 + jaseci_core/jaseci/extens/api/super_api.py | 1 + jaseci_core/jaseci/extens/api/user_api.py | 1 + jaseci_core/jaseci/extens/api/walker_api.py | 1 + jaseci_core/jaseci/extens/api/webhook_api.py | 9 ++++-- jaseci_core/jaseci/extens/svc/elastic_svc.py | 6 ++-- .../jac/interpreter/architype_interp.py | 17 +++++++---- jaseci_core/jaseci/jac/interpreter/interp.py | 1 + .../jaseci/jac/interpreter/sentinel_interp.py | 7 +++-- .../jaseci/jac/interpreter/walker_interp.py | 1 + jaseci_core/jaseci/jac/ir/jac_code.py | 5 ++-- jaseci_core/jaseci/jac/jac_set.py | 1 + jaseci_core/jaseci/jac/machine/jac_scope.py | 1 + jaseci_core/jaseci/jac/machine/jac_value.py | 1 + .../jaseci/jac/machine/machine_state.py | 9 ++++-- jaseci_core/jaseci/jsorc/live_actions.py | 1 + jaseci_core/jaseci/jsorc/redis.py | 1 + jaseci_core/jaseci/jsorc/remote_actions.py | 1 + jaseci_core/jaseci/prim/ability.py | 1 + jaseci_core/jaseci/prim/architype.py | 1 + jaseci_core/jaseci/prim/edge.py | 1 + jaseci_core/jaseci/prim/graph.py | 1 + jaseci_core/jaseci/prim/node.py | 1 + jaseci_core/jaseci/prim/obj_mixins.py | 9 ++++-- jaseci_core/jaseci/prim/sentinel.py | 1 + jaseci_core/jaseci/tests/test_stripe.py | 6 ++-- .../jaseci/utils/actions/actions_optimizer.py | 1 + jaseci_core/jaseci/utils/id_list.py | 1 + jaseci_serv/jaseci_serv/base/models.py | 6 ++-- jaseci_serv/jaseci_serv/hook/orm.py | 1 + jaseci_serv/jaseci_serv/urls.py | 1 + jaseci_serv/manage.py | 1 + 67 files changed, 132 insertions(+), 58 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 38ff8ba126..7efe0d6b5a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - id: check-json - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 24.3.0 hooks: - id: black # It is recommended to specify the latest version of Python diff --git a/jaseci_ai_kit/_inactive/bi_ner/datamodel/example.py b/jaseci_ai_kit/_inactive/bi_ner/datamodel/example.py index c733421084..04b27341f9 100644 --- a/jaseci_ai_kit/_inactive/bi_ner/datamodel/example.py +++ b/jaseci_ai_kit/_inactive/bi_ner/datamodel/example.py @@ -90,11 +90,13 @@ def collate_examples( "input_ids": pad_sequence( all_input_ids, batch_first=True, padding_value=padding_token_id ).long(), - "labels": pad_images( - target_label_ids, padding_value=-100, padding_length=(pad_length, None) - ) - if not no_target_label_ids - else None, + "labels": ( + pad_images( + target_label_ids, padding_value=-100, padding_length=(pad_length, None) + ) + if not no_target_label_ids + else None + ), } if return_batch_examples: @@ -236,13 +238,15 @@ def strided_split( torch.tensor( [-100] + offset[chunk_start:chunk_end, 1].tolist(), dtype=torch.long ).long(), - torch.tensor( - [[-100] * max_entity_length] - + target_label_ids[chunk_start:chunk_end].tolist(), - dtype=torch.long, - ).long() - if target_label_ids is not None - else None, + ( + torch.tensor( + [[-100] * max_entity_length] + + target_label_ids[chunk_start:chunk_end].tolist(), + dtype=torch.long, + ).long() + if target_label_ids is not None + else None + ), ) yield ex chunk_start += stride diff --git a/jaseci_ai_kit/_inactive/bi_ner/model/ph_model.py b/jaseci_ai_kit/_inactive/bi_ner/model/ph_model.py index fa481ece8d..e304cf4c30 100644 --- a/jaseci_ai_kit/_inactive/bi_ner/model/ph_model.py +++ b/jaseci_ai_kit/_inactive/bi_ner/model/ph_model.py @@ -372,11 +372,13 @@ def collate_examples( "input_ids": pad_sequence( all_input_ids, batch_first=True, padding_value=padding_token_id ).long(), - "labels": pad_images( - target_label_ids, padding_value=-100, padding_length=(pad_length, None) - ) - if not no_target_label_ids - else None, + "labels": ( + pad_images( + target_label_ids, padding_value=-100, padding_length=(pad_length, None) + ) + if not no_target_label_ids + else None + ), } if return_batch_examples: diff --git a/jaseci_ai_kit/jac_misc/jac_misc/openai/main.py b/jaseci_ai_kit/jac_misc/jac_misc/openai/main.py index c7a014e862..702bfef172 100644 --- a/jaseci_ai_kit/jac_misc/jac_misc/openai/main.py +++ b/jaseci_ai_kit/jac_misc/jac_misc/openai/main.py @@ -8,6 +8,7 @@ Requires OpenAI API Key """ + from enum import Enum from jaseci.jsorc.live_actions import jaseci_action from jaseci.utils.utils import logger diff --git a/jaseci_ai_kit/jac_nlp/jac_nlp/bi_enc/poly_enc.py b/jaseci_ai_kit/jac_nlp/jac_nlp/bi_enc/poly_enc.py index 0570207242..85da7097e8 100644 --- a/jaseci_ai_kit/jac_nlp/jac_nlp/bi_enc/poly_enc.py +++ b/jaseci_ai_kit/jac_nlp/jac_nlp/bi_enc/poly_enc.py @@ -1,6 +1,7 @@ """ This action is inactive and not maintained for produciton usage. """ + import os import torch from typing import Dict, List, Union diff --git a/jaseci_ai_kit/jac_vision/jac_vision/rftm/model.py b/jaseci_ai_kit/jac_vision/jac_vision/rftm/model.py index 586664c582..d4d5423c96 100644 --- a/jaseci_ai_kit/jac_vision/jac_vision/rftm/model.py +++ b/jaseci_ai_kit/jac_vision/jac_vision/rftm/model.py @@ -341,7 +341,6 @@ def resnet152(**kwargs): class ToTensor(object): - """Convert a ``PIL.Image`` or ``numpy.ndarray`` to tensor. Converts a PIL.Image or numpy.ndarray (H x W x C) in the range [0, 255] to a torch.FloatTensor of shape (C x H x W) in the range [0.0, 1.0]. diff --git a/jaseci_core/jaseci/cli_tools/book_tools.py b/jaseci_core/jaseci/cli_tools/book_tools.py index 2bfc52cdfa..b237b3ae53 100644 --- a/jaseci_core/jaseci/cli_tools/book_tools.py +++ b/jaseci_core/jaseci/cli_tools/book_tools.py @@ -205,11 +205,11 @@ def api_call_spec(self, cls): auth_level = ( "public" if j in Sm._public_api - else "user" - if j in Sm._private_api - else "admin" - if j in Sm._admin_api - else "cli_only" + else ( + "user" + if j in Sm._private_api + else "admin" if j in Sm._admin_api else "cli_only" + ) ) break if not found: @@ -438,11 +438,11 @@ def api_call_spec(self, cls): auth_level = ( "public" if j in Sm._public_api - else "user" - if j in Sm._private_api - else "admin" - if j in Sm._admin_api - else "cli_only" + else ( + "user" + if j in Sm._private_api + else "admin" if j in Sm._admin_api else "cli_only" + ) ) break if not found: diff --git a/jaseci_core/jaseci/extens/act_lib/djson.py b/jaseci_core/jaseci/extens/act_lib/djson.py index 1b91dd2e37..7f3c614c21 100644 --- a/jaseci_core/jaseci/extens/act_lib/djson.py +++ b/jaseci_core/jaseci/extens/act_lib/djson.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action from json import loads, dumps from re import compile diff --git a/jaseci_core/jaseci/extens/act_lib/file.py b/jaseci_core/jaseci/extens/act_lib/file.py index 363cacf72d..cc1a362ee9 100644 --- a/jaseci_core/jaseci/extens/act_lib/file.py +++ b/jaseci_core/jaseci/extens/act_lib/file.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action import os import json diff --git a/jaseci_core/jaseci/extens/act_lib/file_handler.py b/jaseci_core/jaseci/extens/act_lib/file_handler.py index 2303165410..49bad88807 100644 --- a/jaseci_core/jaseci/extens/act_lib/file_handler.py +++ b/jaseci_core/jaseci/extens/act_lib/file_handler.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import mimetypes import magic from os import path diff --git a/jaseci_core/jaseci/extens/act_lib/internal.py b/jaseci_core/jaseci/extens/act_lib/internal.py index b8d32f94c5..531676b0c4 100644 --- a/jaseci_core/jaseci/extens/act_lib/internal.py +++ b/jaseci_core/jaseci/extens/act_lib/internal.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action from jaseci.utils.utils import perf_test_start, perf_test_stop diff --git a/jaseci_core/jaseci/extens/act_lib/jaseci.py b/jaseci_core/jaseci/extens/act_lib/jaseci.py index 7647e6cde1..1ea1deb5b3 100644 --- a/jaseci_core/jaseci/extens/act_lib/jaseci.py +++ b/jaseci_core/jaseci/extens/act_lib/jaseci.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action from jaseci.utils.utils import master_from_meta, copy_func from jaseci.prim.super_master import SuperMaster diff --git a/jaseci_core/jaseci/extens/act_lib/net.py b/jaseci_core/jaseci/extens/act_lib/net.py index 6e8d93ff44..844c84d3c9 100644 --- a/jaseci_core/jaseci/extens/act_lib/net.py +++ b/jaseci_core/jaseci/extens/act_lib/net.py @@ -7,6 +7,7 @@ architype node and/or edges. Keep in mind that a \\lstinline{jac_set} is simply a list that only contains such elements. """ + from jaseci.jsorc.live_actions import jaseci_action from jaseci.utils.utils import master_from_meta from jaseci.jac.jac_set import JacSet diff --git a/jaseci_core/jaseci/extens/act_lib/rand.py b/jaseci_core/jaseci/extens/act_lib/rand.py index eb11ec47a5..75e9bfb9cf 100644 --- a/jaseci_core/jaseci/extens/act_lib/rand.py +++ b/jaseci_core/jaseci/extens/act_lib/rand.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import random # import faker diff --git a/jaseci_core/jaseci/extens/act_lib/request.py b/jaseci_core/jaseci/extens/act_lib/request.py index 2a556a0854..5d5e47aa2a 100644 --- a/jaseci_core/jaseci/extens/act_lib/request.py +++ b/jaseci_core/jaseci/extens/act_lib/request.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import requests from jaseci.jsorc.live_actions import jaseci_action diff --git a/jaseci_core/jaseci/extens/act_lib/stripe.py b/jaseci_core/jaseci/extens/act_lib/stripe.py index 7c591d50f8..af5a6e03ad 100644 --- a/jaseci_core/jaseci/extens/act_lib/stripe.py +++ b/jaseci_core/jaseci/extens/act_lib/stripe.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import stripe as s from jaseci.jsorc.jsorc import JsOrc diff --git a/jaseci_core/jaseci/extens/act_lib/task.py b/jaseci_core/jaseci/extens/act_lib/task.py index 085da683e0..aecb177872 100644 --- a/jaseci_core/jaseci/extens/act_lib/task.py +++ b/jaseci_core/jaseci/extens/act_lib/task.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.jsorc import JsOrc from jaseci.jsorc.live_actions import jaseci_action from jaseci.extens.svc.task_svc import TaskService diff --git a/jaseci_core/jaseci/extens/act_lib/url.py b/jaseci_core/jaseci/extens/act_lib/url.py index a6a2a30c6d..c041cd27e8 100644 --- a/jaseci_core/jaseci/extens/act_lib/url.py +++ b/jaseci_core/jaseci/extens/act_lib/url.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action from fastapi import HTTPException import base64 diff --git a/jaseci_core/jaseci/extens/act_lib/vector.py b/jaseci_core/jaseci/extens/act_lib/vector.py index b862a183e7..86593170f1 100644 --- a/jaseci_core/jaseci/extens/act_lib/vector.py +++ b/jaseci_core/jaseci/extens/act_lib/vector.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import numpy as np from operator import itemgetter import pickle, base64 diff --git a/jaseci_core/jaseci/extens/act_lib/webtool.py b/jaseci_core/jaseci/extens/act_lib/webtool.py index 50a7893857..a3ea40595c 100644 --- a/jaseci_core/jaseci/extens/act_lib/webtool.py +++ b/jaseci_core/jaseci/extens/act_lib/webtool.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + import requests from jaseci.jsorc.live_actions import jaseci_action from bs4 import BeautifulSoup diff --git a/jaseci_core/jaseci/extens/act_lib/zip.py b/jaseci_core/jaseci/extens/act_lib/zip.py index cc04b07a51..08fbedba46 100644 --- a/jaseci_core/jaseci/extens/act_lib/zip.py +++ b/jaseci_core/jaseci/extens/act_lib/zip.py @@ -1,4 +1,5 @@ """Built in actions for Jaseci""" + from jaseci.jsorc.live_actions import jaseci_action from jaseci.utils.utils import print_stack_to_log from base64 import b64decode, b64encode diff --git a/jaseci_core/jaseci/extens/api/actions_api.py b/jaseci_core/jaseci/extens/api/actions_api.py index 0915ecf641..47bf156f56 100644 --- a/jaseci_core/jaseci/extens/api/actions_api.py +++ b/jaseci_core/jaseci/extens/api/actions_api.py @@ -1,6 +1,7 @@ """ Admin Global api functions as a mixin """ + from jaseci.extens.api.interface import Interface import jaseci.jsorc.live_actions as lact import json diff --git a/jaseci_core/jaseci/extens/api/alias_api.py b/jaseci_core/jaseci/extens/api/alias_api.py index c86b2bfdc6..0acbd854a9 100644 --- a/jaseci_core/jaseci/extens/api/alias_api.py +++ b/jaseci_core/jaseci/extens/api/alias_api.py @@ -1,6 +1,7 @@ """ Alias api as a mixin """ + from jaseci.extens.api.interface import Interface diff --git a/jaseci_core/jaseci/extens/api/architype_api.py b/jaseci_core/jaseci/extens/api/architype_api.py index a5fc9eb0ac..63cc4304e7 100644 --- a/jaseci_core/jaseci/extens/api/architype_api.py +++ b/jaseci_core/jaseci/extens/api/architype_api.py @@ -1,6 +1,7 @@ """ Architype api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.prim.architype import Architype from jaseci.prim.sentinel import Sentinel diff --git a/jaseci_core/jaseci/extens/api/global_api.py b/jaseci_core/jaseci/extens/api/global_api.py index 2e10990d85..f6b48b9f21 100644 --- a/jaseci_core/jaseci/extens/api/global_api.py +++ b/jaseci_core/jaseci/extens/api/global_api.py @@ -1,6 +1,7 @@ """ Admin Global api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.prim.sentinel import Sentinel import uuid diff --git a/jaseci_core/jaseci/extens/api/graph_api.py b/jaseci_core/jaseci/extens/api/graph_api.py index da030a401c..f80039f9f4 100644 --- a/jaseci_core/jaseci/extens/api/graph_api.py +++ b/jaseci_core/jaseci/extens/api/graph_api.py @@ -1,6 +1,7 @@ """ Graph api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.utils.id_list import IdList from jaseci.prim.graph import Graph diff --git a/jaseci_core/jaseci/extens/api/health_api.py b/jaseci_core/jaseci/extens/api/health_api.py index b01e1d42f4..4361158141 100644 --- a/jaseci_core/jaseci/extens/api/health_api.py +++ b/jaseci_core/jaseci/extens/api/health_api.py @@ -1,6 +1,7 @@ """ Health APIs """ + from jaseci.jsorc.jsorc import JsOrc from jaseci.extens.api.interface import Interface diff --git a/jaseci_core/jaseci/extens/api/interface.py b/jaseci_core/jaseci/extens/api/interface.py index 024fa993b9..2dcff2f1a5 100644 --- a/jaseci_core/jaseci/extens/api/interface.py +++ b/jaseci_core/jaseci/extens/api/interface.py @@ -1,6 +1,7 @@ """ General master interface engine for client interfaces as mixin """ + from inspect import signature, getdoc from jaseci.utils.utils import logger, is_jsonable, is_true, exc_stack_as_str_list from jaseci.prim.element import Element diff --git a/jaseci_core/jaseci/extens/api/jac_api.py b/jaseci_core/jaseci/extens/api/jac_api.py index ab884cd427..b9f3b8c35f 100644 --- a/jaseci_core/jaseci/extens/api/jac_api.py +++ b/jaseci_core/jaseci/extens/api/jac_api.py @@ -1,6 +1,7 @@ """ Jac tools api functions as a mixin """ + from copy import deepcopy import json import os diff --git a/jaseci_core/jaseci/extens/api/jsorc_api.py b/jaseci_core/jaseci/extens/api/jsorc_api.py index dca1de1ac1..39d04e4313 100644 --- a/jaseci_core/jaseci/extens/api/jsorc_api.py +++ b/jaseci_core/jaseci/extens/api/jsorc_api.py @@ -1,6 +1,7 @@ """ JSORC APIs """ + import json from json import dumps from time import time diff --git a/jaseci_core/jaseci/extens/api/logger_api.py b/jaseci_core/jaseci/extens/api/logger_api.py index 0a94059787..971bcc7594 100644 --- a/jaseci_core/jaseci/extens/api/logger_api.py +++ b/jaseci_core/jaseci/extens/api/logger_api.py @@ -1,6 +1,7 @@ """ Logger api as a mixin """ + import re from jaseci.extens.api.interface import Interface from jaseci.utils.log_utils import parse_logs diff --git a/jaseci_core/jaseci/extens/api/master_api.py b/jaseci_core/jaseci/extens/api/master_api.py index 7625a919a6..2351d33401 100644 --- a/jaseci_core/jaseci/extens/api/master_api.py +++ b/jaseci_core/jaseci/extens/api/master_api.py @@ -1,6 +1,7 @@ """ Master api as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.utils.id_list import IdList import uuid diff --git a/jaseci_core/jaseci/extens/api/object_api.py b/jaseci_core/jaseci/extens/api/object_api.py index 4cb4c97d9b..22b412c122 100644 --- a/jaseci_core/jaseci/extens/api/object_api.py +++ b/jaseci_core/jaseci/extens/api/object_api.py @@ -1,6 +1,7 @@ """ Object api as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.prim.element import Element diff --git a/jaseci_core/jaseci/extens/api/prometheus_api.py b/jaseci_core/jaseci/extens/api/prometheus_api.py index 58f39d5c93..82a39cc6bc 100644 --- a/jaseci_core/jaseci/extens/api/prometheus_api.py +++ b/jaseci_core/jaseci/extens/api/prometheus_api.py @@ -1,6 +1,7 @@ """ Prometheus APIs """ + from jaseci.extens.api.interface import Interface from jaseci.jsorc.jsorc import JsOrc from jaseci.extens.svc.prome_svc import PrometheusService diff --git a/jaseci_core/jaseci/extens/api/queue_api.py b/jaseci_core/jaseci/extens/api/queue_api.py index 0bf55fc526..9dbe576f5a 100644 --- a/jaseci_core/jaseci/extens/api/queue_api.py +++ b/jaseci_core/jaseci/extens/api/queue_api.py @@ -1,6 +1,7 @@ """ Queue api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.jsorc.jsorc import JsOrc from jaseci.extens.svc.task_svc import TaskService diff --git a/jaseci_core/jaseci/extens/api/sentinel_api.py b/jaseci_core/jaseci/extens/api/sentinel_api.py index 8744eae414..1496e626f7 100644 --- a/jaseci_core/jaseci/extens/api/sentinel_api.py +++ b/jaseci_core/jaseci/extens/api/sentinel_api.py @@ -1,6 +1,7 @@ """ Sentinel api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.utils.id_list import IdList from jaseci.prim.sentinel import Sentinel diff --git a/jaseci_core/jaseci/extens/api/super_api.py b/jaseci_core/jaseci/extens/api/super_api.py index e72908db44..3839eb1834 100644 --- a/jaseci_core/jaseci/extens/api/super_api.py +++ b/jaseci_core/jaseci/extens/api/super_api.py @@ -1,6 +1,7 @@ """ Super (master) api as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.prim.master import Master diff --git a/jaseci_core/jaseci/extens/api/user_api.py b/jaseci_core/jaseci/extens/api/user_api.py index 38a12a532c..2d0d28dc61 100644 --- a/jaseci_core/jaseci/extens/api/user_api.py +++ b/jaseci_core/jaseci/extens/api/user_api.py @@ -1,6 +1,7 @@ """ User API """ + from jaseci.extens.api.interface import Interface from jaseci.jsorc.jsorc import JsOrc diff --git a/jaseci_core/jaseci/extens/api/walker_api.py b/jaseci_core/jaseci/extens/api/walker_api.py index ce8d88b060..442be5042f 100644 --- a/jaseci_core/jaseci/extens/api/walker_api.py +++ b/jaseci_core/jaseci/extens/api/walker_api.py @@ -1,6 +1,7 @@ """ Walker api functions as a mixin """ + from jaseci.extens.api.interface import Interface from jaseci.prim.walker import Walker from jaseci.prim.node import Node diff --git a/jaseci_core/jaseci/extens/api/webhook_api.py b/jaseci_core/jaseci/extens/api/webhook_api.py index 281700effd..ddd2e6ad38 100644 --- a/jaseci_core/jaseci/extens/api/webhook_api.py +++ b/jaseci_core/jaseci/extens/api/webhook_api.py @@ -1,6 +1,7 @@ """ Webhook API """ + from jaseci.extens.api.interface import Interface from fastapi import HTTPException from jaseci.jsorc.jsorc import JsOrc @@ -55,9 +56,11 @@ def webhook(self, provider: str, _req_ctx: dict = {}): ) sentinel = self._h.get_obj( master_id, - self._h.get_glob("GLOB_SENTINEL") - if sentinel_id == "global" - else sentinel_id, + ( + self._h.get_glob("GLOB_SENTINEL") + if sentinel_id == "global" + else sentinel_id + ), ) payload = {"event": req_body} diff --git a/jaseci_core/jaseci/extens/svc/elastic_svc.py b/jaseci_core/jaseci/extens/svc/elastic_svc.py index d625d04e55..c7050a66d6 100644 --- a/jaseci_core/jaseci/extens/svc/elastic_svc.py +++ b/jaseci_core/jaseci/extens/svc/elastic_svc.py @@ -70,9 +70,9 @@ def run(self): "elastic", metadata.get("namespace"), ) - self.config[ - "auth" - ] = f'basic {b64encode(f"elastic:{auth}".encode()).decode()}' + self.config["auth"] = ( + f'basic {b64encode(f"elastic:{auth}".encode()).decode()}' + ) self.app = Elastic(self.config) self.app.health("timeout=1s") diff --git a/jaseci_core/jaseci/jac/interpreter/architype_interp.py b/jaseci_core/jaseci/jac/interpreter/architype_interp.py index ce9837cc0d..55f5b26611 100644 --- a/jaseci_core/jaseci/jac/interpreter/architype_interp.py +++ b/jaseci_core/jaseci/jac/interpreter/architype_interp.py @@ -4,6 +4,7 @@ This interpreter should be inhereted from the class that manages state referenced through self. """ + from jaseci.prim.node import Node from jaseci.prim.edge import Edge from jaseci.prim.walker import Walker @@ -206,9 +207,13 @@ def build_object_with_supers(self, item, jac_ast): .get_jac_ast() .kid[-1] ) - self.run_attr_block(super_jac_ast, item) if not isinstance( - item, Walker - ) else self.run_walker_block(super_jac_ast, item) - self.run_attr_block(jac_ast, item) if not isinstance( - item, Walker - ) else self.run_walker_block(jac_ast, item) + ( + self.run_attr_block(super_jac_ast, item) + if not isinstance(item, Walker) + else self.run_walker_block(super_jac_ast, item) + ) + ( + self.run_attr_block(jac_ast, item) + if not isinstance(item, Walker) + else self.run_walker_block(jac_ast, item) + ) diff --git a/jaseci_core/jaseci/jac/interpreter/interp.py b/jaseci_core/jaseci/jac/interpreter/interp.py index 48a155ea80..dd1799f40d 100644 --- a/jaseci_core/jaseci/jac/interpreter/interp.py +++ b/jaseci_core/jaseci/jac/interpreter/interp.py @@ -4,6 +4,7 @@ This interpreter should be inhereted from the class that manages state referenced through self. """ + from jaseci.jsorc.jsorc import JsOrc from jaseci.extens.svc.task_svc import TaskService from jaseci.utils.utils import is_jsonable, parse_str_token, uuid_re diff --git a/jaseci_core/jaseci/jac/interpreter/sentinel_interp.py b/jaseci_core/jaseci/jac/interpreter/sentinel_interp.py index f8e0b04c1f..b421dc393e 100644 --- a/jaseci_core/jaseci/jac/interpreter/sentinel_interp.py +++ b/jaseci_core/jaseci/jac/interpreter/sentinel_interp.py @@ -4,6 +4,7 @@ This interpreter should be inhereted from the class that manages state referenced through self. """ + from jaseci.prim.architype import Architype from jaseci.jac.interpreter.interp import Interp from jaseci.utils.utils import parse_str_token @@ -215,8 +216,10 @@ def load_test(self, jac_ast): ); """ kid = self.set_cur_ast(jac_ast) - self.run_multistring(kid[2]) if kid[1].name == "NAME" else self.run_multistring( - kid[1] + ( + self.run_multistring(kid[2]) + if kid[1].name == "NAME" + else self.run_multistring(kid[1]) ) testcase = { "name": kid[1].token_text() if kid[1].name == "NAME" else "", diff --git a/jaseci_core/jaseci/jac/interpreter/walker_interp.py b/jaseci_core/jaseci/jac/interpreter/walker_interp.py index 2bc443c5f7..7282d1dbdc 100644 --- a/jaseci_core/jaseci/jac/interpreter/walker_interp.py +++ b/jaseci_core/jaseci/jac/interpreter/walker_interp.py @@ -4,6 +4,7 @@ This interpreter should be inhereted from the class that manages state referenced through self. """ + from jaseci.prim.node import Node from jaseci.jac.interpreter.interp import Interp from jaseci.jac.jac_set import JacSet diff --git a/jaseci_core/jaseci/jac/ir/jac_code.py b/jaseci_core/jaseci/jac/ir/jac_code.py index 7776d947ca..ddead655e6 100644 --- a/jaseci_core/jaseci/jac/ir/jac_code.py +++ b/jaseci_core/jaseci/jac/ir/jac_code.py @@ -1,6 +1,7 @@ """ Mix in for jac code object in Jaseci """ + import json from jaseci.utils.utils import logger from jaseci.jac.ir.ast_builder import JacAstBuilder @@ -93,9 +94,7 @@ def apply_ir(self, ir): self.code_ir = ( ir.strip() if (isinstance(ir, str)) - else json.dumps(ir) - if (isinstance(ir, dict)) - else jac_ast_to_ir(ir) + else json.dumps(ir) if (isinstance(ir, dict)) else jac_ast_to_ir(ir) ) self.code_sig = hashlib.md5(self.code_ir.encode()).hexdigest() JacCode.refresh(self) # should disregard overloaded versions diff --git a/jaseci_core/jaseci/jac/jac_set.py b/jaseci_core/jaseci/jac/jac_set.py index 08a5150e5c..d69df33851 100644 --- a/jaseci_core/jaseci/jac/jac_set.py +++ b/jaseci_core/jaseci/jac/jac_set.py @@ -3,6 +3,7 @@ Adds relevant operators to id_list for operations on sets of nodes and edges """ + # from jaseci.utils.id_list import id_list from jaseci.utils.utils import logger from jaseci.prim.element import Element diff --git a/jaseci_core/jaseci/jac/machine/jac_scope.py b/jaseci_core/jaseci/jac/machine/jac_scope.py index fb0fa29cd3..44b95acf2e 100644 --- a/jaseci_core/jaseci/jac/machine/jac_scope.py +++ b/jaseci_core/jaseci/jac/machine/jac_scope.py @@ -3,6 +3,7 @@ Utility for all runtime interaction with variables in different scopes """ + from jaseci.jac.machine.jac_value import JacValue from jaseci.jsorc.live_actions import get_global_actions diff --git a/jaseci_core/jaseci/jac/machine/jac_value.py b/jaseci_core/jaseci/jac/machine/jac_value.py index 4573e8e94d..01a5330cdb 100644 --- a/jaseci_core/jaseci/jac/machine/jac_value.py +++ b/jaseci_core/jaseci/jac/machine/jac_value.py @@ -3,6 +3,7 @@ Representations for all jac runtime variables """ + from jaseci.prim.element import Element from jaseci.prim.obj_mixins import Anchored from jaseci.prim.node import Node diff --git a/jaseci_core/jaseci/jac/machine/machine_state.py b/jaseci_core/jaseci/jac/machine/machine_state.py index 26d60a7ab7..abf81459c4 100644 --- a/jaseci_core/jaseci/jac/machine/machine_state.py +++ b/jaseci_core/jaseci/jac/machine/machine_state.py @@ -4,6 +4,7 @@ This interpreter should be inhereted from the class that manages state referenced through self. """ + from copy import copy from jaseci.utils.utils import logger, exc_stack_as_str_list, generate_stack_as_str_list from jaseci.jsorc.live_actions import live_actions, load_preconfig_actions @@ -99,9 +100,11 @@ def profile_out(self): "u_calls": 0 if name in MachineState.recur_detect_set else 1, "tot_time": self._jac_scope._total_time + (time.time() - self._jac_scope._start_time), - "cum_time": 0 - if name in MachineState.recur_detect_set - else time.time() - self._jac_scope._cum_start_time, + "cum_time": ( + 0 + if name in MachineState.recur_detect_set + else time.time() - self._jac_scope._cum_start_time + ), } else: c = self._mast._jac_profile[name]["calls"] diff --git a/jaseci_core/jaseci/jsorc/live_actions.py b/jaseci_core/jaseci/jsorc/live_actions.py index 7e2fa4bd16..82e7b72663 100644 --- a/jaseci_core/jaseci/jsorc/live_actions.py +++ b/jaseci_core/jaseci/jsorc/live_actions.py @@ -1,6 +1,7 @@ """ General action base class with automation for hot loading """ + from importlib.util import spec_from_file_location, module_from_spec from jaseci.utils.utils import logger from jaseci.jsorc.remote_actions import ACTIONS_SPEC_LOC diff --git a/jaseci_core/jaseci/jsorc/redis.py b/jaseci_core/jaseci/jsorc/redis.py index 4c6dbd9278..64070541f8 100644 --- a/jaseci_core/jaseci/jsorc/redis.py +++ b/jaseci_core/jaseci/jsorc/redis.py @@ -2,6 +2,7 @@ This module includes code related to hooking Jaseci's Redis to the core engine. """ + import json import jaseci as core_mod diff --git a/jaseci_core/jaseci/jsorc/remote_actions.py b/jaseci_core/jaseci/jsorc/remote_actions.py index 6986cd95b0..fbc689eb48 100644 --- a/jaseci_core/jaseci/jsorc/remote_actions.py +++ b/jaseci_core/jaseci/jsorc/remote_actions.py @@ -1,6 +1,7 @@ """ General action base class with automation for hot loading """ + from jaseci.utils.utils import logger, ColCodes as Cc from fastapi import FastAPI from fastapi.responses import RedirectResponse diff --git a/jaseci_core/jaseci/prim/ability.py b/jaseci_core/jaseci/prim/ability.py index 058a15d800..c4feb3e9c3 100644 --- a/jaseci_core/jaseci/prim/ability.py +++ b/jaseci_core/jaseci/prim/ability.py @@ -3,6 +3,7 @@ Each action has an id, name, timestamp and it's set of edges. """ + from jaseci.prim.element import Element from jaseci.jsorc.live_actions import live_actions from jaseci.jac.jac_set import JacSet diff --git a/jaseci_core/jaseci/prim/architype.py b/jaseci_core/jaseci/prim/architype.py index 3b026c9889..5e119b0081 100644 --- a/jaseci_core/jaseci/prim/architype.py +++ b/jaseci_core/jaseci/prim/architype.py @@ -4,6 +4,7 @@ Each architype is a registered templatized version of instances of any Jaseci abstractions or collections of instances (e.g., subgraphs, etc) """ + from jaseci.prim.element import Element from jaseci.jac.interpreter.architype_interp import ArchitypeInterp from jaseci.jac.ir.jac_code import JacCode diff --git a/jaseci_core/jaseci/prim/edge.py b/jaseci_core/jaseci/prim/edge.py index 2a4ff40945..044ed3bb3f 100644 --- a/jaseci_core/jaseci/prim/edge.py +++ b/jaseci_core/jaseci/prim/edge.py @@ -4,6 +4,7 @@ Each edge has an id, name, timestamp, the from node at the element of the edge and the to node it is pointing to. """ + from jaseci.prim.element import Element from jaseci.prim.obj_mixins import Anchored from jaseci.utils.utils import logger diff --git a/jaseci_core/jaseci/prim/graph.py b/jaseci_core/jaseci/prim/graph.py index a0fea6c3fc..77a86d63d4 100644 --- a/jaseci_core/jaseci/prim/graph.py +++ b/jaseci_core/jaseci/prim/graph.py @@ -2,6 +2,7 @@ Graph class for Jaseci """ + from jaseci.prim.node import Node from jaseci.utils.id_list import IdList diff --git a/jaseci_core/jaseci/prim/node.py b/jaseci_core/jaseci/prim/node.py index 71dd93018b..f34f7c6eed 100644 --- a/jaseci_core/jaseci/prim/node.py +++ b/jaseci_core/jaseci/prim/node.py @@ -4,6 +4,7 @@ Each node has an id, name, timestamp and it's set of edges. First node in list of 'member_node_ids' is designated root node """ + from collections import OrderedDict from jaseci.prim.element import Element from jaseci.prim.obj_mixins import Anchored diff --git a/jaseci_core/jaseci/prim/obj_mixins.py b/jaseci_core/jaseci/prim/obj_mixins.py index 6814389dfd..8acd1c00cc 100644 --- a/jaseci_core/jaseci/prim/obj_mixins.py +++ b/jaseci_core/jaseci/prim/obj_mixins.py @@ -3,6 +3,7 @@ Various mixins to define properties of Jaseci objects """ + from jaseci.utils.id_list import IdList from jaseci.utils.utils import logger import uuid @@ -84,9 +85,11 @@ def __init__(self, m_id, mode=None, **kwargs): self.j_access = ( mode if mode is not None - else self._h.get_obj(self._m_id, self._m_id).perm_default - if self._h.has_obj(self._m_id) - else "private" + else ( + self._h.get_obj(self._m_id, self._m_id).perm_default + if self._h.has_obj(self._m_id) + else "private" + ) ) self.j_r_acc_ids = IdList(self) self.j_rw_acc_ids = IdList(self) diff --git a/jaseci_core/jaseci/prim/sentinel.py b/jaseci_core/jaseci/prim/sentinel.py index 449246baf0..13ca8dd4c1 100644 --- a/jaseci_core/jaseci/prim/sentinel.py +++ b/jaseci_core/jaseci/prim/sentinel.py @@ -3,6 +3,7 @@ Each sentinel has an id, name, timestamp and it's set of walkers. """ + from jaseci.prim.element import Element from jaseci.prim.obj_mixins import Anchored from jaseci.utils.utils import ( diff --git a/jaseci_core/jaseci/tests/test_stripe.py b/jaseci_core/jaseci/tests/test_stripe.py index 33d8b1f816..37f367aeb1 100644 --- a/jaseci_core/jaseci/tests/test_stripe.py +++ b/jaseci_core/jaseci/tests/test_stripe.py @@ -13,9 +13,9 @@ class StripeTests(CoreTest): def setUpClass(cls): config = JsOrc.settings("STRIPE_CONFIG") config["enabled"] = True - config[ - "api_key" - ] = "sk_test_51JWUIeCZO78n7fsZnPvualWhmJg1DcCI332kKnWF3q2sKGwnPADjEmNblfFWi4pWAWPuJwHxpeSoJGc0J5ButHN900Q2xBz1se" + config["api_key"] = ( + "sk_test_51JWUIeCZO78n7fsZnPvualWhmJg1DcCI332kKnWF3q2sKGwnPADjEmNblfFWi4pWAWPuJwHxpeSoJGc0J5ButHN900Q2xBz1se" + ) config["webhook_key"] = "test_webhook_key" JsOrc.svc_reset("stripe") diff --git a/jaseci_core/jaseci/utils/actions/actions_optimizer.py b/jaseci_core/jaseci/utils/actions/actions_optimizer.py index 7cef08cbbe..eee2adf158 100644 --- a/jaseci_core/jaseci/utils/actions/actions_optimizer.py +++ b/jaseci_core/jaseci/utils/actions/actions_optimizer.py @@ -1,6 +1,7 @@ """ Module that manage and optimizes the actions configuration of Jaseci """ + from jaseci.jsorc.jsorc import JsOrc from jaseci.extens.svc.kube_svc import KubeService from jaseci.jsorc.remote_actions import ACTIONS_SPEC_LOC diff --git a/jaseci_core/jaseci/utils/id_list.py b/jaseci_core/jaseci/utils/id_list.py index 13ca3e3ac7..f70323eb34 100644 --- a/jaseci_core/jaseci/utils/id_list.py +++ b/jaseci_core/jaseci/utils/id_list.py @@ -6,6 +6,7 @@ parent_obj is the instance that the list belongs to """ + from jaseci.utils.utils import logger diff --git a/jaseci_serv/jaseci_serv/base/models.py b/jaseci_serv/jaseci_serv/base/models.py index b0c2e6755c..9b371b1e27 100644 --- a/jaseci_serv/jaseci_serv/base/models.py +++ b/jaseci_serv/jaseci_serv/base/models.py @@ -135,9 +135,9 @@ def master_allusers( "created_date": i.time_created.isoformat(), "is_activated": i.is_activated, "is_superuser": i.is_superuser, - "last_login": i.last_login.isoformat() - if i.last_login is not None - else "", + "last_login": ( + i.last_login.isoformat() if i.last_login is not None else "" + ), } ) ret = {"total": total, "data": filtered_users} diff --git a/jaseci_serv/jaseci_serv/hook/orm.py b/jaseci_serv/jaseci_serv/hook/orm.py index 32653f543f..b52a7e5666 100644 --- a/jaseci_serv/jaseci_serv/hook/orm.py +++ b/jaseci_serv/jaseci_serv/hook/orm.py @@ -4,6 +4,7 @@ FIX: Serious permissions work needed """ + import uuid from django.core.exceptions import ObjectDoesNotExist diff --git a/jaseci_serv/jaseci_serv/urls.py b/jaseci_serv/jaseci_serv/urls.py index dd74add7a7..ff3e79876a 100644 --- a/jaseci_serv/jaseci_serv/urls.py +++ b/jaseci_serv/jaseci_serv/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path, include from rest_framework import permissions diff --git a/jaseci_serv/manage.py b/jaseci_serv/manage.py index 159e9b84e3..a5faa986cd 100755 --- a/jaseci_serv/manage.py +++ b/jaseci_serv/manage.py @@ -1,4 +1,5 @@ """Django's command-line utility for administrative tasks.""" + import os import sys