NestedCall is no longer WithBlock, RDFNode base class added

Author: asmirnov69

examples/notebooks/conditional-join-w-cmp.ipynb

@@ -1,9 +1,10 @@
 import ipdb
 import sys, contextlib
-from . import wb_stack
 from . import obj_tracking
 from . import obj_utils
+from . import wb_stack
 from . import fstriplestore
+from . import rdf_node
 
 class profile_objs:
     def __init__(self):
@@ -40,7 +41,7 @@ def dump_nested_call_refs(self, nested_call_uri):
             if ref_obj_state_uri:
                 ts.dump_triple(nested_call_uri, "<nested-call-ref>", ref_obj_state_uri)
 
-class NestedCall(wb_stack.WithBlock):
+class NestedCall(rdf_node.RDFNode):
     """
     NestedCall object is to represent situation like this:
     ```python
@@ -59,7 +60,11 @@ class NestedCall(wb_stack.WithBlock):
     The code then proceed and causes controlled call of `nested_call_func` via __call__ implementation. Results are saved as self.ret and later used by MethodCall.handle_end_method_call
     """
     def __init__(self, arg_name, arg_func):
-        super().__init__(label = f"nested_call({arg_name})", rdf_type = "NestedCall")        
+        super().__init__(rdf_type = "NestedCall", label = f"nested_call({arg_name})")
+        rdfl = fstriplestore.triple_store
+        parent_uri = wb_stack.wb_stack.stack_entries__[-1].uri
+        rdfl.dump_triple(self.uri, "<part-of>", parent_uri)
+        
         #ipdb.set_trace()
         self.arg_name = arg_name
         self.arg_func = arg_func

pyjviz/nested_call.py

@@ -71,6 +71,7 @@ def dump_Series_obj_state_cc(obj_state_uri, s, output_type):
     if output_type == 'head':
         ts.dump_triple(obj_state_cc_uri, "rdf:type", "<CCGlance>")
         ts.dump_triple(obj_state_cc_uri, "<shape>", f"{len(s)}")
+        ts.dump_triple(obj_state_cc_uri, "<df-head>", '"NONE"')
     elif output_type == 'plot':
         ts.dump_triple(obj_state_cc_uri, "rdf:type", "<CCBasicPlot>")        
         ts.dump_triple(obj_state_cc_uri, "<shape>", f"{len(s)}")

pyjviz/obj_utils.py

@@ -0,0 +1,16 @@
+import uuid
+
+from . import fstriplestore
+
+class RDFNode:
+    def __init__(self, rdf_type, label):
+        self.label = label
+        self.rdf_type = rdf_type
+        self.uri = f"<{self.rdf_type}#{str(uuid.uuid4())}>"
+
+        rdfl = fstriplestore.triple_store
+        rdf_type_uri = f"<{self.rdf_type}>"
+        rdfl.dump_triple(self.uri, "rdf:type", rdf_type_uri)
+        label_obj = f'"{self.label}"' if self.label else 'rdf:nil'
+        rdfl.dump_triple(self.uri, "rdf:label", label_obj)
+    

pyjviz/rdf_node.py

@@ -105,11 +105,11 @@ def dump_subgraph(g, cc_uri, out_fd, popup_output):
                         node_bgcolor = "#88000022"
                         href = make_table_popup_href(head, popup_output)
                 elif obj_type.toPython() == "Series":
-                    glance_rq = "select ?shape { ?obj_state_cc <obj-state> ?obj_state; rdf:type ?target_cc_type; <shape> ?shape }"
-                    for shape in g.query(glance_rq, base = fstriplestore.base_uri, initBindings = bindings):
-                        shape = shape[0]
+                    glance_rq = "select ?shape ?head { ?obj_state_cc <obj-state> ?obj_state; rdf:type ?target_cc_type; <shape> ?shape; <df-head> ?head }"
+                    for shape, head in g.query(glance_rq, base = fstriplestore.base_uri, initBindings = bindings):
+                        shape = shape
                         node_bgcolor = "#88000022"
-                        href = make_table_popup_href(None, popup_output)
+                        href = make_table_popup_href(head, popup_output)
                 else:
                     raise Exception(f"unknown obj_type {obj_type}")
             elif target_cc_type == cc_basic_plot_uri:
@@ -307,7 +307,7 @@ def print_dot(vertical = False, show_objects = False):
     g = fstriplestore.triple_store.get_graph()
     print(dump_dot_code(g, vertical = vertical, show_objects = show_objects))
 
-def save_dot(dot_output_fn = None, vertical = False, show_objects = False, popup_output = False):
+def save_dot(dot_output_fn = None, vertical = False, show_objects = False, popup_output = True):
     ts = fstriplestore.triple_store
     if dot_output_fn is None:
         if hasattr(ts, 'output_fn') and ts.output_fn is not None:
@@ -327,5 +327,5 @@ def show(vertical = False, show_objects = False):
         raise Exception("triple sink is not in-memory file")
 
     g = ts.get_graph()
-    dot_code = dump_dot_code(g, vertical = vertical, show_objects = show_objects)
+    dot_code = dump_dot_code(g, vertical = vertical, show_objects = show_objects, popup_output = False)
     nb_utils.show_method_chain(dot_code)

pyjviz/viz.py

@@ -1,8 +1,7 @@
-import uuid
-
 from . import fstriplestore
+from . import rdf_node
 
-class WithBlock:
+class WithBlock(rdf_node.RDFNode):
     """
     Code blocks in python - https://docs.python.org/3/reference/executionmodel.html#:~:text=A%20Python%20program%20is%20constructed,typed%20interactively%20is%20a%20block.
     With PEP use of 'block' - https://peps.python.org/pep-0343/#specification-the-with-statement
@@ -11,23 +10,12 @@ class WithBlock:
       - uri - to identify itself in graph as node
       - rdf_type_uri - to identify node type
     """
-    def __init__(self, *, label, rdf_type):
-        self.label = label
-        self.rdf_type = rdf_type
-        self.uri = None
-        self.init_dump__()
-        
-    def init_dump__(self):
+    def __init__(self, *, rdf_type, label):
+        super().__init__(rdf_type, label)
         rdfl = fstriplestore.triple_store
-        self.uri = f"<{self.rdf_type}#{str(uuid.uuid4())}>"
-        rdf_type_uri = f"<{self.rdf_type}>"
-        rdfl.dump_triple(self.uri, "rdf:type", rdf_type_uri)
-        label_obj = f'"{self.label}"' if self.label else 'rdf:nil'
-        rdfl.dump_triple(self.uri, "rdf:label", label_obj)
         global wb_stack
         parent_uri = wb_stack.stack_entries__[-1].uri if wb_stack.size() > 0 else "rdf:nil"
         rdfl.dump_triple(self.uri, "<part-of>", parent_uri)
-        self.dump_init_called = True
 
     def __enter__(self):
         global wb_stack

pyjviz/wb_stack.py

@@ -13,19 +13,18 @@
 from .nested_call import NestedCall
 
 class CodeBlock(wb_stack.WithBlock):
-    def __init__(self, label = None, rdf_type = "CodeBlock"):
-        super().__init__(label = label, rdf_type = rdf_type)
+    def __init__(self, label = None):
+        super().__init__(rdf_type = "CodeBlock", label = label)
 
 CB = CodeBlock
 
-method_counter = 0 # NB: should be better way to cout method calls
+method_counter = 0 # NB: should be better way to count method calls
 class MethodCall(wb_stack.WithBlock):
-    def __init__(self, method_name, pyjviz_opts = {}):
-        super().__init__(label = method_name, rdf_type = "MethodCall")
+    def __init__(self, method_name):
+        super().__init__(rdf_type = "MethodCall", label = method_name)
         self.method_name = method_name
         self.method_bound_args = None
         self.nested_call_args = []
-        self.pyjviz_opts = pyjviz_opts
 
     def handle_start_method_call(self, method_name, method_signature, method_args, method_kwargs):
         if method_name == 'pin':

pyjviz/wb_stack_entries.py

@@ -8,8 +8,8 @@
 @prefix dash: <http://datashapes.org/dash#> .
 
 <WithBlock> rdf:type rdfs:Class; rdf:type sh:NodeShape; dash:closedByType true;
-	sh:property [sh:path rdf:type;  sh:minCount 1; sh:maxCount 1];
-	sh:property [sh:path rdf:label; sh:minCount 1; sh:maxCount 1];
+	sh:property [sh:path rdf:type;  sh:minCount 1; sh:maxCount 1; sh:class <WithBlock>];
+	sh:property [sh:path rdf:label; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
 	sh:property [sh:path <part-of>; sh:minCount 1; sh:maxCount 1; sh:or ([sh:class <WithBlock>] [sh:node rdf:nil])].
 
 <CodeBlock> rdf:type rdfs:Class; rdfs:subClassOf <WithBlock>; rdf:type sh:NodeShape; dash:closedByType true.
@@ -25,22 +25,37 @@
 	     sh:property [sh:path <method-call-arg2>; sh:minCount 0; sh:maxCount 1; sh:class <ObjState>];
 	     sh:property [sh:path <method-call-return>; sh:minCount 1; sh:maxCount 1; sh:class <ObjState>].
 
-<NestedCall> rdf:type rdfs:Class; rdfs:subClassOf <WithBlock>; rdf:type sh:NodeShape; dash:closedByType true;
+<NestedCall> rdf:type rdfs:Class; rdf:type sh:NodeShape; sh:closed true;
 	     sh:property [sh:path <ret-val>; sh:minCount 1; sh:maxCount 1; sh:class <ObjState>].
 
 <Obj> rdf:type rdfs:Class; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
-      sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1];
+      sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1; sh:class <Obj>];
       sh:property [sh:path <obj-type>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
       sh:property [sh:path <obj-uuid>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
       sh:property [sh:path <obj-pyid>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:integer].
 
 <ObjState> rdf:type rdfs:Class; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
-	   sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1];
+	   sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1; sh:class <ObjState>];
 	   sh:property [sh:path <part-of>; sh:minCount 1; sh:maxCount 1; sh:class <WithBlock>];
 	   sh:property [sh:path <obj>; sh:minCount 1; sh:maxCount 1; sh:class <Obj>];
 	   sh:property [sh:path <version>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
 	   sh:property [sh:path <df-shape>; sh:minCount 1; sh:maxCount: 1; sh:datatype xsd:string];
 	   sh:property [sh:path <df-head>; sh:minCount 0; sh:maxCount: 1; ; sh:datatype xsd:string].
-	   
 
+<ObjStateCC> rdf:type rdfs:Class; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
+	     sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1; sh:class <ObjStateCC>];
+	     sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1; sh:class <CC>];
 
+<CC> rdf:type rdfs:Class; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
+     sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1];
+
+<CCGlance> rdf:type rdfs:Class; rdfs:subClassOf <CC>; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
+     	   sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1];
+	   sh:property [sh:path <shape>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
+	   sh:property [sh:path <head>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
+
+<CCBasicPlot> rdf:type rdfs:Class; rdfs:subClassOf <CC>; rdf:type sh:NodeShape; sh:closed true; dash:closedByType true;
+     	      sh:property [sh:path rdf:type; sh:minCount 1; sh:maxCount 1];
+	      sh:property [sh:path <shape>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
+	      sh:property [sh:path <plot-im>; sh:minCount 1; sh:maxCount 1; sh:datatype xsd:string];
+