tricc-oo 1.5.10__tar.gz → 1.5.12__tar.gz

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/PKG-INFO

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

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

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/converters/xml_to_tricc.py

@@ -905,12 +905,13 @@ def get_edges(diagram):
 def process_factor_edge(edge, nodes):
     factor = edge.value.strip()
     if factor != 1:
+        source = nodes[edge.source]
         return TriccNodeCalculate(
             id=edge.id,
-            expression_reference=TriccOperation(TriccOperator.MULTIPLIED, [nodes[edge.source],TriccStatic(factor)]),
-            reference=[nodes[edge.source]],
-            activity=nodes[edge.source].activity,
-            group=nodes[edge.source].group,
+            expression_reference=TriccOperation(TriccOperator.MULTIPLIED, [TriccReference(nodes[edge.source].name),TriccStatic(float(factor))]),
+            reference=[TriccReference(source.name)],
+            activity=source.activity,
+            group=source.group,
             label="factor {}".format(factor),
         )
     return None

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/models/base.py

@@ -142,6 +142,8 @@ class TriccBaseModel(BaseModel):
         instance.id = generate_id(f"{self.id}{nb_instance}")
         instance.instance = int(nb_instance)
         instance.base_instance = self
+        if hasattr(self, 'instances'):
+            self.instances[nb_instance] = instance
         
         
         # assign the defualt group

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/models/tricc.py

@@ -98,7 +98,6 @@ class TriccNodeActivity(TriccNodeBaseModel):
         else:
             instance = super().make_instance(instance_nb, activity=None)
             base_instance = (self.base_instance or self)
-            base_instance.instances[instance_nb] = instance
             instance.base_instance = base_instance
             # instance.base_instance = self
             # we duplicate all the related nodes (not the calculate, duplication is manage in calculate version code)
@@ -283,6 +282,7 @@ class TriccNodeGoTo(TriccNodeBaseModel):
     tricc_type: TriccNodeType = TriccNodeType.goto
     link: Union[TriccNodeActivity, triccId]
     datatype: str = 'n/a'
+    instance: int = 1
 
     # no need ot copy
     def make_instance(self, instance_nb, activity, **kwargs):

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/serializers/xls_form.py

@@ -275,7 +275,7 @@ def get_xfrom_trad(strategy, node, column, mapping, clean_html=False):
     elif column == "appearance":
         if (
             isinstance(node, TriccNodeSelect)
-            and len(node.options) > 9
+            and len(node.options) > 13
             and not any(o.image or o.hint for o in node.options.values())
         ):
             value = "autocomplete"

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/strategies/input/drawio.py

@@ -226,11 +226,7 @@ class DrawioStrategy(BaseInputStrategy):
             # walk thought the next page
             max_instance = 1
             if node.instance == 0 or next_page.root.instance == 0:
-                for other_page in next_page.instances.values():
-                    if int(other_page.instance) > int(max_instance):
-                        max_instance = other_page.instance
-                # auto instance starts at 101
-                next_page = next_page.make_instance()
+                next_page = next_page.make_instance((1000+node.activity.instance) if node.activity.instance>1 else None)
             else:
                 # return existing instance if any
                 next_page = next_page.make_instance(node.instance)

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/strategies/output/xls_form.py

@@ -390,7 +390,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         return f"{ref_expressions[0]} mod {ref_expressions[1]}"
     def tricc_operation_minus(self, ref_expressions):
         if len(ref_expressions)>1:
-            return ' - '.join(ref_expressions)
+            return ' - '.join(map(str,ref_expressions))
         elif len(ref_expressions)==1:
             return f'-{ref_expressions[0]}'
     def tricc_operation_plus(self, ref_expressions):

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo/strategies/output/xlsform_cht.py

@@ -223,10 +223,10 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
         ]
-        self.get_contact_inputs(df_input)
         inputs = self.export_inputs(start_pages[self.processes[0]], **kwargs)
         for input in inputs:
             df_input.loc[len(df_input)] = get_input_line(input)
+        self.get_contact_inputs(df_input)        
         df_input.loc[len(df_input)] = [
             "hidden",
             "external_id",
@@ -310,6 +310,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
         ]
+        self.get_contact_inputs_calculate(df_input)
         df_input.loc[len(df_input)] = [
             "calculate",
             "created_by_person_uuid",
@@ -459,7 +460,54 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
 
     def get_contact_inputs(self, df_input):
         empty = langs.get_trads("", force_dict=True)
+        if not len(df_input[df_input['name'] == 'sex']):
+            df_input.loc[len(df_input)] = [
+                "hidden",
+                "sex",
+                *list(langs.get_trads("Sex", force_dict=True).values()),
+                *list(empty.values()),
+                *list(empty.values()),
+                "",
+                "hidden",
+                "",
+                *list(empty.values()),
+                "",
+                "",
+                "",
+                *list(empty.values()),
+                "",
+                "",
+                "",
+                "",
+                "",
+            ]
+        if not len(df_input[df_input['name'] == 'date_of_birth']):
+            df_input.loc[len(df_input)] = [
+                "hidden",
+                "date_of_birth",
+                *list(langs.get_trads("Date of birth", force_dict=True).values()),
+                *list(empty.values()),
+                *list(empty.values()),
+                "",
+                "hidden",
+                "",
+                *list(empty.values()),
+                "",
+                "",
+                "",
+                *list(empty.values()),
+                "",
+                "",
+                "",
+                "",
+                "",
+            ]
 
+            return df_input
+
+
+    def get_contact_inputs_calculate(self, df_input):
+        empty = langs.get_trads("", force_dict=True)
         df_input.loc[len(df_input)] = [
             "calculate",
             "patient_sex",

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/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)               
        
                 
@@ -489,6 +494,7 @@ def generate_calculates(node,calculates, used_calculates,processed_nodes, proces
             #add_save_calculate(calc_node, calculates, used_calculates,processed_nodes)
             for calc in list_calc:
                 node.activity.nodes[calc.id] = calc
+                add_calculate(calculates, calc)
     return list_calc
 
 
@@ -674,6 +680,8 @@ def process_operation_reference(operation, node, processed_nodes, calculates, us
             node_reference.append(last_found)
             reference.append(TriccReference(ref))
             if replace_reference:
+                if not issubclass(last_found.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeInput)):
+                    last_found = get_node_expression(last_found, processed_nodes, is_prev=True)
                 if isinstance(operation, (TriccOperation)):
                     if modified_operation is None:
                         modified_operation = operation.copy(keep_node=True)
@@ -689,9 +697,13 @@ def process_operation_reference(operation, node, processed_nodes, calculates, us
                     if warn:
                         logger.warning(f"Could not resolve label '{option_label}' for reference {ref}")
                     return False
-            
-                
-            node.path_len = max(node.path_len, last_found.path_len)
+            if hasattr(last_found, 'path_len'):
+                path_len = last_found.path_len  
+            elif isinstance(last_found, TriccOperation):
+                path_len =  max(getattr(n, 'path_len', 0) for n in last_found.get_references())
+            else:
+                path_len = 0
+            node.path_len = max(node.path_len, path_len)
     for ref in real_ref_list:
         if is_prev_processed(ref, node, processed_nodes=processed_nodes, local=False) is False:
             return False
@@ -1270,7 +1282,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):
@@ -1431,11 +1443,11 @@ def reorder_node_list(node_list, group, processed_nodes):
         # 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 start nodes)
-        elif activity and not isinstance(activity.root, TriccNodeActivityStart) and activity in active_activities:
+        # 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-start activities
-        elif activity and not isinstance(activity.root, TriccNodeActivityStart):
+        # 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:
@@ -1799,12 +1811,15 @@ def create_determine_diagnosis_activity(diags):
         activity.calculates.append(r)
         activity.calculates.append(c)
         set_prev_next_node(r, d, edge_only=False)
-        set_prev_next_node(d, f, 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
 
     options = [

{tricc_oo-1.5.10 → tricc_oo-1.5.12}/tricc_oo.egg-info/PKG-INFO

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