tricc-oo 1.4.4__tar.gz → 1.4.6__tar.gz

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.4
+Version: 1.4.6
 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
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+
 Requires-Dist: lxml
 Requires-Dist: html2text
 Requires-Dist: pydantic

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/pyproject.toml

@@ -4,9 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.4"
+version = "1.4.6"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
+license-files = ["LICENSE"]
 
 requires-python = ">=3.8"
 classifiers = [

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/models/ordered_set.py

@@ -86,6 +86,39 @@ class OrderedSet(Sequence):
         sorted_keys = sorted(self._od.keys(), key=key, reverse=reverse)
         self._od = OrderedDict.fromkeys(sorted_keys)
         
+    def find_last(self, filter: callable):
+        # Iterate over items in reverse order
+        for item in reversed(list(self._od.keys())):
+            if filter(item):
+                return item
+        return None  # Return None if no matching item is found
+
+    def find_first(self, filter: callable):
+        for item in list(self._od.keys()):
+            if filter(item):
+                return item
+        return None  # Return None if no matching item is found
+
+
+    def find_prev(self, obj, filter: callable):
+        # Get the list of keys (items) in the OrderedSet
+        keys = list(self._od.keys())
+        
+        # If the object is not in the OrderedSet, start from the end
+        if obj not in self._od:
+            start_index = len(keys) - 1
+        else:
+            # Find the index of the given object
+            start_index = keys.index(obj)
+        
+        # Iterate backward from the start_index
+        for i in range(start_index - 1, -1, -1):
+            item = keys[i]
+            if filter(item):
+                return item
+        
+        return None  # Return None if no matching item is found before the object
+
     @classmethod
     def __get_pydantic_core_schema__(cls, source_type: type, handler: GetCoreSchemaHandler) -> CoreSchema:
         # Define how Pydantic should handle this type

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/models/tricc.py

@@ -16,7 +16,7 @@ class TriccNodeCalculateBase(TriccNodeBaseModel):
     #input: Dict[TriccOperation, TriccNodeBaseModel] = {}
     reference: Union[List[Union[TriccNodeBaseModel,TriccStatic]], Expression, TriccStatic] = None
     expression_reference: Union[str, TriccOperation] = None
-    last: bool = True
+    last: bool = None
     datatype: str = 'boolean'
     # to use the enum value of the TriccNodeType
     class Config:

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/serializers/xls_form.py

@@ -418,6 +418,7 @@ def generate_xls_form_export(strategy, node, processed_nodes, stashed_nodes, df_
                         if len(df_calculate[df_calculate.name == get_export_name(node)])==0:
                             df_calculate.loc[len(df_calculate)] = values
                         else:
+                            df_calculate.loc[len(df_calculate)] = values
                             logger.critical("name {} found twice".format(node.name))
                     elif  ODK_TRICC_TYPE_MAP[node.tricc_type] !='':
                         values = []

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/strategies/input/drawio.py

@@ -134,7 +134,7 @@ class DrawioStrategy(BaseInputStrategy):
 
         # do the calculation, expression ...
 
-    def linking_nodes(self, node, page, pages, processed_nodes=set(), path=[]):
+    def linking_nodes(self, node, page, pages, processed_nodes=OrderedSet(), path=[]):
         # get the edges that have that node as source
 
 

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/strategies/output/spice.py

@@ -285,7 +285,7 @@ class SpiceStrategy(BaseOutPutStrategy):
             )
 
 
-    def activity_export(self, activity, processed_nodes=set(), **kwargs):
+    def activity_export(self, activity, processed_nodes=OrderedSet(), **kwargs):
         stashed_nodes = OrderedSet()
         calculates = []
         cur_group = activity

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/strategies/output/xls_form.py

@@ -155,7 +155,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
 
     def activity_export(self, activity, processed_nodes=None, **kwargs):
         if processed_nodes is None:
-            processed_nodes = set()
+            processed_nodes = OrderedSet()
         stashed_nodes = OrderedSet()
         # The stashed node are all the node that have all their prevnode processed but not from the same group
         # This logic works only because the prev node are ordered by group/parent ..

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo/visitors/tricc.py

@@ -31,22 +31,27 @@ def get_max_version(dict):
     return max_version
 
 def get_versions(name, iterable):
-    return [n for n in iterable if ((name == 'tricc_end' and isinstance(n, TriccNodeEnd)) or  n.name == name) and not isinstance(n, TriccNodeSelectOption)]
+    return [n for n in iterable if version_filter(name)(n)]
 
+def version_filter(name):
+    return lambda item: hasattr(item, 'name') and ( (name == 'tricc_end' and isinstance(item, TriccNodeEnd)) or item.name == name ) and not isinstance(item, TriccNodeSelectOption)
 
 def get_last_version(name, processed_nodes,  _list=None):
     max_version = None
     if isinstance(_list, dict):
         _list = _list[name].values() if name in _list else []
     if _list is None:
-        _list = get_versions(name, processed_nodes)
+        if isinstance(processed_nodes, OrderedSet):
+            return processed_nodes.find_last(version_filter(name))
+        else:    
+            _list = get_versions(name, processed_nodes)
     if _list:
         for  sim_node in _list:
             # get the max version while not taking a node that have a next node before next calc
             if ((max_version is None 
                 or  max_version.activity.path_len < sim_node.activity.path_len
                 or  max_version.path_len < sim_node.path_len 
-                or max_version.path_len == sim_node.path_len and hash(max_version.id) < hash(sim_node.id)
+                or (max_version.path_len == sim_node.path_len and hash(max_version.id) < hash(sim_node.id))
                 ) ):
                 max_version = sim_node
     if not max_version:
@@ -110,24 +115,53 @@ 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()))
-            last_version = get_last_version(node.name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel)) and not isinstance(node, TriccNodeSelectOption)  else  None
+            last_version = get_last_version(node.name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase)) and not isinstance(node, TriccNodeSelectOption)  else  None
+            #last_version = processed_nodes.find_prev(node, lambda item: hasattr(item, 'name') and item.name == node.name)
             if last_version:
                 # 0-100 for manually specified instance.  100-200 for auto instance 
                 node.version = last_version.version + 1
                 last_version.last = False
                 node.path_len = max(node.path_len, last_version.path_len + 1)
                 # FIXME this is for XLS form where only calculate are evaluated for a activity that is not triggered
-                if issubclass(node.__class__, (TriccNodeCalculateBase, TriccNodeNote)):
+                if not issubclass(node.__class__, (TriccNodeInputModel)):
                     node.last = True
+                    if (
+                        issubclass(node.__class__, (TriccNodeDisplayCalculateBase )) and node.name is not None
+                    ):
+                        node_name = node.name if not isinstance(node, TriccNodeEnd) else 'tricc_end'
+
+                                #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)
+                        else:
+                            expression = node.expression or node.expression_reference or node.relevance
+                            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] 
+                                )
+                            if node.expression:
+                                node.expression = expression
+                            elif node.expression_reference:
+                                node.expression_reference = expression
+                            elif node.relevance:
+                                node.relevance = expression
                 else:
                     node.last = False
-                    # versions = get_versions(node.name, processed_nodes)
-                    # if the last version is already a coalesce no need to take all lat version
-                    # if len(versions)>1:
-                    #     if issubclass(last_version.__class__, TriccNodeCalculateBase):
-                    #         versions = [last_version]
-                    #     else:
-                    #         logger.warning(f"several version of {node.get_name()} without a coalesce wrap")
+                    
+                    
                     calc = TriccNodeCalculate(
                         id=generate_id(),
                         name=node.name,
@@ -151,8 +185,9 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
                                 last_version
                             ]
                         )
+                    
                 
-                
+
         # if has prev, create condition
             if hasattr(node, 'relevance') and (node.relevance is None or isinstance(node.relevance, TriccOperation)):
                 node.relevance = get_node_expressions(node, processed_nodes=processed_nodes)
@@ -182,28 +217,14 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
                         if issubclass(r.__class__, (TriccNodeDisplayCalculateBase )):
                             add_used_calculate(node, r, calculates, used_calculates, processed_nodes)
                 
-                generate_calculates(node,calculates, used_calculates,processed_nodes=processed_nodes)
-            if last_version:
+                generate_calculates(node,calculates, used_calculates,processed_nodes=processed_nodes)                
+            if last_version and hasattr(node, 'relevance'):
                 if isinstance(node, TriccNodeInputModel):
                     version_relevance =  TriccOperation(
                             TriccOperator.ISNULL,
                             [last_version]
                         )
                 elif last_version.relevance:
-                    if last_version.activity.relevance:
-                        version_relevance = TriccOperation(
-                                TriccOperator.NOT,
-                                [
-                                    TriccOperation(
-                                        TriccOperator.AND,
-                                        [
-                                            last_version.relevance,
-                                            last_version.activity.relevance
-                                        ]
-                                    )
-                                ]
-                            )
-                    else:
                         version_relevance = TriccOperation(
                                 TriccOperator.NOT,
                                 [
@@ -236,53 +257,6 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
                     elif hasattr(node, 'relevance'):
                         node.relevance = version_relevance
             
-            if (
-                issubclass(node.__class__, (TriccNodeDisplayCalculateBase )) and node.name is not None
-            ):
-                node_name = node.name if not isinstance(node, TriccNodeEnd) else 'tricc_end'
-                # generate the calc node version by looking in the processed calculate
-                # TODO the calculates should not be required with the latest version of get_last_version
-                last_calc = get_last_version(
-                    node_name,
-                    [p for p in processed_nodes if issubclass(p.__class__, (TriccNodeCalculateBase, TriccNodeDisplayCalculateBase))]
-                )
-                
-                # add calculate is added after the version collection so it is 0 in case there is no calc found_                add_calculate(calculates,node)  
-                # merge is there is unused version ->
-                # current node not yet in the list so 1 item is enough
-                node_to_delete = None
-                if last_calc is not None:
-                    node.path_len = max(node.path_len, last_calc.path_len + 1 )
-                    node.version = last_calc.version + 1
-                        #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_calc,node)
-                    else:
-                        expression = node.expression or node.expression_reference or node.relevance
-                        datatype = expression.get_datatype()
-                        if datatype == 'boolean':
-                            expression_reference = TriccOperation(
-                                TriccOperator.OR,
-                                [TriccOperation(TriccOperator.ISTRUE, [last_calc]), expression]
-                            )
-                        
-                        elif datatype == 'number':
-                            expression = TriccOperation(
-                                TriccOperator.PLUS,
-                                [last_version, expression] 
-                            )
-                        else:
-                            expression = TriccOperation(
-                                TriccOperator.COALESCE,
-                                [last_version, expression] 
-                            )
-                        if node.expression:
-                            node.expression = expression
-                        elif node.expression_reference:
-                            node.expression_reference = expression
-                        elif node.relevance:
-                            node.relevance = expression
-                    last_calc.last = False
                     #update_calc_version(calculates,node_name)
             #if hasattr(node, 'next_nodes'):
                 #node.next_nodes=reorder_node_list(node.next_nodes, node.group)
@@ -690,7 +664,7 @@ def process_operation_reference(operation, node, processed_nodes, calculates, us
                 last_found = node_in_act[0]
         else:
             last_found = get_last_version(name=ref, processed_nodes=processed_nodes)
-        if last_found is None:
+        if last_found is None:    
             if codesystems:
                 concept =  lookup_codesystems_code(codesystems, ref)
                 if not concept:
@@ -974,7 +948,7 @@ def get_data_for_log(node):
         node.instance)
 
 def stashed_node_func(node, callback, recursive=False, **kwargs):
-    processed_nodes = kwargs.get('processed_nodes', set())
+    processed_nodes = kwargs.get('processed_nodes', OrderedSet())
     stashed_nodes = kwargs.get('stashed_nodes', OrderedSet())
     path_len = 0
     walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, stashed_nodes, path_len, recursive,
@@ -1574,7 +1548,7 @@ def export_proposed_diags(activity, diags=None, **kwargs):
         if isinstance(node, TriccNodeActivity):
             diags = export_proposed_diags(node, diags, **kwargs)
         if isinstance(node, TriccNodeProposedDiagnosis):
-            if node.last\
+            if node.last is not False\
                 and not any([diag.name  == node.name for diag in diags]):
                     diags.append(node)
     return diags

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.4
+Version: 1.4.6
 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
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE.md
+License-File: LICENSE
 Requires-Dist: lxml
 Requires-Dist: html2text
 Requires-Dist: pydantic

{tricc_oo-1.4.4 → tricc_oo-1.4.6}/tricc_oo.egg-info/SOURCES.txt

@@ -1,4 +1,4 @@
-LICENSE.md
+LICENSE
 README.md
 pyproject.toml
 tests/build.py