compressedfhir 1.0.5__tar.gz → 1.0.7__tar.gz

{compressedfhir-1.0.5/compressedfhir.egg-info → compressedfhir-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compressedfhir
-Version: 1.0.5
+Version: 1.0.7
 Summary: Stores FHIR JSON resources in compressed form in memory
 Home-page: https://github.com/icanbwell/compressed-fhir
 Author: Imran Qureshi

compressedfhir-1.0.7/VERSION

@@ -0,0 +1 @@
+1.0.7

{compressedfhir-1.0.5 → compressedfhir-1.0.7}/compressedfhir/fhir/fhir_resource.py

@@ -156,3 +156,11 @@ class FhirResource(CompressedDict[str, Any]):
             raw_dict
         )
         return json.dumps(obj=raw_dict, cls=FhirJSONEncoder)
+
+    def to_fhir_dict(self) -> Dict[str, Any]:
+        """
+        Convert the resource to a FHIR-compliant dictionary.
+
+        :return: A dictionary representation of the resource.
+        """
+        return cast(Dict[str, Any], json.loads(self.json()))

{compressedfhir-1.0.5 → compressedfhir-1.0.7}/compressedfhir/utilities/compressed_dict/v1/compressed_dict.py

@@ -429,6 +429,7 @@ class CompressedDict[K, V](MutableMapping[K, V]):
         """
         Returns the raw dictionary.  Deserializes if necessary.
         Note that this dictionary preserves the python types so it is not FHIR friendly.
+        For example, datetime will be represented as a datetime object instead of iso format string per FHIR.
         Use dict() if you want a FHIR friendly version.
 
         Returns:
@@ -437,12 +438,14 @@ class CompressedDict[K, V](MutableMapping[K, V]):
         if self._working_dict:
             return self._working_dict
         else:
-            # if the working dict is not None, return it but don't store it in the self._working_dict to keep memory low
+            # if the working dict is None, create and return it but don't store it
+            # in the self._working_dict to keep memory low
             return self.create_working_dict()
 
     def dict(self) -> OrderedDict[K, V]:
         """
         Convert to a FHIR friendly dictionary where the python types like datetime are converted to string versions
+        For example, datetime will be represented as a iso format string per FHIR instead of a python datetime object.
 
         Returns:
             FHIR friendly dictionary
@@ -585,6 +588,7 @@ class CompressedDict[K, V](MutableMapping[K, V]):
         """
         # Create a new instance with the same storage mode
         new_instance = CompressedDict(
+            # we use raw_dict() instead of dict() so we can preserve python data types like datetime
             initial_dict=copy.deepcopy(self.raw_dict()),
             storage_mode=self._storage_mode,
             properties_to_cache=self._properties_to_cache,

{compressedfhir-1.0.5 → compressedfhir-1.0.7}/compressedfhir/utilities/json_serializers/test/test_type_preservation_serializer.py

@@ -1,4 +1,5 @@
 import logging
+from collections import OrderedDict
 from datetime import datetime, timezone, date
 from decimal import Decimal
 from logging import Logger
@@ -68,6 +69,8 @@ def test_nested_dict() -> None:
     """
     logger: Logger = logging.getLogger(__name__)
     nested_dict = {
+        "resourceType": "Coverage",
+        "id": "3456789012345670304",
         "beneficiary": {"reference": "Patient/1234567890123456703", "type": "Patient"},
         "class": [
             {
@@ -94,7 +97,6 @@ def test_nested_dict() -> None:
                 },
             }
         ],
-        "id": "3456789012345670304",
         "identifier": [
             {
                 "system": "https://sources.aetna.com/coverage/identifier/membershipid/59",
@@ -144,7 +146,6 @@ def test_nested_dict() -> None:
                 }
             ]
         },
-        "resourceType": "Coverage",
         "status": "active",
         "subscriber": {"reference": "Patient/1234567890123456703", "type": "Patient"},
         "subscriberId": "435679010300",
@@ -160,12 +161,16 @@ def test_nested_dict() -> None:
     }
 
     logger.info("-------- Serialized --------")
-    serialized = TypePreservationSerializer.serialize(nested_dict)
+    serialized: str = TypePreservationSerializer.serialize(nested_dict)
     logger.info(serialized)
     logger.info("-------- Deserialized --------")
-    deserialized = TypePreservationSerializer.deserialize(serialized)
+    deserialized: OrderedDict[str, Any] = TypePreservationSerializer.deserialize(
+        serialized
+    )
     logger.info(deserialized)
 
+    assert isinstance(deserialized, OrderedDict)
+
     assert isinstance(deserialized["period"]["start"], date)
     assert isinstance(deserialized["period"]["end"], date)
     assert nested_dict == deserialized

{compressedfhir-1.0.5 → compressedfhir-1.0.7/compressedfhir.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compressedfhir
-Version: 1.0.5
+Version: 1.0.7
 Summary: Stores FHIR JSON resources in compressed form in memory
 Home-page: https://github.com/icanbwell/compressed-fhir
 Author: Imran Qureshi

compressedfhir-1.0.5/VERSION

@@ -1 +0,0 @@
-1.0.5