iris-pex-embedded-python 3.4.1b3__tar.gz → 3.4.1b5__tar.gz

{iris_pex_embedded_python-3.4.1b3/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.4.1b5}/PKG-INFO

@@ -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 → iris_pex_embedded_python-3.4.1b5}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.4.1b3"
+version = "3.4.1b5"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 authors = [

{iris_pex_embedded_python-3.4.1b3 → iris_pex_embedded_python-3.4.1b5}/src/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 → iris_pex_embedded_python-3.4.1b5/src/iris_pex_embedded_python.egg-info}/PKG-INFO

@@ -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