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

iop/__init__.py

@@ -4,6 +4,7 @@ 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._outbound_adapter import _OutboundAdapter
 from iop._pickle_message import _PickleMessage
 from iop._private_session_duplex import _PrivateSessionDuplex
@@ -21,4 +22,5 @@ class DuplexOperation(_PrivateSessionDuplex): pass
 class DuplexProcess(_PrivateSessionProcess): pass
 class Message(_Message): pass
 class PickleMessage(_PickleMessage): pass
+class PydanticMessage(_PydanticMessage): pass
 class Director(_Director): pass

iop/_dispatch.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, List, Type
 
 import iris
 from dacite import Config, from_dict
+from pydantic import BaseModel
 
 from iop._utils import _Utils
 from iop._serialization import IrisJSONEncoder, IrisJSONDecoder
@@ -165,17 +166,20 @@ def dataclass_from_dict(klass: Type, dikt: Dict) -> Any:
     Returns:
         A dataclass object with the fields of the dataclass and the fields of the dictionary.
     """
-    ret = from_dict(klass, dikt, Config(check_types=False))
-    
-    try:
-        fieldtypes = klass.__annotations__
-    except Exception as e:
-        fieldtypes = []
-    
-    for key, val in dikt.items():
-        if key not in fieldtypes:
-            setattr(ret, key, val)
-    return ret
+    if issubclass(klass, BaseModel):
+        return klass.model_validate(dikt)
+    else:
+        ret = from_dict(klass, dikt, Config(check_types=False))
+        
+        try:
+            fieldtypes = klass.__annotations__
+        except Exception as e:
+            fieldtypes = []
+        
+        for key, val in dikt.items():
+            if key not in fieldtypes:
+                setattr(ret, key, val)
+        return ret
 
 def dispach_message(host, request: Any) -> Any:
     """Dispatches the message to the appropriate method.

iop/_message_validator.py

@@ -1,9 +1,13 @@
 import dataclasses
 from typing import Any, Type
+from pydantic import BaseModel
+from iop._message import _Message
 
 
 def is_message_instance(obj: Any) -> bool:
     """Check if object is a valid Message instance."""
+    if isinstance(obj, BaseModel):
+        return True
     if is_message_class(type(obj)):
         if not dataclasses.is_dataclass(obj):
             raise TypeError(f"{type(obj).__module__}.{type(obj).__qualname__} must be a dataclass")
@@ -27,10 +31,12 @@ def is_iris_object_instance(obj: Any) -> bool:
 
 def is_message_class(klass: Type) -> bool:
     """Check if class is a Message type."""
-    name = f"{klass.__module__}.{klass.__qualname__}"
-    if name in ("iop.Message", "grongier.pex.Message"): 
+    if issubclass(klass, BaseModel):
+        return True
+    if issubclass(klass, _Message):
         return True
-    return any(is_message_class(c) for c in klass.__bases__)
+    return False
+
 
 
 def is_pickle_message_class(klass: Type) -> bool:

iop/_pydantic_message.py

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

iop/_serialization.py

@@ -15,6 +15,7 @@ from dacite import Config, from_dict
 import iris
 
 from iop._utils import _Utils
+from pydantic import BaseModel
 
 # Constants
 DATETIME_FORMAT_LENGTH = 23
@@ -91,6 +92,8 @@ class IrisJSONEncoder(json.JSONEncoder):
     """JSONEncoder that handles dates, decimals, UUIDs, etc."""
     
     def default(self, obj: Any) -> Any:
+        if isinstance(obj, BaseModel):
+            return obj.model_dump()
         if obj.__class__.__name__ == 'DataFrame':
             return f'dataframe:{TypeConverter.convert_to_string("dataframe", obj)}'
         elif isinstance(obj, datetime.datetime):
@@ -134,6 +137,9 @@ class MessageSerializer:
     @staticmethod
     def serialize(message: Any, use_pickle: bool = False) -> iris.cls:
         """Serializes a message to IRIS format."""
+        if isinstance(message, BaseModel):
+            return (MessageSerializer._serialize_pickle(message) 
+                   if use_pickle else MessageSerializer._serialize_json(message))
         if use_pickle:
             return MessageSerializer._serialize_pickle(message)
         return MessageSerializer._serialize_json(message)
@@ -155,7 +161,11 @@ class MessageSerializer:
 
     @staticmethod
     def _serialize_json(message: Any) -> iris.cls:
-        json_string = json.dumps(message, cls=IrisJSONEncoder, ensure_ascii=False)
+        if isinstance(message, BaseModel):
+            json_string = json.dumps(message.model_dump(), cls=IrisJSONEncoder, ensure_ascii=False)
+        else:
+            json_string = json.dumps(message, cls=IrisJSONEncoder, ensure_ascii=False)
+            
         msg = iris.cls('IOP.Message')._New()
         msg.classname = f"{message.__class__.__module__}.{message.__class__.__name__}"
         
@@ -187,7 +197,10 @@ class MessageSerializer:
         
         try:
             json_dict = json.loads(json_string, cls=IrisJSONDecoder)
-            return dataclass_from_dict(msg_class, json_dict)
+            if issubclass(msg_class, BaseModel):
+                return msg_class.model_validate(json_dict)
+            else:
+                return dataclass_from_dict(msg_class, json_dict)
         except Exception as e:
             raise SerializationError(f"Failed to deserialize JSON: {str(e)}")
 

{iris_pex_embedded_python-3.3.1.dist-info → iris_pex_embedded_python-3.4.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iris_pex_embedded_python
-Version: 3.3.1
+Version: 3.4.0b1
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -45,6 +45,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dacite>=1.6.0
+Requires-Dist: pydantic>=2.0.0
 Requires-Dist: xmltodict>=0.12.0
 Requires-Dist: iris-embedded-python-wrapper>=0.0.6
 Requires-Dist: setuptools>=40.8.0

{iris_pex_embedded_python-3.3.1.dist-info → iris_pex_embedded_python-3.4.0b1.dist-info}/RECORD

@@ -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=fX1Osx2Dmcuv8C5hmvoG4fPDIbk0qksJcIgpQibJ_p4,1067
+iop/__init__.py,sha256=-7_A7epvomoAFBIevir_8f82mEQ6pzIhhKVgP2KFMoU,1166
 iop/__main__.py,sha256=pQzVtkDhAeI6dpNRC632dVk2SGZZIEDwDufdgZe8VWs,98
 iop/_async_request.py,sha256=btDFNFaO-Yvl6wvgXrCYNWoQb2RtbzEvTJsk7j03b30,2170
 iop/_business_host.py,sha256=wI2LlVTVjEqE8GWE9nSz1WHvqTduAuJQTk7Ky7qkz4U,9658
@@ -101,16 +101,17 @@ iop/_cli.py,sha256=IwvVxglSTVkCDXwANLMqnd8mfxGtWB6GjBSdEy8EMm0,7551
 iop/_common.py,sha256=E_Mn2t--klAtT4p1MzW1KtcKcLrB1g4Flq5H4JlV8Vs,11619
 iop/_decorators.py,sha256=ZpgEETLdKWv58AoSMfXnm3_mA-6qPphIegjG-npDgwg,2324
 iop/_director.py,sha256=DrswFoqJ6IG62hkW-0ZffTtZdxw6KNozlZSIq3O6d-o,11629
-iop/_dispatch.py,sha256=4317Z0ujXxDGUQaL7WX6zfGzBPOdw70MWiqmLUKxhik,6611
+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=xMMPOZOop3Nv12E3_QPI5caTgYgAzoKlRxcMmUkrj2c,1379
+iop/_message_validator.py,sha256=LAHrgXEA6WfWjrVcBA6Hc9RwjPK0PRItq-0nzXAayUo,1438
 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/_serialization.py,sha256=jHJGTMpKI2QDcF_m7R0WyH_J-vjQyYpNpD0ktn9Rqo4,8106
+iop/_pydantic_message.py,sha256=KGpHWI-o8ZW7ZgiyLf-FoN5_k5uxhZv_3odrg7x22XU,246
+iop/_serialization.py,sha256=UVc1sV-oAwWSmVJw3GWe1aYERKocMv2gpXhHgARRlxI,8707
 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
@@ -136,9 +137,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.3.1.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.3.1.dist-info/METADATA,sha256=dsJ4pvP-mBaxashySn6A9FgZ6pKVLjidQBu_dRC_fZY,4425
-iris_pex_embedded_python-3.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-iris_pex_embedded_python-3.3.1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.3.1.dist-info/top_level.txt,sha256=VWDlX4YF4qFVRGrG3-Gs0kgREol02i8gIpsHNbhfFPw,42
-iris_pex_embedded_python-3.3.1.dist-info/RECORD,,
+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,,