tricc-oo 1.4.15__tar.gz → 1.4.17__tar.gz

{tricc_oo-1.4.15/tricc_oo.egg-info → tricc_oo-1.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: tricc-oo
-Version: 1.4.15
+Version: 1.4.17
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.4.15 → tricc_oo-1.4.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.15"
+version = "1.4.17"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 

{tricc_oo-1.4.15 → tricc_oo-1.4.17}/tests/build.py

@@ -145,7 +145,7 @@ if __name__ == "__main__":
     if in_filepath is None:
         print_help()
         sys.exit(2)
-    in_filepath_list = in_filepath.split(',')
+    
     if not download_dir:
         download_dir = out_path
     debug_path = os.fspath(out_path + "/debug.log")
@@ -165,6 +165,7 @@ if __name__ == "__main__":
         setup_logger("default", debug_file_path, logging.INFO)
     file_content = []
     files = []
+    in_filepath_list = in_filepath.split(',')
     for in_filepath in in_filepath_list:
         pre, ext = os.path.splitext(in_filepath)
 

{tricc_oo-1.4.15 → tricc_oo-1.4.17}/tricc_oo/strategies/input/base_input_strategy.py

@@ -53,7 +53,7 @@ class BaseInputStrategy:
                     project.start_pages['determine-diagnosis'] = diags_activity
             root_process = sorted_pages[list(sorted_pages.keys())[0]][0].root
             root = TriccNodeMainStart(
-                id=generate_id('s-determine-diagnosis'),
+                id=generate_id('s-main'),
                 form_id=root_process.form_id,
                 label=root_process.label,
                 process='main'
@@ -61,7 +61,7 @@ class BaseInputStrategy:
             nodes = {}
             nodes[root.id] = root
             app = TriccNodeActivity(
-                id=generate_id('a-determine-diagnosis'),
+                id=generate_id('a-main'),
                 name=root_process.name,
                 root=root,
                 nodes=nodes
@@ -73,29 +73,30 @@ class BaseInputStrategy:
             # setting the activity/group to main
             prev_bridge = root
             prev_process = None
-            for process in sorted_pages:
-                nodes = {page.id: page for page in sorted_pages[process]}
-                if prev_process:
-                    prev_bridge = get_activity_wait(
-                        prev_bridge,
-                        sorted_pages[prev_process],
-                        nodes.values(),
-                        activity=app,
-                    )
-                else:
-                    for a in nodes:
-                         set_prev_next_node(
+            for process in self.processes:
+                if process in sorted_pages:
+                    nodes = {page.id: page for page in sorted_pages[process]}
+                    if prev_process:
+                        prev_bridge = get_activity_wait(
                             prev_bridge,
-                            a,
-                            edge_only=True
+                            sorted_pages[prev_process],
+                            nodes.values(),
+                            activity=app,
                         )
-                app.nodes[prev_bridge.id] = prev_bridge
-                
-                for n in nodes.values():
-                    n.activity = app
-                    n.group = app
-                    app.nodes[n.id] = n
-                prev_process = process
+                    else:
+                        for a in nodes:
+                            set_prev_next_node(
+                                prev_bridge,
+                                a,
+                                edge_only=True
+                            )
+                    app.nodes[prev_bridge.id] = prev_bridge
+                    
+                    for n in nodes.values():
+                        n.activity = app
+                        n.group = app
+                        app.nodes[n.id] = n
+                    prev_process = process
 
 
             return app

{tricc_oo-1.4.15 → tricc_oo-1.4.17}/tricc_oo/visitors/tricc.py

@@ -768,7 +768,13 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
         references = node.get_references()
         if references:
             path_len = max(path_len, *[0,*[getattr(n,'path_len',0) + 1 for n in references]])
-    node.path_len = max(node.path_len, path_len)    
+    node.path_len = max(node.path_len, path_len)
+    prev_process = process[0] if process else None
+    if isinstance(node, TriccNodeActivity) and getattr(node.root, 'process', None):
+        if process is None:
+            process = [node.root.process]
+        else:
+            process[0] = node.root.process
     if (
         callback(
             node, 
@@ -802,11 +808,6 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
         if not recursive:
             reorder_node_list(stashed_nodes, node.group, processed_nodes)
         if isinstance(node, (TriccNodeActivityStart, TriccNodeMainStart)):
-            if getattr(node, 'process', None):
-                if process is None:
-                    process = [node.process]
-                else:
-                    process[0] = node.process
             if recursive:
                 for gp in node.activity.groups.values():
                     walktrhough_tricc_node_processed_stached(
@@ -851,11 +852,6 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
             if node.root not in processed_nodes:
                 if node.root is not None:
                     node.root.path_len = max(path_len,  node.root.path_len)
-                    if getattr(node.root, 'process', None):
-                        if process is None:
-                            process = [node.root.process]
-                        else:
-                            process[0] = node.root.process
                     if recursive:
                         walktrhough_tricc_node_processed_stached(node.root, callback, processed_nodes, stashed_nodes, path_len,
                                                             recursive, warn = warn,node_path = node_path.copy(),**kwargs)
@@ -897,6 +893,8 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
         
                 
     else:
+        if prev_process and process and prev_process != process[0]:
+            process[0] = prev_process
         if node not in processed_nodes and node not in stashed_nodes:
             if node not in stashed_nodes:
                 stashed_nodes.insert_at_bottom(node)
@@ -1686,9 +1684,10 @@ def get_select_accept_reject_options(node, group):
     return {0:yes, 1:no }
 
 def create_determine_diagnosis_activity(diags):
-    start = TriccNodeActivityStart(
+    start = TriccNodeMainStart(
         id=generate_id('start.determine-diagnosis'),
-        name="start.determine-diagnosis"
+        name="start.determine-diagnosis",
+        process='determine-diagnosis'
     )
 
     
@@ -2032,7 +2031,7 @@ def get_rhombus_terms( node, processed_nodes, is_calculate=False, negate=False,
                 ]
             )
         else:
-            if left_term is not None and re.search(" (\+)|(\-)|(or)|(and) ", expression):
+            if left_term is not None and re.search(" (+)|(-)|(or)|(and) ", expression):
                 expression = "({0}){1}".format(expression, left_term)
             else:
                 expression = "{0}{1}".format(expression, left_term)

{tricc_oo-1.4.15 → tricc_oo-1.4.17/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.15
+Version: 1.4.17
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues