tricc-oo 1.6.25__tar.gz → 1.7.0.dev1__tar.gz

{tricc_oo-1.6.25/tricc_oo.egg-info → tricc_oo-1.7.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.25
+Version: 1.7.0.dev1
 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.25 → tricc_oo-1.7.0.dev1}/pyproject.toml

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

tricc_oo-1.7.0.dev1/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-1.6.25 → tricc_oo-1.7.0.dev1}/tests/test_cql.py

@@ -26,15 +26,6 @@ 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.25 → tricc_oo-1.7.0.dev1}/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.25 → tricc_oo-1.7.0.dev1}/tricc_oo/converters/cql_to_operation.py

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

{tricc_oo-1.6.25 → tricc_oo-1.7.0.dev1}/tricc_oo/converters/datadictionnary.py

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

{tricc_oo-1.6.25 → tricc_oo-1.7.0.dev1}/tricc_oo/converters/drawio_type_map.py

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

{tricc_oo-1.6.25 → tricc_oo-1.7.0.dev1}/tricc_oo/converters/tricc_to_xls_form.py

@@ -1,5 +1,5 @@
 import logging
-from tricc_oo.converters.utils import clean_name
+from tricc_oo.converters.utils import clean_name, clean_str
 from tricc_oo.models.tricc import TriccNodeSelectOption, TRICC_TRUE_VALUE, TRICC_FALSE_VALUE, TriccNodeActivity
 from tricc_oo.models.calculate import TriccNodeInput
 from tricc_oo.models.base import TriccNodeBaseModel, TriccStatic, TriccReference
@@ -36,15 +36,13 @@ def get_export_name(node, replace_dots=True):
     elif isinstance(node, bool):
         return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if node else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
     elif isinstance(node, TriccReference):
-        logger.warning(f"Reference {node.value} use in export, bad serialization probable")
+        logger.warning(f"Reference {node.value} use in export, bad serialiuation probable")
         return str(node.value)
     elif isinstance(node, (str, TriccStatic, TriccNodeSelectOption)):
         if isinstance(node, TriccNodeSelectOption):
             value = node.name
         elif isinstance(node, TriccStatic):
             value = node.value
-            if isinstance(value, TriccNodeSelectOption):
-                value = value.name
         else:
             value = node
         if isinstance(value, bool):  # or r.value in ('true', 'false')
@@ -66,13 +64,14 @@ def get_export_name(node, replace_dots=True):
         return node
     else:
         node.gen_name()
-        if isinstance(node, TriccNodeActivity) and getattr(node, 'instance', 1) > 1:
+        if isinstance(node, TriccNodeActivity) and getattr(node, 'instance', 1)>1:
             node.export_name = clean_name(
                 node.name + INSTANCE_SEPARATOR + str(node.instance),
                 replace_dots=replace_dots,
             )
         elif isinstance(node, TriccNodeSelectOption):
             node.export_name = node.name
+            
         elif node.last is False:
             node.export_name = clean_name(
                 node.name + VERSION_SEPARATOR + str(node.version),

{tricc_oo-1.6.25 → tricc_oo-1.7.0.dev1}/tricc_oo/converters/xml_to_tricc.py

@@ -7,7 +7,7 @@ import re
 
 from tricc_oo.converters.utils import remove_html, clean_str
 from tricc_oo.converters.cql_to_operation import transform_cql_to_operation
-from tricc_oo.converters.utils import generate_id
+from tricc_oo.converters.utils import generate_id, get_rand_name
 from tricc_oo.models.base import (
     TriccOperator, TriccOperation,
     TriccStatic, TriccReference, TriccNodeType, TriccEdge, OPERATION_LIST
@@ -107,7 +107,7 @@ def create_activity(diagram, media_path, project):
     if root is not None:
         activity = TriccNodeActivity(
             root=root,
-            name=name,  # start node 'name' is saved in label
+            name=name,  #  start node 'name' is saved in label
             id=id,
             external_id=external_id,
             label=label,
@@ -128,7 +128,7 @@ def create_activity(diagram, media_path, project):
         for n in nodes.values():
 
             if (
-                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeInput))
+                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase))
                 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", "conceptType": get_concept_type(n)},
+                        {"datatype": "Boolean", "contextType": get_context_type(n)},
                     )
                 elif not isinstance(n, TriccNodeSelectNotAvailable):
                     add_concept(
@@ -148,20 +148,8 @@ def create_activity(diagram, media_path, project):
                         n.name,
                         n.label,
                         {
-                            "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),
+                            "datatype": get_data_type(n.tricc_type),
+                            "contextType": get_context_type(n),
                         },
                     )
                 if getattr(n, "save", None):
@@ -172,8 +160,8 @@ def create_activity(diagram, media_path, project):
                         n.save,
                         n.label,
                         {
-                            "dataType": get_data_type(n.tricc_type),
-                            "conceptType": get_concept_type(n),
+                            "datatype": get_data_type(n.tricc_type),
+                            "contextType": get_context_type(n),
                         },
                     )
 
@@ -187,7 +175,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
@@ -209,7 +197,6 @@ 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),
@@ -483,17 +470,17 @@ def set_additional_attributes(attribute_names, elm, node):
             # input expression can add a condition to either relevance (display) or calculate expression
             if attributename == "expression_inputs":
                 attribute = [attribute]
-            elif attributename in ["priority", "instance"]:
+            elif attributename == "instance":
                 attribute = int(attribute)
             else:
                 attribute
             setattr(node, attributename, attribute)
 
 
-def get_concept_type(node):
-    concept_type = getattr(node, "concept_type", None)
-    if concept_type:
-        return concept_type
+def get_context_type(node):
+    context_type = getattr(node, "context_type", None)
+    if context_type:
+        return context_type
     if isinstance(node, TriccNodeSelectMultiple):
         return "Question"
     elif isinstance(node, TriccNodeSelectOption):
@@ -548,7 +535,7 @@ def get_select_options(diagram, select_node, nodes):
             activity=select_node.activity,
             group=select_node.group,
         )
-        set_additional_attributes(["save", "relevance", "concept_type"], elm, option)
+        set_additional_attributes(["save", "relevance", "context_type"], elm, option)
         load_expressions(option)
         options[i] = option
         nodes[id] = option
@@ -612,11 +599,7 @@ def inject_bridge_path(node, nodes):
         calc = TriccNodeDisplayBridge(**data)
     else:
         calc = TriccNodeBridge(**data)
-    if node:
-        priority = getattr(node, 'priority', None)
-        if priority:
-            calc.priority = priority
-            
+
     for e in node.activity.edges:
         if e.target == node.id:
             if e.source in node.activity.nodes and len(node.activity.nodes[e.source].next_nodes):
@@ -636,23 +619,21 @@ def enrich_node(diagram, media_path, edge, node, activity, help_before=False):
         # get node and process type
         type, message = get_message(diagram, edge.source_external_id)
         if type is not None:
-            # if type == "help":
-            #     help = TriccNodeMoreInfo(
-            #         id=generate_id(),
-            #         name=f"{node.name}.more_info",
-            #         label=message,
-            #         parent=node,
-            #         group=node.group,
-            #         activity=node.activity,
-            #         required=None,
-            #     )
-            #     # node.help = message
-            #     if help_before:
-            #         inject_node_before(help, node, activity)
-            #     else:
-            #         set_prev_next_node(node, help, edge_only=True, activity=activity)
-            #         activity.nodes[help.id] = help
-            #     return help, None
+            if type == "help":
+                help = TriccNodeMoreInfo(
+                    id=generate_id(),
+                    name=f"{node.name}.more_info",
+                    label=message,
+                    parent=node,
+                    required=None,
+                )
+                # node.help = message
+                if help_before:
+                    inject_node_before(help, node, activity)
+                else:
+                    set_prev_next_node(node, help, edge_only=True, activity=activity)
+                    activity.nodes[help.id] = help
+                return help, None
 
             if type in (TriccNodeType.start, TriccNodeType.activity_start):
                 return True
@@ -819,11 +800,9 @@ 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":
-            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))
+            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: