tricc-oo 1.4.18__tar.gz → 1.4.19__tar.gz

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tricc-oo
-Version: 1.4.18
+Version: 1.4.19
 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.4.18 → tricc_oo-1.4.19}/pyproject.toml

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

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo/converters/cql_to_operation.py

@@ -33,6 +33,7 @@ FUNCTION_MAP = {
 class cqlToXlsFormVisitor(cqlVisitor):
     def __init__(self):
         self.xlsform_rows = []
+        self.errors= []
         
     def resolve_scv(self, arg):
         
@@ -42,9 +43,15 @@ class cqlToXlsFormVisitor(cqlVisitor):
         # if no code or not found return None
         if arg.startswith('"') and arg.endswith('"'):
             return TriccReference(arg[1:-1])
-        else:
+        elif arg.lower() in ['true', 'false']:
+            return TriccStatic(arg.lower() == 'true')
+        elif arg != 'runner':
+            self.errors.append(f"'{arg}' will be poccessed as reference ")
             return TriccReference(arg)
         
+        else:
+            return 'runner'
+        
     def translate(self, arg, type=ANY):
         return self.resolve_scv(arg) or str(arg)
     
@@ -368,13 +375,13 @@ class CQLErrorListener(ErrorListener):
         self.errors.append(error)
 
 def transform_cql_to_operation(cql_input, context=None):
-    cql_input = f"""
+    lib_input = f"""
     library runner
     
     define "calc":
         {cql_input.replace('−', '-')}
     """
-    input_stream = InputStream(chr(10).join(cql_input.split('\n')))
+    input_stream = InputStream(chr(10).join(lib_input.split('\n')))
     lexer = cqlLexer(input_stream)
     stream = CommonTokenStream(lexer)
     parser = cqlParser(stream)
@@ -390,12 +397,18 @@ def transform_cql_to_operation(cql_input, context=None):
     # Check for errors
     if error_listener.errors:
         for error in error_listener.errors:
-            print(f"CQL Grammar Error: {error}")
+            print(f"CQL Grammar Error: {error} \n in:\n {cql_input}")
         return None  # Or handle errors as appropriate for your use case
 
     # If no errors, proceed with visitor
     visitor = cqlToXlsFormVisitor()
+    
     visitor.visit(tree)
+    if visitor.errors:
+        logger.warning(f"while visiting cql: \n{cql_input}")
+        for e in visitor.errors:
+            logger.warning(e)
+        
     return visitor.xlsform_rows[0]['calculation']
 
 def transform_cql_lib_to_operations(cql_input):

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo/models/base.py

@@ -305,7 +305,7 @@ class TriccStatic(BaseModel):
         return str(self.value)
     
     def __repr__(self):
-        return "TriccStatic:"+str(type(self.value))+':' +str(self.value)
+        return self.__class__.__name__+":"+str(type(self.value))+':' +str(self.value)
 
     def get_references(self):
         return OrderedSet()

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo/serializers/xls_form.py

@@ -62,12 +62,11 @@ def start_group(
     
     if not relevance:
         relevance_expression = ""
-    elif isinstance(relevance_expression, TriccOperation):
+    elif isinstance(relevance_expression, (TriccOperation, TriccStatic)):
         relevance_expression = strategy.get_tricc_operation_expression(
             relevance_expression
         )
-    elif isinstance(relevance_expression, TriccStatic):
-        relevance_expression = str(relevance_expression.value)
+
 
     # elif is_activity:
     #    relevance_expression = TRICC_CALC_EXPRESSION.format(get_export_name(cur_group.root))

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo/strategies/output/xlsform_cht.py

@@ -117,7 +117,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
         # pause
         ends = []
         for p in self.project.pages.values():
-            p_ends = list(filter(lambda x:  issubclass(x.__class__, TriccNodeEnd) and getattr(x, 'hint', None) is not None, p.nodes.values() ))
+            p_ends = list(filter(lambda x:  issubclass(x.__class__, TriccNodeEnd) and getattr(x, 'process', '') == 'pause', p.nodes.values() ))
             if p_ends:
                 ends += p_ends
         if ends:

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo/visitors/tricc.py

@@ -120,7 +120,7 @@ def process_calculate(node,processed_nodes, stashed_nodes, calculates, used_calc
             node_name = node.name if not isinstance(node, TriccNodeEnd) else node.get_reference()
             last_version = get_last_version(node_name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption)  else  None
             #last_version = processed_nodes.find_prev(node, lambda item: hasattr(item, 'name') and item.name == node.name)
-            if last_version:
+            if last_version and getattr(node, 'process', '') != 'pause':
                 # 0-100 for manually specified instance.  100-200 for auto instance 
                 node.version = last_version.version + 1
                 last_version.last = False
@@ -526,12 +526,15 @@ def process_reference(node, processed_nodes, calculates, used_calculates=None,
             node.reference = list(modified_expression.get_references())
             node.expression_reference = modified_expression
     elif getattr(node, 'reference', None):
-        if isinstance(node.reference, list):
+        reference = node.reference
+        if isinstance(reference, list):
+            if isinstance(node, TriccNodeWait):
+                reference = [TriccOperation(TriccOperator.ISTRUE,[n]) for n in reference]
             if len(node.reference) == 1 :
-                operation = node.reference[0]
+                operation = reference[0]
             else:
                 operation = and_join(
-                        node.reference
+                        reference
                     )
             modified_expression = process_operation_reference(
                 operation, 
@@ -1468,7 +1471,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
     expression = None
     negate_expression = None
     node = in_node
-    if isinstance(node, (TriccNodeActivityStart,TriccNodeMainStart, TriccNodeActivityEnd)):
+    if isinstance(node, (TriccNodeActivityStart,TriccNodeMainStart)):
         if is_prev and is_calculate:
             expression = get_node_expression(
                 node.activity,
@@ -1478,7 +1481,9 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
                 negate=negate,
                 process=process
             )
-        elif  isinstance(node, (TriccNodeActivityStart)):
+            if isinstance(node, TriccNodeMainStart):
+                expression =  get_applicability_expression(node.activity, processed_nodes, process, expression )
+        elif isinstance(node, (TriccNodeActivityStart)):
             return None
         
     elif isinstance(node, TriccNodeWait):
@@ -1538,7 +1543,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
         # else:    
         expression = node.expression_reference
     elif not is_prev and hasattr(node, 'relevance') and isinstance(node.relevance, TriccOperation):
-        expression = node.relevance  
+        expression = node.relevance     
     elif is_prev and isinstance(node, TriccNodeSelectOption):
         if negate:
             negate_expression = get_selected_option_expression(node, negate)
@@ -1625,6 +1630,9 @@ def get_process_skip_expression(node, processed_nodes, process, expression=None)
     f_end_expression = get_end_expression(processed_nodes)
     if f_end_expression:
         end_expressions.append(f_end_expression)
+    b_end_expression = get_end_expression(processed_nodes, 'pause')
+    if b_end_expression:
+        end_expressions.append(b_end_expression)        
     if process[0] in PROCESSES:
         for p in PROCESSES[PROCESSES.index(process[0])+1:]:
             p_end_expression = get_end_expression(processed_nodes, p)

{tricc_oo-1.4.18 → tricc_oo-1.4.19}/tricc_oo.egg-info/PKG-INFO

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