oehrpy 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

{oehrpy-0.1.0.dist-info → oehrpy-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oehrpy
-Version: 0.1.0
+Version: 0.1.1
 Summary: A Python SDK for openEHR with type-safe Reference Model classes, template builders, and EHRBase client
 Project-URL: Homepage, https://github.com/platzhersh/oehrpy
 Project-URL: Documentation, https://github.com/platzhersh/oehrpy#readme

{oehrpy-0.1.0.dist-info → oehrpy-0.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 openehr_sdk/__init__.py,sha256=Rzs3NFgVa-P2ljZu2-OXcgkKBrhE_mAwWf9HnnVwrB8,1295
 openehr_sdk/aql/__init__.py,sha256=auR0SKnnnAhzRzq2nU0YZSzUPKmAzYoXXdWs9Kxzoq8,958
-openehr_sdk/aql/builder.py,sha256=APYpX-MhgKllz8USb1XLnW8zI4BN3ZTe5Wxv1DjIex4,17053
+openehr_sdk/aql/builder.py,sha256=XptfUJVuMbUAa-LY-XFWxWDXFzBbMSHZStNloz2PAGo,17053
 openehr_sdk/client/__init__.py,sha256=swqiwHCbwyIvq_newgkUEfGq6FvHV_CFfU_fYw2rw08,626
-openehr_sdk/client/ehrbase.py,sha256=kTY6j0cTDWfJxinWizODzhZ2xO9NcAGjkyFgaYArvtQ,20740
+openehr_sdk/client/ehrbase.py,sha256=m3Ml8MZ0YBzY6oWOWgpxc2aqWytfTth35E7e3FVWr-k,22242
 openehr_sdk/rm/__init__.py,sha256=yS5JAFaUuoo3D-k_Q9V78j2cBQKTW4EMK9LYEl34ZAc,457
-openehr_sdk/rm/rm_types.py,sha256=QQtWk5QZD-Xh8VAPScPQYnXu-zoQar94ZFv2JPSzQUc,50511
+openehr_sdk/rm/rm_types.py,sha256=7DLcfubGplYPIhF6byBsrnEO0ayOw_bBeJbzrDqbZ-Q,50518
 openehr_sdk/serialization/__init__.py,sha256=aucmds3NXlq1nQrjQNZnYR6PzqT63lAcCLh3og2AtM8,748
 openehr_sdk/serialization/canonical.py,sha256=hQMLaKWne9Ep_mv0VrT7kJa0y89C37YEB5owRpACRag,6325
 openehr_sdk/serialization/flat.py,sha256=w8hh6jGGsVHzvnjm1RlMoAhAxuhLumfuV_rrC5sH60A,13122
@@ -12,7 +12,7 @@ openehr_sdk/templates/__init__.py,sha256=_9Fwua5Mw_mM5n9CaKqXql12GSQyVvqdc_-J-jx
 openehr_sdk/templates/builder_generator.py,sha256=oTYcsvmwGasUfGU3zmW9O79eCFyyprO4hkGJ5SvMB5I,13679
 openehr_sdk/templates/builders.py,sha256=CJuOrobrCNWBbEyHbVJTzGqxApZ7CAyZrhUmY9ctvWg,13665
 openehr_sdk/templates/opt_parser.py,sha256=WzOFYUHgAYTn7hk8LWghqP2gjiG9t3LWlYpQ3-999pg,12423
-oehrpy-0.1.0.dist-info/METADATA,sha256=Tf-pVSj8lJ4wPt7rFBMnAkTjRgcnznH8p2ZC5WYm91E,11972
-oehrpy-0.1.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-oehrpy-0.1.0.dist-info/licenses/LICENSE,sha256=2RQ4UN7dGDVJh_e9NTzuaUzdMWMDsy1jgLPxKxJahus,1073
-oehrpy-0.1.0.dist-info/RECORD,,
+oehrpy-0.1.1.dist-info/METADATA,sha256=oxbOaOJ4OQ0btd6x7NvUsWlz6Leo5N1KdeuJpWjb80g,11972
+oehrpy-0.1.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+oehrpy-0.1.1.dist-info/licenses/LICENSE,sha256=2RQ4UN7dGDVJh_e9NTzuaUzdMWMDsy1jgLPxKxJahus,1073
+oehrpy-0.1.1.dist-info/RECORD,,

openehr_sdk/aql/builder.py

@@ -66,7 +66,7 @@ class FromClause:
 
         # EHR clause
         if self.ehr_id_param:
-            parts.append(f"EHR {self.ehr_alias}[ehr_id/value=:{self.ehr_id_param}]")
+            parts.append(f"EHR {self.ehr_alias}[ehr_id/value=${self.ehr_id_param}]")
         else:
             parts.append(f"EHR {self.ehr_alias}")
 
@@ -178,7 +178,7 @@ class AQLBuilder:
         ...     .select("c/context/start_time/value", alias="time")
         ...     .from_ehr("e")
         ...     .contains_composition("c", "IDCR - Vital Signs Encounter.v1")
-        ...     .where("e/ehr_id/value = :ehr_id")
+        ...     .where("e/ehr_id/value = $ehr_id")
         ...     .order_by("c/context/start_time/value", descending=True)
         ...     .limit(10)
         ...     .build()
@@ -269,7 +269,7 @@ class AQLBuilder:
 
         if archetype_id:
             param_name = f"{alias}_archetype_id"
-            containment = f"{rm_type} {alias}[archetype_id/value=:{param_name}]"
+            containment = f"{rm_type} {alias}[archetype_id/value=${param_name}]"
             self._parameters[param_name] = archetype_id
         else:
             containment = f"{rm_type} {alias}"
@@ -299,7 +299,7 @@ class AQLBuilder:
             self._from_clause = FromClause()
 
         if archetype_id:
-            containment = f"COMPOSITION {alias}[archetype_id/value=:{alias}_archetype_id]"
+            containment = f"COMPOSITION {alias}[archetype_id/value=${alias}_archetype_id]"
             self._parameters[f"{alias}_archetype_id"] = archetype_id
         else:
             containment = f"COMPOSITION {alias}"
@@ -309,7 +309,7 @@ class AQLBuilder:
         # Add template_id filter as parameterized WHERE clause
         if template_id:
             self._where_clause.add(
-                f"{alias}/archetype_details/template_id/value = :{template_id_param}"
+                f"{alias}/archetype_details/template_id/value = ${template_id_param}"
             )
             self._parameters[template_id_param] = template_id
 
@@ -373,7 +373,7 @@ class AQLBuilder:
         Returns:
             Self for method chaining.
         """
-        return self.where(f"{ehr_alias}/ehr_id/value = :{param_name}")
+        return self.where(f"{ehr_alias}/ehr_id/value = ${param_name}")
 
     def where_template(
         self,
@@ -391,7 +391,7 @@ class AQLBuilder:
         Returns:
             Self for method chaining.
         """
-        self.where(f"{composition_alias}/archetype_details/template_id/value = :{param_name}")
+        self.where(f"{composition_alias}/archetype_details/template_id/value = ${param_name}")
         if template_id:
             self._parameters[param_name] = template_id
         return self
@@ -417,10 +417,10 @@ class AQLBuilder:
             Self for method chaining.
         """
         if start:
-            self.where(f"{path} >= :{start_param}")
+            self.where(f"{path} >= ${start_param}")
             self._parameters[start_param] = start
         if end:
-            self.where(f"{path} <= :{end_param}")
+            self.where(f"{path} <= ${end_param}")
             self._parameters[end_param] = end
         return self
 

openehr_sdk/client/ehrbase.py

@@ -110,13 +110,25 @@ class CompositionResponse:
     @classmethod
     def from_response(cls, data: dict[str, Any], ehr_id: str | None = None) -> CompositionResponse:
         """Create from API response."""
+        # Try canonical format first (uid is a dict with "value" key)
         uid_data = data.get("uid")
         uid = uid_data.get("value", "") if isinstance(uid_data, dict) else uid_data or ""
+
+        template_id = data.get("archetype_details", {}).get("template_id", {}).get("value")
+        archetype_id = data.get("archetype_details", {}).get("archetype_id", {}).get("value")
+
+        # For FLAT format responses, extract uid from */_uid key
+        if not uid:
+            for key, value in data.items():
+                if key.endswith("/_uid") and isinstance(value, str):
+                    uid = value
+                    break
+
         return cls(
             uid=uid,
             ehr_id=ehr_id,
-            template_id=data.get("archetype_details", {}).get("template_id", {}).get("value"),
-            archetype_id=data.get("archetype_details", {}).get("archetype_id", {}).get("value"),
+            template_id=template_id,
+            archetype_id=archetype_id,
             composition=data,
         )
 
@@ -318,24 +330,37 @@ class EHRBaseClient:
         Returns:
             EHRResponse with the created EHR details.
         """
-        headers = {}
+        headers: dict[str, str] = {"Prefer": "return=representation"}
         if ehr_id:
-            headers["Prefer"] = "return=representation"
             response = await self.client.put(
                 f"/rest/openehr/v1/ehr/{ehr_id}",
                 headers=headers,
             )
         else:
-            headers["Prefer"] = "return=representation"
-            params = {}
-            if subject_id:
-                params["subject_id"] = subject_id
-            if subject_namespace:
-                params["subject_namespace"] = subject_namespace
+            body = None
+            if subject_id and subject_namespace:
+                body = {
+                    "_type": "EHR_STATUS",
+                    "archetype_node_id": "openEHR-EHR-EHR_STATUS.generic.v1",
+                    "name": {"value": "EHR Status"},
+                    "subject": {
+                        "external_ref": {
+                            "id": {
+                                "_type": "GENERIC_ID",
+                                "value": subject_id,
+                                "scheme": "id_scheme",
+                            },
+                            "namespace": subject_namespace,
+                            "type": "PERSON",
+                        }
+                    },
+                    "is_modifiable": True,
+                    "is_queryable": True,
+                }
             response = await self.client.post(
                 "/rest/openehr/v1/ehr",
                 headers=headers,
-                params=params if params else None,
+                json=body,
             )
 
         data = self._handle_response(response)
@@ -439,9 +464,17 @@ class EHRBaseClient:
         """
         format_str = format.value if isinstance(format, CompositionFormat) else format
 
+        # Extract versioned object UID (uuid::system::version -> uuid::system)
+        uid_parts = composition_uid.split("::")
+        versioned_object_uid = "::".join(uid_parts[:2]) if len(uid_parts) >= 2 else composition_uid
+
+        params: dict[str, str] = {}
+        if format_str:
+            params["format"] = format_str
+
         response = await self.client.get(
-            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{composition_uid}",
-            params={"format": format_str} if format_str else None,
+            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{versioned_object_uid}",
+            params=params if params else None,
         )
 
         data = self._handle_response(response)
@@ -469,8 +502,9 @@ class EHRBaseClient:
         """
         format_str = format.value if isinstance(format, CompositionFormat) else format
 
-        # Extract base UID without version
-        base_uid = composition_uid.split("::")[0] if "::" in composition_uid else composition_uid
+        # Extract versioned object UID (uuid::system::version -> uuid::system)
+        uid_parts = composition_uid.split("::")
+        versioned_object_uid = "::".join(uid_parts[:2]) if len(uid_parts) >= 2 else composition_uid
 
         headers = {
             "Prefer": "return=representation",
@@ -485,7 +519,7 @@ class EHRBaseClient:
             params["format"] = format_str
 
         response = await self.client.put(
-            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{base_uid}",
+            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{versioned_object_uid}",
             json=composition,
             headers=headers,
             params=params if params else None,
@@ -505,10 +539,12 @@ class EHRBaseClient:
             ehr_id: The EHR ID.
             composition_uid: The composition UID.
         """
-        base_uid = composition_uid.split("::")[0] if "::" in composition_uid else composition_uid
+        # Extract versioned object UID (uuid::system::version -> uuid::system)
+        uid_parts = composition_uid.split("::")
+        versioned_object_uid = "::".join(uid_parts[:2]) if len(uid_parts) >= 2 else composition_uid
 
         response = await self.client.delete(
-            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{base_uid}",
+            f"/rest/openehr/v1/ehr/{ehr_id}/composition/{versioned_object_uid}",
         )
         self._handle_response(response)
 

openehr_sdk/rm/rm_types.py

@@ -1030,7 +1030,7 @@ class HISTORY(BaseModel):
     archetype_details: ARCHETYPED | None = None
     feeder_audit: FEEDER_AUDIT | None = None
     links: list[LINK] | None = None
-    origin: DV_DATE_TIME | None
+    origin: DV_DATE_TIME | None = None
     period: DV_DURATION | None = None
     duration: DV_DURATION | None = None
     summary: Any | None = None