tricc-oo 1.5.13__tar.gz → 1.5.15__tar.gz

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/PKG-INFO

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

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

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/converters/cql_to_operation.py

@@ -305,9 +305,7 @@ class cqlToXlsFormVisitor(cqlVisitor):
     def visitUnionExpression(self, ctx):
         raise NotImplementedError('union not supported')
 
-    def visitThisInvocation(self, ctx):
-        # TODO
-        raise NotImplementedError('Implies not supported')
+    
 
     def visitQuantity(self, ctx):
         # TODO

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/converters/drawio_type_map.py

@@ -44,7 +44,7 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
-            "priority"
+            "priority", "trigger", "default"
 
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
@@ -60,7 +60,7 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
-            "priority"
+            "priority", "trigger", "default"
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectMultiple
@@ -75,7 +75,7 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
-            "priority"
+            "priority", "trigger", "default"
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDecimal
@@ -90,7 +90,7 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
-            "priority"
+            "priority", "trigger", "default"
             
         ],
         "mandatory_attributes": ["label", "name"],
@@ -99,43 +99,43 @@ TYPE_MAP = {
 
     TriccNodeType.text: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority"],
+        "attributes": ["save", "relevance","priority", "trigger", "default"],
         "mandatory_attributes": ["label", 'name'],
         "model": TriccNodeText
     },
     TriccNodeType.date: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance","priority"],
+        "attributes": ["save", "relevance","priority", "trigger", "default"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDate
     },
     TriccNodeType.add: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
+        "attributes": ["save", "expression", "trigger"],
         "mandatory_attributes": ['label', "name"],
         "model": TriccNodeAdd
     },
     TriccNodeType.count: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
+        "attributes": ["save", "expression", "trigger"],
         "mandatory_attributes": ['label', "name"],
         "model": TriccNodeCount
     },
     TriccNodeType.calculate: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference"],
+        "attributes": ["save", "reference", "trigger"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeCalculate
     },
     TriccNodeType.rhombus: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression", 'label','priority'],
+        "attributes": ["save", "expression", 'label','priority', "trigger"],
         "mandatory_attributes": ["reference"],
         "model": TriccNodeRhombus
     },
     TriccNodeType.wait: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression"],
+        "attributes": ["save", "expression", "trigger"],
         "mandatory_attributes": ["reference", "name", 'label'],
         "model": TriccNodeWait
     },
@@ -159,7 +159,7 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
-            "relevance","priority"
+            "relevance","priority", "trigger", "default"
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectYesNo
@@ -208,7 +208,7 @@ TYPE_MAP = {
     },
     TriccNodeType.proposed_diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference", "severity", "priority"],
+        "attributes": ["save", "reference", "severity", "priority", "trigger"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeProposedDiagnosis
     },

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/converters/xml_to_tricc.py

@@ -644,10 +644,14 @@ def add_tricc_base_node(
 
 
 def load_expressions(node):
+    if getattr(node, 'constraint', None):
+        node.constraint = parse_expression('', node.constraint)
     if getattr(node, 'expression', None):
         node.expression = parse_expression('', node.expression)
     if getattr(node, 'relevance', None):
         node.relevance = parse_expression('', node.relevance)
+    if getattr(node, 'trigger', None):
+        node.trigger = parse_expression('', node.trigger)
     if getattr(node, 'default', None):
         node.default = parse_expression('', node.default)
     if getattr(node, 'reference', None):

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/models/calculate.py

@@ -20,7 +20,8 @@ class TriccNodeDisplayCalculateBase(TriccNodeCalculateBase):
     save: Optional[str] = None  # contribute to another calculate
     hint: Optional[str] = None  # for diagnostic display
     help: Optional[str] = None  # for diagnostic display
-    applicability: Optional[Union[Expression, TriccOperation]] = None
+    trigger: Optional[Union[Expression, TriccOperation, TriccReference]] = None
+    applicability: Optional[Union[Expression, TriccOperation, TriccReference]] = None
     # no need to copy save
     def to_fake(self):
         data = vars(self)
@@ -75,10 +76,10 @@ class TriccRhombusMixIn():
         reference = []
         expression_reference = None
         instance.path = None
-        if isinstance(self.expression_reference, (str, TriccOperation)):
+        if isinstance(self.expression_reference, (str, TriccOperation, TriccReference, TriccStatic)):
             expression_reference = self.expression_reference.copy()
             reference = list(expression_reference.get_references())
-        if isinstance(self.reference, (str, TriccOperation)):
+        if isinstance(self.reference, (str, TriccOperation, TriccReference, TriccStatic)):
             expression_reference = self.reference.copy()
             reference = list(expression_reference.get_references())
         elif isinstance(self.reference, list):

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/models/tricc.py

@@ -237,6 +237,8 @@ class TriccNodeDisplayModel(TriccNodeBaseModel):
     help: Optional[Union[str, TriccNodeBaseModel]] = None
     group: Optional[Union[TriccGroup, TriccNodeActivity]] = None
     relevance: Optional[Union[Expression, TriccOperation]] = None
+    default: Optional[Union[Expression, TriccOperation, TriccReference, TriccStatic]] = None
+    trigger: Optional[Union[Expression, TriccOperation, TriccReference]] = None
     priority: Union[float, int, None] = None
 
     # to use the enum value of the TriccNodeType

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/serializers/xls_form.py

@@ -231,6 +231,7 @@ SURVEY_MAP = {
     **langs.get_trads_map("required_message"),
     "read only": "read only",
     "calculation": "expression",
+    "trigger": "trigger",
     "repeat_count": "repeat_count",
     "media::image": "image",
     "choice_filter": "",
@@ -602,6 +603,7 @@ def get_input_line(node, replace_dots=True):
         "",  #'required'
         *list(empty.values()),  #'required message'
         "",  #'read only'
+        "",
         "",  #'expression'
         "",  #'repeat_count'
         "",  #'image'
@@ -629,6 +631,7 @@ def get_input_calc_line(node, replace_dots=True):
         "",  #'read only'
         "../inputs/contact/"
         + clean_name(node.name, replace_dots=replace_dots),  #'expression'
+        "",
         "",  #'repeat_count'
         "",  #'image'
         "",  # choice filter

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/strategies/output/xlsform_cdss.py

@@ -70,6 +70,7 @@ class XLSFormCDSSStrategy(XLSFormStrategy):
             *list(empty.values()) ,#'required message'
             '',#'read only'
             '',#'expression'
+            "",
             '',#'repeat_count'
             '',#'image' 
             ''
@@ -90,6 +91,7 @@ class XLSFormCDSSStrategy(XLSFormStrategy):
             *list(empty.values()) ,#'required message'
             '',#'read only'
             '',#'expression'
+            "",
             '',#'repeat_count'
             '',#'image' 
             ''
@@ -110,6 +112,7 @@ class XLSFormCDSSStrategy(XLSFormStrategy):
             *list(empty.values()) ,#'required message'
             '',#'read only'
             '',#'expression'
+            "",
             '',#'repeat_count'
             '',#'image' 
             ''
@@ -133,6 +136,7 @@ class XLSFormCDSSStrategy(XLSFormStrategy):
             '1',#'required'
             *list(empty.values()) ,#'required message'
             '',#'read only'
+            "",
             '',#'expression'
             '',#'repeat_count'
             '',#'image' 

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/strategies/output/xlsform_cht.py

@@ -61,6 +61,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "hidden",
@@ -81,6 +82,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "hidden",
@@ -101,6 +103,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         df_input.loc[len(df_input)] = [
@@ -122,6 +125,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "string",
@@ -142,6 +146,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "string",
@@ -162,6 +167,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "string",
@@ -182,6 +188,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "end_group",
@@ -202,6 +209,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "begin_group",
@@ -222,6 +230,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         inputs = self.export_inputs(start_pages[self.processes[0]], **kwargs)
         for input in inputs:
@@ -246,6 +255,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         df_input.loc[len(df_input)] = [
@@ -267,6 +277,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         df_input.loc[len(df_input)] = [
@@ -288,6 +299,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         df_input.loc[len(df_input)] = [
@@ -309,6 +321,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         self.get_contact_inputs_calculate(df_input)
         df_input.loc[len(df_input)] = [
@@ -327,6 +340,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/user/contact_id",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -347,6 +361,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/user/facility_id",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -367,6 +382,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/user/name",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -387,6 +403,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/contact/_id",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -408,6 +425,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/source_id",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -428,6 +446,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             *list(empty.values()),  #'required message'
             "",  #'read only'
             "../inputs/user/facility_id",  #'expression'
+            "",
             "",  #'repeat_count'
             "",  #'image'
             "",  # choice filter
@@ -451,6 +470,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         for input in inputs:
@@ -480,6 +500,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
                 "",
                 "",
                 "",
+                "",
             ]
         if not len(df_input[df_input['name'] == 'date_of_birth']):
             df_input.loc[len(df_input)] = [
@@ -501,6 +522,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
                 "",
                 "",
                 "",
+                "",
             ]
 
             return df_input
@@ -527,6 +549,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
         df_input.loc[len(df_input)] = [
             "calculate",
@@ -547,6 +570,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
             "",
+            "",
         ]
 
         return df_input

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo/visitors/tricc.py

@@ -591,6 +591,22 @@ def process_reference(node, processed_nodes, calculates, used_calculates=None,
             return False
         elif modified_expression and replace_reference:
             node.relevance = modified_expression
+            
+    if isinstance(getattr(node, 'trigger', None), (TriccOperation, TriccReference)):
+        modified_expression = process_operation_reference(
+            node.trigger, 
+            node, 
+            processed_nodes=processed_nodes,
+            calculates=calculates, 
+            used_calculates=used_calculates, 
+            replace_reference=replace_reference,
+            warn=warn, 
+            codesystems=codesystems
+        )
+        if modified_expression is False:
+            return False
+        elif modified_expression and replace_reference:
+            node.trigger = modified_expression
     
     if isinstance(getattr(node, 'default', None), (TriccOperation, TriccReference)):
         modified_expression = process_operation_reference(
@@ -2101,7 +2117,7 @@ def get_rhombus_terms( node, processed_nodes, get_overall_exp=False, negate=Fals
                                                                                                         node.get_name()))
                     exit(1)
             elif node.expression_reference is not None and node.expression_reference != '':
-                if isinstance(node.expression_reference, TriccOperation):
+                if isinstance(node.expression_reference, (TriccOperation, TriccReference, TriccStatic)):
                     return node.expression_reference
                 elif isinstance(node.expression_reference, str):
                     expression = node.expression_reference.format(*get_list_names(node.reference))

{tricc_oo-1.5.13 → tricc_oo-1.5.15}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.13
+Version: 1.5.15
 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.13 → tricc_oo-1.5.15}/tricc_oo.egg-info/top_level.txt

@@ -1,8 +1,6 @@
-build
 diagrams
 dist
 locales
 tests
-tools
 tricc_oo
 uploads