jaseci 1.4.1.9__tar.gz → 1.4.2__tar.gz

jaseci-1.4.2/PKG-INFO

@@ -0,0 +1,35 @@
+Metadata-Version: 2.1
+Name: jaseci
+Version: 1.4.2
+Home-page: https://github.com/Jaseci-Labs/jaseci
+Author: Jason Mars
+Author-email: jason@jaseci.org
+License-File: LICENSE
+Requires-Dist: click<8.2.0,>=8.1.0
+Requires-Dist: click-shell<2.2,>=2.1
+Requires-Dist: numpy<1.24.0,>=1.23.0
+Requires-Dist: antlr4-python3-runtime<4.10.0,>=4.9.3
+Requires-Dist: fastapi[all]<1.0.0,>=0.75.0
+Requires-Dist: requests
+Requires-Dist: redis
+Requires-Dist: celery<6,>=5
+Requires-Dist: flake8
+Requires-Dist: pep8-naming
+Requires-Dist: stripe
+Requires-Dist: pydantic<2.0.0
+Requires-Dist: docstring-parser
+Requires-Dist: prometheus_api_client==0.5.1
+Requires-Dist: prometheus-client==0.14.1
+Requires-Dist: kubernetes==23.6.0
+Requires-Dist: pytest
+Requires-Dist: pytest-xdist
+Requires-Dist: pytest-cov
+Requires-Dist: validators==0.21.2
+Requires-Dist: psycopg2-binary==2.9.5
+Requires-Dist: pygls
+Requires-Dist: mock
+Requires-Dist: beautifulsoup4<4.13.0,>=4.12.2
+Requires-Dist: lxml<4.10.0,>=4.9.2
+Requires-Dist: html5lib<1.2,>=1.1
+Requires-Dist: prettytable<3.8.0,>=3.7.0
+Requires-Dist: apache-libcloud==3.7.0

jaseci-1.4.2/jaseci/VERSION

@@ -0,0 +1 @@
+1.4.2

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/extens/api/global_api.py

@@ -42,17 +42,26 @@ class GlobalApi:
     @Interface.admin_api()
     def global_sentinel_set(self, snt: Sentinel = None):
         """
-        Set sentinel as globally accessible
+        Make a sentinel globally accessible and set it as the global sentinel
         """
         snt.make_read_only()
         snt.propagate_access()
         self._h.save_glob("GLOB_SENTINEL", snt.jid)
         return {"response": f"Global sentinel set to '{snt}'!"}
 
+    @Interface.admin_api()
+    def global_sentinel_set_access(self, snt: Sentinel = None):
+        """
+        Make a sentinel globally accessible
+        """
+        snt.make_read_only()
+        snt.propagate_access()
+        return {"response": f"Sentinel '{snt}' is now globally accessible."}
+
     @Interface.admin_api()
     def global_sentinel_unset(self):
         """
-        Set sentinel as globally accessible
+        Unset a global sentinel
         """
         current = self.global_get("GLOB_SENTINEL")["value"]
         if current:

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/extens/svc/elastic_svc.py

@@ -81,8 +81,12 @@ class ElasticService(JsOrc.CommonService):
         under_test = self.config.get("under_test", False)
         if not under_test:
             self.configure_elastic()
-        LOG_QUEUES["core"] = self.add_elastic_log_handler(logger, "core", under_test)
-        LOG_QUEUES["app"] = self.add_elastic_log_handler(app_logger, "app", under_test)
+        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):
         """

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/jsorc/jsorc_settings.py

@@ -172,6 +172,8 @@ class JsOrcSettings:
         "auth": os.getenv("ELASTIC_AUTH"),
         "common_index": f"{KUBE_NAMESPACE}-common",
         "activity_index": f"{KUBE_NAMESPACE}-activity",
+        "core_log_index": "core",
+        "app_log_index": "app",
         "ilm_policy_name": ELASTIC_ILM_POLICY_NAME,
         "ilm_policy": ELASTIC_ILM_POLICY,
         "index_template_name": ELASTIC_INDEX_TEMPLATE_NAME,

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/prim/edge.py

@@ -103,8 +103,13 @@ class Edge(Element, Anchored):
         """
         Write self through hook to persistent storage
         """
+
         if self.is_fast():
             self._persist = False
+            if self.from_node_id:
+                self.from_node().save()
+            if self.to_node_id:
+                self.to_node().save()
         super().save()
 
     def destroy(self):

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/prim/node.py

@@ -52,16 +52,23 @@ class Node(Element, Anchored):
         for k in self.fast_edges.keys():
             for v in self.fast_edges[k]:
                 link_order = [v[0], self.jid] if v[1] == FROM else [self.jid, v[0]]
-                edge = Edge(
-                    m_id=self._m_id, h=self._h, kind="edge", name=k, auto_save=False
-                )
-                edge.from_node_id = link_order[0]
-                edge.to_node_id = link_order[1]
-                edge.bidirected = v[1] == BI
-                edge.jid = v[2] if len(v) > 2 else uuid.uuid4().urn
-                edge.context = v[3] if len(v) > 3 else {}
-                edge.save()
-                self._fast_edge_ids.add_obj(edge)
+                edge = self._h.get_obj(self._m_id, v[2])
+                if edge:
+                    v[3] = edge.context
+                else:
+                    edge = Edge(
+                        m_id=self._m_id, h=self._h, kind="edge", name=k, auto_save=False
+                    )
+                    edge.from_node_id = link_order[0]
+                    edge.to_node_id = link_order[1]
+                    edge.bidirected = v[1] == BI
+                    edge.jid = v[2] if len(v) > 2 else uuid.uuid4().urn
+                    edge.context = v[3] if len(v) > 3 else {}
+                    # old `edge.save()` might be confusing
+                    # this line doesn't mean it has to be saved on db
+                    # it only needs to be available on cache (memory, redis)
+                    self._h.commit_obj_to_cache(edge, True)
+                self._fast_edge_ids.add_obj(edge, bypass=True)
 
     def smart_add_edge(self, obj):
         # make sure fast edges built

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/tests/jac_test_code.py

@@ -1186,3 +1186,108 @@ struct_types = """
         report [a.basic.apple.apple, a.basic.apple.orange];
     }
     """
+
+
+simple_graph = """
+node a1 {has val = 0;}
+node a2 {has val = 0;}
+node a3 {has val = 0;}
+node b1 {has val = 0;}
+node b2 {has val = 0;}
+edge e1 {has val = 0;}
+edge e2 {has val = 0;}
+edge e3 {has val = 0;}
+
+walker sample {
+    root {
+        take --> node::a1 else: take spawn here +[e1]+> node::a1;
+        take --> node::b1 else: take spawn here ++> node::b1;
+    }
+
+    a1: take --> node::a2 else {
+        report --> node::a2;
+        report -[e2]-> node::a2;
+        take spawn here +[e2]+> node::a2;
+    }
+    a2: take --> node::a3 else: take spawn here +[e3]+> node::a3;
+    b1: take --> node::b2 else: take spawn here ++> node::b2;
+}
+
+walker sample2 {
+    root {
+        take --> node::a1;
+        take --> node::b1;
+    }
+    a1: take --> node::a2;
+    a2: take --> node::a3;
+    a3: here.val = 1;
+    b1: take --> node::b2;
+    b2: here.val = 1;
+}
+
+walker sample3 {
+    root {
+        take --> node::a1;
+        take --> node::b1;
+    }
+    a1 {
+        -[e2]->.edge[0].val = 1;
+        take --> node::a2;
+    }
+    a2 {
+        take --> node::a3;
+        here not --> node::a3;
+    }
+    a3: here.val = 2;
+    b1: take --> node::b2;
+}
+"""
+
+simple_graph2 = """
+node a1 {has val = 0;}
+edge e1 {has val = 0;}
+
+walker sample {
+    root: report spawn here <+[e1]+ node::a1;
+}
+
+walker sample2 {
+    root: report <-[e1]- node::a1.edge[0].val;
+    a1 {
+        --> node::root.edge[0].val = 4;
+        report -[e1]->.edge[0].val;
+        take --> node::root;
+    }
+}
+
+walker sample3 {
+    root {
+        report <-[e1]- node::a1.edge[0].val;
+        take <-[e1]- node::a1;
+    }
+
+    a1: report -[e1]->.edge[0].val;
+}
+
+walker sample4 {
+    root {
+        <-- node::a1.edge[0].val = 6;
+        report <-[e1]- node::a1.edge[0].val;
+        take <-[e1]- node::a1;
+    }
+    a1: report -[e1]-> node::root.edge[0].val;
+}
+
+walker sample5 {
+    root: report <-[e1]-.edge[0].val;
+    a1 {
+        report -[e1]-> node::root.edge[0].val;
+        take -[e1]-> node::root;
+    }
+}
+
+walker sample6 {
+    root: <-[e1]- node::a1.edge[0].val = 8;
+    a1: report --> node::root.edge[0].val;
+}
+"""

{jaseci-1.4.1.9 → jaseci-1.4.2}/jaseci/utils/id_list.py

@@ -27,7 +27,9 @@ class IdList(list):
     def cache_reset(self):
         self.cached_objects = []
 
-    def add_obj(self, obj, push_front=False, allow_dups=False, silent=False):
+    def add_obj(
+        self, obj, push_front=False, allow_dups=False, silent=False, bypass=False
+    ):
         """Adds a obj obj to Jaseci object"""
         self.parent_obj.check_hooks_match(obj)
         if not allow_dups and obj.jid in self:
@@ -39,10 +41,12 @@ class IdList(list):
                 self.insert(0, obj.jid)
             else:
                 self.append(obj.jid)
-            if not obj.j_parent:
-                obj.j_parent = self.parent_obj.jid
-                self.save(obj)
-            self.save()
+
+            if not bypass:
+                if not obj.j_parent:
+                    obj.j_parent = self.parent_obj.jid
+                    self.save(obj)
+                self.save()
 
     def add_obj_list(self, obj_list, push_front=False, allow_dups=False, silent=False):
         self.cache_reset()

jaseci-1.4.2/jaseci.egg-info/PKG-INFO

@@ -0,0 +1,35 @@
+Metadata-Version: 2.1
+Name: jaseci
+Version: 1.4.2
+Home-page: https://github.com/Jaseci-Labs/jaseci
+Author: Jason Mars
+Author-email: jason@jaseci.org
+License-File: LICENSE
+Requires-Dist: click<8.2.0,>=8.1.0
+Requires-Dist: click-shell<2.2,>=2.1
+Requires-Dist: numpy<1.24.0,>=1.23.0
+Requires-Dist: antlr4-python3-runtime<4.10.0,>=4.9.3
+Requires-Dist: fastapi[all]<1.0.0,>=0.75.0
+Requires-Dist: requests
+Requires-Dist: redis
+Requires-Dist: celery<6,>=5
+Requires-Dist: flake8
+Requires-Dist: pep8-naming
+Requires-Dist: stripe
+Requires-Dist: pydantic<2.0.0
+Requires-Dist: docstring-parser
+Requires-Dist: prometheus_api_client==0.5.1
+Requires-Dist: prometheus-client==0.14.1
+Requires-Dist: kubernetes==23.6.0
+Requires-Dist: pytest
+Requires-Dist: pytest-xdist
+Requires-Dist: pytest-cov
+Requires-Dist: validators==0.21.2
+Requires-Dist: psycopg2-binary==2.9.5
+Requires-Dist: pygls
+Requires-Dist: mock
+Requires-Dist: beautifulsoup4<4.13.0,>=4.12.2
+Requires-Dist: lxml<4.10.0,>=4.9.2
+Requires-Dist: html5lib<1.2,>=1.1
+Requires-Dist: prettytable<3.8.0,>=3.7.0
+Requires-Dist: apache-libcloud==3.7.0

jaseci-1.4.1.9/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: jaseci
-Version: 1.4.1.9
-Home-page: https://github.com/Jaseci-Labs/jaseci
-Author: Jason Mars
-Author-email: jason@jaseci.org
-License-File: LICENSE

jaseci-1.4.1.9/jaseci/VERSION

@@ -1 +0,0 @@
-1.4.1.9

jaseci-1.4.1.9/jaseci.egg-info/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: jaseci
-Version: 1.4.1.9
-Home-page: https://github.com/Jaseci-Labs/jaseci
-Author: Jason Mars
-Author-email: jason@jaseci.org
-License-File: LICENSE