pathling 9.5.0.dev0__tar.gz → 9.6.0.dev0__tar.gz

{pathling-9.5.0.dev0 → pathling-9.6.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pathling
-Version: 9.5.0.dev0
+Version: 9.6.0.dev0
 Summary: Python API for Pathling
 Project-URL: Homepage, https://github.com/aehrc/pathling
 Author-email: "Australian e-Health Research Centre, CSIRO" <pathling@csiro.au>

{pathling-9.5.0.dev0 → pathling-9.6.0.dev0}/pathling/_version.py

@@ -2,8 +2,8 @@
 # Auto generated from POM project version.
 # Please do not modify.
 #
-__version__="9.5.0.dev0"
-__java_version__="9.5.0-SNAPSHOT"
+__version__="9.6.0.dev0"
+__java_version__="9.6.0-SNAPSHOT"
 __scala_version__="2.13"
 __delta_version__="4.0.0"
 __hadoop_version__="3.4.1"

{pathling-9.5.0.dev0 → pathling-9.6.0.dev0}/pathling/context.py

@@ -41,6 +41,21 @@ def _convert_java_value(value):
     return str(value)
 
 
+def _convert_typed_values(jtyped_values) -> list:
+    """Converts a Java list of TypedValue objects to Python dicts.
+
+    :param jtyped_values: iterable of Java TypedValue objects with getType() and getValue()
+    :return: list of dicts with ``type`` and ``value`` keys
+    """
+    results = []
+    for jtyped_value in jtyped_values:
+        value = jtyped_value.getValue()
+        if value is not None:
+            value = _convert_java_value(value)
+        results.append({"type": jtyped_value.getType(), "value": value})
+    return results
+
+
 class StorageType:
     MEMORY: str = "memory"
     DISK: str = "disk"
@@ -453,7 +468,8 @@ class PathlingContext:
                expression is composed with the context expression
         :param variables: optional named variables available via %variable syntax, or None
         :return: a dict with ``results`` (list of dicts with ``type`` and ``value``
-                 keys) and ``expectedReturnType`` (string)
+                 keys), ``expectedReturnType`` (string), and ``traces`` (list of
+                 dicts with ``label`` and ``values`` keys)
         :raises: Exception if the expression is invalid or evaluation fails
         """
         jresult = self._jpc.evaluateFhirPath(
@@ -464,16 +480,21 @@ class PathlingContext:
             variables,
         )
         # Convert Java FhirPathResult to Python dict.
-        results = []
-        for jtyped_value in jresult.getResults():
-            value = jtyped_value.getValue()
-            # Convert Java types to Python types.
-            if value is not None:
-                value = _convert_java_value(value)
-            results.append({"type": jtyped_value.getType(), "value": value})
+        results = _convert_typed_values(jresult.getResults())
+
+        # Convert trace results.
+        traces = [
+            {
+                "label": jtrace.getLabel(),
+                "values": _convert_typed_values(jtrace.getValues()),
+            }
+            for jtrace in jresult.getTraces()
+        ]
+
         return {
             "results": results,
             "expectedReturnType": jresult.getExpectedReturnType(),
+            "traces": traces,
         }
 
     def search_to_column(self, resource_type: str, search_expression: str) -> Column:

{pathling-9.5.0.dev0 → pathling-9.6.0.dev0}/pathling/datasource.py

@@ -72,7 +72,7 @@ class DataSource(SparkConversionsMixin):
         self,
         resource: Optional[str] = None,
         select: Optional[Sequence[Dict]] = None,
-        constants: Optional[Sequence[Dict]] = None,
+        constant: Optional[Sequence[Dict]] = None,
         where: Optional[Sequence[Dict]] = None,
         json: Optional[str] = None,
     ) -> DataFrame:
@@ -82,7 +82,7 @@ class DataSource(SparkConversionsMixin):
         :param resource: The FHIR resource that the view is based upon, e.g. 'Patient' or
                'Observation'.
         :param select: A list of columns and nested selects to include in the view.
-        :param constants: A list of constants that can be used in FHIRPath expressions.
+        :param constant: A list of constants that can be used in FHIRPath expressions.
         :param where: A list of FHIRPath expressions that can be used to filter the view.
         :param json: A JSON string representing the view definition, as an alternative to providing
                the parameters as Python objects.
@@ -96,7 +96,7 @@ class DataSource(SparkConversionsMixin):
             args = locals()
             query = {
                 key: args[key]
-                for key in ["resource", "select", "constants", "where"]
+                for key in ["resource", "select", "constant", "where"]
                 if args[key] is not None
             }
             query_json = dumps(query)

{pathling-9.5.0.dev0 → pathling-9.6.0.dev0}/pyproject.toml

@@ -1,4 +1,4 @@
-#  Copyright © 2018-2025 Commonwealth Scientific and Industrial Research
+#  Copyright © 2018-2026 Commonwealth Scientific and Industrial Research
 #  Organisation (CSIRO) ABN 41 687 119 230.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");