tricc-oo 1.6.24__tar.gz → 1.6.26__tar.gz

{tricc_oo-1.6.24/tricc_oo.egg-info → tricc_oo-1.6.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.24
+Version: 1.6.26
 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.24 → tricc_oo-1.6.26}/pyproject.toml

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

{tricc_oo-1.6.24 → tricc_oo-1.6.26}/tricc_oo/models/tricc.py

@@ -99,6 +99,7 @@ class TriccNodeActivity(TriccNodeBaseModel):
     # - case definition
     calculates: List[TriccNodeCalculateBase] = []
     applicability: Optional[Union[Expression, TriccOperation]] = None
+    is_sequence_defined: bool = False
 
     # redefine
     def make_instance(self, instance_nb=None, **kwargs):
@@ -294,7 +295,8 @@ class TriccNodeDisplayModel(TriccNodeBaseModel):
     default: Optional[Union[Expression, TriccOperation, TriccReference, TriccStatic]] = None
     trigger: Optional[Union[Expression, TriccOperation, TriccReference]] = None
     priority: Union[float, int, None] = None
-
+    concept_type: str = None
+    datatype: str = None
     # to use the enum value of the TriccNodeType
 
 

{tricc_oo-1.6.24 → tricc_oo-1.6.26}/tricc_oo/serializers/xls_form.py

@@ -357,8 +357,7 @@ def generate_choice_filter(strategy, node):
         choice_filter = TriccOperation(TriccOperator.OR, [basic])
         for k, op in relevances.items():
             choice_filter.append(
-                TriccOperation(
-                    TriccOperator.AND,
+                and_join(
                     [
                         TriccOperation(
                             TriccOperator.EQUAL,
@@ -368,7 +367,7 @@ def generate_choice_filter(strategy, node):
                             ],
                         ),
                         op,
-                    ],
+                    ]
                 )
             )
         return strategy.get_tricc_operation_expression(choice_filter)

{tricc_oo-1.6.24 → tricc_oo-1.6.26}/tricc_oo/visitors/tricc.py

@@ -176,7 +176,7 @@ def get_version_inheritance(node, all_prev_versions, processed_nodes):
                 expression = node.expression or node.expression_reference or getattr(node, "relevance", None)
                 # Merge with ALL previous versions, not just the last one
                 if all_prev_versions:
-                    expression = merge_all_expressions(expression, all_prev_versions)
+                    expression = merge_expressions(expression, *all_prev_versions)
                 if node.expression:
                     node.expression = expression
                 elif node.expression_reference:
@@ -216,39 +216,15 @@ def get_version_inheritance(node, all_prev_versions, processed_nodes):
             node.expression = TriccOperation(TriccOperator.COALESCE, coalesce_operands)
 
 
-def merge_expression(expression, last_version):
+def merge_expressions(expression, last_version, *argv):
     datatype = expression.get_datatype()
     if datatype == "boolean":
-        expression = or_join([TriccOperation(TriccOperator.ISTRUE, [last_version]), expression])
+        expression = or_join([TriccOperation(TriccOperator.ISTRUE, [last_version, *argv]), expression])
 
     elif datatype == "number":
-        expression = TriccOperation(TriccOperator.PLUS, [last_version, expression])
+        expression = TriccOperation(TriccOperator.PLUS, [last_version, *argv, expression])
     else:
-        expression = TriccOperation(TriccOperator.COALESCE, [last_version, expression])
-    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([expression, *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)
-    
+        expression = TriccOperation(TriccOperator.COALESCE, [expression, last_version, *argv])
     return expression
 
 
@@ -582,7 +558,7 @@ def generate_calculates(node, calculates, used_calculates, processed_nodes, proc
             node.activity.calculates.append(calc_node)
             last_version = set_last_version_false(calc_node, processed_nodes)
             if last_version:
-                calc_node.expression = merge_expression(calc_node.expression, last_version)
+                calc_node.expression = merge_expressions(calc_node.expression, last_version)
             processed_nodes.add(calc_node)
             logger.debug(
                 "generate_save_calculate:{}:{} as {}".format(
@@ -615,7 +591,7 @@ def generate_calculates(node, calculates, used_calculates, processed_nodes, proc
                 node.activity.calculates.append(calc_node)
                 last_version = set_last_version_false(calc_node, processed_nodes)
                 if last_version:
-                    calc_node.expression = merge_expression(calc_node.expression, last_version)
+                    calc_node.expression = merge_expressions(calc_node.expression, last_version)
                 processed_nodes.add(calc_node)
                 list_calc.append(calc_node)
                 node.activity.nodes[calc_node.id] = calc_node
@@ -2265,8 +2241,7 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
         if act_expression_inputs:
             act_sub = or_join(act_expression_inputs)
             # if there is condition fallback on the calling activity condition
-            if act_sub == TriccStatic(True):
-                act_sub = get_node_expression(
+            act_relevance = get_node_expression(
                     prev_node.activity,
                     processed_nodes=processed_nodes,
                     get_overall_exp=get_overall_exp,
@@ -2274,7 +2249,9 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     negate=False,
                     process=process,
                 )
-            elif none_sequence_defined_prev_node:
+            if act_sub == TriccStatic(True):
+                act_sub = act_relevance
+            elif act_relevance != TriccStatic(True) and 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,
@@ -2284,7 +2261,13 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                 #     negate=False,
                 #     process=process,
                 # )
-                act_sub = and_join([ prev_node.activity.root, act_sub])
+                act_sub = and_join([
+                    TriccOperation(
+                        TriccOperator.ISTRUE,
+                        [prev_node.activity.root]
+                    ),
+                    act_sub
+                ])
             add_sub_expression(expression_inputs, act_sub)
             # avoid void is there is not conditions to avoid looping too much itme
     # expression_inputs = clean_or_list(
@@ -2661,13 +2644,10 @@ def get_selected_option_expression_multiple(option_node, negate):
     selected = TriccOperation(TriccOperator.SELECTED, [option_node.select, TriccStatic(option_node)])
 
     if negate:
-        return TriccOperation(
-            operator=TriccOperator.AND,
-            resource=[
+        return and_join([
                 TriccOperation(operator=TriccOperator.NOT, resource=[selected]),
                 TriccOperation(operator=TriccOperator.ISNOTNULL, resource=[option_node.select]),
-            ],
-        )
+            ])
 
     else:
         return selected
@@ -2778,7 +2758,7 @@ def generate_base(node, processed_nodes, **kwargs):
                         )
                         constraints_max = "The maximum value is {0}.".format(node.max)
                     if len(constraints) > 1:
-                        node.constraint = TriccOperation(TriccOperator.AND, constraints)
+                        node.constraint = and_join(constraints)
                         node.constraint_message = (constraints_min + " " + constraints_max).strip()
                     elif len(constraints) == 1:
                         node.constraint = constraints[0]

{tricc_oo-1.6.24 → tricc_oo-1.6.26/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.24
+Version: 1.6.26
 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.24 → tricc_oo-1.6.26}/tricc_oo.egg-info/SOURCES.txt

@@ -2,8 +2,8 @@ LICENSE
 README.md
 pyproject.toml
 tests/build.py
+tests/test_cql.py
 tests/to_ocl.py
-tests/data/test_cql.py
 tricc_oo/__init__.py
 tricc_oo.egg-info/PKG-INFO
 tricc_oo.egg-info/SOURCES.txt