tricc-oo 1.5.9__py3-none-any.whl → 1.5.11__py3-none-any.whl

tricc_oo/visitors/tricc.py

@@ -94,6 +94,8 @@ def get_node_expressions(node, processed_nodes, process=None):
     return expression
 
 def set_last_version_false(node, processed_nodes):
+    if isinstance(node, (TriccNodeDiagnosis, TriccNodeSelectOption)):
+        return
     node_name = node.name if not isinstance(node, TriccNodeEnd) else node.get_reference()
     #last_version = get_last_version(node_name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption)  else  None
     last_version = processed_nodes.find_prev(node, version_filter(node_name))
@@ -191,9 +193,12 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
         ):
             if kwargs.get('warn', True):
                 logger.debug('Processing relevance for node {0}'.format(node.get_name()))
+            # tricc diagnostic have the same name as proposed diag but will be serialised with different names
+
             last_version =  set_last_version_false(node, processed_nodes)
             if last_version:
                 last_version = get_version_inheritance(node, last_version, processed_nodes)
+
             generate_calculates(node,calculates, used_calculates,processed_nodes=processed_nodes, process=process)               
        
                 
@@ -809,8 +814,6 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
         # put the stached node from that group first
         # if has next, walkthrough them (support options)
         # if len(stashed_nodes)>1:
-        if not recursive:
-            reorder_node_list(stashed_nodes, node.group, processed_nodes)
         if isinstance(node, (TriccNodeActivityStart, TriccNodeMainStart)):
             if recursive:
                 for gp in node.activity.groups.values():
@@ -894,6 +897,9 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
                 for nn in node.next_nodes:
                     if nn not in stashed_nodes:
                         stashed_nodes.insert_at_top(nn)
+        if not recursive:
+            reorder_node_list(stashed_nodes, node.group, processed_nodes)
+ 
         
                 
     else:
@@ -1269,7 +1275,7 @@ def set_prev_next_node(source_node, target_node, replaced_node=None, edge_only =
         set_next_node(source_node, target_node, replaced_node, edge_only)
          
     if activity and not any([(e.source == source_id) and ( e.target == target_id) for e in activity.edges]):
-        label = "continue" if issubclass(source_node.__class__, TriccNodeSelectYesNo) else None
+        label = "continue" if issubclass(source_node.__class__, TriccNodeSelect) else None
         activity.edges.append(TriccEdge(id = generate_id(), source = source_id, target = target_id, value = label))
 
 def remove_prev_next(prev_node, next_node, activity=None):
@@ -1403,37 +1409,52 @@ def replace_next_node(prev_node,next_node,old_node):
     for n_p_node in list_nodes:
         if n_p_node == old_node :
             set_prev_next_node(prev_node, next_node, old_node)
-    
-def reorder_node_list(list_node, group, processed_nodes):
-    active_activities = set(n.activity for n in processed_nodes)
-    
-    # Define a lambda to assign numeric priorities
-    def filter_logic(l_node):
-        priority = int(getattr(l_node, "priority", None) or 400)
-        if (
-            isinstance(l_node, TriccNodeWait)
-            and any(isinstance(rn, TriccNodeActivity) and any(sn.activity == rn for sn in list_node) for rn in l_node.reference)
-        ):
-            pass
-        elif group is not None and hasattr(l_node, 'group') and l_node.group and l_node.group.id == group.id:
-            priority += 7000  # Highest priority: Same group
-        elif issubclass(l_node.__class__, TriccRhombusMixIn) :
-            priority += 1000
-        elif hasattr(group, 'group') and group.group and l_node.group and l_node.group.id == group.group.id:
-            priority += 6000  # Second priority: Parent group
-        elif not isinstance(l_node.activity.root, TriccNodeActivityStart) and l_node.activity in active_activities:
-            priority += 5000  # Third priority: Active activities
-        elif not isinstance(l_node.activity.root, TriccNodeActivityStart):
-            priority += 4000  # Third priority: Active activities
-        elif l_node.activity in active_activities:
-            priority += 3000 # Third priority: Active activities
+
+
+# Priority constants
+SAME_GROUP_PRIORITY = 7000
+PARENT_GROUP_PRIORITY = 6000
+ACTIVE_ACTIVITY_PRIORITY = 5000
+NON_START_ACTIVITY_PRIORITY = 4000
+ACTIVE_ACTIVITY_LOWER_PRIORITY = 3000
+RHOMBUS_PRIORITY = 1000
+DEFAULT_PRIORITY = 2000
+
+def reorder_node_list(node_list, group, processed_nodes):
+    # Cache active activities for O(1) lookup
+    active_activities = {n.activity for n in processed_nodes}
+
+    def get_priority(node):
+        # Cache attributes to avoid repeated getattr calls
+        priority = int(getattr(node, "priority", 0) or 0)
+        node_group = getattr(node, "group", None)
+        activity = getattr(node, "activity", None)
+
+        # Check for same group
+        if group is not None and node_group and node_group.id == group.id:
+            priority += SAME_GROUP_PRIORITY
+        # Check for parent group
+        elif hasattr(group, "group") and group.group and node_group and node_group.id == group.group.id:
+            priority += PARENT_GROUP_PRIORITY
+        # Check for active activities (not main)
+        elif activity and isinstance(activity.root, TriccNodeActivityStart) and activity in active_activities:
+            priority += ACTIVE_ACTIVITY_PRIORITY
+        # Check for non main activities
+        elif activity and isinstance(activity.root, TriccNodeActivityStart):
+            priority += NON_START_ACTIVITY_PRIORITY
+        # Check for active activities (lower priority)
+        elif activity and activity in active_activities:
+            priority += ACTIVE_ACTIVITY_LOWER_PRIORITY
+        # Check for rhombus nodes
+        elif issubclass(node.__class__, TriccRhombusMixIn):
+            priority += RHOMBUS_PRIORITY
         else:
-            priority += 2000  # Lowest priority: Others
+            priority += DEFAULT_PRIORITY
+
         return priority
-    
-    # Sort list_node in place using filter_logic as the key
-    list_node.sort(key=filter_logic, reverse=True)
-    return None
+
+    # Sort in place, highest priority first
+    node_list.sort(key=get_priority, reverse=True)
     
 def loop_info(loop, **kwargs):
     logger.critical("dependency details")
@@ -1677,7 +1698,7 @@ def export_proposed_diags(activity, diags=None, **kwargs):
     return diags
     
 
-def get_accept_diagnostic_node(code, display, severity, activity):
+def get_accept_diagnostic_node(code, display, severity, priority, activity):
     node = TriccNodeAcceptDiagnostic(
         id=generate_id("pre_final." + code),
         name="pre_final." + code,
@@ -1685,24 +1706,28 @@ def get_accept_diagnostic_node(code, display, severity, activity):
         list_name="acc_rej",
         activity=activity,
         group=activity,
-        severity=severity
+        severity=severity,
+        priority=priority
     )
     node.options = get_select_accept_reject_options(node, node.activity)
     return node
 
 def get_diagnostic_node(code, display, severity, priority, activity):
-    node = TriccNodeAcceptDiagnostic(
+    node = TriccNodeCalculate(
         id=generate_id("final." + code),
         name="final." + code,
         label=display,
-        list_name="acc_rej",
         activity=activity,
         group=activity,
-        severity=severity,
-        priority=priority
-        
+        priority=priority,
+        expression_reference=or_join([
+            TriccOperation(TriccOperator.ISTRUE, [TriccReference("pre_final." + code)]), 
+            TriccOperation(
+                TriccOperator.SELECTED,
+                [TriccReference('tricc.manual.diag'), TriccStatic(code)]
+            )
+        ])
     )
-    node.options = get_select_accept_reject_options(node, node.activity)
     return node
 
 def get_select_accept_reject_options(node, group):
@@ -1743,7 +1768,6 @@ def create_determine_diagnosis_activity(diags):
     start.activity = activity
     start.group = activity
     diags_conf = []
-    r_diags_conf = []
     end = TriccNodeActivityEnd(
         id=generate_id("end.determine-diagnosis"),
         name="end.determine-diagnosis",
@@ -1751,10 +1775,23 @@ def create_determine_diagnosis_activity(diags):
         group=activity,
     )
     activity.nodes[end.id]=end
+    
+    f = TriccNodeSelectMultiple(
+        name="tricc.manual.diag",
+        label="Add diagnosis",
+        list_name='manual_diag',
+        id=generate_id("tricc.manual.diag"),
+        activity=activity,
+        group=activity,
+        required=TriccStatic(False),
+        
+    )
     for proposed in diags:
-        d = get_diagnostic_node(proposed.name, proposed.label, proposed.severity, proposed.priority, activity)
+        d = get_accept_diagnostic_node(proposed.name, proposed.label, proposed.severity, proposed.priority, activity)
+        c = get_diagnostic_node(proposed.name, proposed.label, proposed.severity, proposed.priority, activity)
         diags_conf.append(d)
         r = TriccNodeRhombus(
+            path=start,
             id=generate_id(f"proposed-rhombus{proposed.id}"),
             expression_reference=TriccOperation(
                 TriccOperator.ISTRUE,
@@ -1762,26 +1799,22 @@ def create_determine_diagnosis_activity(diags):
             ),
             reference=[TriccReference(proposed.name)],
             activity=activity,
-            group=activity        )
-        r_diags_conf.append(r)
-        set_prev_next_node(start, r, edge_only=False)
+            priority=proposed.priority,
+            group=activity)
+        activity.calculates.append(r)
+        activity.calculates.append(c)
         set_prev_next_node(r, d, edge_only=False)
         set_prev_next_node(d, end, edge_only=False)
+        wait2 = get_activity_wait([activity.root], diags_conf, [f], edge_only=False)
         activity.nodes[d.options[0].id] = d.options[0]
         activity.nodes[d.options[1].id] = d.options[1]
         activity.nodes[d.id]=d
         activity.nodes[r.id]=r
+        activity.nodes[c.id]=c
+        activity.nodes[f.id]=f
+        activity.nodes[wait2.id]=wait2
     # fallback
-    f = TriccNodeSelectMultiple(
-        name="tricc.manual.diag",
-        label="Add diagnosis",
-        list_name='manual_diag',
-        id=generate_id("tricc.manual.diag"),
-        activity=activity,
-        group=activity,
-        required=TriccStatic(False),
-        
-    )
+
     options = [
         TriccNodeSelectOption(
             id=generate_id(d.name),
@@ -1793,10 +1826,8 @@ def create_determine_diagnosis_activity(diags):
         ) for d in diags
     ]
     f.options=dict(zip(range(0, len(options)), options))
-    wait2 = get_activity_wait([activity.root], diags_conf, [f], edge_only=False)
-    activity.nodes[wait2.id]=wait2
     activity.nodes[f.id]=f
-
+    set_prev_next_node(f, end, edge_only=False)
     
     return activity
     

{tricc_oo-1.5.9.dist-info → tricc_oo-1.5.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.9
+Version: 1.5.11
 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.5.9.dist-info → tricc_oo-1.5.11.dist-info}/RECORD

@@ -6,7 +6,7 @@ tricc_oo/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tricc_oo/converters/codesystem_to_ocl.py,sha256=-ZKMBeIvzgqmhJfnn6ptuwpnHQtuE-fCDDfKpfGvUSU,6066
 tricc_oo/converters/cql_to_operation.py,sha256=bsVD4HO5Zr2clHuIWz86gIUnI7aZ676IXDK5S7x32_o,14439
 tricc_oo/converters/datadictionnary.py,sha256=WWKcTtKLfc4aduHcDBhr4JSfU2NqRMaslwX-wdZPIAw,3968
-tricc_oo/converters/drawio_type_map.py,sha256=rHNuED6QX10bhaT2zDuYJHzzWOxQ9vmpUOwscmlbUCI,7243
+tricc_oo/converters/drawio_type_map.py,sha256=VsiKJuAcM_kaSacxZgMaMEfEMVwVAbJjxrRj4TDMIxc,7254
 tricc_oo/converters/tricc_to_xls_form.py,sha256=bJVd-FLrivrCxGI6mO2i0V7GVVuJZdaDuwcEf3gHNR8,2327
 tricc_oo/converters/utils.py,sha256=UyndDORsDbRV5-gYW-yInK5ztjtYdeCw6K-mrYr1Emk,1688
 tricc_oo/converters/xml_to_tricc.py,sha256=pJpDLAsDX9dAhmviR6AtZRnPPlK6ajmPBoSp7TfAlhs,37117
@@ -16,16 +16,16 @@ tricc_oo/converters/cql/cqlParser.py,sha256=hIUdR907WX24P2Jlrxk-H0IT94n51yh_ZsCm
 tricc_oo/converters/cql/cqlVisitor.py,sha256=SWSDIqVYBhucR4VgLn_EPNs7LV9yCqsOmzFZ0bmRSGc,33865
 tricc_oo/models/__init__.py,sha256=Rdk1fsNXHrbmXTQD1O7i0NC_A6os648Ap6CtWRliOg8,92
 tricc_oo/models/base.py,sha256=mqeAnC1mfZkdEm49dFiYoGImC5CWHG2Rl7frG1pE8sk,24547
-tricc_oo/models/calculate.py,sha256=znxGy5SobhCWAkyBam1ekn9OqKcr2vyS5ugwwiNETVM,7571
+tricc_oo/models/calculate.py,sha256=sHuUEFc88yUZMtYWIG09wNOiOsbemj8wEoulVPXwcys,7486
 tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
 tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
 tricc_oo/models/ordered_set.py,sha256=wbbmppjgKy0xcKD9kIAbT4kgNkuwTILPxRw_KAAoPEY,4178
-tricc_oo/models/tricc.py,sha256=EwWDFfxEeNPsgtpn79MyPUf5U7DkS8Phj26cj_0Tn3k,16624
+tricc_oo/models/tricc.py,sha256=sds17Ea4Hj-tibtI_DYKkqrN8QSCvo98L09SovcsL84,16669
 tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/parsers/xml.py,sha256=vq9PA5Zt4G3QMtZ1zgyN8110O1w19Jqt6JClJYhHJlU,4410
 tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/serializers/planuml.py,sha256=a81YKsjgng-h2H_rmFE2J5FeBBUaH8kRGT8YrvzpEKE,455
-tricc_oo/serializers/xls_form.py,sha256=oaBfHGJ_I_7qAPuxdG361PCaEKo1TD1LUvHJvo0kYlk,22707
+tricc_oo/serializers/xls_form.py,sha256=p1nNFMBHretUc2z773DBUatSNjrCLL8FHi3BYP6Di1s,22784
 tricc_oo/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/strategies/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/strategies/input/base_input_strategy.py,sha256=-GQ_xRvJXzn-q_eT8R-wtFOTWzPtdNj79zjmsH6x070,4065
@@ -34,13 +34,13 @@ tricc_oo/strategies/output/base_output_strategy.py,sha256=WiJwqm4g_x-rbksrjoE0AB
 tricc_oo/strategies/output/spice.py,sha256=s_COahyYCoc4Xv5TGh_AW9evDOW6GOex0Xwa_JWeLsI,11280
 tricc_oo/strategies/output/xls_form.py,sha256=1jNkF8qZXonDh-aOKpVN7HEBrRufKn_7ECvpNnQC73g,31037
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=8oLlgS1Hr6IVvI0O71kIk5oIKXbt2lPVc1SZIjzcSTc,9452
-tricc_oo/strategies/output/xlsform_cht.py,sha256=QcWcmXqIoaQWqLU2cILqnU7ybKYBs2Xd6cUL0gSr3gw,20148
+tricc_oo/strategies/output/xlsform_cht.py,sha256=YCL7gQlq9CU1GQxPSy5C8fYfPTI1XDPx9G9sr2RZFWM,22359
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=0D_H68a2S7oLKJENEePaRGIocrRIF45BofHlLOtGsKo,2206
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=Owwa3-vIpaVgY_4CcpFqPF6u1-yLsEtcd-xNV7bWwlg,98907
+tricc_oo/visitors/tricc.py,sha256=jJd_yNWsnums4rRA5acVVPRUCmuowsY1xxlpenhLY0U,99799
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
-tricc_oo-1.5.9.dist-info/METADATA,sha256=HzkdkeERfRYPfuACW9bcFarT-1mMdT7ZqOXQUsx3gGs,7877
-tricc_oo-1.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.9.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.9.dist-info/RECORD,,
+tricc_oo-1.5.11.dist-info/METADATA,sha256=iHk1h8ukZJJ1_qpP1O5jmYiDRSk3l4eeVUuICpWH1jE,7878
+tricc_oo-1.5.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.11.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.11.dist-info/RECORD,,