jaseci 1.4.0.18__py3-none-any.whl → 1.4.0.20__py3-none-any.whl

jaseci/utils/json_handler.py

@@ -60,7 +60,11 @@ def json_str_to_jsci_dict(input_str, parent_obj=None):
     except ValueError:
         logger.error(str(f"Invalid jsci_obj string {input_str} on {parent_obj.jid}"))
         obj_fields = {}
+    jsci_dict_normalize(obj_fields, parent_obj)
+    return obj_fields
+
+
+def jsci_dict_normalize(obj_fields, parent_obj):
     for i in obj_fields.keys():
         if str(i).endswith("_ids") and isinstance(obj_fields[i], list):
             obj_fields[i] = IdList(parent_obj=parent_obj, in_list=obj_fields[i])
-    return obj_fields

jaseci/utils/utils.py

@@ -20,8 +20,13 @@ from time import time
 from pathlib import Path
 from pprint import pformat
 from typing import Union
-
 from jaseci.utils.log_utils import LimitedSlidingBuffer
+from jaseci.utils.gprof2dot import (
+    PstatsParser,
+    DotWriter,
+    Profile,
+    TEMPERATURE_COLORMAP,
+)
 
 LOGS_DIR = ".jaseci_logs/"
 
@@ -220,35 +225,61 @@ def b64decode_str(code):
     return code
 
 
+class MyPstatsParser(PstatsParser):
+    def __init__(self, stats_obj):
+        self.stats = stats_obj
+        self.profile = Profile()
+        self.function_ids = {}
+
+
 def perf_test_start():
     perf_prof = cProfile.Profile()
     perf_prof.enable()
     return perf_prof
 
 
-def perf_test_stop(perf_prof, save_to_file=False):
+def perf_test_stop(perf_prof):
     perf_prof.disable()
-    if save_to_file:
-        perf_prof.dump_stats(f"{id(perf_prof)}.prof")
-    s = io.StringIO()
+    stats = pstats.Stats(perf_prof)
+    profile = MyPstatsParser(stats).parse()
+    profile.prune(
+        node_thres=0.01, edge_thres=0.002, paths="", color_nodes_by_selftime=False
+    )
+    graph_str = io.StringIO()
+    dot = DotWriter(graph_str)
+    dot.graph(profile, TEMPERATURE_COLORMAP)
+    calls_str = io.StringIO()
     sortby = pstats.SortKey.CUMULATIVE
-    ps = pstats.Stats(perf_prof, stream=s).sort_stats(sortby)
+    ps = pstats.Stats(perf_prof, stream=calls_str).sort_stats(sortby)
     ps.print_stats()
-    s = s.getvalue()
-    s = "ncalls" + s.split("ncalls")[-1]
-    s = "\n".join([",".join(line.rstrip().split(None, 5)) for line in s.split("\n")])
-    return s
-
-
-def perf_test_to_b64(perf_prof, do_delete=True):
-    s = ""
-    fn = f"{id(perf_prof)}.prof"
-    if os.path.exists(fn):
-        with open(fn, "rb") as image_file:
-            s = base64.b64encode(image_file.read()).decode()
-        if do_delete:
-            os.remove(fn)
-    return s
+    calls_str = calls_str.getvalue()
+    calls_str = "ncalls" + calls_str.split("ncalls")[-1]
+    calls_str = "\n".join(
+        [",".join(line.rstrip().split(None, 5)) for line in calls_str.split("\n")]
+    )
+    return calls_str, graph_str.getvalue()
+
+
+def format_jac_profile(jac_profile, sort_by="cum_time"):
+    """Format a JAC profile to a csv string"""
+    entries = []
+    for k in jac_profile.keys():
+        c = jac_profile[k]["calls"]
+        u = jac_profile[k]["u_calls"]
+        t = jac_profile[k]["tot_time"]
+        p = jac_profile[k]["cum_time"]
+        jac_profile[k]["avg_time"] = t / c
+        jac_profile[k]["per_call"] = p / c
+        jac_profile[k]["name"] = k
+        entries.append(jac_profile[k])
+    sorted_entries = sorted(entries, key=lambda x: x[sort_by], reverse=True)
+    csv = "name,calls,r_calls,avg_time,per_call,tot_time,cum_time\n"
+    for e in sorted_entries:
+        csv += (
+            f"{e['name']},{e['calls']},{e['calls']-e['u_calls']},"
+            + f"{e['avg_time']},{e['per_call']},{e['tot_time']},{e['cum_time']}\n"
+        )
+    return csv
 
 
 class TestCaseHelper:

{jaseci-1.4.0.18.dist-info → jaseci-1.4.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaseci
-Version: 1.4.0.18
+Version: 1.4.0.20
 Home-page: https://github.com/Jaseci-Labs/jaseci
 Author: Jason Mars
 Author-email: jason@jaseci.org
@@ -24,7 +24,6 @@ Requires-Dist: kubernetes (==23.6.0)
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: pytest-cov
-Requires-Dist: gprof2dot
 Requires-Dist: validators
 Requires-Dist: psycopg2-binary (==2.9.5)
 Requires-Dist: pygls
@@ -32,4 +31,5 @@ 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)
 

{jaseci-1.4.0.18.dist-info → jaseci-1.4.0.20.dist-info}/RECORD

@@ -1,23 +1,23 @@
-jaseci/VERSION,sha256=wt2cDwcEID1HJJqP4EFUnrYbbWFI95p3NNCVHoBS-L4,9
+jaseci/VERSION,sha256=5LGlUEhABhyjdVEr9_YxHUWDiJYfMYjOgDM2mLzMa1I,9
 jaseci/__init__.py,sha256=qkJ3-ufZPGervTKYsKVNxdKvdMbrCmae8pgFAcWk5Pg,1101
 jaseci/cli_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/cli_tools/book_tools.py,sha256=4xeNRhKufKJgAaKI5miPTezdBDWeA-iB_H5F5cqyIB8,16103
-jaseci/cli_tools/jsctl.py,sha256=v9BroL1TnBRpH1JEqWIBSWdMJLIVqXsa9KtFcMrwPTQ,13225
+jaseci/cli_tools/jsctl.py,sha256=1Sx7IdQ27xeSH5Q3mgZQ75yjr0vKgGf55WmS9WOx_fg,14384
 jaseci/cli_tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/cli_tools/tests/test_jsctl.py,sha256=Th5e2htD-93tX3RVkjluUnXsaBwhvH7yaxDNkrWa9mE,20799
+jaseci/cli_tools/tests/test_jsctl.py,sha256=zDbXY2SdWxBKqZn4NsSO4yoPmjHBe1I_O8mhPZQqdMs,21217
 jaseci/extens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/extens/act_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/extens/act_lib/date.py,sha256=Xv_ZYtWDfJKFyJ4sHCgctaTX71fVoBB_QKWxZPenHSc,1879
 jaseci/extens/act_lib/elastic.py,sha256=msl2F_NyOsiZahGQRY2NdZ2lqYfwa_vHQ65pJA9DJaU,2193
 jaseci/extens/act_lib/file.py,sha256=NzLiV5Il5GaSOq_sSQQxUymcb1NDFSZVeMmdS95bpG8,1987
-jaseci/extens/act_lib/internal.py,sha256=ksXDK6Bcr_lWWrenmhqxtPHfXp6vnDfdcW1yGncpZy8,429
+jaseci/extens/act_lib/internal.py,sha256=FkheUnwHei62ccurvgJg3IncYI0qqlsdl2Wuj1iemBM,481
 jaseci/extens/act_lib/jaseci.py,sha256=heeTVhb8-9HmhedQRIaZppftN5OE-kFDZQxc2fCbqjc,1696
 jaseci/extens/act_lib/mail.py,sha256=VwJMmOYYUVSewYS74EX5PZTvM5h43_37JQBcK9tukiU,315
 jaseci/extens/act_lib/net.py,sha256=Wil8umf3y8WCVe8ujbJst5JAgMj01Y7qxo-A9d4EJRA,7162
 jaseci/extens/act_lib/rand.py,sha256=ffvqZ1kgtbWk25-u7u6Yxyo4DUB1IikMVE4cOZwIxXI,2119
 jaseci/extens/act_lib/regex.py,sha256=bY8cpdNf-uYknQwAP2B4EBv9pvtnbhmdd5jBlB3QHQ4,2050
 jaseci/extens/act_lib/request.py,sha256=B8S5jFOjBOK5c-4ruv4qdDFglPBx_uq2Z2iM4MtkNaU,4153
-jaseci/extens/act_lib/std.py,sha256=a6TdMurRFNzIlk2bJrpeGfR85CjNUOivnc01WKoLc_U,5704
+jaseci/extens/act_lib/std.py,sha256=66J9S0fSw9akBK2cwLKZUoGRIWnwUlmLI5es5tQ79Uo,5825
 jaseci/extens/act_lib/stripe.py,sha256=Aal_0jmt8nGSWM4PFiKsSAXPN779d51nV-tnFr6_pw0,7551
 jaseci/extens/act_lib/task.py,sha256=2OlsgYDprGyDwEzJ7943piqrqo7soCDBZRpqgGVMhUk,355
 jaseci/extens/act_lib/url.py,sha256=SC0fgrCA28UFznEAA_vOLnB51_N0MXU0801V_MVhDQg,1853
@@ -32,7 +32,7 @@ jaseci/extens/act_lib/tests/test_mail_lib.py,sha256=H1ZjCMwMj0MbArIG337mgA2EShMS
 jaseci/extens/act_lib/tests/test_net_lib.py,sha256=CrREUnx1H_3vESAFcAQ5XZYWIHOnr_oFMUHk0r4MWPg,2215
 jaseci/extens/act_lib/tests/test_regex.py,sha256=ahPDqHHNaxYIdk78FCTC06vf0rf9tWXG4X58uPaCcrk,2007
 jaseci/extens/act_lib/tests/test_std.py,sha256=wSNganrnB7XVNYKBD8n2emXp1jrJJ5IiN5OgFn7Kb-w,1735
-jaseci/extens/act_lib/tests/test_std_lib.py,sha256=3RO3Q0y32A_D3bAokYRWSE8iHeyD2VRie8rmEpyZ9kM,1204
+jaseci/extens/act_lib/tests/test_std_lib.py,sha256=TL3s98DhgI51Uk3p6yv7e8L9pONKHEBkCdwWORUCzdQ,1243
 jaseci/extens/act_lib/tests/test_url.py,sha256=TfCWRtSrB-wjDOxRpfT9yjkSVRW6Ro4_IynbPir00XM,904
 jaseci/extens/act_lib/tests/test_vector.py,sha256=Lte-EZnheAGiJUpCE0mlXzhCH3dTMW000pgYbiLeHtY,1285
 jaseci/extens/act_lib/tests/test_webtool.py,sha256=BfRQOdCUk3ciZj_wP6yzxVevcieqH5fQ6NhnbhllBH8,1529
@@ -46,7 +46,7 @@ jaseci/extens/api/global_api.py,sha256=c9wiOaQGlhPUcGYknNkSzAmk67GDlRYYHHUpW_yOB
 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
-jaseci/extens/api/jsorc_api.py,sha256=Fk89Kd_fM_NLEg4BcrHVSWrbRnPgfWx8yZyUvzf_KC0,9066
+jaseci/extens/api/jsorc_api.py,sha256=XcnAqOkqGI6IPykPpdeXPiQ7CXcV4XHYW7uSlV8wKdA,9991
 jaseci/extens/api/logger_api.py,sha256=9uAvhUW4rv-SoFmtVBB6lIDcoGNs_vCQY00rfGnX0a4,2805
 jaseci/extens/api/master_api.py,sha256=69sfxfPAVGbix5pLdq5cWnVYxaoKLBykh8FFeBBgsLA,4142
 jaseci/extens/api/object_api.py,sha256=GyKnnCsr-M11yOJf6HyiwYhaH5BYNGA8al96FNOG-EQ,3201
@@ -55,7 +55,7 @@ jaseci/extens/api/queue_api.py,sha256=h7aj_1C7e3I5wKDBMOTVS6cmbLu_Hlmi3RCf0kJ1a9
 jaseci/extens/api/sentinel_api.py,sha256=wGbG9GZ-snis9cYBi2CJEYc85KTsldKgNqyxW9N4EkM,9632
 jaseci/extens/api/super_api.py,sha256=Zk0n0W6XfLFFn8G1dw7oaRFmK7AchFy3krANrwz9_yI,1998
 jaseci/extens/api/user_api.py,sha256=pH0JoNHA-OOd_lw3EhPjfrkdTbllSHppTb5CW3oIL34,5373
-jaseci/extens/api/walker_api.py,sha256=FQ0mo8fa-v2Sczk9vqo_AC9wnsEkBYfLyiR3rVvPSEA,9260
+jaseci/extens/api/walker_api.py,sha256=4zOm9C5u3hia_B_kkM5W4F37QW56C65G4MkUiycMPSk,9556
 jaseci/extens/api/webhook_api.py,sha256=SSXLDcNIKmuHIzO7Z0xPDYKXcXbqVdzDctzRCLKmdLU,1934
 jaseci/extens/api/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/extens/api/tests/test_architype_api.py,sha256=zq3_lwFQUWC8ZULWX-pWsR9MP7PgZrB_C9dqdlyAJUY,1820
@@ -75,17 +75,17 @@ jaseci/extens/svc/stripe_svc.py,sha256=sh5rZ1VDOSHrGSBRhIxKvWzddg5dChsoBrKiTA3ha
 jaseci/extens/svc/task_svc.py,sha256=wjkXCwdb_RoNXwQQg6k9qlCq3LZNEF9OI3eBX0kIzXc,4135
 jaseci/extens/svc/tasks.py,sha256=a8j8A7i2_B-9YPM5SMuARoN8RY8HvlWDucGtw2mBoSw,10365
 jaseci/jac/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/jac/jac.g4,sha256=yY5Fi5Vfp3HaXF_aHwluNEIA3T7nmpzivchBKccl-Yg,8925
+jaseci/jac/jac.g4,sha256=Nr-M3lxfr4nd4VQwxdcQYid6mg-TPMngU1ZW3trvUFE,8916
 jaseci/jac/jac_set.py,sha256=Reg1QkRQEAyzd6F8r-2cD0LvslgOF2Pc8mS-xalmEt0,3357
 jaseci/jac/interpreter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/jac/interpreter/architype_interp.py,sha256=vu-T4Mp8SoF6Rdodv8AjV0WjVY1IqJu1OkbwrAea1mE,5929
-jaseci/jac/interpreter/interp.py,sha256=zxMny7tJuVxnQnrP07l-KhPoRVHWJZsQSsijLJ7ec4c,70752
-jaseci/jac/interpreter/sentinel_interp.py,sha256=s4Y7aVshKj27StQsJc7n1dOYi6F6lbwCpSQDoRM3vQQ,7163
-jaseci/jac/interpreter/walker_interp.py,sha256=IjZ6hROK8eA4IgU5e04wPtcRmhw4Jz_ISWvYrtvcnCI,9114
+jaseci/jac/interpreter/architype_interp.py,sha256=GTvWnm_iiWlxpJ8gL5mIlObfltClkU2oSflIKGIVuF8,7277
+jaseci/jac/interpreter/interp.py,sha256=KQh4vU8RwrmmswxEMznDhVvAvjdCiH1_DeUX6SFO1-c,66641
+jaseci/jac/interpreter/sentinel_interp.py,sha256=-gCm8udNbECP6eKALxxqf4RTj0ydcuz71rxhzIbvnwc,9460
+jaseci/jac/interpreter/walker_interp.py,sha256=nCZrL8p4jWXQhHuxF5IRBLID-vNYVHLV4gyh5qv3-2U,8503
 jaseci/jac/interpreter/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jac/interpreter/tests/test_interp.py,sha256=sQGSZNrQgLuEp-PaE8w5urMIM1I4zEFLcug84HEnh0o,1546
 jaseci/jac/ir/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/jac/ir/ast.py,sha256=8X8niHmHYvmqP8okl4642qyMprSbKWhm6P5aBuZsNGg,1601
+jaseci/jac/ir/ast.py,sha256=tvG-rr1OqxsLSbQ6dAn1j43iX8xxaQBZQrdfHVKdEjM,1759
 jaseci/jac/ir/ast_builder.py,sha256=jh0BKyBDzlDgE59twB9tm-dOjj2I0fnH4gUSSI_I5dE,8399
 jaseci/jac/ir/jac_code.py,sha256=PbThal8CP4fvl-gCs8WkjeHZtnTPRw3f0vZJ7S0Vx0Y,4601
 jaseci/jac/ir/passes/__init__.py,sha256=SWns4N_ZDV4iGUGoH0kvcq-DwdSSDCNRfbnEYwPdXmU,393
@@ -98,8 +98,8 @@ jaseci/jac/ir/passes/schedule.py,sha256=PIEloXIhi9iywLtvzGSrq6tIAY67zsVLIEIHtZCk
 jaseci/jac/ir/passes/stats_pass.py,sha256=b2LI6SxPG2YsnbkL4TbfoYxe3DwagPIRMmKjAZID8kA,468
 jaseci/jac/jac_parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jac/jac_parse/jacLexer.py,sha256=byRuxnd-NpBjdC_vbZ1JReywX1vbdRlmj12TU8WXnFE,34691
-jaseci/jac/jac_parse/jacListener.py,sha256=OOLv8vWLInuCS1_1zKbihq9ZvGzu58HjBY5cI4jg5lk,29061
-jaseci/jac/jac_parse/jacParser.py,sha256=20Eb5ochF50mlyS6Has0zmfPoLgqnki-OQn8HYIcoO4,333597
+jaseci/jac/jac_parse/jacListener.py,sha256=omVWAovAIR4V0p98kkRa_IYrtV6i14-VzQ-fi9gFNno,29031
+jaseci/jac/jac_parse/jacParser.py,sha256=Oc4CveorHlVgIB79JHqLmcaCrJpIc8pttX6-YNG6PYU,334026
 jaseci/jac/jsci_vm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jac/jsci_vm/disasm.py,sha256=sFZjrP2wufITt4gjICnKYlWNHjX61vQACL-y8mFk_v0,3613
 jaseci/jac/jsci_vm/inst_ptr.py,sha256=1HPFEx1oSz9ru3ASsQPHSdP1MEmP08u3EwXUmx-eZlQ,768
@@ -108,20 +108,20 @@ jaseci/jac/jsci_vm/op_codes.py,sha256=h6DzvXw_9J5Uwvu8qIeZvfXmAyrXIpYHwB4MSsoE80
 jaseci/jac/jsci_vm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jac/jsci_vm/tests/test_codegen.py,sha256=sqBPy2qkQ8UWxUap4ZF5YJ3_RYzEXvFABxFMTwEJCiU,1116
 jaseci/jac/machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/jac/machine/jac_scope.py,sha256=56Wb5qrdgSXI2vTuUVj8OkSG5Q45RSTNzX9kZJUL9Ao,3271
+jaseci/jac/machine/jac_scope.py,sha256=vs2nMxE89IAdI1zOtDe_KKHmf8JCUTTpecWf_mXXiSE,2934
 jaseci/jac/machine/jac_value.py,sha256=5xhFGl3HVhoqpmsbFyC9OWgnsAMoGLxiUf-t9fGAUE8,6814
-jaseci/jac/machine/machine_state.py,sha256=ITNXCP4Y6eU--VgKOA7Q7jAMFwl7hb010IV7ANyLOrc,9164
+jaseci/jac/machine/machine_state.py,sha256=d7aqng4pyi_IT_nnZjM4y5xROjtN_UpEkbB3z1BvOLc,11850
 jaseci/jac/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jac/tests/book_code.py,sha256=VZ_WL9dLGhK7wuZtAvgW6_rDC1OluiHZXuu7pX77njI,13323
 jaseci/jac/tests/test_book.py,sha256=7P5YSSq7HUxNl6KmFh6UM2ZYsBaq-If06KpN0o618YY,13870
 jaseci/jac/tests/test_lang_14.py,sha256=haw5hvFe4mR1IDHPZGtCvIAMAFLHF0bdg11nl-JP2aQ,1885
 jaseci/jsorc/__init__.py,sha256=575FXvIbY1S4j1idZn7iqc8z3Gvo1A7FPZNA_1I5Ru4,134
-jaseci/jsorc/jsorc.py,sha256=va6DFMyalzkWOdNPKXRQMi9VBUhycIpkmU-yIXtu9tk,21053
+jaseci/jsorc/jsorc.py,sha256=moWROfP3MgYLTevBUYBT5llQUYQ8Gj09VHc9TOsb-RI,21601
 jaseci/jsorc/jsorc_settings.py,sha256=-p6ok9bvc0yQLxkPxD81d0kBY3BoEHmq_BaJgP48nww,7490
 jaseci/jsorc/jsorc_utils.py,sha256=DidYQ3HGnfv9HQL5xDxx-l-Kfb2enGqUl-AGk80mGMM,8390
-jaseci/jsorc/live_actions.py,sha256=0Gj8tbHQhK4s2tOIISAI9DbuNqs6Duie7voYXQwj4Co,11290
+jaseci/jsorc/live_actions.py,sha256=PDEiwRarZ5AauztPsKhbAewpnC63mFl-Fw2LAkGbtcM,11408
 jaseci/jsorc/memory.py,sha256=TTvyM1Ckyogkt2yiXFxggOEpkA7EUT7ZMo6tQhn4C1g,7342
-jaseci/jsorc/redis.py,sha256=zPAn1d0WId8or_cHzzYf55-UV02nHnIPFrjtAo2QRqs,4427
+jaseci/jsorc/redis.py,sha256=m0lntrk-JL_hr5fG5BAwdsYH6QeJ8NV9EptMN_APx94,4570
 jaseci/jsorc/remote_actions.py,sha256=KGoC5nj5ka9NS0MFWnxoSm-CfjwirJNZzUp40KfJnVM,3248
 jaseci/jsorc/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/jsorc/manifests/database.yaml,sha256=T3lDD4s2QR1oKpsc_vihgvzhaYVOfsxPlv8YhQcGLZ4,2234
@@ -132,41 +132,41 @@ jaseci/jsorc/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 jaseci/jsorc/tests/test_actions.py,sha256=9IvVGZU0EV8Wtsauk4syh5LXPjju6s2zJSjG4QlP-hM,2569
 jaseci/jsorc/tests/test_jsorc.py,sha256=uglTSUPvHR5wxpOrdwOZy3iK4oyi5LcpUtjfygFUAyA,3987
 jaseci/prim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaseci/prim/action.py,sha256=o_2HifqnZDeL4m0liEp-O7ISD0D54rJRP3_uO0t4RNg,3398
-jaseci/prim/architype.py,sha256=MSTvAvvZr3B3qQuXOd8Jmi25deelW3t7WpeQ6qfofnQ,2212
+jaseci/prim/ability.py,sha256=zt3rD9DEuqnc_WUntfSJ4EVQD_CkdHrqeExshWteUhs,3837
+jaseci/prim/architype.py,sha256=mscTCsXTKh4ZBGyQTGHxEbQl1FFRJs3eoHs7koxLhm4,2706
 jaseci/prim/edge.py,sha256=BghEIhy7CNQ5_e_UzpkpClSpDBEvJTJwDit07Tkk1sI,5024
 jaseci/prim/element.py,sha256=XFGw0vVFdIe-KkBMILYWI-KkaltASdo6nm9NHLPYfSo,7669
 jaseci/prim/graph.py,sha256=uZZLyq9jmQilCrAMUKpSwDXqrhVR8JGlIcu8bmPbCjY,596
-jaseci/prim/item.py,sha256=ztCISpsHD47MFBBCyrUqts_v0qdpX9nG9HlY5HNptQ4,610
 jaseci/prim/master.py,sha256=WCfMqWJ9D1V_6Zny96it_6FcDcia3iUZp9qRwYa2Vs0,1835
 jaseci/prim/node.py,sha256=trjLehUQRf6Mwjz986fDe4z99JkOxuexTknUiFbMBvc,17712
-jaseci/prim/obj_mixins.py,sha256=Kgu7L614gjqk_NpODrxtYCKQikNkO6U9Xxaj6BOFjzg,7167
-jaseci/prim/sentinel.py,sha256=o8imDFzuEyh8-Ryppp7aQJSAklxxsc0u7J4nW0Cmsuw,9296
+jaseci/prim/obj_mixins.py,sha256=BNvNzUGjWKtJ2jJSizPdvELW-TEupsueGA7VMr-tU8A,7286
+jaseci/prim/sentinel.py,sha256=f1QP--JaMbmW971gBhPv2bZLSJ-xWpsKIAuRMpFDcDA,9372
 jaseci/prim/super_master.py,sha256=KHSD1YoF1OKWw3ob8qdS9Amxf38N0FpYfCkT1mk_DDQ,852
-jaseci/prim/walker.py,sha256=32cxCDSYc6hB5vVp0CWed_gplsH9skIFs0EQ34sj3h8,8410
+jaseci/prim/walker.py,sha256=w7O-Zo_8LK1ySCx1lz1UTnQPUvpHzsIxSmwLqmHzzIs,8600
 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=G9CpyOAZvIz_9dMIiw6a2n-I6ybEIb2tx3vLQyOu-fQ,25194
-jaseci/tests/jac_test_progs.py,sha256=83Sfl4g_b13laBZHMSdf3L6a0N77mrl6I7iECDkGk0o,14257
+jaseci/tests/jac_test_progs.py,sha256=x1uNZyxQfRyYXj9jpuNhZ76Lnfm426mrXoLz5IAX87o,14396
 jaseci/tests/test_core.py,sha256=fYoIF-xQizO8qrMnFpwhzMgScJAx5XTOL7SdvCx7do4,5888
-jaseci/tests/test_jac.py,sha256=lOVKeeBNGP8HEAZwpThqoZa_cRtOh_on4h7AUJg1DWI,31676
-jaseci/tests/test_node.py,sha256=B5MKLsycj9Wxcf4mKVuFGFJ2MBHPwWvjGeqacKra_sk,3826
-jaseci/tests/test_progs.py,sha256=SHWRcTEB21XGtbJczLcwszDeuwIQmeOXJAlfaI0w1IA,23906
-jaseci/tests/test_stack.py,sha256=a0I_46zE0NEMz21Rmxu6aSSncGAM1AUEfK44SYiLJyE,7565
+jaseci/tests/test_jac.py,sha256=lS4CgD-R1O6BdmP4414wu5tJkI3trDyN9Zu3A5lId4s,31674
+jaseci/tests/test_node.py,sha256=tXnRbc3lHGPidzE45BIF1LiTkC5aB5idxbyzRj06Ufs,3710
+jaseci/tests/test_progs.py,sha256=OSM0ue4p1TRQSw4Omib74PfHws18ADTdqSpIJLF169o,24345
+jaseci/tests/test_stack.py,sha256=CrNbcRpRA5jhQw44wKsjWwfgbMXodJglY48TyoNYu5U,8453
 jaseci/tests/test_stripe.py,sha256=dt4_CKofGsWR1y9DXZStd48rtDUTTBQp-3lD7SiA9DA,8096
 jaseci/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jaseci/utils/gprof2dot.py,sha256=NwoCm318NFS169fvJhfltsIINxzpd6bS7_9b1-Fy4Xg,119142
 jaseci/utils/id_list.py,sha256=L1uzwBrLRxnw3EaapOsEMA7QCsbY50RnK0nFTu2ruWo,5328
-jaseci/utils/json_handler.py,sha256=P1fY7BnGBfA_mkiKjeJvAwfqGXWt3cpY0JcmPVL86bQ,2135
+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
-jaseci/utils/utils.py,sha256=iGK-Ovf5u9Y5cQUc95GJmyGpQQa1cnF7QOCseCf42EQ,9101
+jaseci/utils/utils.py,sha256=1Ejf6BqaScjGX3myu-okKxpF5vuQpNspuq9gI42WoGw,10234
 jaseci/utils/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaseci/utils/actions/actions_manager.py,sha256=sKfWk9zRpDpkLo3-mKpVMKrqx7kpRG7hRi5tfDTcqb8,8527
-jaseci/utils/actions/actions_optimizer.py,sha256=gs2spE-HFzdfW8WNqctw9DBldUxv3vj3DPpU5txZllE,20786
+jaseci/utils/actions/actions_optimizer.py,sha256=ddj6zF6pfcYD3OeLiOBTeDU07764-bLy7RXn7c71JrI,21564
 jaseci/utils/actions/actions_state.py,sha256=5p080-DtDXS9QUd2FwkrtN6-7LBqT2tmJDOKVKjDEbU,2963
-jaseci-1.4.0.18.dist-info/LICENSE,sha256=2b_qOOd7ak6x49HwOzCAmRLSPJehiBJdqj9HDX1Jp7U,1072
-jaseci-1.4.0.18.dist-info/METADATA,sha256=wh0bSDOWuDVz46_MXv15eNHZM0NUbXw0VByq0TRUGO8,1059
-jaseci-1.4.0.18.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-jaseci-1.4.0.18.dist-info/entry_points.txt,sha256=nryZyKQLUJzlTOcA9knRGoXHGmNUCQxvvuDIEj5ePyg,88
-jaseci-1.4.0.18.dist-info/top_level.txt,sha256=0WZh7RF_ruiaZHQSi8IWOiLRUvKKDlhcnLe-by6EyFc,7
-jaseci-1.4.0.18.dist-info/RECORD,,
+jaseci-1.4.0.20.dist-info/LICENSE,sha256=2b_qOOd7ak6x49HwOzCAmRLSPJehiBJdqj9HDX1Jp7U,1072
+jaseci-1.4.0.20.dist-info/METADATA,sha256=D3oay2B5xbSfALVj2rNHvhBrK8n55p1U0eeXEcdM45U,1078
+jaseci-1.4.0.20.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+jaseci-1.4.0.20.dist-info/entry_points.txt,sha256=nryZyKQLUJzlTOcA9knRGoXHGmNUCQxvvuDIEj5ePyg,88
+jaseci-1.4.0.20.dist-info/top_level.txt,sha256=0WZh7RF_ruiaZHQSi8IWOiLRUvKKDlhcnLe-by6EyFc,7
+jaseci-1.4.0.20.dist-info/RECORD,,

jaseci/prim/item.py

@@ -1,29 +0,0 @@
-"""
-Item class for Jaseci
-
-Each item has an id, name, timestamp.
-"""
-from jaseci.prim.element import Element
-
-
-class Item(Element):
-    """Item class for Jaseci"""
-
-    def __init__(self, value=None, **kwargs):
-        self.item_value = value
-        Element.__init__(self, **kwargs)
-
-    @property
-    def value(self):
-        return self.item_value
-
-    @value.setter
-    def value(self, val):
-        self.item_value = val
-        self.save()
-
-    def __str__(self):
-        if self.value:
-            return super().__str__() + f":{self.value}"
-        else:
-            return super().__str__() + ":None"