compressedfhir 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

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/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/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.dist-info → compressedfhir-1.0.7.dist-info}/METADATA

@@ -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.dist-info → compressedfhir-1.0.7.dist-info}/RECORD

@@ -11,7 +11,7 @@ compressedfhir/fhir/fhir_bundle_entry_search.py,sha256=uYVJxuNN3gt3Q6BZ5FhRs47x7
 compressedfhir/fhir/fhir_identifier.py,sha256=tA_nmhBaYHu5zjJdE0IWMFEF8lrIPV3_nu-yairiIKw,2711
 compressedfhir/fhir/fhir_link.py,sha256=jf2RrwmsPrKW3saP77y42xVqI0xwHFYXxm6YHQJk7gU,1922
 compressedfhir/fhir/fhir_meta.py,sha256=vNI4O6SoG4hJRHyd-bJ_QnYFTfBHyR3UA6h21ByQmWo,1669
-compressedfhir/fhir/fhir_resource.py,sha256=5v_xcAUCFcqzQodT8uiw292NUG86gWJ4UbyhY2Vy79c,5084
+compressedfhir/fhir/fhir_resource.py,sha256=WDrS6ZAQARsTfEsKNhNIgCw8vir_U-1nBzFGt510OBw,5340
 compressedfhir/fhir/fhir_resource_list.py,sha256=qlAAwWWphtFicBxPG8iriz2eOHGcrWJk5kGThmvkbPE,4480
 compressedfhir/fhir/fhir_resource_map.py,sha256=XFJ0o5_kLUeHYKp1q_Bxsoyp2-rLX7P4c9FwQ7YfGWM,6571
 compressedfhir/fhir/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,7 +28,7 @@ compressedfhir/utilities/fhir_json_encoder.py,sha256=hn-ZuDrTEdYZmILk_5_k4R72PQB
 compressedfhir/utilities/json_helpers.py,sha256=lEiPapLN0p-kLu6PFm-h971ieXRxwPB2M-8FCZ2Buo8,5642
 compressedfhir/utilities/compressed_dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 compressedfhir/utilities/compressed_dict/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-compressedfhir/utilities/compressed_dict/v1/compressed_dict.py,sha256=C2mblG2P8qx0XWpDJO-7OGBqyQRTp0WelaUbwopI7qc,22049
+compressedfhir/utilities/compressed_dict/v1/compressed_dict.py,sha256=fvsIxizmOfLohXkoHxN6jEBvQ66La9K5P-5DfESU5bk,22400
 compressedfhir/utilities/compressed_dict/v1/compressed_dict_access_error.py,sha256=xuwED0KGZcQORIcZRfi--5CdXplHJ5vYLBUqpbDi344,132
 compressedfhir/utilities/compressed_dict/v1/compressed_dict_storage_mode.py,sha256=mEdtJjPX2I9DqP0Ly_VsZZWhEMNTI1psqQ8iJtUQ2oE,1412
 compressedfhir/utilities/compressed_dict/v1/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,7 +40,7 @@ compressedfhir/utilities/json_serializers/type_preservation_serializer.py,sha256
 compressedfhir/utilities/json_serializers/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 compressedfhir/utilities/json_serializers/test/test_type_preservation_decoder.py,sha256=GQotwYQJe9VZQotvLWmQWMkSIBne53bolmgflBoR7DU,4752
 compressedfhir/utilities/json_serializers/test/test_type_preservation_encoder.py,sha256=O4VczBdsJF35WozZiwSdJ8638qDn01JQsai2wTXu5Vo,1737
-compressedfhir/utilities/json_serializers/test/test_type_preservation_serializer.py,sha256=dTYdgI1wMgWU0DJCNJlbMmsnhr-Q_2SPXeydLsn70rA,6043
+compressedfhir/utilities/json_serializers/test/test_type_preservation_serializer.py,sha256=jRl0UEzvsjj1Kl2_7VYCf3kaJch9UZ2-8VHdKZC69xo,6171
 compressedfhir/utilities/ordered_dict_to_dict_converter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 compressedfhir/utilities/ordered_dict_to_dict_converter/ordered_dict_to_dict_converter.py,sha256=CMerJQD7O0vMyGtUp1rKSerZA1tDZeY5GTQT3AykL4w,831
 compressedfhir/utilities/string_compressor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,9 +51,9 @@ compressedfhir/utilities/string_compressor/v1/test/test_string_compressor.py,sha
 compressedfhir/utilities/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 compressedfhir/utilities/test/test_fhir_json_encoder.py,sha256=6pbNmZp5eBWY66bHjgjm_pZVhs5HDKP8hCGnwNFzpEw,5171
 compressedfhir/utilities/test/test_json_helpers.py,sha256=V0R9oHDQAs0m0012niEz50sHJxMSUQvA3km7kK8HgjE,3860
-compressedfhir-1.0.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+compressedfhir-1.0.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-compressedfhir-1.0.5.dist-info/METADATA,sha256=jitzP2jc8_vqD1C9RYDNyetYivS_DOHuUplgJZy8t20,3456
-compressedfhir-1.0.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-compressedfhir-1.0.5.dist-info/top_level.txt,sha256=YMKdvBBdiCzFbpI9fG8BUDjaRd-f4R0qAvUoVETpoWw,21
-compressedfhir-1.0.5.dist-info/RECORD,,
+compressedfhir-1.0.7.dist-info/METADATA,sha256=9KZZ4ummH8dgEpDshUgDVmwg2MY87xjZ8qVsII9IPx4,3456
+compressedfhir-1.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+compressedfhir-1.0.7.dist-info/top_level.txt,sha256=YMKdvBBdiCzFbpI9fG8BUDjaRd-f4R0qAvUoVETpoWw,21
+compressedfhir-1.0.7.dist-info/RECORD,,