jaseci 1.4.1.9__py3-none-any.whl → 1.4.2__py3-none-any.whl

jaseci/VERSION

@@ -1 +1 @@
-1.4.1.9
+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/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/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/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/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/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/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.1.9.dist-info → jaseci-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaseci
-Version: 1.4.1.9
+Version: 1.4.2
 Home-page: https://github.com/Jaseci-Labs/jaseci
 Author: Jason Mars
 Author-email: jason@jaseci.org

{jaseci-1.4.1.9.dist-info → jaseci-1.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jaseci/VERSION,sha256=XHS3if98ec6lkupR2POyxAWC1yi8cXnM_WKnG5v7Q-Y,8
+jaseci/VERSION,sha256=uZtMfN8jb1m8n2XZY96uyuOxan2th5OcrLkFf3Zk2u4,6
 jaseci/__init__.py,sha256=tFVuF0i901L-YymidhuSjyE24IWOhIiJA5G18DuAP2g,1246
 jaseci/cli_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/cli_tools/book_tools.py,sha256=4xeNRhKufKJgAaKI5miPTezdBDWeA-iB_H5F5cqyIB8,16103
@@ -48,7 +48,7 @@ jaseci/extens/api/actions_api.py,sha256=Ml2wRROmXofEXWTOXy0PQCxRcjDLkxz163p7Z13z
 jaseci/extens/api/alias_api.py,sha256=kfO9wxfp_HF5-_1TeIgU5KYAcn-7vZ91GOJiDRUv6gs,5157
 jaseci/extens/api/architype_api.py,sha256=GozQuyFJYaG-7Ee1JT_62Pc0InCR2KcLD_esrkIdeGM,7237
 jaseci/extens/api/config_api.py,sha256=OgIkXUKc34HfgetmHtJxKMae8sB2XCl66kI8brtarb0,3581
-jaseci/extens/api/global_api.py,sha256=c9wiOaQGlhPUcGYknNkSzAmk67GDlRYYHHUpW_yOBbU,1907
+jaseci/extens/api/global_api.py,sha256=yPPG3LKeifDvbd2fQvjRhL1Bn-gZf4QqRtozb3oCgVk,2226
 jaseci/extens/api/graph_api.py,sha256=mGuUr22tGys-NypaW0AEZE-vZ6_OzSnqESVxhQrEI60,5074
 jaseci/extens/api/interface.py,sha256=KnYbClPGe0iTlENdr0LHL8RBuPJGyyuaPspnRvggcXo,9587
 jaseci/extens/api/jac_api.py,sha256=95w0sh08BHHXv5avMa5xngNo06iipU9Fk08D3TiBHj0,5816
@@ -74,7 +74,7 @@ jaseci/extens/api/tests/test_uncommon.py,sha256=x6JB9tGcD1IIQEOoYuXDO6HCbBji7ynL
 jaseci/extens/api/tests/test_user_api.py,sha256=4MXXjd48uRbZs0CvEkuVIisCjIM4QrIiARt3mgafXGk,873
 jaseci/extens/api/tests/test_walker_api.py,sha256=KgWNP5hP4niiMDG0pAoJWPu-thhSarcj6X7MN3BMWJw,12622
 jaseci/extens/svc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/extens/svc/elastic_svc.py,sha256=48lKlcmohHch7m0rd7hRNT3_XdLVUpBYqtHckKpT-SI,13272
+jaseci/extens/svc/elastic_svc.py,sha256=b34FWYep-4ef7XolF8p5GrSk_Sc-mUSXmFeVlIBHZLo,13389
 jaseci/extens/svc/kube_svc.py,sha256=o39b_1lrbfUl3yASIkRZStv3X77QudA5hj-ZfYnlcUM,15612
 jaseci/extens/svc/mail_svc.py,sha256=g7lvUpEDc8mEYIE4cs_Kh3oPp7CAKd437Kgtklo0f8I,5064
 jaseci/extens/svc/prome_svc.py,sha256=btnYPRI7gFoXzbp0-VJDQn1O4RR8sPlT0iPJpjBkRZ4,12467
@@ -126,7 +126,7 @@ jaseci/jac/tests/test_book.py,sha256=7P5YSSq7HUxNl6KmFh6UM2ZYsBaq-If06KpN0o618YY
 jaseci/jac/tests/test_lang_14.py,sha256=haw5hvFe4mR1IDHPZGtCvIAMAFLHF0bdg11nl-JP2aQ,1885
 jaseci/jsorc/__init__.py,sha256=575FXvIbY1S4j1idZn7iqc8z3Gvo1A7FPZNA_1I5Ru4,134
 jaseci/jsorc/jsorc.py,sha256=moWROfP3MgYLTevBUYBT5llQUYQ8Gj09VHc9TOsb-RI,21601
-jaseci/jsorc/jsorc_settings.py,sha256=3UIsgFHf8clp4NG0guO4sT5TnbmeNKCgQp-47xa8Mcg,8849
+jaseci/jsorc/jsorc_settings.py,sha256=eUYEt4CNoPfvHMSYqUtyggQi6snSX7kwwW0ECnOEp_0,8915
 jaseci/jsorc/jsorc_utils.py,sha256=hie_5ttXKM_MqBumFbRFzszAAzdksIUuQbNLpLvOFX0,8945
 jaseci/jsorc/live_actions.py,sha256=_hHPfjzu4fE1uA7oP6aOs-5XT0_2KV5mFf7fWbJq69s,12302
 jaseci/jsorc/memory.py,sha256=b-jX452YN3-EqrKXTPC676xL9BoGNpLAgu9h3OJxeV0,8254
@@ -143,11 +143,11 @@ jaseci/jsorc/tests/test_jsorc.py,sha256=HAwDmI7NuuUJrFFdADYjpCCnr58cd9qPy1AZQ-ws
 jaseci/prim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/prim/ability.py,sha256=XkHpKCsCjZ9Je7oiL0X_Mkbz_FSiVBxGaAVLZv7LCXI,3405
 jaseci/prim/architype.py,sha256=mscTCsXTKh4ZBGyQTGHxEbQl1FFRJs3eoHs7koxLhm4,2706
-jaseci/prim/edge.py,sha256=BghEIhy7CNQ5_e_UzpkpClSpDBEvJTJwDit07Tkk1sI,5024
+jaseci/prim/edge.py,sha256=GzKLZVio28sCF65zfDzFDHyjDPlfcTbQA5L3RkItcR0,5169
 jaseci/prim/element.py,sha256=XFGw0vVFdIe-KkBMILYWI-KkaltASdo6nm9NHLPYfSo,7669
 jaseci/prim/graph.py,sha256=uZZLyq9jmQilCrAMUKpSwDXqrhVR8JGlIcu8bmPbCjY,596
 jaseci/prim/master.py,sha256=WCfMqWJ9D1V_6Zny96it_6FcDcia3iUZp9qRwYa2Vs0,1835
-jaseci/prim/node.py,sha256=trjLehUQRf6Mwjz986fDe4z99JkOxuexTknUiFbMBvc,17712
+jaseci/prim/node.py,sha256=TtDRCBy8azHKclwpdmpDMcQUZi0XdtGn3A5iv4r8Q8o,18139
 jaseci/prim/obj_mixins.py,sha256=BNvNzUGjWKtJ2jJSizPdvELW-TEupsueGA7VMr-tU8A,7286
 jaseci/prim/sentinel.py,sha256=ERWM-7p9xVRj1oAvQlv6gvMeudS0qqlhRi_06VD7uMs,9531
 jaseci/prim/super_master.py,sha256=KHSD1YoF1OKWw3ob8qdS9Amxf38N0FpYfCkT1mk_DDQ,852
@@ -155,7 +155,7 @@ jaseci/prim/walker.py,sha256=gUCOiqdM6YaZpoSMUPErpb4UwDrQoa-DhqfwEVqACSw,8884
 jaseci/svc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/tests/infer.py,sha256=3TAwXO1W5s4yLDV5p_Izxbp5PvyQYR2oaMcB_aYza4c,1006
-jaseci/tests/jac_test_code.py,sha256=0WrmoCECv0rHI-L2hOPvZCprAOT9GqmGhr9H2d_LJSs,25823
+jaseci/tests/jac_test_code.py,sha256=d8WycjXqmqQJr07abJBIinuyTTDwXdYZxUU6qkhfrBY,27903
 jaseci/tests/jac_test_progs.py,sha256=U7RwFdZUsEpZMdv-PUhBZ8CuRmTusRvKmNKNLRO_mfA,14672
 jaseci/tests/test_core.py,sha256=fYoIF-xQizO8qrMnFpwhzMgScJAx5XTOL7SdvCx7do4,5888
 jaseci/tests/test_jac.py,sha256=bE6FLhLV0-TnxLlS7HdPxe65wMj65Pa_qGLySpuVIJA,32750
@@ -166,7 +166,7 @@ jaseci/tests/test_stripe.py,sha256=bXq4m7AIRquWu7ZCzzp4Qz99NccuZTt_Tjjg-Kx1isE,8
 jaseci/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/utils/file_handler.py,sha256=b1_zCVO37h1eKjaa_P9jKkx0lwJfrsWKRGkv68lYpY8,4797
 jaseci/utils/gprof2dot.py,sha256=NwoCm318NFS169fvJhfltsIINxzpd6bS7_9b1-Fy4Xg,119142
-jaseci/utils/id_list.py,sha256=L1uzwBrLRxnw3EaapOsEMA7QCsbY50RnK0nFTu2ruWo,5328
+jaseci/utils/id_list.py,sha256=vknSJi-xtIMPW8O3SjJb7l_Jg3Fw4kMjCAm6tS9KZ9s,5400
 jaseci/utils/json_handler.py,sha256=-MmExFTpbr5hlS9i_0DAUZK-rgWI2wpDAA4rI3idv74,2234
 jaseci/utils/log_utils.py,sha256=U46KspmCbX6S7YzEk1LB20iB4G1DPHfpV5RFim04Mbg,1629
 jaseci/utils/test_core.py,sha256=DG0mW2GRc2l0M1A1-vCgTUFnZh8ip_0-h7eOfKMxlXQ,1549
@@ -175,9 +175,9 @@ jaseci/utils/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 jaseci/utils/actions/actions_manager.py,sha256=sKfWk9zRpDpkLo3-mKpVMKrqx7kpRG7hRi5tfDTcqb8,8527
 jaseci/utils/actions/actions_optimizer.py,sha256=ddj6zF6pfcYD3OeLiOBTeDU07764-bLy7RXn7c71JrI,21564
 jaseci/utils/actions/actions_state.py,sha256=5p080-DtDXS9QUd2FwkrtN6-7LBqT2tmJDOKVKjDEbU,2963
-jaseci-1.4.1.9.dist-info/LICENSE,sha256=2b_qOOd7ak6x49HwOzCAmRLSPJehiBJdqj9HDX1Jp7U,1072
-jaseci-1.4.1.9.dist-info/METADATA,sha256=QfrZRsD8OyTKi3lqhQKIw2-kQVjO1Hr7Xj0BaNuL7uo,1104
-jaseci-1.4.1.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-jaseci-1.4.1.9.dist-info/entry_points.txt,sha256=nryZyKQLUJzlTOcA9knRGoXHGmNUCQxvvuDIEj5ePyg,88
-jaseci-1.4.1.9.dist-info/top_level.txt,sha256=0WZh7RF_ruiaZHQSi8IWOiLRUvKKDlhcnLe-by6EyFc,7
-jaseci-1.4.1.9.dist-info/RECORD,,
+jaseci-1.4.2.dist-info/LICENSE,sha256=2b_qOOd7ak6x49HwOzCAmRLSPJehiBJdqj9HDX1Jp7U,1072
+jaseci-1.4.2.dist-info/METADATA,sha256=hdA3vhSDn6vQtv778-nZv_Siruc_xieemJWESSkbA44,1102
+jaseci-1.4.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+jaseci-1.4.2.dist-info/entry_points.txt,sha256=nryZyKQLUJzlTOcA9knRGoXHGmNUCQxvvuDIEj5ePyg,88
+jaseci-1.4.2.dist-info/top_level.txt,sha256=0WZh7RF_ruiaZHQSi8IWOiLRUvKKDlhcnLe-by6EyFc,7
+jaseci-1.4.2.dist-info/RECORD,,