tricc-oo 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

tests/test_build.py

@@ -0,0 +1,260 @@
+import unittest
+import subprocess
+import sys
+import os
+import tempfile
+import shutil
+from pathlib import Path
+import pandas as pd
+from pyxform import create_survey_from_xls
+
+
+class TestBuildScript(unittest.TestCase):
+    """Test cases for the build.py script with different argument combinations."""
+
+    def setUp(self):
+        """Set up test fixtures."""
+        self.test_data_dir = Path(__file__).parent / "data"
+        self.test_output_dir = Path(__file__).parent / "output"
+        self.demo_file = self.test_data_dir / "demo.drawio"
+
+        # Ensure test data exists
+        self.assertTrue(self.demo_file.exists(), f"Test data file {self.demo_file} does not exist")
+
+    def run_build_script(self, args):
+        """Helper method to run build.py with given arguments."""
+        cmd = [sys.executable, str(Path(__file__).parent / "build.py")] + args
+        result = subprocess.run(cmd, capture_output=True, text=True, cwd=Path(__file__).parent.parent)
+        return result
+
+    def test_basic_build_with_demo_file(self):
+        """Test basic build with demo.drawio file."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_directory_input(self):
+        """Test build with directory containing drawio files."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.test_data_dir),
+                "-o", temp_dir,
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_xlsform_strategy(self):
+        """Test build with XLSFormStrategy (default)."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_html_strategy(self):
+        """Test build with HTMLStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "HTMLStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_fhir_strategy(self):
+        """Test build with FHIRStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "FHIRStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_dhis2_strategy(self):
+        """Test build with DHIS2Strategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "DHIS2Strategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_openmrs_strategy(self):
+        """Test build with OpenMRSStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "OpenMRSStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_cht_strategy(self):
+        """Test build with XLSFormCHTStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormCHTStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_cht_hf_strategy(self):
+        """Test build with XLSFormCHTHFStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormCHTHFStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_cdss_strategy(self):
+        """Test build with XLSFormCDSSStrategy."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormCDSSStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    # def test_build_with_spice_strategy(self):
+    #     """Test build with SpiceStrategy."""
+    #     with tempfile.TemporaryDirectory() as temp_dir:
+    #         args = [
+    #             "-i", str(self.demo_file),
+    #             "-o", temp_dir,
+    #             "-O", "SpiceStrategy",
+    #             "-l", "i"
+    #         ]
+    #         result = self.run_build_script(args)
+    #         self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_debug_level(self):
+        """Test build with debug logging level."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-l", "d"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_trad_option(self):
+        """Test build with translation option."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-t",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_with_form_id(self):
+        """Test build with custom form ID."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-d", "test_form_123",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+    def test_build_missing_input(self):
+        """Test build with missing input file."""
+        args = ["-o", "/tmp/test_output"]
+        result = self.run_build_script(args)
+        self.assertNotEqual(result.returncode, 0, "Build should fail with missing input")
+
+    def test_build_invalid_input_file(self):
+        """Test build with invalid input file."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            args = [
+                "-i", "/nonexistent/file.drawio",
+                "-o", temp_dir,
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertNotEqual(result.returncode, 0, "Build should fail with invalid input file")
+
+    def validate_xls_form(self, xls_path):
+        """Helper method to validate XLS form using ODK libraries."""
+        try:
+            # Convert XLS to XML using pyxform
+            survey = create_survey_from_xls(xls_path)
+            xml_output = survey.to_xml()
+
+            # Basic validation - check if XML was generated successfully
+            # In a real scenario, you might want to use odk_validate command line tool
+            if xml_output and len(xml_output.strip()) > 0:
+                return True, "Validation successful"
+            else:
+                return False, "Empty XML output"
+        except Exception as e:
+            return False, str(e)
+
+    def test_xlsform_strategy_validation(self):
+        """Test XLSFormStrategy output validation with ODK libraries."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            xls_output = Path(temp_dir) / "demo_tricc.xlsx"
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+            # Check if XLS file was created
+            self.assertTrue(xls_output.exists(), f"XLS file {xls_output} was not created")
+
+    def test_xlsform_cdss_strategy_validation(self):
+        """Test XLSFormCDSSStrategy output validation with ODK libraries."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            xls_output = Path(temp_dir) / "demo_tricc.xlsx"
+            args = [
+                "-i", str(self.demo_file),
+                "-o", temp_dir,
+                "-O", "XLSFormCDSSStrategy",
+                "-l", "i"
+            ]
+            result = self.run_build_script(args)
+            self.assertEqual(result.returncode, 0, f"Build failed: {result.stderr}")
+
+
+
+if __name__ == "__main__":
+    unittest.main()

tricc_oo/converters/xml_to_tricc.py

@@ -455,7 +455,7 @@ def create_root_node(diagram):
                 instance=int(elm.attrib.get("instance") if elm.attrib.get("instance") is not None else 1),
             )
     load_expressions(node)
-    return node, _get_name(elm.attrib.get("name", "act_"), external_id, diagram.attrib.get("id"))
+    return node, _get_name(elm.attrib.get("name", "act_"), external_id, diagram.attrib.get("id")) if node else None
 
 
 # converter XML item to object

tricc_oo/strategies/output/xls_form.py

@@ -399,7 +399,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         # build lower level
         if hasattr(self, f"tricc_operation_{operation.operator}"):
             callable = getattr(self, f"tricc_operation_{operation.operator}")
-            return callable(list(map(str, ref_expressions)))
+            return callable(ref_expressions)
         else:
             raise NotImplementedError(
                 f"This type of opreation '{operation.operator}' is not supported in this strategy"
@@ -409,7 +409,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         return f"count-selected({self.clean_coalesce(ref_expressions[0])})"
 
     def tricc_operation_multiplied(self, ref_expressions):
-        return "*".join(ref_expressions)
+        return "*".join(map(str,ref_expressions))
 
     def tricc_operation_divided(self, ref_expressions):
         return f"{ref_expressions[0]} div {ref_expressions[1]}"
@@ -430,7 +430,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
             return f"-{ref_expressions[0]}"
 
     def tricc_operation_plus(self, ref_expressions):
-        return " + ".join(ref_expressions)
+        return " + ".join(map(str,ref_expressions))
 
     def tricc_operation_not(self, ref_expressions):
         return f"not({ref_expressions[0]})"
@@ -474,7 +474,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
                 return "0"
                 # return f"jr:choice-name({','.join(ref_expressions[1:])})"
             else:
-                return f"{ref_expressions[0]}({','.join(ref_expressions[1:])})"
+                return f"{ref_expressions[0]}({','.join(map(str,ref_expressions[1:]))})"
 
     def tricc_operation_istrue(self, ref_expressions):
         if str(BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]).isnumeric():
@@ -548,15 +548,15 @@ class XLSFormStrategy(BaseOutPutStrategy):
         ifs = 0
         parts = []
         else_found = False
-        if not isinstance(ref_expressions[0], list):
+        if isinstance(ref_expressions[0], list):
             return self.tricc_operation_ifs(ref_expressions)
-        for i in range(int(len(ref_expressions))):
+        for i in range(int(len(ref_expressions[1:]))):
             if isinstance(ref_expressions[i], list):
-                parts.append(f"if({ref_expressions[i][0]},{ref_expressions[i][1]}")
+                parts.append(f"if({ref_expressions[0]}={ref_expressions[i+1][0]},{ref_expressions[i+1][1]}")
                 ifs += 1
             else:
                 else_found = True
-                parts.append(ref_expressions[i])
+                parts.append(ref_expressions[i+1])
         # join the if
         exp = ",".join(map(str, parts))
         # in case there is no default put ''
@@ -571,15 +571,16 @@ class XLSFormStrategy(BaseOutPutStrategy):
         ifs = 0
         parts = []
         else_found = False
-        for i in range(int(len(ref_expressions[1:]))):
-            if isinstance(ref_expressions[i + 1], list):
-                parts.append(f"if({ref_expressions[0]}={ref_expressions[i+1][0]},{ref_expressions[i+1][1]}")
+        for i in range(int(len(ref_expressions))):
+            if isinstance(ref_expressions[i], list):
+                parts.append(f"if({ref_expressions[i][0]},{ref_expressions[i][1]}")
                 ifs += 1
             else:
                 else_found = True
-                parts.append(ref_expressions[i + 1])
+                parts.append(ref_expressions[i])
+                break
         # join the if
-        exp = ",".join(parts)
+        exp = ",".join(map(str, parts))
         # in case there is no default put ''
         if not else_found:
             exp += ",''"
@@ -736,4 +737,4 @@ class XLSFormStrategy(BaseOutPutStrategy):
             raise NotImplementedError(f"This type of node {r.__class__} is not supported within an operation")
 
     def tricc_operation_concatenate(self, ref_expressions):
-        return f"concat({','.join(ref_expressions)})"
+        return f"concat({','.join(map(str, ref_expressions))})"

tricc_oo/visitors/tricc.py

@@ -173,16 +173,22 @@ def get_version_inheritance(node, last_version, processed_nodes):
                     node.relevance = expression
     else:
         node.last = False
+        
+                    # Create a calculate node that coalesces the previous saved value with the current node value
+        calc_id = generate_id(f"save_{node.save}")
         calc = TriccNodeCalculate(
-            id=generate_id(f"save{node.id}"),
-            name=node.name,
+            id=calc_id,
+            name=node.save,
             path_len=node.path_len + 1,
-            # version=get_next_version(node.name, processed_nodes, node.version+2),
-            expression=merge_expression(node, last_version),
-            label=f"merge{node.id}",
-            last=True,
+            expression_reference=TriccOperation(
+                TriccOperator.COALESCE,
+                [TriccReference(node.save), last_version],
+            ),
+            reference=[TriccReference(n.name)],
             activity=node.activity,
             group=node.group,
+            label=f"Save calculation for {n.label}",
+            last=True,
         )
         node.activity.nodes[calc.id] = calc
         node.activity.calculates.append(calc)
@@ -1927,7 +1933,6 @@ def get_prev_instance_skip_expression(node, processed_nodes, process, expression
                 ),
             )
         if expression and expression_inputs:
-            add_sub_expression(expression_inputs, expression)
             expression = nand_join(expression, or_join(expression_inputs))
         elif expression_inputs:
             expression = negate_term(or_join(expression_inputs))

{tricc_oo-1.6.2.dist-info → tricc_oo-1.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.2
+Version: 1.6.4
 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
@@ -24,6 +24,7 @@ Requires-Dist: antlr4-python3-runtime==4.13.2
 Requires-Dist: antlr4-tools==0.2.1
 Requires-Dist: beautifulsoup4
 Requires-Dist: ocldev
+Requires-Dist: pyxform
 Dynamic: license-file
 
 # TRICC-OO

{tricc_oo-1.6.2.dist-info → tricc_oo-1.6.4.dist-info}/RECORD

@@ -1,4 +1,5 @@
 tests/build.py,sha256=Qbxvjkj_Wk2nQ-WjaMGiE1FIe3SRmJMRIgeoMoxqlfQ,6748
+tests/test_build.py,sha256=5t8iliPe_0XwoZjSGkHxUbZaNOWBfc6SpIQijh9DLUA,10037
 tests/test_cql.py,sha256=dAsLMqVaS6qxnq62fg5KqTFu6UG6pHO6Ab3NZ1c9T3Y,5248
 tests/to_ocl.py,sha256=4e-i65K3UM6wHgdVcrZcM9AyL1bahIsXJiZTXhhHgQk,2048
 tricc_oo/__init__.py,sha256=oWCE1ubmC_6iqaWOMgTei4eXVQgV202Ia-tXS1NnW_4,139
@@ -9,7 +10,7 @@ tricc_oo/converters/datadictionnary.py,sha256=T2HLCBo4Am1p0kFqSH1r0PqbD8AC2IGuWk
 tricc_oo/converters/drawio_type_map.py,sha256=UCPiGs7Lw0bigKScmZUnmOhACBz-FiDq92jHkI7RTSQ,9113
 tricc_oo/converters/tricc_to_xls_form.py,sha256=HZh0tQoKfRMPshJvEBwCOGqYGA1ZJLJ67bwV79qtlwk,3486
 tricc_oo/converters/utils.py,sha256=JZrtrvvOfXwdkw49pKauzinOcauWwsy-CVcw36TjyLo,1684
-tricc_oo/converters/xml_to_tricc.py,sha256=Gdi7soIjBYikYy3OATWb2Qa4iTvmNj5mI7hHD7gBvFE,39570
+tricc_oo/converters/xml_to_tricc.py,sha256=T7oFEr56yNZ0empqlev6AaVrairl3evFciji-SeNmyA,39588
 tricc_oo/converters/cql/cqlLexer.py,sha256=8HArbRphcrpnAG4uogJ2rHv4tc1WLzjN0B1uFeYILAc,49141
 tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoSKrtw7Hffc,57538
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
@@ -36,16 +37,16 @@ tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3gr
 tricc_oo/strategies/output/html_form.py,sha256=qSleEZOMV_-Z04y-i-ucyd5rgAYWAyjPwMrw0IHtCRM,8604
 tricc_oo/strategies/output/openmrs_form.py,sha256=zAmDGMmZdIGNpil5MD-huiUvt_Dbhc2vt5qsGaCS2_k,29003
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=26pEea0I_owpsz9S8hoHJNzChA5b2Th8KPRIeTEMfqo,29323
+tricc_oo/strategies/output/xls_form.py,sha256=_0xghjaHU50U1fBKekN4BP9oPzRs17_WRJO8VKtokag,29366
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
 tricc_oo/strategies/output/xlsform_cht.py,sha256=RY_mre9j6w2vVnRFSGn5R3CuTWFjIbQyl1uWwz9Ay5E,22965
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=MrhB6SI2KSpuxOITiqdqChioV58nBWj_MQC6kS-twpI,107724
+tricc_oo/visitors/tricc.py,sha256=V4ai-rPjAbLSGdcKRBQiXohe6IqhZNCVyVjJLxYiavQ,107896
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.2.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.2.dist-info/METADATA,sha256=EhHpqx3TDl1HPlIMFlLLxox7KvU5rpTT6KtgGnbK0sw,8576
-tricc_oo-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.6.2.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.2.dist-info/RECORD,,
+tricc_oo-1.6.4.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.4.dist-info/METADATA,sha256=UeHJ7oRz6JMRUiXb2Dtp8s3bzfCLxIDeld4SMKwfqKo,8599
+tricc_oo-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.6.4.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.4.dist-info/RECORD,,