iris-pex-embedded-python 3.4.1b3__py3-none-any.whl → 3.4.1b5__py3-none-any.whl

iop/_serialization.py

@@ -4,13 +4,13 @@ import importlib
 import inspect
 import pickle
 import json
-from dataclasses import asdict, is_dataclass
+from dataclasses import is_dataclass
 from typing import Any, Dict, Type
 
 from . import _iris
 from pydantic import BaseModel, TypeAdapter, ValidationError
 
-from iop._message import _PydanticPickleMessage
+from iop._message import _PydanticPickleMessage, _Message
 from iop._utils import _Utils
 
 class SerializationError(Exception):
@@ -31,10 +31,10 @@ class MessageSerializer:
         """Convert objects to JSON-safe format."""
         if isinstance(obj, BaseModel):
             return obj.model_dump_json()
-        elif is_dataclass(obj):
+        elif is_dataclass(obj) and isinstance(obj, _Message):
             return TempPydanticModel.model_validate(dataclass_to_dict(obj)).model_dump_json()
         else:
-            raise SerializationError(f"Object {obj} must be a Pydantic model or dataclass")
+            raise SerializationError(f"Object {obj} must be a Pydantic model or dataclass Message")
 
     @staticmethod
     def serialize(message: Any, use_pickle: bool = False) -> Any:
@@ -149,12 +149,20 @@ def dataclass_from_dict(klass: Type, dikt: Dict) -> Any:
 def dataclass_to_dict(instance: Any) -> Dict:
     """Converts a class instance to a dictionary.
     Handles non attended fields."""
-    dikt = asdict(instance)
-    # assign any extra fields
-    for k, v in vars(instance).items():
-        if k not in dikt:
-            dikt[k] = v
-    return dikt
+    result = {}
+    for field in instance.__dict__:
+        value = getattr(instance, field)
+        if is_dataclass(value):
+            result[field] = dataclass_to_dict(value)
+        elif isinstance(value, list):
+            result[field] = [dataclass_to_dict(i) if is_dataclass(i) else i for i in value]
+        elif isinstance(value, dict):
+            result[field] = {k: dataclass_to_dict(v) if is_dataclass(v) else v for k, v in value.items()}
+        elif hasattr(value, '__dict__'):
+            result[field] = dataclass_to_dict(value)
+        else:
+            result[field] = value
+    return result
 
 # Maintain backwards compatibility
 serialize_pickle_message = lambda msg: MessageSerializer.serialize(msg, use_pickle=True)

{iris_pex_embedded_python-3.4.1b3.dist-info → iris_pex_embedded_python-3.4.1b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 3.4.1b3
+Version: 3.4.1b5
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-3.4.1b3.dist-info → iris_pex_embedded_python-3.4.1b5.dist-info}/RECORD

@@ -47,7 +47,7 @@ iop/_message_validator.py,sha256=K6FxLe72gBHQXZTLVrFw87rABGM0F6CTaNtZ2MqJoss,140
 iop/_outbound_adapter.py,sha256=YTAhLrRf9chEAd53mV6KKbpaHOKNOKJHoGgj5wakRR0,726
 iop/_private_session_duplex.py,sha256=mzlFABh-ly51X1uSWw9YwQbktfMvuNdp2ALlRvlDow4,5152
 iop/_private_session_process.py,sha256=todprfYFSDr-h-BMvWL_IGC6wbQqkMy3mPHWEWCUSE0,1686
-iop/_serialization.py,sha256=iMC51QMIcWwj1ntDbTgZbLZIFFQuBcC4wH9kfQNivic,6164
+iop/_serialization.py,sha256=lS5zHS14Olpw2i2s-cXMHV8CsjJLNmYdAhfZFvLfqe4,6652
 iop/_utils.py,sha256=zguWjvZQkzAScHXl4OomZr2ZtPljDqVAs1CFllQZn5g,20092
 iop/cls/IOP/BusinessOperation.cls,sha256=lrymqZ8wHl5kJjXwdjbQVs5sScV__yIWGh-oGbiB_X0,914
 iop/cls/IOP/BusinessProcess.cls,sha256=s3t38w1ykHqM26ETcbCYLt0ocjZyVVahm-_USZkuJ1E,2855
@@ -71,9 +71,9 @@ iop/cls/IOP/PrivateSession/Message/Start.cls,sha256=uk-WTe66GicCshgmVy3F5ugHiAyP
 iop/cls/IOP/PrivateSession/Message/Stop.cls,sha256=7g3gKFUjNg0WXBLuWnj-VnCs5G6hSE09YTzGEp0zbGc,1390
 iop/cls/IOP/Service/WSGI.cls,sha256=VLNCXEwmHW9dBnE51uGE1nvGX6T4HjhqePT3LVhsjAE,10440
 iop/wsgi/handlers.py,sha256=NrFLo_YbAh-x_PlWhAiWkQnUUN2Ss9HoEm63dDWCBpQ,2947
-iris_pex_embedded_python-3.4.1b3.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.4.1b3.dist-info/METADATA,sha256=9EmsdVoVtDZEmrDsWt-3o8_gcxQ4wquLG5n_lsvPnbE,4419
-iris_pex_embedded_python-3.4.1b3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-iris_pex_embedded_python-3.4.1b3.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.4.1b3.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
-iris_pex_embedded_python-3.4.1b3.dist-info/RECORD,,
+iris_pex_embedded_python-3.4.1b5.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.4.1b5.dist-info/METADATA,sha256=gl9Pr67eVGmn8UaiANlFUMkuSudDJ1W7X2DMTn4bMnw,4419
+iris_pex_embedded_python-3.4.1b5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+iris_pex_embedded_python-3.4.1b5.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.4.1b5.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
+iris_pex_embedded_python-3.4.1b5.dist-info/RECORD,,