iris-pex-embedded-python 3.4.0b1__py3-none-any.whl → 3.4.0b2__py3-none-any.whl

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
 

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

iop/_message.py

@@ -1,6 +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
+    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)

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

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.dist-info → iris_pex_embedded_python-3.4.0b2.dist-info}/METADATA

@@ -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.dist-info → iris_pex_embedded_python-3.4.0b2.dist-info}/RECORD

@@ -19,7 +19,7 @@ grongier/cls/Grongier/PEX/PrivateSession/Message/Poll.cls,sha256=pcUgHgxX1pMH-wQ
 grongier/cls/Grongier/PEX/PrivateSession/Message/Start.cls,sha256=T3jNoR8RjKr1InQ6SgqBYTgFwpSB0Q60WholjbvForg,433
 grongier/cls/Grongier/PEX/PrivateSession/Message/Stop.cls,sha256=zy30ZXXN4XcovPij-kOF3PuH1SkP1EUvlEJQRx2S9RU,431
 grongier/cls/Grongier/Service/WSGI.cls,sha256=7u2SsFmnsubMfdazvaDchKCM3yesPRMfKBzMIkwQ9xc,77
-grongier/pex/__init__.py,sha256=zHFF0Znipx1fwHYUEBZjNOYoZH1ro7z4IgYDU32kdn0,1067
+grongier/pex/__init__.py,sha256=CPLDFa4dusvGX9VZYTUk-M0Xa_yR4e4Gqku1rIT75qo,1060
 grongier/pex/__main__.py,sha256=pQzVtkDhAeI6dpNRC632dVk2SGZZIEDwDufdgZe8VWs,98
 grongier/pex/_business_host.py,sha256=dlV8CWJad8Pr2TNfD9OjcVKaq5gEYQACZla1FK6-bDM,44
 grongier/pex/_cli.py,sha256=hOHz3n-aHtULuhdCkqZ_SSb3sv7M6j2WhRxgCTvgR9I,64
@@ -90,7 +90,7 @@ intersystems_iris/pex/_InboundAdapter.py,sha256=gZlWl7afumamkj8pNbpLyKFSzhaTAiAX
 intersystems_iris/pex/_Message.py,sha256=Ugaa_lsEYke__pI5kdC7phAuyPQ7rxXUcROJL4cUxVQ,320
 intersystems_iris/pex/_OutboundAdapter.py,sha256=ao2Ubbta2DcrQGdzDUD_j1Zsk8bvUfcZNKTZkzPTNBU,1628
 intersystems_iris/pex/__init__.py,sha256=l_I1dpnluWawbFrGMDC0GLHpuHwjbpd-nho8otFX6TE,1379
-iop/__init__.py,sha256=-7_A7epvomoAFBIevir_8f82mEQ6pzIhhKVgP2KFMoU,1166
+iop/__init__.py,sha256=1C589HojSVK0yJf1KuTPA39ZjrOYO0QFLv45rqbZpA4,1183
 iop/__main__.py,sha256=pQzVtkDhAeI6dpNRC632dVk2SGZZIEDwDufdgZe8VWs,98
 iop/_async_request.py,sha256=btDFNFaO-Yvl6wvgXrCYNWoQb2RtbzEvTJsk7j03b30,2170
 iop/_business_host.py,sha256=wI2LlVTVjEqE8GWE9nSz1WHvqTduAuJQTk7Ky7qkz4U,9658
@@ -104,14 +104,12 @@ iop/_director.py,sha256=DrswFoqJ6IG62hkW-0ZffTtZdxw6KNozlZSIq3O6d-o,11629
 iop/_dispatch.py,sha256=q9oCE4b5FazW1t2oczvBGQtKzip_-yykY9WvXUp1urE,6775
 iop/_inbound_adapter.py,sha256=PS5ToqhrYcXq9ZdLbCBqAfVp8kCeRACm_KF66pwBO9U,1652
 iop/_log_manager.py,sha256=PZnGWsi-zvWo-bumQO5BK-8kHG2XW-WnZ6ShL7QeZ4c,3499
-iop/_message.py,sha256=LSkfZcmEu1aj2hdSg3sUHSWNc8tWWZR8Q2_h9_axVrs,325
-iop/_message_validator.py,sha256=LAHrgXEA6WfWjrVcBA6Hc9RwjPK0PRItq-0nzXAayUo,1438
+iop/_message.py,sha256=pJQOjRIdw4wSDoJamvItGODMe-UjDU71XihgWdtCAqc,1120
+iop/_message_validator.py,sha256=K6FxLe72gBHQXZTLVrFw87rABGM0F6CTaNtZ2MqJoss,1408
 iop/_outbound_adapter.py,sha256=YTAhLrRf9chEAd53mV6KKbpaHOKNOKJHoGgj5wakRR0,726
-iop/_pickle_message.py,sha256=noKfc2VkXufV3fqjKvNHN_oANQ1YN9ffCaSV0XSTAIE,331
 iop/_private_session_duplex.py,sha256=mzlFABh-ly51X1uSWw9YwQbktfMvuNdp2ALlRvlDow4,5152
 iop/_private_session_process.py,sha256=todprfYFSDr-h-BMvWL_IGC6wbQqkMy3mPHWEWCUSE0,1686
-iop/_pydantic_message.py,sha256=KGpHWI-o8ZW7ZgiyLf-FoN5_k5uxhZv_3odrg7x22XU,246
-iop/_serialization.py,sha256=UVc1sV-oAwWSmVJw3GWe1aYERKocMv2gpXhHgARRlxI,8707
+iop/_serialization.py,sha256=hGpFYHWjYRcDuQv4Ml9N16onW8vmHGhDwA3bv_NwFnM,8923
 iop/_utils.py,sha256=Aqtp9Jx3ghzkNs4f2cOZXYwv8cGsjmdBocnkP64fa3M,19574
 iop/cls/IOP/BusinessOperation.cls,sha256=lrymqZ8wHl5kJjXwdjbQVs5sScV__yIWGh-oGbiB_X0,914
 iop/cls/IOP/BusinessProcess.cls,sha256=s3t38w1ykHqM26ETcbCYLt0ocjZyVVahm-_USZkuJ1E,2855
@@ -137,9 +135,9 @@ iop/cls/IOP/Service/WSGI.cls,sha256=VLNCXEwmHW9dBnE51uGE1nvGX6T4HjhqePT3LVhsjAE,
 iop/wsgi/handlers.py,sha256=NrFLo_YbAh-x_PlWhAiWkQnUUN2Ss9HoEm63dDWCBpQ,2947
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
-iris_pex_embedded_python-3.4.0b1.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.4.0b1.dist-info/METADATA,sha256=Llw7FI-38MNAaB9Ri1AxjYSEsI22-qmaT1D3z1T7xzo,4458
-iris_pex_embedded_python-3.4.0b1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-iris_pex_embedded_python-3.4.0b1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.4.0b1.dist-info/top_level.txt,sha256=VWDlX4YF4qFVRGrG3-Gs0kgREol02i8gIpsHNbhfFPw,42
-iris_pex_embedded_python-3.4.0b1.dist-info/RECORD,,
+iris_pex_embedded_python-3.4.0b2.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.4.0b2.dist-info/METADATA,sha256=wSmLx_zkXK9oTutFdot5ManhtmjC7_-eYrZLeCC4w_Q,4458
+iris_pex_embedded_python-3.4.0b2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+iris_pex_embedded_python-3.4.0b2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.4.0b2.dist-info/top_level.txt,sha256=VWDlX4YF4qFVRGrG3-Gs0kgREol02i8gIpsHNbhfFPw,42
+iris_pex_embedded_python-3.4.0b2.dist-info/RECORD,,

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

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)