iris-pex-embedded-python 3.5.0b5__tar.gz → 3.5.0b6__tar.gz

{iris_pex_embedded_python-3.5.0b5/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.5.0b6}/PKG-INFO

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

{iris_pex_embedded_python-3.5.0b5 → iris_pex_embedded_python-3.5.0b6}/pyproject.toml

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

{iris_pex_embedded_python-3.5.0b5 → iris_pex_embedded_python-3.5.0b6}/src/iop/_message.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from pydantic import BaseModel
 
@@ -7,7 +7,11 @@ class _Message:
     This class has no properties or methods. Users subclass Message and add properties.
     The IOP framework provides the persistence to objects derived from the Message class.
     """
-    pass
+    _iris_id: Optional[str] = None
+    
+    def get_iris_id(self) -> Optional[str]:
+        """Get the IRIS ID of the message."""
+        return self._iris_id
 
 class _PickleMessage(_Message):
     """ The abstract class that is the superclass for persistent messages sent from one component to another.
@@ -19,12 +23,18 @@ class _PickleMessage(_Message):
 class _PydanticMessage(BaseModel):
     """Base class for Pydantic-based messages that can be serialized to IRIS."""
     
+    _iris_id: Optional[str] = None
+
     def __init__(self, **data: Any):
         super().__init__(**data)
 
-class _PydanticPickleMessage(BaseModel):
+    def get_iris_id(self) -> Optional[str]:
+        """Get the IRIS ID of the message."""
+        return self._iris_id
+
+class _PydanticPickleMessage(_PydanticMessage):
     """Base class for Pydantic-based messages that can be serialized to IRIS."""
-    
+
     def __init__(self, **data: Any):
         super().__init__(**data)
 

{iris_pex_embedded_python-3.5.0b5 → iris_pex_embedded_python-3.5.0b6}/src/iop/_serialization.py

@@ -26,19 +26,10 @@ class TempPydanticModel(BaseModel):
 class MessageSerializer:
     """Handles message serialization and deserialization."""
 
-    @staticmethod
-    def _convert_to_json_safe(obj: Any) -> Any:
-        """Convert objects to JSON-safe format."""
-        if isinstance(obj, BaseModel):
-            return obj.model_dump_json()
-        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 Message")
-
     @staticmethod
     def serialize(message: Any, use_pickle: bool = False, is_generator:bool = False) -> Any:
         """Serializes a message to IRIS format."""
+        message = remove_iris_id(message)
         if use_pickle:
             return MessageSerializer._serialize_pickle(message, is_generator)
         return MessageSerializer._serialize_json(message, is_generator)
@@ -58,12 +49,34 @@ class MessageSerializer:
         else:
             msg.json = json_string
         return msg
+    
+    @staticmethod
+    def _serialize_pickle(message: Any, is_generator: bool = False) -> Any:
+        """Serializes a message to IRIS format using pickle."""
+        message = remove_iris_id(message)
+        pickle_string = codecs.encode(pickle.dumps(message), "base64").decode()
+        if is_generator:
+            msg = _iris.get_iris().cls('IOP.Generator.Message.StartPickle')._New()
+        else:
+            msg = _iris.get_iris().cls('IOP.PickleMessage')._New()
+        msg.classname = f"{message.__class__.__module__}.{message.__class__.__name__}"
+        msg.jstr = _Utils.string_to_stream(pickle_string)
+        return msg
 
     @staticmethod
     def deserialize(serial: Any, use_pickle: bool = False) -> Any:
         if use_pickle:
-            return MessageSerializer._deserialize_pickle(serial)
-        return MessageSerializer._deserialize_json(serial)
+            msg=MessageSerializer._deserialize_pickle(serial)
+        else:
+            msg=MessageSerializer._deserialize_json(serial)
+    
+        try:
+            iris_id = serial._Id()
+            msg._iris_id = iris_id if iris_id else None
+        except Exception as e:
+            pass
+
+        return msg
 
     @staticmethod
     def _deserialize_json(serial: Any) -> Any:
@@ -90,17 +103,6 @@ class MessageSerializer:
         except Exception as e:
             raise SerializationError(f"Failed to deserialize JSON: {str(e)}")
 
-    @staticmethod
-    def _serialize_pickle(message: Any, is_generator: bool = False) -> Any:
-        pickle_string = codecs.encode(pickle.dumps(message), "base64").decode()
-        if is_generator:
-            msg = _iris.get_iris().cls('IOP.Generator.Message.StartPickle')._New()
-        else:
-            msg = _iris.get_iris().cls('IOP.PickleMessage')._New()
-        msg.classname = f"{message.__class__.__module__}.{message.__class__.__name__}"
-        msg.jstr = _Utils.string_to_stream(pickle_string)
-        return msg
-
     @staticmethod
     def _deserialize_pickle(serial: Any) -> Any:
         string = _Utils.stream_to_string(serial.jstr)
@@ -112,6 +114,24 @@ class MessageSerializer:
         if j <= 0:
             raise SerializationError(f"Classname must include a module: {classname}")
         return classname[:j], classname[j+1:]
+    
+    @staticmethod
+    def _convert_to_json_safe(obj: Any) -> Any:
+        """Convert objects to JSON-safe format."""
+        if isinstance(obj, BaseModel):
+            return obj.model_dump_json()
+        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 Message")
+
+    
+def remove_iris_id(message: Any) -> Any:
+    try:
+        del message._iris_id
+    except AttributeError:
+        pass
+    return message
 
 def dataclass_from_dict(klass: Type | Any, dikt: Dict) -> Any:
     """Converts a dictionary to a dataclass instance.

{iris_pex_embedded_python-3.5.0b5 → iris_pex_embedded_python-3.5.0b6/src/iris_pex_embedded_python.egg-info}/PKG-INFO

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