tricc-oo 1.6.22__py3-none-any.whl → 1.6.23__py3-none-any.whl

tricc_oo/models/base.py

@@ -217,6 +217,7 @@ class TriccNodeBaseModel(TriccBaseModel):
     expression_inputs: List[Expression] = []
     activity: Optional[FwTriccNodeBaseModel] = None
     ref_def: Optional[Union[int, str]] = None  # for medal creator
+    is_sequence_defined: bool = False
 
     class Config:
         use_enum_values = True  # <--

tricc_oo/models/tricc.py

@@ -301,6 +301,7 @@ class TriccNodeDisplayModel(TriccNodeBaseModel):
 class TriccNodeNote(TriccNodeDisplayModel):
     tricc_type: TriccNodeType = TriccNodeType.note
     datatype: str = "string"
+    is_sequence_defined: bool = True
 
 
 class TriccNodeInputModel(TriccNodeDisplayModel):
@@ -308,6 +309,7 @@ class TriccNodeInputModel(TriccNodeDisplayModel):
     constraint_message: Optional[Union[str, Dict[str, str]]] = None
     constraint: Optional[Expression] = None
     save: Optional[str] = None  # contribute to another calculate
+    is_sequence_defined: bool = True
 
 
 class TriccNodeDate(TriccNodeInputModel):

tricc_oo/visitors/tricc.py

@@ -158,19 +158,25 @@ def set_last_version_false(node, processed_nodes):
     return last_version
 
 
-def get_version_inheritance(node, last_version, processed_nodes):
-    # FIXME this is for XLS form where only calculate are evaluated
-    # for a activity that is not triggered
+def get_version_inheritance(node, all_prev_versions, processed_nodes):
+
+    # Updated to merge ALL previous versions, not just the last one
+    # This ensures inheritance works even when intermediate activities weren't triggered
+    
     if not issubclass(node.__class__, (TriccNodeInputModel)):
         node.last = True
         if issubclass(node.__class__, (TriccNodeDisplayCalculateBase, TriccNodeEnd)) and node.name is not None:
             # logger.debug("set last to false for node {}
             # and add its link it to next one".format(last_used_calc.get_name()))
             if node.prev_nodes:
-                set_prev_next_node(last_version, node)
+                # Set prev_next_node only with the immediate last version
+                for pv in  all_prev_versions:
+                    set_prev_next_node(pv, node)
             else:
                 expression = node.expression or node.expression_reference or getattr(node, "relevance", None)
-                expression = merge_expression(expression, last_version)
+                # Merge with ALL previous versions, not just the last one
+                if all_prev_versions:
+                    expression = merge_all_expressions(expression, all_prev_versions)
                 if node.expression:
                     node.expression = expression
                 elif node.expression_reference:
@@ -180,17 +186,21 @@ def get_version_inheritance(node, last_version, processed_nodes):
     else:
         node.last = False
 
-        # Create a calculate node that coalesces the previous saved value with the current node value
+        # Create a calculate node that coalesces all previous saved values with the current node value
         calc_id = generate_id(f"save_{node.save}")
+        
+        # Build reference list with current node and all previous versions
+        reference_list = [node] + (all_prev_versions if all_prev_versions else [])
+        
         calc = TriccNodeCalculate(
             id=calc_id,
             name=node.save,
             path_len=node.path_len + 1,
             expression_reference=TriccOperation(
                 TriccOperator.COALESCE,
-                [node, last_version],
+                reference_list,
             ),
-            reference=[node, last_version],
+            reference=reference_list,
             activity=node.activity,
             group=node.group,
             label=f"Save calculation for {node.label}",
@@ -201,7 +211,9 @@ def get_version_inheritance(node, last_version, processed_nodes):
         # set_last_version_false(calc, processed_nodes)
         processed_nodes.add(calc)
         if issubclass(node.__class__, TriccNodeInputModel):
-            node.expression = TriccOperation(TriccOperator.COALESCE, ["$this", last_version])
+            # Coalesce with all previous versions
+            coalesce_operands = ["$this"] + (all_prev_versions if all_prev_versions else [])
+            node.expression = TriccOperation(TriccOperator.COALESCE, coalesce_operands)
 
 
 def merge_expression(expression, last_version):
@@ -216,6 +228,30 @@ def merge_expression(expression, last_version):
     return expression
 
 
+def merge_all_expressions(expression, all_versions):
+    """
+    Merge an expression with ALL previous versions, not just the last one.
+    This ensures inheritance works even when intermediate versions weren't evaluated
+    due to activity relevance conditions.
+    """
+    if not all_versions:
+        return expression
+    
+    datatype = expression.get_datatype() if expression else "unknown"
+    
+    if datatype == "boolean":
+        expression = or_join(all_versions)
+    
+    else:
+        # COALESCE through all previous versions, then the current expression
+        coalesce_operands = list(all_versions)
+        if expression:
+            coalesce_operands.append(expression)
+        expression = TriccOperation(TriccOperator.COALESCE, coalesce_operands)
+    
+    return expression
+
+
 def load_calculate(
     node, processed_nodes, stashed_nodes, calculates, used_calculates, warn=False, process=None, **kwargs
 ):
@@ -239,8 +275,14 @@ def load_calculate(
             # 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)
+            # Get all previous versions from processed_nodes, not just the last one
+            node_name = node.name if not isinstance(node, TriccNodeEnd) else node.get_reference()
+            all_prev_versions = get_versions(node_name, processed_nodes)
+            # Exclude the current node itself
+            all_prev_versions = [v for v in all_prev_versions if v != node]
+
             if last_version:
-                last_version = get_version_inheritance(node, last_version, processed_nodes)
+                get_version_inheritance(node, all_prev_versions, processed_nodes)
 
             generate_calculates(node, calculates, used_calculates, processed_nodes=processed_nodes, process=process)
 
@@ -2194,9 +2236,9 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
 
     for act_id in prev_activities:
         act_expression_inputs = []
-        none_input_prev_node = False
+        none_sequence_defined_prev_node = False
         for prev_node in prev_activities[act_id]:
-            none_input_prev_node = none_input_prev_node or not issubclass(prev_node.__class__, TriccNodeInputModel)
+            none_sequence_defined_prev_node = none_sequence_defined_prev_node or not prev_node.is_sequence_defined
             if (
                 excluded_name is None
                 or prev_node != excluded_name
@@ -2232,8 +2274,8 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     negate=False,
                     process=process,
                 )
-            elif none_input_prev_node:
-                # For non-input nodes, AND the activity relevance with the prev expression
+            elif none_sequence_defined_prev_node:
+                # For nodes with is_sequence_defined = False, AND the activity relevance with the prev expression
                 activity_relevance = get_node_expression(
                     prev_node.activity,
                     processed_nodes=processed_nodes,
@@ -2554,15 +2596,6 @@ def get_calculation_terms(node, processed_nodes, get_overall_exp=False, negate=F
 
     if isinstance(node.expression_reference, (TriccOperation, TriccStatic)):
         expression = node.expression_reference
-    elif node.reference is not None and node.expression_reference is not None:
-        expression = get_prev_node_expression(
-            node, processed_nodes=processed_nodes, get_overall_exp=get_overall_exp, process=process
-        )
-        ref_expression = node.expression_reference.format(*[get_export_name(ref) for ref in node.reference])
-        if expression is not None and expression != "":
-            expression = and_join([expression, ref_expression])
-        else:
-            expression = ref_expression
     elif expression is None:
         expression = get_prev_node_expression(
             node, processed_nodes=processed_nodes, get_overall_exp=get_overall_exp, process=process
@@ -2655,6 +2688,12 @@ def generate_calculate(node, processed_nodes, **kwargs):
     if node not in processed_nodes:
         if kwargs.get("warn", True):
             logger.debug("generation of calculate for node {}".format(node.get_name()))
+
+        # Set is_sequence_defined for calculate nodes based on dependencies
+        if issubclass(node.__class__, TriccNodeCalculateBase):
+            # Calculate node is sequence defined if ALL prev_nodes have is_sequence_defined = True
+            node.is_sequence_defined = all(prev_node.is_sequence_defined for prev_node in node.prev_nodes)
+
         if (
             hasattr(node, "expression")
             and (node.expression is None)

{tricc_oo-1.6.22.dist-info → tricc_oo-1.6.23.dist-info}/METADATA

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

@@ -15,12 +15,12 @@ tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoS
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
 tricc_oo/converters/cql/cqlVisitor.py,sha256=iHuup2S7OGSVWLEcI4H3oecRqgXztC1sKnew_1P2iGY,33880
 tricc_oo/models/__init__.py,sha256=CgS52LLqdDIaXHvZy08hhu_VaYw80OEdfL_llM9ICBA,108
-tricc_oo/models/base.py,sha256=QR4HlseB3_pjd-O7foACQHiyzJdzYTyOYILvQD1VrhU,26098
+tricc_oo/models/base.py,sha256=f5EQtTSJH9aPanqCc0qD6579TgAirzYaZ5BtQ2Iu0xw,26136
 tricc_oo/models/calculate.py,sha256=uNP0IDUqPQcJq9Co05H8eX5wbR_DikSxuOHxfVE5Dxg,8018
 tricc_oo/models/lang.py,sha256=ZMRwdoPWe01wEDhOM0uRk-6rt3BkoAAZM8mZ61--s3A,2265
 tricc_oo/models/ocl.py,sha256=MybSeB6fgCOUVJ4aektff0vrrTZsyfwZ2Gt_pPBu_FY,8728
 tricc_oo/models/ordered_set.py,sha256=BpXLW8plRAy4te25PIUPvVXPnLPcypvKg3iNPhtPulA,3833
-tricc_oo/models/tricc.py,sha256=lQ1xguJjhbRQ8wFt2rwefw_756aq_y4rWxf8Gj9zhas,17475
+tricc_oo/models/tricc.py,sha256=H_HPFzFsS_-fFXCx3vdKsw29DFrlTnAscTJE_lQG_Lk,17549
 tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/parsers/xml.py,sha256=uzkb1y18MHfqVFmZqVh0sKT4cx6u0-NcAT_lV_gHBt8,4208
 tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,11 +41,11 @@ tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e
 tricc_oo/strategies/output/xlsform_cht.py,sha256=lY1xIDxqYxl_lYNVCl3msXZL88No49yEVCpahcHGOn0,28675
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=f66dadGtQittZvSyJNPi21pXL2HVOczLOVsJDmD2i6w,112456
+tricc_oo/visitors/tricc.py,sha256=uWfPs4yUqTlVBzQcNGLaf635pOz5ClzJ2yj9pieJANY,114090
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.22.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.22.dist-info/METADATA,sha256=At70THgAUro2_V5Oz8mx8_Q_GqqR78d8rPmwu57DCHA,8600
-tricc_oo-1.6.22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-tricc_oo-1.6.22.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.22.dist-info/RECORD,,
+tricc_oo-1.6.23.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.23.dist-info/METADATA,sha256=7_BWo-Qm5UcknB4D9LNIO2Gnit5zdxQWHEL4BUFxlLI,8600
+tricc_oo-1.6.23.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tricc_oo-1.6.23.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.23.dist-info/RECORD,,