tricc-oo 1.6.12__tar.gz → 1.6.14__tar.gz

{tricc_oo-1.6.12/tricc_oo.egg-info → tricc_oo-1.6.14}/PKG-INFO

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

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

{tricc_oo-1.6.12 → tricc_oo-1.6.14}/tricc_oo/converters/codesystem_to_ocl.py

@@ -31,16 +31,16 @@ def extract_properties_metadata(fhir_cs: CodeSystem) -> Dict[str, Dict]:
 
             property_types[prop.code] = {
                 "name": prop.code,
-                "datatype": ocl_type,
+                "dataType": ocl_type,
                 "description": prop.description if hasattr(prop, "description") else "",
             }
     return property_types
 
 
 def get_fhir_concept_datatype(concept):
-    datatype = extract_concept_properties(concept, ["datatype"])
+    datatype = extract_concept_properties(concept, ["dataType"])
     if datatype:
-        return datatype["datatype"]
+        return datatype["dataType"]
     else:
         return OclConstants.DATA_TYPE_NONE
 
@@ -84,7 +84,7 @@ def get_attributes_from_concept_properties(concept, property_types: Dict) -> Lis
                 "type": "Attribute",
                 "attribute_type": code,
                 "value": value,
-                "value_type": property_types[code]["datatype"],
+                "value_type": property_types[code]["dataType"],
             }
         )
     return attributes

{tricc_oo-1.6.12 → tricc_oo-1.6.14}/tricc_oo/converters/datadictionnary.py

@@ -103,7 +103,7 @@ def check_and_add_concept(code_system: CodeSystem, code: str, display: str, attr
                 # TODO support other type of Codesystem Concept Property Value
                 existing_attributes
                 if p.valueString != v:
-                    logger.warning(f"conflicting value for property {k}: {p.valueString} != {v}")
+                    logger.warning(f"conflicting value for concept `{concept.code}` property ` {k}`: {p.valueString} != {v}")
         if not existing_attributes:
             new_concept.property.append(CodeSystemConceptProperty(code=k, valueString=v))
 

{tricc_oo-1.6.12 → tricc_oo-1.6.14}/tricc_oo/converters/drawio_type_map.py

@@ -47,7 +47,7 @@ TYPE_MAP = {
     },
     TriccNodeType.note: {
         "objects": ["UserObject", "object"],
-        "attributes": ["relevance", "priority", "context_type"],
+        "attributes": ["relevance", "priority", "concept_type"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeNote,
     },
@@ -76,7 +76,7 @@ TYPE_MAP = {
             "priority",
             "trigger",
             "default",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectOne,
@@ -94,7 +94,7 @@ TYPE_MAP = {
             "priority",
             "trigger",
             "default",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectMultiple,
@@ -112,7 +112,7 @@ TYPE_MAP = {
             "priority",
             "trigger",
             "default",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDecimal,
@@ -130,7 +130,7 @@ TYPE_MAP = {
             "priority",
             "trigger",
             "default",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeInteger,
@@ -145,7 +145,7 @@ TYPE_MAP = {
             "default",
             "constraint",
             "constraint_message",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeText,
@@ -160,7 +160,7 @@ TYPE_MAP = {
             "default",
             "constraint",
             "constraint_message",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDate,
@@ -183,7 +183,7 @@ TYPE_MAP = {
             "save",
             "reference",
             "trigger",
-            "context_type",
+            "concept_type",
             "remote_reference",
         ],
         "mandatory_attributes": ["name", "label"],
@@ -217,7 +217,7 @@ TYPE_MAP = {
     },
     TriccNodeType.not_available: {
         "objects": ["UserObject", "object"],
-        "attributes": ["context_type"],
+        "attributes": ["concept_type"],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectNotAvailable,
     },
@@ -233,7 +233,7 @@ TYPE_MAP = {
             "priority",
             "trigger",
             "default",
-            "context_type",
+            "concept_type",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectYesNo,
@@ -295,7 +295,7 @@ TYPE_MAP = {
     },
     TriccNodeType.input: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference", "datatype", "context_type"],
+        "attributes": ["save", "reference", "data_type", "concept_type"],
         "mandatory_attributes": ["name", "label"],
         "model": TriccNodeInput,
     },

{tricc_oo-1.6.12 → tricc_oo-1.6.14}/tricc_oo/converters/xml_to_tricc.py

@@ -128,7 +128,7 @@ def create_activity(diagram, media_path, project):
         for n in nodes.values():
 
             if (
-                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase))
+                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeInput))
                 and not isinstance(n, (TriccRhombusMixIn, TriccNodeRhombus, TriccNodeDisplayBridge))
                 and not n.name.startswith("label_")  # FIXME
             ):
@@ -139,7 +139,7 @@ def create_activity(diagram, media_path, project):
                         system,
                         n.select.name,
                         n.label,
-                        {"datatype": "Boolean", "contextType": get_context_type(n)},
+                        {"dataType": "Boolean", "conceptType": get_concept_type(n)},
                     )
                 elif not isinstance(n, TriccNodeSelectNotAvailable):
                     add_concept(
@@ -148,8 +148,20 @@ def create_activity(diagram, media_path, project):
                         n.name,
                         n.label,
                         {
-                            "datatype": get_data_type(n.tricc_type),
-                            "contextType": get_context_type(n),
+                            "dataType": get_data_type(n.tricc_type),
+                            "conceptType": get_concept_type(n),
+                        },
+                    )
+                elif not issubclass(n.__class__, TriccNodeCalculate):
+                    system = n.name.split(".")[0] if "." in n.name else "calculate"
+                    add_concept(
+                        project.code_systems,
+                        system,
+                        n.name,
+                        n.label,
+                        {
+                            "dataType": get_data_type(n.tricc_type),
+                            "conceptType": get_concept_type(n),
                         },
                     )
                 if getattr(n, "save", None):
@@ -160,8 +172,8 @@ def create_activity(diagram, media_path, project):
                         n.save,
                         n.label,
                         {
-                            "datatype": get_data_type(n.tricc_type),
-                            "contextType": get_context_type(n),
+                            "dataType": get_data_type(n.tricc_type),
+                            "conceptType": get_concept_type(n),
                         },
                     )
 
@@ -175,7 +187,7 @@ def create_activity(diagram, media_path, project):
         # link back the activity
         activity.root.activity = activity
         manage_dangling_calculate(activity)
-
+        # assign the process
         if activity is not None:
             if activity.root is not None:
                 project.pages[activity.id] = activity
@@ -197,6 +209,7 @@ def create_activity(diagram, media_path, project):
                         )
         if images:
             project.images += images
+        # Assign parent to NotAvailable
         for node in list(
             filter(
                 lambda p_node: isinstance(p_node, TriccNodeSelectNotAvailable),
@@ -477,10 +490,10 @@ def set_additional_attributes(attribute_names, elm, node):
             setattr(node, attributename, attribute)
 
 
-def get_context_type(node):
-    context_type = getattr(node, "context_type", None)
-    if context_type:
-        return context_type
+def get_concept_type(node):
+    concept_type = getattr(node, "concept_type", None)
+    if concept_type:
+        return concept_type
     if isinstance(node, TriccNodeSelectMultiple):
         return "Question"
     elif isinstance(node, TriccNodeSelectOption):
@@ -535,7 +548,7 @@ def get_select_options(diagram, select_node, nodes):
             activity=select_node.activity,
             group=select_node.group,
         )
-        set_additional_attributes(["save", "relevance", "context_type"], elm, option)
+        set_additional_attributes(["save", "relevance", "concept_type"], elm, option)
         load_expressions(option)
         options[i] = option
         nodes[id] = option
@@ -802,9 +815,11 @@ def set_mandatory_attribute(elm, mandatory_attributes, diagram=None):
             id = elm.attrib.get("id")
             attribute_value = _get_name(name, id, diagram_id)
         elif attributes == "list_name":
-            name = elm.attrib.get("name")
-            id = elm.attrib.get("id")
-            attribute_value = TRICC_LIST_NAME.format(clean_str(_get_name(name, id, diagram_id), replace_dots=True))
+            attribute_value = elm.attrib.get("list_name", None)
+            if not attribute_value:
+                name = elm.attrib.get("name")
+                id = elm.attrib.get("id")
+                attribute_value = TRICC_LIST_NAME.format(clean_str(_get_name(name, id, diagram_id), replace_dots=True))
         else:
             attribute_value = elm.attrib.get(attributes)
         if attribute_value is None:

{tricc_oo-1.6.12 → tricc_oo-1.6.14}/tricc_oo/serializers/xls_form.py

@@ -32,6 +32,7 @@ from tricc_oo.visitors.tricc import (
     get_applicability_expression,
     get_prev_instance_skip_expression,
     get_process_skip_expression,
+    process_operation_reference,
 )
 
 logger = logging.getLogger("default")
@@ -64,7 +65,36 @@ def start_group(
         groups[name] = 0
     relevance = relevance and cur_group.relevance is not None and cur_group.relevance != ""
     past_instances = len(getattr(cur_group.base_instance, "instances", []))
+    group_calc_required = relevance is not None and (len(str(relevance)) > 100 or past_instances > 1)
     calc = None
+    if group_calc_required and getattr(cur_group.relevance, 'operator', None) != TriccOperator.ISTRUE:
+
+        calc = TriccNodeCalculate(
+            id=generate_id(get_export_group_name(name)),
+            group=cur_group.group,
+            activity=cur_group.activity,
+            name=get_export_group_name(name),
+            expression=cur_group.relevance
+        )
+
+        if calc not in cur_group.activity.calculates:
+            process_reference(
+                calc,
+                processed_nodes,
+                calculates=kwargs.get('calculates', None),
+                used_calculates=kwargs.get('used_calculates', None),
+                replace_reference=True,
+                warn=False,
+                codesystems=kwargs.get('codesystems', None)
+            )
+            cur_group.activity.calculates.append(calc)
+            cur_group.activity.nodes[calc.id] = calc
+            processed_nodes.add(calc)
+
+        cur_group.relevance = TriccOperation(
+                TriccOperator.ISTRUE,
+                [calc]
+            )
 
     relevance_expression = cur_group.relevance
     relevance_expression = get_applicability_expression(cur_group, processed_nodes, process, relevance_expression)
@@ -74,7 +104,18 @@ def start_group(
     if not relevance:
         relevance_expression_str = ""
     elif isinstance(relevance_expression, (TriccOperation, TriccStatic)):
-        relevance_expression_str = strategy.get_tricc_operation_expression(relevance_expression)
+        relevance_expression = process_operation_reference(
+            relevance_expression,
+            cur_group,
+            processed_nodes=processed_nodes,
+            calculates=kwargs.get('calculates', None),
+            used_calculates=kwargs.get('used_calculates', None),
+            replace_reference=True,
+            warn=False,
+            codesystems=kwargs.get('codesystems', None),
+        ) or relevance_expression
+        if relevance_expression:
+            relevance_expression_str = strategy.get_tricc_operation_expression(relevance_expression)
 
     # group
     values = []
@@ -95,7 +136,23 @@ def start_group(
             values.append(get_xfrom_trad(strategy, cur_group, column, SURVEY_MAP))
     df_survey.loc[len(df_survey)] = values
 
-    # Group calculates are now created during process_calculate phase
+    # calc
+    if calc and len(df_calculate[df_calculate["name"] == get_export_group_name(name)]) == 0:
+        calc_values = []
+        for column in SURVEY_MAP:
+            if column == "type":
+                calc_values.append("calculate")
+            elif column == "name":
+                value = get_export_name(calc)
+                calc_values.append(value)
+            elif column == "calculation":
+                calc_values.append(f"number({strategy.get_tricc_operation_expression(calc.expression)})")
+            elif column == "relevance":
+                calc_values.append("")
+            else:
+                calc_values.append(get_xfrom_trad(strategy, cur_group, column, SURVEY_MAP))
+
+        df_calculate.loc[len(df_calculate)] = calc_values
 
 
 # def add_background_color(input_string, color):