tricc-oo 1.6.11__tar.gz → 1.6.12__tar.gz

{tricc_oo-1.6.11/tricc_oo.egg-info → tricc_oo-1.6.12}/PKG-INFO

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

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

{tricc_oo-1.6.11 → tricc_oo-1.6.12}/tricc_oo/serializers/xls_form.py

@@ -64,36 +64,7 @@ def start_group(
         groups[name] = 0
     relevance = relevance and cur_group.relevance is not None and cur_group.relevance != ""
     past_instances = len(getattr(cur_group.base_instance, "instances", []))
-    group_calc_required = relevance is not None and (len(str(relevance)) > 100 or past_instances > 1)
     calc = None
-    if group_calc_required and getattr(cur_group.relevance, 'operator', None) != TriccOperator.ISTRUE:
-
-        calc = TriccNodeCalculate(
-            id=generate_id(get_export_group_name(name)),
-            group=cur_group.group,
-            activity=cur_group.activity,
-            name=get_export_group_name(name),
-            expression=cur_group.relevance.copy()
-        )
-
-        if calc not in cur_group.activity.calculates:
-            process_reference(
-                calc,
-                processed_nodes,
-                calculates=kwargs.get('calculates', None),
-                used_calculates=kwargs.get('used_calculates', None),
-                replace_reference=True,
-                warn=False,
-                codesystems=kwargs.get('codesystems', None)
-            )
-            cur_group.activity.calculates.append(calc)
-            cur_group.activity.nodes[calc.id] = calc
-            processed_nodes.add(calc)
-
-        cur_group.relevance = TriccOperation(
-                TriccOperator.ISTRUE,
-                [calc]
-            )
 
     relevance_expression = cur_group.relevance
     relevance_expression = get_applicability_expression(cur_group, processed_nodes, process, relevance_expression)
@@ -124,23 +95,7 @@ def start_group(
             values.append(get_xfrom_trad(strategy, cur_group, column, SURVEY_MAP))
     df_survey.loc[len(df_survey)] = values
 
-    # calc
-    if calc and len(df_calculate[df_calculate["name"] == get_export_group_name(name)]) == 0:
-        calc_values = []
-        for column in SURVEY_MAP:
-            if column == "type":
-                calc_values.append("calculate")
-            elif column == "name":
-                value = get_export_name(calc)
-                calc_values.append(value)
-            elif column == "calculation":
-                calc_values.append(f"number({strategy.get_tricc_operation_expression(calc.expression)})")
-            elif column == "relevance":
-                calc_values.append("")
-            else:
-                calc_values.append(get_xfrom_trad(strategy, cur_group, column, SURVEY_MAP))
-
-        df_calculate.loc[len(df_calculate)] = calc_values
+    # Group calculates are now created during process_calculate phase
 
 
 # def add_background_color(input_string, color):

{tricc_oo-1.6.11 → tricc_oo-1.6.12}/tricc_oo/strategies/output/xlsform_cht.py

@@ -821,34 +821,22 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             return jar_path
 
     def _ensure_odk_validate_jar(self):
-        """Ensure ODK Validate JAR is available by extracting from medic zip."""
+        """Ensure ODK Validate JAR is available by downloading from GitHub releases."""
         jar_path = os.path.join(os.path.dirname(__file__), "ODK_Validate.jar")
 
         # Check if JAR already exists
         if os.path.exists(jar_path):
             return jar_path
 
-        # Extract JAR from medic zip
-        medic_zip_path = os.path.join(os.path.dirname(__file__), "xls2xform-medic")
-        if not os.path.exists(medic_zip_path):
-            logger.error("xls2xform-medic zip not found, cannot extract ODK Validate JAR")
-            return None
-
+        # Download JAR from GitHub releases
+        jar_url = "https://github.com/getodk/validate/releases/download/v1.19.2/validate.jar"
         try:
-            with zipfile.ZipFile(medic_zip_path, 'r') as zip_ref:
-                # Extract the JAR from the zip
-                jar_in_zip = "site-packages/pyxform/validators/odk_validate/bin/ODK_Validate.jar"
-                zip_ref.extract(jar_in_zip, os.path.dirname(__file__))
-
-                # Move to final location
-                extracted_jar = os.path.join(os.path.dirname(__file__), jar_in_zip)
-                shutil.move(extracted_jar, jar_path)
-
-            logger.info(f"Extracted ODK Validate JAR to {jar_path}")
+            import urllib.request
+            urllib.request.urlretrieve(jar_url, jar_path)
+            logger.info(f"Downloaded ODK Validate JAR to {jar_path}")
             return jar_path
-
         except Exception as e:
-            logger.error(f"Failed to extract ODK Validate JAR: {str(e)}")
+            logger.error(f"Failed to download ODK Validate JAR: {str(e)}")
             return None
 
     def tricc_operation_zscore(self, ref_expressions):

{tricc_oo-1.6.11 → tricc_oo-1.6.12}/tricc_oo/visitors/tricc.py

@@ -57,6 +57,16 @@ logger = logging.getLogger("default")
 ONE_QUESTION_AT_A_TIME = False
 
 
+def get_main_activity(activity, processed_nodes):
+    """Traverse up the activity hierarchy to find the main activity (root activity)."""
+    activities = list(set(
+        n.activity for n in  activity.relevance.get_references()
+        if hasattr(n, 'activity') and n.activity != activity and n.activity.root in processed_nodes
+    ))
+    if activities:
+        return activities[0]
+
+
 def merge_node(from_node, to_node):
     if from_node.activity != to_node.activity:
         logger.critical("Cannot merge nodes from different activities")
@@ -123,7 +133,7 @@ def get_last_version(name, processed_nodes, _list=None):
 def get_node_expressions(node, processed_nodes, process=None):
     get_overall_exp = issubclass(
         node.__class__,
-        (TriccNodeDisplayCalculateBase, TriccNodeProposedDiagnosis, TriccNodeDiagnosis)
+        (TriccNodeDisplayCalculateBase, TriccNodeProposedDiagnosis, TriccNodeDiagnosis, TriccNodeActivity)
     ) and not isinstance(node, (TriccNodeDisplayBridge))
     expression = None
     # in case of recursive call processed_nodes will be None
@@ -245,7 +255,29 @@ def load_calculate(
             if hasattr(node, "relevance") and (node.relevance is None or isinstance(node.relevance, TriccOperation)):
                 node.relevance = get_node_expressions(node, processed_nodes=processed_nodes, process=process)
                 # manage not Available
-                if isinstance(node, TriccNodeSelectNotAvailable):
+                if isinstance(node, TriccNodeActivity) and isinstance(node.root, TriccNodeActivityStart):
+                    past_instances = len(getattr(node.base_instance, "instances", []))
+                    group_calc_required = False  # (len(str(node.relevance)) > 50 or past_instances > 1 or len(node.calculates)>0)
+                    calc = None
+                    
+                    if group_calc_required and getattr(node.relevance, 'operator', None) != TriccOperator.ISTRUE:
+                        main_activity = get_main_activity(node, processed_nodes)
+                        if  main_activity:
+                            calc = TriccNodeCalculate(
+                                id=generate_id(f"gc.{node.id}"),
+                                group=main_activity.group,
+                                activity=main_activity,
+                                name=f"gc.{node.name}",
+                                expression_reference=node.relevance.copy()
+                            )
+                            main_activity.calculates.append(calc)
+                            main_activity.nodes[calc.id] = calc
+                            processed_nodes.add(calc)
+                            node.relevance = TriccOperation(
+                                    TriccOperator.ISTRUE,
+                                    [calc]
+                            )
+                elif isinstance(node, TriccNodeSelectNotAvailable):
                     # update the checkbox
                     if node.parent:
                         if len(node.prev_nodes) == 1:
@@ -1735,14 +1767,14 @@ def replace_next_node(prev_node, next_node, old_node):
 
 
 # Priority constants
-SAME_GROUP_PRIORITY = 7000
-PARENT_GROUP_PRIORITY = 6000
-ACTIVE_ACTIVITY_PRIORITY = 5000
-NON_START_ACTIVITY_PRIORITY = 4000
-ACTIVE_ACTIVITY_LOWER_PRIORITY = 3000
-FLOW_CALCULATE_NODE_PRIORITY = 6500
+SAME_GROUP_PRIORITY = 4000
+PARENT_GROUP_PRIORITY = 3000
+ACTIVE_ACTIVITY_PRIORITY = 1400
+NON_START_ACTIVITY_PRIORITY = 1300
+ACTIVE_ACTIVITY_LOWER_PRIORITY = 1200
+FLOW_CALCULATE_NODE_PRIORITY = 2000
 RHOMBUS_PRIORITY = 1000
-DEFAULT_PRIORITY = 2000
+DEFAULT_PRIORITY = 1100
 
 
 def reorder_node_list(node_list, group, processed_nodes):
@@ -1780,6 +1812,8 @@ def reorder_node_list(node_list, group, processed_nodes):
             priority += RHOMBUS_PRIORITY
         else:
             priority += DEFAULT_PRIORITY
+        
+        priority = max(priority, max((get_priority(prev_node) for prev_node in node.prev_nodes), default=0))
 
         return priority
 
@@ -1829,6 +1863,7 @@ def get_node_expression(in_node, processed_nodes, get_overall_exp=False, is_prev
     expression = None
     negate_expression = None
     node = in_node
+ 
     if isinstance(node, (TriccNodeActivityStart, TriccNodeMainStart)):
         if is_prev and get_overall_exp:
             expression = get_node_expression(

{tricc_oo-1.6.11 → tricc_oo-1.6.12/tricc_oo.egg-info}/PKG-INFO

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