iris-pex-embedded-python 3.4.0b1__tar.gz → 3.4.0b2__tar.gz

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iris_pex_embedded_python
-Version: 3.4.0b1
+Version: 3.4.0b2
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/pyproject.toml

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

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/grongier/pex/__init__.py

@@ -6,7 +6,7 @@ from iop._business_operation import _BusinessOperation
 from iop._inbound_adapter import _InboundAdapter
 from iop._outbound_adapter import _OutboundAdapter
 from iop._message import _Message
-from iop._pickle_message import _PickleMessage
+from iop._message import _PickleMessage
 from iop._director import _Director
 from iop._utils import _Utils
 

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/iop/__init__.py

@@ -3,10 +3,8 @@ from iop._business_process import _BusinessProcess
 from iop._business_service import _BusinessService
 from iop._director import _Director
 from iop._inbound_adapter import _InboundAdapter
-from iop._message import _Message
-from iop._pydantic_message import _PydanticMessage
+from iop._message import _Message, _PickleMessage, _PydanticMessage, _PydanticPickleMessage
 from iop._outbound_adapter import _OutboundAdapter
-from iop._pickle_message import _PickleMessage
 from iop._private_session_duplex import _PrivateSessionDuplex
 from iop._private_session_process import _PrivateSessionProcess
 from iop._utils import _Utils
@@ -23,4 +21,5 @@ class DuplexProcess(_PrivateSessionProcess): pass
 class Message(_Message): pass
 class PickleMessage(_PickleMessage): pass
 class PydanticMessage(_PydanticMessage): pass
+class PydanticPickleMessage(_PydanticPickleMessage): pass
 class Director(_Director): pass

iris_pex_embedded_python-3.4.0b2/src/iop/_message.py

@@ -0,0 +1,28 @@
+from typing import Any
+from pydantic import BaseModel
+
+class _Message:
+    """ The abstract class that is the superclass for persistent messages sent from one component to another.
+    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
+
+class _PickleMessage:
+    """ The abstract class that is the superclass for persistent messages sent from one component to another.
+    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
+
+class _PydanticMessage(BaseModel):
+    """Base class for Pydantic-based messages that can be serialized to IRIS."""
+    
+    def __init__(self, **data: Any):
+        super().__init__(**data)
+
+class _PydanticPickleMessage(BaseModel):
+    """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.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/iop/_message_validator.py

@@ -1,7 +1,6 @@
 import dataclasses
 from typing import Any, Type
-from pydantic import BaseModel
-from iop._message import _Message
+from iop._message import _Message, _PickleMessage, _PydanticPickleMessage, BaseModel
 
 
 def is_message_instance(obj: Any) -> bool:
@@ -17,6 +16,8 @@ def is_message_instance(obj: Any) -> bool:
 
 def is_pickle_message_instance(obj: Any) -> bool:
     """Check if object is a PickleMessage instance."""
+    if isinstance(obj, _PydanticPickleMessage):
+        return True
     if is_pickle_message_class(type(obj)):
         return True
     return False
@@ -31,8 +32,6 @@ def is_iris_object_instance(obj: Any) -> bool:
 
 def is_message_class(klass: Type) -> bool:
     """Check if class is a Message type."""
-    if issubclass(klass, BaseModel):
-        return True
     if issubclass(klass, _Message):
         return True
     return False
@@ -41,7 +40,8 @@ def is_message_class(klass: Type) -> bool:
 
 def is_pickle_message_class(klass: Type) -> bool:
     """Check if class is a PickleMessage type."""
-    name = f"{klass.__module__}.{klass.__qualname__}"
-    if name in ("iop.PickleMessage", "grongier.pex.PickleMessage"):
+    if issubclass(klass, _PickleMessage):
         return True
-    return any(is_pickle_message_class(c) for c in klass.__bases__)
+    if issubclass(klass, _PydanticPickleMessage):
+        return True
+    return False

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/iop/_serialization.py

@@ -14,6 +14,7 @@ from typing import Any, Dict, Type, Optional
 from dacite import Config, from_dict
 import iris
 
+from iop._message import _PydanticPickleMessage
 from iop._utils import _Utils
 from pydantic import BaseModel
 
@@ -137,6 +138,9 @@ class MessageSerializer:
     @staticmethod
     def serialize(message: Any, use_pickle: bool = False) -> iris.cls:
         """Serializes a message to IRIS format."""
+        # Check for PydanticPickleMessage first
+        if isinstance(message, _PydanticPickleMessage):
+            return MessageSerializer._serialize_pickle(message)
         if isinstance(message, BaseModel):
             return (MessageSerializer._serialize_pickle(message) 
                    if use_pickle else MessageSerializer._serialize_json(message))

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/iris_pex_embedded_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iris_pex_embedded_python
-Version: 3.4.0b1
+Version: 3.4.0b2
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b2}/src/iris_pex_embedded_python.egg-info/SOURCES.txt

@@ -111,10 +111,8 @@ src/iop/_log_manager.py
 src/iop/_message.py
 src/iop/_message_validator.py
 src/iop/_outbound_adapter.py
-src/iop/_pickle_message.py
 src/iop/_private_session_duplex.py
 src/iop/_private_session_process.py
-src/iop/_pydantic_message.py
 src/iop/_serialization.py
 src/iop/_utils.py
 src/iop/cls/IOP/BusinessOperation.cls

iris_pex_embedded_python-3.4.0b1/src/iop/_message.py

@@ -1,6 +0,0 @@
-class _Message:
-    """ The abstract class that is the superclass for persistent messages sent from one component to another.
-    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_pex_embedded_python-3.4.0b1/src/iop/_pickle_message.py

@@ -1,6 +0,0 @@
-class _PickleMessage:
-    """ The abstract class that is the superclass for persistent messages sent from one component to another.
-    This class has no properties or methods. Users subclass Message and add properties.
-    The PEX framework provides the persistence to objects derived from the Message class.
-    """
-    pass

iris_pex_embedded_python-3.4.0b1/src/iop/_pydantic_message.py

@@ -1,9 +0,0 @@
-
-from typing import Any
-from pydantic import BaseModel
-
-class _PydanticMessage(BaseModel):
-    """Base class for Pydantic-based messages that can be serialized to IRIS."""
-    
-    def __init__(self, **data: Any):
-        super().__init__(**data)