tricc-oo 1.4.23__tar.gz → 1.4.25__tar.gz

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/PKG-INFO

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

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

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo/converters/tricc_to_xls_form.py

@@ -37,8 +37,12 @@ def get_export_name(node, replace_dots=True):
                 node.export_name = node.name
         elif node.last == False:
             node.export_name = clean_name(node.name + VERSION_SEPARATOR + str(node.version), replace_dots=replace_dots)
-        elif node.activity.instance>1:
-            node.export_name =  clean_name(node.name +  INSTANCE_SEPARATOR + str(node.activity.instance), replace_dots=replace_dots)
+        # elif node.activity.instance>1:
+        #     if node.version:
+        #         node.export_name = clean_name(node.name + VERSION_SEPARATOR + str(node.version), replace_dots=replace_dots)
+        #     else:
+        #         node.export_name =  clean_name(node.name +  INSTANCE_SEPARATOR + str(node.activity.instance), replace_dots=replace_dots)
+            
         elif isinstance(node, TriccNodeInput):
             node.export_name = clean_name('load.' +node.name, replace_dots=replace_dots)
         else:

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo/models/tricc.py

@@ -299,7 +299,7 @@ class TriccNodeSelectOption(TriccNodeDisplayModel):
     select: TriccNodeInputModel
     list_name: str
     def get_datatype(self):
-        if isnumeric(self.name):
+        if self.name.isnumeric():
             return 'number'
         else:
             return 'string'
@@ -323,7 +323,7 @@ class TriccNodeSelect(TriccNodeInputModel):
     list_name: str
     def get_datatype(self):
         rtype = set()
-        for k,o in options.items():
+        for k,o in self.options.items():
             rtype.add(o.get_datatype())
         if len(rtype)>1:
             return 'mixed'

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo/serializers/xls_form.py

@@ -21,6 +21,8 @@ from tricc_oo.visitors.tricc import (
     get_applicability_expression,
     get_prev_instance_skip_expression,
     get_process_skip_expression,
+    get_next_version,
+    set_last_version_false,
 )
 
 logger = logging.getLogger("default")

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo/strategies/output/xls_form.py

@@ -26,7 +26,8 @@ from tricc_oo.visitors.tricc import (
     process_reference,
     get_node_expressions,
     TRICC_TRUE_VALUE,
-    TRICC_FALSE_VALUE
+    TRICC_FALSE_VALUE,
+    set_last_version_false
 )
 from tricc_oo.serializers.xls_form import (
     CHOICE_MAP,
@@ -607,14 +608,16 @@ class XLSFormStrategy(BaseOutPutStrategy):
     # function update the calcualte in the XLSFORM format
     # @param left part
     # @param right part        
-    def generate_xls_form_calculate(self, node, processed_nodes, stashed_nodes, **kwargs):
-        if is_ready_to_process(node, processed_nodes):
+    def generate_xls_form_calculate(self, node, processed_nodes, stashed_nodes, calculates, **kwargs):
+        if is_ready_to_process(node, processed_nodes, strict=False) and process_reference(node, processed_nodes, calculates, replace_reference=False, codesystems= kwargs.get('codesystems', None)):
             if node not in processed_nodes:
                 if kwargs.get('warn', True):          
                     logger.debug("generation of calculate for node {}".format(node.get_name()))
                 if hasattr(node, 'expression') and (node.expression is None) and issubclass(node.__class__,TriccNodeCalculateBase):
                     node.expression = get_node_expressions(node, processed_nodes, process=kwargs.get('process', 'main '))
                     # continue walk
+                if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)):
+                    last_version =  set_last_version_false(node, processed_nodes)
                 return True
         return False
     

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo/visitors/tricc.py

@@ -95,11 +95,11 @@ def get_node_expressions(node, processed_nodes, process=None):
 
 def set_last_version_false(node, processed_nodes):
     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, lambda item: hasattr(item, 'name') and item.name == node.name)
+    #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, lambda item: item.id != node.id and hasattr(item, 'name') and item.name == node.name and  issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption))
     if last_version and getattr(node, 'process', '') != 'pause':
         # 0-100 for manually specified instance.  100-200 for auto instance 
-        node.version = last_version.version + 1
+        node.version = get_next_version(node.name, processed_nodes, last_version.version + 1, 0)
         last_version.last = False
         node.path_len = max(node.path_len, last_version.path_len + 1)
     return last_version
@@ -116,23 +116,7 @@ def get_version_inheritance(node, last_version, processed_nodes):
                     set_prev_next_node(last_version, node)
                 else:
                     expression = node.expression or node.expression_reference or getattr(node, 'relevance', None)
-                    datatype = expression.get_datatype()
-                    if datatype == 'boolean':
-                        expression_reference = TriccOperation(
-                            TriccOperator.OR,
-                            [TriccOperation(TriccOperator.ISTRUE, [last_version]), expression]
-                        )
-                    
-                    elif datatype == 'number':
-                        expression = TriccOperation(
-                            TriccOperator.PLUS,
-                            [last_version, expression] 
-                        )
-                    else:
-                        expression = TriccOperation(
-                            TriccOperator.COALESCE,
-                            [last_version, expression] 
-                        )
+                    expression = merge_expression(expression, last_version)
                     if node.expression:
                         node.expression = expression
                     elif node.expression_reference:
@@ -141,24 +125,20 @@ def get_version_inheritance(node, last_version, processed_nodes):
                         node.relevance = expression
         else:
             node.last = False
-            
-            
             calc = TriccNodeCalculate(
                 id=generate_id(f"save{node.id}"),
                 name=node.name,
                 path_len=node.path_len+1,
-                version=get_next_version(node.name, processed_nodes, node.version+2),
-                expression=TriccOperation(
-                    TriccOperator.COALESCE,
-                    [node, last_version, TriccStatic("''")]
-                ),
+                #version=get_next_version(node.name, processed_nodes, node.version+2),
+                expression= merge_expression(node, last_version),
+                label= f"merge{node.id}",
                 last=True,
                 activity=node.activity,
                 group=node.group
                 )
             node.activity.nodes[calc.id]=calc
             node.activity.calculates.append(calc)
-            set_last_version_false(calc, processed_nodes)
+            #set_last_version_false(calc, processed_nodes)
             processed_nodes.add(calc)
             if issubclass(node.__class__, TriccNodeInputModel):
                 node.expression = TriccOperation(
@@ -168,6 +148,26 @@ def get_version_inheritance(node, last_version, processed_nodes):
                         last_version
                     ]
                 )
+                
+def merge_expression(expression, last_version):
+    datatype = expression.get_datatype()
+    if datatype == 'boolean':
+        expression = TriccOperation(
+            TriccOperator.OR,
+            [TriccOperation(TriccOperator.ISTRUE, [last_version]), expression]
+        )
+    
+    elif datatype == 'number':
+        expression = TriccOperation(
+            TriccOperator.PLUS,
+            [last_version, expression] 
+        )
+    else:
+        expression = TriccOperation(
+            TriccOperator.COALESCE,
+            [last_version, expression] 
+        )
+    return expression
 
 def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calculates, 
                       warn = False, process=None, **kwargs ):
@@ -472,39 +472,31 @@ def generate_calculates(node,calculates, used_calculates,processed_nodes):
     if hasattr(node, 'save') and node.save is not None and node.save != '':
         # get fragments type.name.icdcode
         calculate_name=node.save   
-        if not isinstance(node, TriccNodeSelectYesNo) and  issubclass(node.__class__, (TriccNodeSelect)):
-            calc_node = get_count_node(node)
-            calc_node.path_len += 1
-            calc_node.name=calculate_name
-            calc_node.label =  "save select: " +node.get_name()        
-        elif node.name != calculate_name:
+        if node.name != calculate_name:
             calc_id = generate_id(f"autosave{node.id}")
             
             calc_node = TriccNodeCalculate(
                 name=calculate_name,
                 id = calc_id,
                 group = node.group,
-                version=get_next_version(calculate_name, processed_nodes, node.version+2),
+                #version=get_next_version(calculate_name, processed_nodes, node.version+2),
                 activity = node.activity,
                 label =  "save: " +node.get_name(),
                 path_len=node.path_len+ 1,
-                last=True
+                last=True,
+                expression=get_node_expression(node,processed_nodes,True,True)
             )
-            node.activity.nodes[calc_node.id]=calc_node
+            node.activity.calculates.append(calc_node)
             last_version = set_last_version_false(calc_node, processed_nodes)
             if last_version:
-                get_version_inheritance(node, last_version, processed_nodes)
+                calc_node.expression = merge_expression(calc_node.expression, last_version)
             processed_nodes.add(calc_node)
-        logger.debug("generate_save_calculate:{}:{} as {}".format(calc_node.tricc_type, node.name if hasattr(node,'name') else node.id, calculate_name))
-        if isinstance(node, TriccNodeSelectYesNo):
-            yesNode =  node.options[0]
-            set_prev_next_node(yesNode,calc_node)
-        else:
-            set_prev_next_node(node,calc_node)
-        list_calc.append(calc_node)
-        #add_save_calculate(calc_node, calculates, used_calculates,processed_nodes)
-        for calc in list_calc:
-            node.activity.nodes[calc.id] = calc
+            logger.debug("generate_save_calculate:{}:{} as {}".format(calc_node.tricc_type, node.name if hasattr(node,'name') else node.id, calculate_name))
+            
+            list_calc.append(calc_node)
+            #add_save_calculate(calc_node, calculates, used_calculates,processed_nodes)
+            for calc in list_calc:
+                node.activity.nodes[calc.id] = calc
     return list_calc
 
 
@@ -965,8 +957,8 @@ def walkthrough_tricc_option(node, callback, processed_nodes, stashed_nodes, pat
                                                                         warn = warn,
                                                                         node_path = node_path.copy(), **kwargs)
 
-def get_next_version(name, processed_nodes, version=0,):
-    return max(version, 100,*[(getattr(n,'version',0) or getattr(n,'instance',0) or 0) for n in get_versions(name, processed_nodes)])
+def get_next_version(name, processed_nodes, version=0, min=100):
+    return max(version, min,*[(getattr(n,'version',None) or getattr(n,'instance',None) or 0) for n in get_versions(name, processed_nodes)])+1
 
 
 def get_data_for_log(node):
@@ -1557,6 +1549,8 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
             logger.critical(f"Rhombus without expression {node.get_name()}")
     elif is_prev and issubclass(node.__class__, TriccNodeDisplayCalculateBase):
         expression = TriccOperation(TriccOperator.ISTRUE, [node])
+    elif is_prev and is_calculate and (issubclass(node.__class__, TriccNodeSelect) or isinstance(node, TriccNodeSelectNotAvailable)):
+        expression = get_count_terms_details( node,  processed_nodes, is_calculate, negate, process)
     elif hasattr(node, 'expression_reference') and isinstance(node.expression_reference, TriccOperation):
         # if issubclass(node.__class__, TriccNodeDisplayCalculateBase):
         #     expression = TriccOperation(
@@ -1875,7 +1869,28 @@ def get_activity_end_terms( node, processed_nodes, process=None):
 
 def get_count_terms( node, processed_nodes, is_calculate, negate=False, process=None):
     terms = []
+    
     for prev_node in node.prev_nodes:
+        term = get_count_terms_details( prev_node, processed_nodes, is_calculate, negate, process)
+        if term:
+            terms.append(term)
+    if len(terms) == 1:
+        return TriccOperation(
+            TriccOperator.CAST_NUMBER,
+            [terms[0]]
+        )
+    elif len(terms) > 0:
+        return TriccOperation(
+            TriccOperator.PLUS,
+            [
+                TriccOperation(
+                    TriccOperator.CAST_NUMBER,
+                    [term]
+                ) for term in terms
+            ]
+        )
+        
+def get_count_terms_details( prev_node, processed_nodes, is_calculate, negate=False, process=None):
         operation_none = TriccOperation(
             TriccOperator.SELECTED,
             [
@@ -1883,12 +1898,20 @@ def get_count_terms( node, processed_nodes, is_calculate, negate=False, process=
                 TriccStatic('opt_none')
             ]
         )
-        if isinstance(prev_node, TriccNodeSelectMultiple):
+        if isinstance(prev_node, TriccNodeSelectYesNo):
+            return TriccOperation(
+                TriccOperator.SELECTED,
+                [
+                    prev_node,
+                    TriccStatic(prev_node.options[0].name)
+                ]
+            )
+        elif issubclass(prev_node.__class__, TriccNodeSelect):
             if negate:
-                terms.append()
+                return
                 #terms.append(TRICC_SELECT_MULTIPLE_CALC_NONE_EXPRESSION.format(get_export_name(prev_node)))
             else:
-                terms.append(TriccOperation(
+                return TriccOperation(
                     TriccOperator.MINUS,
                     [
                         TriccOperation(
@@ -1903,23 +1926,22 @@ def get_count_terms( node, processed_nodes, is_calculate, negate=False, process=
                                 operation_none
                             ]
                         )
-                ]))
+                ])
                 #terms.append(TRICC_SELECT_MULTIPLE_CALC_EXPRESSION.format(get_export_name(prev_node)))
-        elif isinstance(prev_node, (TriccNodeSelectYesNo, TriccNodeSelectNotAvailable)):
-            terms.append(TriccOperation(
+        elif isinstance(prev_node, (TriccNodeSelectNotAvailable)):
+            return TriccOperation(
                 TriccOperator.SELECTED,
                 [
                     prev_node,
                     TriccStatic('1')
                 ]
-            ))
+            )
             #terms.append(TRICC_SELECTED_EXPRESSION.format(get_export_name(prev_node), '1'))
         elif isinstance(prev_node, TriccNodeSelectOption):
-            terms.append(get_selected_option_expression(prev_node, negate))
+            return get_selected_option_expression(prev_node, negate)
         else:
             if negate:
-                terms.append(
-                    TriccOperation(
+                return TriccOperation(
                         TriccOperator.CAST_NUMBER,
                         [
                             TriccOperation(
@@ -1940,10 +1962,9 @@ def get_count_terms( node, processed_nodes, is_calculate, negate=False, process=
                             )
                         ]
                     )
-                )
+                
             else:
-                terms.append(
-                    TriccOperation(
+                return TriccOperation(
                         TriccOperator.CAST_NUMBER,
                         [
                             get_node_expression(
@@ -1953,22 +1974,8 @@ def get_count_terms( node, processed_nodes, is_calculate, negate=False, process=
                                 is_prev=True,
                                 process=process)
                         ]
-                    ))
-    if len(terms) == 1:
-        return TriccOperation(
-            TriccOperator.CAST_NUMBER,
-            [terms[0]]
-        )
-    elif len(terms) > 0:
-        return TriccOperation(
-            TriccOperator.PLUS,
-            [
-                TriccOperation(
-                    TriccOperator.CAST_NUMBER,
-                    [term]
-                ) for term in terms
-            ]
-        )
+                    )
+    
         
     
 def get_add_terms( node, processed_nodes, is_calculate=False, negate=False, process=None):

{tricc_oo-1.4.23 → tricc_oo-1.4.25}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.23
+Version: 1.4.25
 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