jaseci 1.4.2.4__py3-none-any.whl → 1.4.2.6__py3-none-any.whl

jaseci/extens/svc/elastic_svc.py

@@ -70,23 +70,24 @@ class ElasticService(JsOrc.CommonService):
                         "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")
 
     def post_run(self):
-        under_test = self.config.get("under_test", False)
-        if not under_test:
-            self.configure_elastic()
-        LOG_QUEUES["core"] = self.add_elastic_log_handler(
-            logger, self.config.get("core_log_index") or "core", under_test
-        )
-        LOG_QUEUES["app"] = self.add_elastic_log_handler(
-            app_logger, self.config.get("app_log_index") or "app", under_test
-        )
+        if multiprocessing.current_process().name == "MainProcess":
+            under_test = self.config.get("under_test", False)
+            if not under_test:
+                self.configure_elastic()
+            LOG_QUEUES["core"] = self.add_elastic_log_handler(
+                logger, self.config.get("core_log_index") or "core", under_test
+            )
+            LOG_QUEUES["app"] = self.add_elastic_log_handler(
+                app_logger, self.config.get("app_log_index") or "app", under_test
+            )
 
     def configure_elastic(self):
         """
@@ -297,14 +298,13 @@ class Elastic:
     # standard methods
     def generate_from_meta(self, meta: dict, override: dict, action: str = None):
         scope = meta["scope"].local_scope
-        interp = meta["interp"]
 
-        node = interp.current_node
         walker = scope["visitor"]
+        node = walker.current_node
 
         override_misc = override.get("misc")
         override["misc"] = {
-            "report": copy(interp.report),
+            "report": copy(walker.report),
             "node": node.serialize(detailed=False),
         }
 
@@ -313,7 +313,7 @@ class Elastic:
 
         master = meta["h"].get_obj(meta["m_id"], meta["m_id"]).master_self(True)
 
-        headers = interp.request_context.get("headers", {})
+        headers = walker.request_context.get("headers", {})
         if headers.get("Authorization"):
             del headers["Authorization"]
 
@@ -326,7 +326,7 @@ class Elastic:
             "node_id": node.jid,
             "master_id": master["jid"],
             "user": master.get("__meta__") or {"email": master["name"]},
-            "request_context": interp.request_context,
+            "request_context": walker.request_context,
             "data": walker.context,
         }
 

jaseci/extens/svc/kube_svc.py

@@ -1,5 +1,5 @@
 from base64 import b64decode
-
+from datetime import datetime
 from kubernetes import config as kubernetes_config
 from kubernetes.client import (
     ApiClient,
@@ -394,3 +394,39 @@ class KubeService(JsOrc.CommonService):
         placeholder_resolver(manifest, manifest)
 
         return manifest
+
+    def has_replicas(self):
+        try:
+            return (
+                self.read(
+                    "Deployment", "jaseci", self.namespace, quiet=self.quiet
+                ).spec.replicas
+                > 1
+            )
+        except Exception as e:
+            self.quiet or logger.error(f"Error checking jaseci replica -- {e}")
+
+    def restart(self):
+        try:
+            return self.api.patch_namespaced_deployment(
+                name="jaseci",
+                namespace=self.namespace,
+                body={
+                    "spec": {
+                        "template": {
+                            "metadata": {
+                                "annotations": {
+                                    "kubectl.kubernetes.io/restartedAt": datetime.utcnow().isoformat(
+                                        "T"
+                                    )
+                                    + "Z"
+                                }
+                            }
+                        }
+                    }
+                },
+            )
+        except ApiException as e:
+            self.quiet or logger.error(
+                f"Error triggering jaseci rollout restart -- {e}"
+            )

jaseci/extens/svc/redis_svc.py

@@ -49,9 +49,12 @@ class RedisService(JsOrc.CommonService):
     #                     CLEANER                     #
     ###################################################
 
-    def clear(self):
+    def clear(self, all=True):
         if self.is_running():
-            self.app.flushdb()
+            if all:
+                self.app.flushall()
+            else:
+                self.app.flushdb()
 
     # ---------------- PROXY EVENTS ----------------- #
 

jaseci/extens/svc/storage_svc.py

@@ -1,12 +1,14 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from jaseci.jsorc.jsorc import JsOrc
 from jaseci.utils.file_handler import FileHandler
 
-from libcloud.storage.providers import get_driver
+from libcloud.storage.types import Provider, ObjectDoesNotExistError
+from libcloud.storage.providers import get_driver as _get_driver
 from libcloud.storage.base import StorageDriver, Object, Container
+from libcloud.storage.drivers.azure_blobs import AzureBlobsStorageDriver
 
-from typing import Iterator
+from azure.storage.blob import generate_blob_sas
 
 
 @JsOrc.service(
@@ -33,13 +35,16 @@ class StorageService(JsOrc.CommonService):
         metadata = {
             "id": file.id,
             "name": file.name,
-            "content_type": file.content_type,
             "created": datetime.utcnow().isoformat(),
         }
 
+        # metadata doesn't support empty value
+        if file.content_type:
+            metadata["content_type"] = file.content_type
+
         # metadata doesn't support empty value
         if file.field:
-            metadata["field"] - file.field
+            metadata["field"] = file.field
 
         if container:
             container = provider["driver"].get_container(container_name=container)
@@ -72,13 +77,29 @@ class StorageService(JsOrc.CommonService):
 
         return temp_file
 
-    def delete(self, file: str, provider: str = None, container: str = None) -> bool:
+    def cdn_url(
+        self, file: str, provider: str = None, container: str = None, **kwargs
+    ) -> str:
         provider = self.app.get_storage(provider)
+        driver = provider["driver"]
 
-        obj: Object = provider["driver"].get_object(
-            container_name=container or provider["container"].name, object_name=file
+        return driver.get_object_cdn_url(
+            driver.get_object(
+                container_name=container or provider["container"].name, object_name=file
+            ),
+            **kwargs,
         )
 
+    def delete(self, file: str, provider: str = None, container: str = None) -> bool:
+        provider = self.app.get_storage(provider)
+
+        try:
+            obj: Object = provider["driver"].get_object(
+                container_name=container or provider["container"].name, object_name=file
+            )
+        except ObjectDoesNotExistError:
+            return True
+
         return provider["driver"].delete_object(obj)
 
     def create_container(self, name: str, provider: str = None) -> Container:
@@ -124,3 +145,49 @@ class StorageHandler:
             return self.storage[provider]
         elif self.default:
             return self.storage[self.default]
+
+
+#############################################################################################
+# ----------------------------------- PROVIDER OVERRIDE ----------------------------------- #
+#############################################################################################
+
+
+class AzureBlobsStorageDriverOverride(AzureBlobsStorageDriver):
+    AZURE_STORAGE_CDN_URL_DATE_FORMAT = "%Y-%m-%dT%HH:%M:%SZ"
+
+    def __init__(
+        self,
+        key,
+        secret=None,
+        **kwargs,
+    ):
+        self.secret_raw = secret
+        super().__init__(key, secret, **kwargs)
+
+    def get_object_cdn_url(self, obj: Object, ex_expiry: float = 24, **kwargs):
+        sas = generate_blob_sas(
+            self.key,
+            obj.container.name,
+            obj.name,
+            account_key=self.secret_raw,
+            permission="r",
+            expiry=datetime.utcnow() + timedelta(hours=ex_expiry),
+            **kwargs,
+        )
+
+        return "{scheme}://{host}:{port}{action}?{sas_token}".format(
+            scheme="https" if self.secure else "http",
+            host=self.connection.host,
+            port=self.connection.port,
+            action=self.connection.morph_action_hook(
+                self._get_object_path(obj.container, obj.name)
+            ),
+            sas_token=sas,
+        )
+
+
+overrided_providers = {Provider.AZURE_BLOBS: AzureBlobsStorageDriverOverride}
+
+
+def get_driver(provider):
+    return overrided_providers.get(provider) or _get_driver(provider)

jaseci/jac/interpreter/architype_interp.py

@@ -4,6 +4,7 @@ Sentinel interpreter for jac code in AST form
 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 @@ class ArchitypeInterp(Interp):
                 .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)
+        )

jaseci/jac/interpreter/interp.py

@@ -4,6 +4,7 @@ Interpreter for jac code in AST form
 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
@@ -23,6 +24,7 @@ from json import dumps, loads
 from copy import copy, deepcopy
 from base64 import b64decode
 from itertools import pairwise
+from types import GeneratorType
 
 from jaseci.jac.jsci_vm.op_codes import JsCmp
 
@@ -156,13 +158,15 @@ class Interp(VirtualMachine):
         self._jac_try_mode += 1
         try:
             self.run_code_block(kid[1])
+            self._jac_try_mode -= 1
         except TryException as e:
+            self._jac_try_mode -= 1
             if len(kid) > 2:
                 self.run_else_from_try(kid[2], e.ref)
         except Exception as e:
+            self._jac_try_mode -= 1
             if len(kid) > 2:
                 self.run_else_from_try(kid[2], self.jac_exception(e, kid[2]))
-        self._jac_try_mode -= 1
 
     def run_else_from_try(self, jac_ast, jac_ex):
         """
@@ -228,7 +232,7 @@ class Interp(VirtualMachine):
             self.run_expression(kid[3])
             lst = self.pop().value
 
-            if isinstance(lst, (list, dict)):
+            if isinstance(lst, (list, dict, GeneratorType)):
                 for i in lst:
                     self._loop_ctrl = None
                     var.value = i
@@ -324,13 +328,24 @@ class Interp(VirtualMachine):
         """
         destroy_action: KW_DESTROY expression SEMI;
         """
+        from jaseci.prim.ability import Ability
+
         kid = self.set_cur_ast(jac_ast)
         self.run_expression(kid[1])
         result = self.pop()
+
+        destroy_node_ids = None
+        if isinstance(self, Ability):
+            # currently, only walker process destroy_node_ids
+            # ability should be able to trigger destroy but still connected to current walker
+            destroy_node_ids = self._jac_scope.local_scope["visitor"].destroy_node_ids
+        else:
+            destroy_node_ids = self.destroy_node_ids
+
         if isinstance(result.value, Element):
-            self.destroy_node_ids.add_obj(result.value)
+            destroy_node_ids.add_obj(result.value)
         elif isinstance(result.value, JacSet):
-            self.destroy_node_ids.add_obj_list(result.value)
+            destroy_node_ids.add_obj_list(result.value)
         result.self_destruct(kid[1])
 
     def run_report_action(self, jac_ast):

jaseci/jac/interpreter/sentinel_interp.py

@@ -4,6 +4,7 @@ Sentinel interpreter for jac code in AST form
 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 @@ class SentinelInterp(Interp):
             );
         """
         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 "",

jaseci/jac/interpreter/walker_interp.py

@@ -4,6 +4,7 @@ Walker interpreter for jac code in AST form
 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

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 @@ class JacCode:
         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

jaseci/jac/jac_set.py

@@ -3,6 +3,7 @@ Jac's set class for Jaseci
 
 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

jaseci/jac/machine/jac_scope.py

@@ -3,6 +3,7 @@ Variable scope manager for Jac
 
 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
 

jaseci/jac/machine/jac_value.py

@@ -3,6 +3,7 @@ Variable manager for Jac
 
 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

jaseci/jac/machine/machine_state.py

@@ -4,6 +4,7 @@ Interpreter for jac code in AST form
 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 @@ class MachineState:
                     "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"]
@@ -210,13 +213,21 @@ class MachineState:
     def inherit_runtime_state(self, mach):
         """Inherits runtime output state from another machine"""
         self.report += mach.report
+        mach.report = []
         if mach.report_status:
             self.report_status = mach.report_status
+            mach.report_status = None
         if mach.report_custom:
             self.report_custom = mach.report_custom
+            mach.report_custom = None
         if mach.report_file:
             self.report_file = mach.report_file
+            mach.report_file = None
         self.runtime_errors += mach.runtime_errors
+        mach.runtime_errors = []
+        mach.runtime_stack_trace = []
+        mach._loop_ctrl = None
+        mach._stopped = None
 
     def obj_set_to_jac_set(self, obj_set):
         """

jaseci/jsorc/jsorc.py

@@ -84,7 +84,7 @@ class JsOrc:
     @classmethod
     def run(cls):
         if not cls.__running__:
-            cls.__running__ == True
+            cls.__running__ = True
             cls.configure()
             cls.push_interval(1)
 
@@ -264,6 +264,32 @@ class JsOrc:
 
         return cls._service_instances[service]
 
+    @classmethod
+    def svc_conf_set(
+        cls, service: str, config: dict, hook: None, cast: T = None
+    ) -> Union[T, cs]:
+        from jaseci.extens.svc.kube_svc import KubeService
+
+        if service not in cls._services:
+            raise Exception(f"Service {service} is not existing!")
+
+        if cls.db_check():
+            instance = cls._services[service][0]
+            hook = hook or cls.hook(use_proxy=instance["proxy"])
+            hook.save_glob(instance["config"], dumps(config))
+            hook.commit()
+
+        kube = cls.svc("kube", KubeService)
+        if kube.is_running() and kube.has_replicas():
+            hook.clear_cache(True)
+            return (
+                "Rollout restart commencing..."
+                if not isinstance(kube.restart(), ApiException)
+                else "Attempt to rollout restart failed! Please check the logs for further information!"
+            )
+
+        return cls.svc_reset(service).info()
+
     @classmethod
     def svc_reset(cls, service, cast: T = None) -> Union[T, cs]:
         """
@@ -333,7 +359,7 @@ class JsOrc:
                 target=cls._services,
                 entry={
                     "type": service,
-                    "config": config or f"{name.upper()}_CONFIG",
+                    "config": (config or f"{name}_CONFIG").upper(),
                     "manifest": manifest,
                     "manifest_type": manifest_type,
                     "priority": priority,

jaseci/jsorc/jsorc_utils.py

@@ -284,3 +284,15 @@ class CommonService:
         # for build on pickle load
         self.state = State.FAILED
         del self
+
+    # ------------------- COMMON -------------------- #
+
+    def info(self):
+        return {
+            "enabled": self.enabled,
+            "automated": self.automated,
+            "quiet": self.quiet,
+            "state": self.state.name,
+            "config": self.config,
+            "error": str(self.error) if self.error else None,
+        }

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

jaseci/jsorc/manifests/elastic.yaml

@@ -5639,6 +5639,7 @@ spec:
       serviceAccountName: elastic-operator
       securityContext:
         runAsNonRoot: true
+        fsGroup: 65534
       containers:
       - image: "docker.elastic.co/eck/eck-operator:2.7.0"
         imagePullPolicy: IfNotPresent
@@ -6000,6 +6001,10 @@ spec:
     count: 1
     config:
       node.store.allow_mmap: false
+      http.cors.enabled: true
+      http.cors.allow-origin: "*"
+      http.cors.allow-methods: OPTIONS, POST, GET
+      http.cors.allow-headers: X-Requested-With, X-Auth-Token, Content-Type, Content-Length, Authorization, Access-Control-Allow-Headers, Accept
     volumeClaimTemplates:
     - metadata:
         name: elasticsearch-data

jaseci/jsorc/memory.py

@@ -231,7 +231,7 @@ class MemoryHook:
 
         return cls
 
-    def clear_cache(self):
+    def clear_cache(self, all=False):
         MemoryHook.__init__(self)
 
     ####################################################

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
@@ -131,11 +132,9 @@ class RedisHook(MemoryHook):
     #                     CLEANER                     #
     ###################################################
 
-    def clear_cache(self):
-        if self.redis.is_running():
-            self.redis.app.flushdb()
-
-        MemoryHook.__init__(self)
+    def clear_cache(self, all=False):
+        super().clear_cache(all)
+        self.redis.clear(all)
 
 
 # ----------------------------------------------- #

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

jaseci/prim/ability.py

@@ -3,6 +3,7 @@ Action class for Jaseci
 
 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
@@ -34,7 +35,6 @@ class Ability(Element, JacCode, Interp):
         """
         Run ability
         """
-        Interp.__init__(self)  # Reset before as result need to be absorbed after
         self.push_scope(
             JacScope(
                 parent=self,
@@ -66,22 +66,17 @@ class Ability(Element, JacCode, Interp):
         action_manager.pre_action_call_hook()
 
         ts = time.time()
-        if "meta" in args:
-            result = func(
-                *param_list["args"],
-                **param_list["kwargs"],
-                meta={
+        try:
+            if "meta" in args:
+                param_list["kwargs"]["meta"] = {
                     "m_id": scope.parent._m_id,
                     "h": scope.parent._h,
                     "scope": scope,
                     "interp": interp,
-                },
-            )
-        else:
-            try:
-                result = func(*param_list["args"], **param_list["kwargs"])
-            except Exception as e:
-                interp.rt_error(e, jac_ast, True)
+                }
+            result = func(*param_list["args"], **param_list["kwargs"])
+        except Exception as e:
+            interp.rt_error(e, jac_ast, True)
         t = time.time() - ts
         action_manager.post_action_call_hook(action_name, t)
         return result

jaseci/prim/architype.py

@@ -4,6 +4,7 @@ Architype class for Jaseci
 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