tricc-oo 1.6.16__tar.gz → 1.6.18__tar.gz

{tricc_oo-1.6.16/tricc_oo.egg-info → tricc_oo-1.6.18}/PKG-INFO

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

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

{tricc_oo-1.6.16 → tricc_oo-1.6.18}/tests/test_cql.py

@@ -26,6 +26,15 @@ class TestCql(unittest.TestCase):
         )
         self.assertEqual(str(dg_operation), str(dg_expected))
 
+    def test_diagnosis_list(self):
+        if_cql = 'DiagnosisList("final.TRIAGE_YELLOW", "triage_RED")'
+        dg_operation = transform_cql_to_operation(if_cql)
+        dg_expected = TriccOperation(
+            operator=TriccOperator.DIAGNOSIS_LIST,
+            reference=[TriccReference(value="final.TRIAGE_YELLOW"), TriccReference(value="triage_RED")],
+        )
+        self.assertEqual(str(dg_operation), str(dg_expected))
+
     def test_implied_concat(self):
         if_cql = "'A' & \"B\" & 'C'"
         cc_operation = transform_cql_to_operation(if_cql)

{tricc_oo-1.6.16 → tricc_oo-1.6.18}/tricc_oo/converters/cql_to_operation.py

@@ -37,6 +37,7 @@ FUNCTION_MAP = {
     "HasQualifier": TriccOperator.HAS_QUALIFIER,
     "DateTimeToDecimal": TriccOperator.DATETIME_TO_DECIMAL,
     "Count": TriccOperator.COUNT,
+    "DiagnosisList": TriccOperator.DIAGNOSIS_LIST,
 }
 # TODO
 # Min

{tricc_oo-1.6.16 → tricc_oo-1.6.18}/tricc_oo/models/base.py

@@ -377,6 +377,7 @@ class TriccOperator(StrEnum):
     PARENTHESIS = "parenthesis"
     CONCATENATE = "concatenate"
     DATETIME_TO_DECIMAL = "datetime_to_decimal"
+    DIAGNOSIS_LIST = "diagnosis_list"
 
 
 RETURNS_BOOLEAN = [
@@ -423,6 +424,8 @@ RETURNS_NUMBER = [
 
 RETURNS_DATE = [TriccOperator.CAST_DATE]
 
+RETURNS_STRING = [TriccOperator.DIAGNOSIS_LIST]
+
 OPERATION_LIST = {
     ">=": TriccOperator.MORE_OR_EQUAL,
     "<=": TriccOperator.LESS_OR_EQUAL,
@@ -480,6 +483,8 @@ class TriccOperation(BaseModel):
             return "number"
         elif self.operator in RETURNS_DATE:
             return "date"
+        elif self.operator in RETURNS_STRING:
+            return "string"
         elif self.operator == TriccOperator.CONCATENATE:
             return "string"
         elif self.operator == TriccOperator.PARENTHESIS:

{tricc_oo-1.6.16 → tricc_oo-1.6.18}/tricc_oo/strategies/output/xls_form.py

@@ -694,6 +694,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
     # @param left part
     # @param right part
     def generate_xls_form_calculate(self, node, processed_nodes, stashed_nodes, calculates, **kwargs):
+        self.codesystems = kwargs.get("codesystems", {})
         if is_ready_to_process(node, processed_nodes, strict=False) and process_reference(
             node,
             processed_nodes,
@@ -749,6 +750,36 @@ class XLSFormStrategy(BaseOutPutStrategy):
     def tricc_operation_concatenate(self, ref_expressions):
         return f"concat({','.join(map(str, ref_expressions))})"
 
+    def tricc_operation_diagnosis_list(self, ref_expressions):
+        from tricc_oo.converters.datadictionnary import lookup_codesystems_code
+        parts = []
+        for expr in ref_expressions:
+            if isinstance(expr, str):
+                # expr is the variable reference like "final.TRIAGE_YELLOW" or "${var}"
+                if expr.startswith("${") and expr.endswith("}"):
+                    var_path = expr[2:-1]
+                else:
+                    var_path = expr
+                # Handle final. prefix
+                code = var_path[6:] if var_path.startswith("final.") else var_path
+                concept = lookup_codesystems_code(self.codesystems, code)
+                if concept:
+                    display = concept.get("display", code)
+                else:
+                    logger.warning(f"Diagnosis code '{code}' not found in codesystems")
+                    display = code
+                if expr.startswith("${"):
+                    condition = f"{expr} = 1"
+                else:
+                    condition = f"${{{expr}}} = 1"
+                # Always include comma after diagnosis name
+                parts.append(f"if({condition}, '{display},', '')")
+            else:
+                logger.warning(f"Unexpected expression type: {type(expr)}, value: {expr}")
+        if parts:
+            return f"concat({','.join(parts)})"
+        return "''"
+
     def validate(self):
         """Validate the generated XLS form using pyxform."""
         try:

{tricc_oo-1.6.16 → tricc_oo-1.6.18/tricc_oo.egg-info}/PKG-INFO

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