iris-pex-embedded-python 3.5.0b4__py3-none-any.whl → 3.5.0b6__py3-none-any.whl

iop/_dispatch.py

@@ -31,6 +31,9 @@ def dispatch_serializer(message: Any, is_generator: bool = False) -> Any:
     if message == "" or message is None:
         return message
 
+    if hasattr(message, '__iter__'):
+        raise TypeError("You may have tried to invoke a generator function without using the 'send_generator_request' method. Please use that method to handle generator functions.")
+
     raise TypeError("The message must be an instance of a class that is a subclass of Message or IRISObject %Persistent class.")
 
 def dispatch_deserializer(serial: Any) -> Any:
@@ -115,6 +118,10 @@ def get_handler_info(host: Any, method_name: str) -> Tuple[str, str] | None:
 
         param: Parameter = next(iter(params.values()))
         annotation = param.annotation
+
+        if isinstance(annotation, str):
+            # return it as is, assuming it's a fully qualified class name
+            return annotation, method_name
         
         if annotation == Parameter.empty or not isinstance(annotation, type):
             return None

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)
 

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.0b4.dist-info → iris_pex_embedded_python-3.5.0b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 3.5.0b4
+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.0b4.dist-info → iris_pex_embedded_python-3.5.0b6.dist-info}/RECORD

@@ -39,17 +39,17 @@ iop/_common.py,sha256=W39gb-K7oh93YdxOIIud0TT64Z6dSogVT4Rpda7_IvU,13986
 iop/_debugpy.py,sha256=67BC1jxZx4MZfj65trYYnSJ_MVKMTv49n3CqqfgVQdk,4725
 iop/_decorators.py,sha256=LpK0AK4GIzXbPFSIw_x6zzM3FwsHvFjgQUh-MnqtTE8,2322
 iop/_director.py,sha256=dJ4uLs5JxBS1wc0OtL25HuaDi3Jh8M9JC5Ra366ic1g,11489
-iop/_dispatch.py,sha256=Z62grevFrqRobDmB6Sf1VG0HjHMMgAaKfOxNU4QfTjw,4121
+iop/_dispatch.py,sha256=4LOF0v0e492B3NHuhLdPVAMNCDeFfyOhIjWDPC4bmAw,4499
 iop/_generator_request.py,sha256=I67JOjfsznN9JlS0bg_D05phcfSXqp6GJlCULJPXKvw,1284
 iop/_inbound_adapter.py,sha256=yG33VfJ2KxSDVxBTQTjFXqdX1fMEic1zxSAOhP5DqTk,1649
 iop/_iris.py,sha256=cw1mIKchXNlUJXSxwMhXYQr8DntJEO1hSPnLyJab10w,204
 iop/_log_manager.py,sha256=SHY2AUBSjh-qZbEHfe0j4c_S8PuU6JFjjmjEX6qnoC4,3407
-iop/_message.py,sha256=UUJauHBChQaL92Wp1EpYaz-G4N998PIv4RbdJofN6yg,1136
+iop/_message.py,sha256=iM7LXdhYRGOBEAJu-VH1m9iKyMYtrScWcALc3khmCFY,1465
 iop/_message_validator.py,sha256=ooDFWp8XvqJWP91RDbkFgpA5V3LbNrQO6IMx2vSjoF8,1516
 iop/_outbound_adapter.py,sha256=cN7dkZyx9ED89yUGePsUYsUhlR3ze3w1JorCG8HvDCw,723
 iop/_private_session_duplex.py,sha256=c6Q0k-qnZi_JcIOdpUx1Edu44zVbUE2Kf2aCHM8Eq80,5202
 iop/_private_session_process.py,sha256=rvZFO6nWVwZtaEWJkSHyLTV-vhzDqQhsVi7INQLLwWI,1685
-iop/_serialization.py,sha256=k61wsrAui-GOIPdAXv4wpnpdyrWo-nyZ0HTBa5zWF4w,7232
+iop/_serialization.py,sha256=C9-88bb6vC8A4ugQ3QqjahAbv7NjAD2sZy8_D-X0Ois,7721
 iop/_utils.py,sha256=yAvssj3O3p9mLVJ_RvDIuawyYNhOIm5WrK0SANaSIwU,21256
 iop/cls/IOP/BusinessOperation.cls,sha256=E4rnujZi3QFd3uLtZ5YjLiMU_FWoN1gkBe19kxmYO34,932
 iop/cls/IOP/BusinessProcess.cls,sha256=XJxzbiV0xokzRm-iI2Be5UIJLE3MlXr7W3WS_LkOCYs,3363
@@ -78,9 +78,9 @@ iop/cls/IOP/PrivateSession/Message/Start.cls,sha256=RsJLrhglrONBDGT0RqW2K9MDXa98
 iop/cls/IOP/PrivateSession/Message/Stop.cls,sha256=7g3gKFUjNg0WXBLuWnj-VnCs5G6hSE09YTzGEp0zbGc,1390
 iop/cls/IOP/Service/WSGI.cls,sha256=VLNCXEwmHW9dBnE51uGE1nvGX6T4HjhqePT3LVhsjAE,10440
 iop/wsgi/handlers.py,sha256=NrFLo_YbAh-x_PlWhAiWkQnUUN2Ss9HoEm63dDWCBpQ,2947
-iris_pex_embedded_python-3.5.0b4.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.5.0b4.dist-info/METADATA,sha256=WWYcgcEhhzbAbj3FKI4faBbTqisGyMXZepabAygnNNo,4415
-iris_pex_embedded_python-3.5.0b4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iris_pex_embedded_python-3.5.0b4.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.5.0b4.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
-iris_pex_embedded_python-3.5.0b4.dist-info/RECORD,,
+iris_pex_embedded_python-3.5.0b6.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.5.0b6.dist-info/METADATA,sha256=0UEPT7nywOnuI8RTD14oO24QL8ef_M1T6qgbDUl27Ns,4415
+iris_pex_embedded_python-3.5.0b6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iris_pex_embedded_python-3.5.0b6.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.5.0b6.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
+iris_pex_embedded_python-3.5.0b6.dist-info/RECORD,,