tricc-oo 1.5.24__tar.gz → 1.5.26__tar.gz

{tricc_oo-1.5.24/tricc_oo.egg-info → tricc_oo-1.5.26}/PKG-INFO

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

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

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tests/build.py

@@ -1,20 +1,17 @@
-from tricc_oo.strategies.output.spice import SpiceStrategy
-from tricc_oo.strategies.output.xlsform_cht_hf import XLSFormCHTHFStrategy
-from tricc_oo.strategies.output.xlsform_cht import XLSFormCHTStrategy
-from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy
-from tricc_oo.strategies.output.xls_form import XLSFormStrategy
-from tricc_oo.strategies.output.openmrs_form import OpenMRSStrategy
-from tricc_oo.strategies.output.fhir_form import FHIRStrategy
-from tricc_oo.strategies.output.html_form import HTMLStrategy
-
-from tricc_oo.strategies.input.drawio import DrawioStrategy
+from tricc_oo.strategies.output.spice import SpiceStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cht_hf import XLSFormCHTHFStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cht import XLSFormCHTStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy  # noqa: F401
+from tricc_oo.strategies.output.xls_form import XLSFormStrategy  # noqa: F401
+from tricc_oo.strategies.output.openmrs_form import OpenMRSStrategy  # noqa: F401
+from tricc_oo.strategies.output.fhir_form import FHIRStrategy  # noqa: F401
+from tricc_oo.strategies.output.html_form import HTMLStrategy  # noqa: F401
+from tricc_oo.strategies.input.drawio import DrawioStrategy  # noqa: F401
 import getopt
-import gettext
 import logging
 import os
 import sys
 import gc
-import shutil
 from pathlib import Path
 
 # set up logging to file
@@ -43,15 +40,15 @@ def setup_logger(
     level=logging.INFO,
     formatting="[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s",
 ):
-    l = logging.getLogger(logger_name)
+    logger = logging.getLogger(logger_name)
     formatter = logging.Formatter(formatting)
     file_handler = logging.FileHandler(log_file, mode="w+")
     file_handler.setFormatter(formatter)
     stream_handler = logging.StreamHandler()
     stream_handler.setFormatter(formatter)
 
-    l.setLevel(level)
-    l.addHandler(file_handler)
+    logger.setLevel(level)
+    logger.addHandler(file_handler)
 
 
 class ColorFormatter(logging.Formatter):

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tests/test_cql.py

@@ -53,9 +53,9 @@ class TestCql(unittest.TestCase):
 
     def test_case(self):
         case_cql = """
-        case AgeInMonths() 
-        when 0 then 'newborn' 
-        when 1 then 'newborn' 
+        case AgeInMonths()
+        when 0 then 'newborn'
+        when 1 then 'newborn'
         else 'child' end
         """
         case_operation = transform_cql_to_operation(case_cql)
@@ -72,7 +72,7 @@ class TestCql(unittest.TestCase):
 
     def test_ifs(self):
         case_cql = """
-        case 
+        case
         when AgeInMonths() <= 2 then true
         when AgeInYears() > 5 then true
         else false end

tricc_oo-1.5.26/tricc_oo/converters/tricc_to_xls_form.py

@@ -0,0 +1,86 @@
+import logging
+from tricc_oo.converters.utils import clean_name, clean_str
+from tricc_oo.models.tricc import TriccNodeSelectOption, TRICC_TRUE_VALUE, TRICC_FALSE_VALUE
+from tricc_oo.models.calculate import TriccNodeInput
+from tricc_oo.models.base import TriccNodeBaseModel, TriccStatic, TriccReference
+
+# from babel import _
+
+# TRICC_SELECT_MULTIPLE_CALC_EXPRESSION = "count-selected(${{{0}}}) - number(selected(${{{0}}},'opt_none'))"
+# TRICC_SELECT_MULTIPLE_CALC_NONE_EXPRESSION = "selected(${{{0}}},'opt_none')"
+# TRICC_CALC_EXPRESSION = "${{{0}}}>0"
+# TRICC_CALC_NOT_EXPRESSION = "${{{0}}}=0"
+# TRICC_EMPTY_EXPRESSION = "coalesce(${{{0}}},'') != ''"
+# TRICC_SELECTED_EXPRESSION = 'selected(${{{0}}}, "{1}")'
+# TRICC_SELECTED_NEGATE_EXPRESSION = 'count-selected(${{{0}}})>0 and not(selected(${{{0}}}, "{1}"))'
+# TRICC_REF_EXPRESSION = "${{{0}}}"
+TRICC_NEGATE = "not({})"
+# TRICC_NUMBER = "number({})"
+# TRICC_AND_EXPRESSION = '{0} and {1}'
+VERSION_SEPARATOR = "_Vv_"
+INSTANCE_SEPARATOR = "_Ii_"
+BOOLEAN_MAP = {
+    str(TRICC_TRUE_VALUE): 1,
+    str(TRICC_FALSE_VALUE): 0,
+}
+
+
+logger = logging.getLogger("default")
+
+# gettext language dict {'code':gettext}
+
+
+def get_export_name(node, replace_dots=True):
+    if hasattr(node, 'export_name') and node.export_name is not None:
+        return node.export_name
+    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 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
+        else:
+            value = node
+        if isinstance(value, bool):  # or r.value in ('true', 'false')
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if value else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif value == TRICC_TRUE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
+        elif value == TRICC_FALSE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif isinstance(value, str):
+            export_name = f"'{clean_str(value, replace_dots=replace_dots)}'"
+        else:
+            export_name = str(value)
+        if hasattr(node, 'export_name'):
+            node.export_name = export_name
+        return export_name
+    elif not hasattr(node, 'export_name'):
+        return node
+    else:
+        node.gen_name()
+        if 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),
+                replace_dots=replace_dots,
+            )
+        elif isinstance(node, TriccNodeInput):
+            node.export_name = clean_name("load." + node.name, replace_dots=replace_dots)
+        else:
+            node.export_name = clean_name(node.name, replace_dots=replace_dots)
+        return node.export_name
+
+
+def get_list_names(list):
+    names = []
+    for elm in list:
+        if issubclass(elm.__class__, TriccNodeBaseModel):
+            names.append(get_export_name(elm))
+        elif isinstance(elm, str):
+            names.append(elm)
+    return names

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/converters/utils.py

@@ -23,7 +23,7 @@ def clean_str(name, replace_dots=False):
 
 def clean_name(name, prefix="", replace_dots=False):
     name = clean_str(name, replace_dots)
-    if name[0].isdigit():
+    if name and name[0].isdigit():
         name = "id_" + name
     elif name[0].isdigit() == "_":
         name = name[1:]

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/models/tricc.py

@@ -15,6 +15,8 @@ import logging
 
 
 logger = logging.getLogger(__name__)
+TRICC_TRUE_VALUE = "true"
+TRICC_FALSE_VALUE = "false"
 
 
 class TriccNodeCalculateBase(TriccNodeBaseModel):

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/serializers/xls_form.py

@@ -3,7 +3,7 @@ import hashlib
 
 # from bs4 import BeautifulSoup
 from tricc_oo.converters.tricc_to_xls_form import (
-    get_export_name,
+    get_export_name, BOOLEAN_MAP
 )
 from tricc_oo.models.lang import SingletonLangClass
 from tricc_oo.converters.utils import clean_name, remove_html
@@ -13,7 +13,6 @@ from tricc_oo.models.base import (
 )
 from tricc_oo.models.calculate import (
     TriccNodeDisplayCalculateBase,
-
 )
 from tricc_oo.models.tricc import (
     TriccNodeActivity, TriccNodeBaseModel, TriccNodeSelectMultiple, TriccNodeSelectOption,
@@ -29,8 +28,6 @@ from tricc_oo.visitors.tricc import (
     is_ready_to_process,
     process_reference,
     add_calculate,
-    TRICC_TRUE_VALUE,
-    TRICC_FALSE_VALUE,
     get_applicability_expression,
     get_prev_instance_skip_expression,
     get_process_skip_expression,
@@ -41,11 +38,6 @@ logger = logging.getLogger("default")
 langs = SingletonLangClass()
 TRICC_CALC_EXPRESSION = "${{{0}}}>0"
 
-BOOLEAN_MAP = {
-    str(TRICC_TRUE_VALUE): 1,
-    str(TRICC_FALSE_VALUE): 0,
-}
-
 
 def start_group(
     strategy,

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/strategies/output/openmrs_form.py

@@ -22,8 +22,7 @@ from tricc_oo.models.tricc import (
     TriccNodeInputModel,
     TriccNodeBaseModel,
     TriccNodeDisplayModel,
-    TriccNodeSelectYesNo
-    )
+)
 
 from tricc_oo.models.calculate import TriccNodeDisplayCalculateBase, TriccNodeDiagnosis
 from tricc_oo.models.ordered_set import OrderedSet
@@ -36,6 +35,7 @@ UUID_NAMESPACE = uuid.UUID('12345678-1234-5678-9abc-def012345678')
 CIEL_YES = "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 CIEL_NO = "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 
+
 class OpenMRSStrategy(BaseOutPutStrategy):
     processes = ["main"]
     project = None
@@ -193,8 +193,8 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             if node.hint:
                 question["questionInfo"] = node.hint
             if node.tricc_type in ['select_one', 'select_multiple']:
-                labelTrue = None
-                labelFalse = None
+                # labelTrue = None
+                # labelFalse = None
                 # Add answers if options
                 if hasattr(node, 'options'):
                     answers = []
@@ -204,10 +204,10 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                         concept_val = self.get_option_value(opt.name)
                         if concept_val == TriccStatic(False):
                             concept_val = CIEL_NO
-                            labelFalse = display
+                            # labelFalse = display
                         if concept_val == TriccStatic(True):
                             concept_val = CIEL_YES
-                            labelTrue = display
+                            # labelTrue = display
                         answers.append({
                             "label": display,
                             "concept": concept_val,
@@ -241,7 +241,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                     "id": self.get_export_name(node),
                     "type": "obs" if isinstance(node, TriccNodeDiagnosis) else "control",
                     "label": getattr(node, 'label', '').replace('\u00a0', ' ').strip(),
-                    "hide":{
+                    "hide": {
                         "hideWhenExpression": "true"
                     },
                     "questionOptions": {
@@ -414,16 +414,16 @@ class OpenMRSStrategy(BaseOutPutStrategy):
 
     # Operation methods similar, but for string expressions
     def tricc_operation_equal(self, ref_expressions):
-        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] == True or ref_expressions[1] == 'true':
+        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] is True or ref_expressions[1] == 'true':
             return f"{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
-        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] == False or ref_expressions[1] == 'false':
+        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] is False or ref_expressions[1] == 'false':
             return f"{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
         return f"{ref_expressions[0]} === {ref_expressions[1]}"
 
     def tricc_operation_not_equal(self, ref_expressions):
-        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] == True or ref_expressions[1] == 'true':
+        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] is True or ref_expressions[1] == 'true':
             return f"!{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
-        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] == False or ref_expressions[1] == 'false':
+        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] is False or ref_expressions[1] == 'false':
             return f"!{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
         return f"{ref_expressions[0]} !== {ref_expressions[1]}"
 
@@ -494,11 +494,11 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             return f"{ref_expressions[0]}({','.join(ref_expressions[1:])})"
 
     def tricc_operation_istrue(self, ref_expressions):
-        #return f"{ref_expressions[0]} === true"
+        # return f"{ref_expressions[0]} === true"
         return f"{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
 
     def tricc_operation_isfalse(self, ref_expressions):
-        #return f"{ref_expressions[0]} === false"
+        # return f"{ref_expressions[0]} === false"
         return f"{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
 
     def tricc_operation_parenthesis(self, ref_expressions):
@@ -514,11 +514,11 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         return f"!isEmpty{ref_expressions[0]})"
 
     def tricc_operation_isnottrue(self, ref_expressions):
-        #return f"{ref_expressions[0]} !== true"
+        # return f"{ref_expressions[0]} !== true"
         return f"!{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
 
     def tricc_operation_isnotfalse(self, ref_expressions):
-        #return f"{ref_expressions[0]} !== false"
+        # return f"{ref_expressions[0]} !== false"
         return f"!{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
 
     def _boolean(self, ref_expressions, operator, answer_uuid, bool_val='false'):

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/strategies/output/xls_form.py

@@ -25,9 +25,11 @@ from tricc_oo.models.tricc import (
     TriccNodeBaseModel,
     TriccNodeSelectOption,
     TriccNodeInputModel,
-    TriccNodeDisplayModel
+    TriccNodeDisplayModel,
+    TRICC_FALSE_VALUE,
+    TRICC_TRUE_VALUE,
 )
-from tricc_oo.converters.tricc_to_xls_form import get_export_name
+from tricc_oo.converters.tricc_to_xls_form import get_export_name, BOOLEAN_MAP
 
 from tricc_oo.models.lang import SingletonLangClass
 
@@ -37,8 +39,6 @@ from tricc_oo.visitors.tricc import (
     is_ready_to_process,
     process_reference,
     get_node_expressions,
-    TRICC_TRUE_VALUE,
-    TRICC_FALSE_VALUE,
     set_last_version_false,
     generate_calculate,
     generate_base,
@@ -49,7 +49,6 @@ from tricc_oo.serializers.xls_form import (
     end_group,
     generate_xls_form_export,
     start_group,
-    BOOLEAN_MAP,
 )
 from tricc_oo.strategies.output.base_output_strategy import BaseOutPutStrategy
 
@@ -461,7 +460,10 @@ class XLSFormStrategy(BaseOutPutStrategy):
             return "1"
 
     def tricc_operation_native(self, ref_expressions):
+    
         if len(ref_expressions) > 0:
+            if ref_expressions[0].startswith(("'","`",)):
+                ref_expressions[0] = ref_expressions[0][1:-1]
             if ref_expressions[0] == "GetChoiceName":
                 return f"""jr:choice-name({
                     self.clean_coalesce(ref_expressions[1])
@@ -722,23 +724,21 @@ class XLSFormStrategy(BaseOutPutStrategy):
             logger.warning(f"reference `{r.value}` still used in a calculate")
             return f"${{{get_export_name(r.value)}}}"
         elif isinstance(r, TriccStatic):
-            if isinstance(r.value, bool):  # or r.value in ('true', 'false')
-                return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if r.value else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
-            if r.value == TRICC_TRUE_VALUE:
+            return get_export_name(r)
+        elif isinstance(r, str):
+            if r == TRICC_TRUE_VALUE:
                 return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
-            if r.value == TRICC_FALSE_VALUE:
+            elif r == TRICC_FALSE_VALUE:
                 return BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
-            if isinstance(r.value, str):
-                return f"'{r.value}'"
+            elif isinstance(r, str):
+                return f"'{r}'"
             else:
-                return str(r.value)
-        elif isinstance(r, str):
-            return f"{r}"
+                return str(r)
         elif isinstance(r, (int, float)):
             return str(r)
         elif isinstance(r, TriccNodeSelectOption):
-            logger.warning(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
-            return f"'{r.name}'"
+            logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
+            return get_export_name(r)
         elif issubclass(r.__class__, TriccNodeInputModel):
             return f"coalesce(${{{get_export_name(r)}}},{coalesce_fallback})"
         elif issubclass(r.__class__, TriccNodeBaseModel):

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/strategies/output/xlsform_cht.py

@@ -33,7 +33,6 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
 
         self.inject_version()
 
-
     def get_cht_input(self, start_pages, **kwargs):
         empty = langs.get_trads("", force_dict=True)
         df_input = pd.DataFrame(columns=SURVEY_MAP.keys())

{tricc_oo-1.5.24 → tricc_oo-1.5.26}/tricc_oo/visitors/tricc.py

@@ -44,6 +44,8 @@ from tricc_oo.models.tricc import (
     TriccNodeDisplayModel,
     TriccNodeMainStart,
     TriccNodeAcceptDiagnostic,
+    TRICC_FALSE_VALUE,
+    TRICC_TRUE_VALUE,
 )
 from tricc_oo.visitors.utils import PROCESSES
 from tricc_oo.converters.cql_to_operation import transform_cql_to_operation
@@ -53,9 +55,6 @@ from tricc_oo.converters.tricc_to_xls_form import get_list_names, get_export_nam
 logger = logging.getLogger("default")
 ONE_QUESTION_AT_A_TIME = False
 
-TRICC_TRUE_VALUE = "true"
-TRICC_FALSE_VALUE = "false"
-
 
 def merge_node(from_node, to_node):
     if from_node.activity != to_node.activity:

{tricc_oo-1.5.24 → tricc_oo-1.5.26/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.24
+Version: 1.5.26
 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.24/tricc_oo/converters/tricc_to_xls_form.py

@@ -1,55 +0,0 @@
-import logging
-from tricc_oo.converters.utils import clean_name
-from tricc_oo.models.tricc import TriccNodeSelectOption
-from tricc_oo.models.calculate import TriccNodeInput
-from tricc_oo.models.base import TriccNodeBaseModel
-# from babel import _
-
-# TRICC_SELECT_MULTIPLE_CALC_EXPRESSION = "count-selected(${{{0}}}) - number(selected(${{{0}}},'opt_none'))"
-# TRICC_SELECT_MULTIPLE_CALC_NONE_EXPRESSION = "selected(${{{0}}},'opt_none')"
-# TRICC_CALC_EXPRESSION = "${{{0}}}>0"
-# TRICC_CALC_NOT_EXPRESSION = "${{{0}}}=0"
-# TRICC_EMPTY_EXPRESSION = "coalesce(${{{0}}},'') != ''"
-# TRICC_SELECTED_EXPRESSION = 'selected(${{{0}}}, "{1}")'
-# TRICC_SELECTED_NEGATE_EXPRESSION = 'count-selected(${{{0}}})>0 and not(selected(${{{0}}}, "{1}"))'
-# TRICC_REF_EXPRESSION = "${{{0}}}"
-TRICC_NEGATE = "not({})"
-# TRICC_NUMBER = "number({})"
-# TRICC_AND_EXPRESSION = '{0} and {1}'
-VERSION_SEPARATOR = "_Vv_"
-INSTANCE_SEPARATOR = "_Ii_"
-
-
-logger = logging.getLogger("default")
-
-# gettext language dict {'code':gettext}
-
-
-def get_export_name(node, replace_dots=True):
-    if isinstance(node, str):
-        return clean_name(node, replace_dots=replace_dots)
-    if node.export_name is None:
-        node.gen_name()
-        if 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),
-                replace_dots=replace_dots,
-            )
-        elif isinstance(node, TriccNodeInput):
-            node.export_name = clean_name("load." + node.name, replace_dots=replace_dots)
-        else:
-            node.export_name = clean_name(node.name, replace_dots=replace_dots)
-
-    return node.export_name
-
-
-def get_list_names(list):
-    names = []
-    for elm in list:
-        if issubclass(elm.__class__, TriccNodeBaseModel):
-            names.append(get_export_name(elm))
-        elif isinstance(elm, str):
-            names.append(elm)
-    return names