iris-pex-embedded-python 3.1.1b1__tar.gz → 3.1.1b3__tar.gz

{iris_pex_embedded_python-3.1.1b1/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.1.1b3}/PKG-INFO

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

{iris_pex_embedded_python-3.1.1b1 → iris_pex_embedded_python-3.1.1b3}/pyproject.toml

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

{iris_pex_embedded_python-3.1.1b1 → iris_pex_embedded_python-3.1.1b3}/src/iop/_business_host.py

@@ -34,15 +34,14 @@ class _BusinessHost(_Common):
         :param fonction: the function that will be decorated
         :return: The function dispatch_serializer is being returned.
         """
-        def dispatch_serializer(self,*params, **param2):
-            # Handle positional arguments
-            serialized=[]
-            for param in params:
-                serialized.append(self._dispatch_serializer(param))
-            # Handle keyword arguments
-            for key, value in param2.items():
-                param2[key] = self._dispatch_serializer(value)
-            return fonction(self,*serialized, **param2)
+        def dispatch_serializer(self, *params, **param2):
+            # Handle positional arguments using list comprehension
+            serialized = [self._dispatch_serializer(param) for param in params]
+            
+            # Handle keyword arguments using dictionary comprehension
+            param2 = {key: self._dispatch_serializer(value) for key, value in param2.items()}
+            
+            return fonction(self, *serialized, **param2)
         return dispatch_serializer
     
     def input_serialzer_param(position:int,name:str):
@@ -55,19 +54,20 @@ class _BusinessHost(_Common):
         """
         def input_serialzer_param(fonction):
             @wraps(fonction)
-            def dispatch_serializer(self,*params, **param2):
-                # Handle positional arguments
-                serialized=[]
-                for i,param in enumerate(params):
-                    if i == position:
-                        serialized.append(self._dispatch_serializer(param))
-                    else:
-                        serialized.append(param)
-                # Handle keyword arguments
-                for key, value in param2.items():
-                    if key == name:
-                        param2[key] = self._dispatch_serializer(value)
-                return fonction(self,*serialized, **param2)
+            def dispatch_serializer(self, *params, **param2):
+                # Handle positional arguments using list comprehension
+                serialized = [
+                    self._dispatch_serializer(param) if i == position else param
+                    for i, param in enumerate(params)
+                ]
+                
+                # Handle keyword arguments using dictionary comprehension
+                param2 = {
+                    key: self._dispatch_serializer(value) if key == name else value
+                    for key, value in param2.items()
+                }
+                
+                return fonction(self, *serialized, **param2)
             return dispatch_serializer
         return input_serialzer_param
 
@@ -93,15 +93,14 @@ class _BusinessHost(_Common):
         :param fonction: the function that will be decorated
         :return: The function dispatch_deserializer is being returned.
         """
-        def dispatch_deserializer(self,*params, **param2):
-            # Handle positional arguments
-            serialized=[]
-            for param in params:
-                serialized.append(self._dispatch_deserializer(param))
-            # Handle keyword arguments
-            for key, value in param2.items():
-                param2[key] = self._dispatch_deserializer(value)
-            return fonction(self,*serialized, **param2)
+        def dispatch_deserializer(self, *params, **param2):
+            # Handle positional arguments using list comprehension
+            serialized = [self._dispatch_deserializer(param) for param in params]
+            
+            # Handle keyword arguments using dictionary comprehension
+            param2 = {key: self._dispatch_deserializer(value) for key, value in param2.items()}
+            
+            return fonction(self, *serialized, **param2)
         return dispatch_deserializer
 
     def output_serialzer(fonction):
@@ -236,18 +235,20 @@ class _BusinessHost(_Common):
         :param message: The message to be serialized
         :return: The serialized message
         """
-        if (message is not None and self._is_message_instance(message)):
-            return self._serialize_message(message)
-        elif (message is not None and self._is_pickle_message_instance(message)):
-            return self._serialize_pickle_message(message)
-        elif (message is not None and self._is_iris_object_instance(message)):
-            return message
-        elif (message is None or message == ""):
+        if message is not None:
+            if self._is_message_instance(message):
+                return self._serialize_message(message)
+            elif self._is_pickle_message_instance(message):
+                return self._serialize_pickle_message(message)
+            elif self._is_iris_object_instance(message):
+                return message
+
+        if message == "" or message is None:
             return message
-        else:
-            # todo : decorator takes care of all the parameters, so this should never happen
-            # return message
-            raise TypeError("The message must be an instance of a class that is a subclass of Message or IRISObject %Persistent class.")
+
+        # todo : decorator takes care of all the parameters, so this should never happen
+        # return message
+        raise TypeError("The message must be an instance of a class that is a subclass of Message or IRISObject %Persistent class.")
 
     def _serialize_message(self,message):
         """ Converts a python dataclass message into an iris iop.message.
@@ -265,8 +266,10 @@ class _BusinessHost(_Common):
         msg = iris.cls('IOP.Message')._New()
         msg.classname = module + "." + classname
 
-        stream = _Utils.string_to_stream(json_string)
-        msg.jstr = stream
+        if hasattr(message, 'buffer') and len(json_string) > msg.buffer:
+            msg.json = _Utils.string_to_stream(json_string)
+        else:
+            msg.json = json_string
 
         return msg
 
@@ -289,16 +292,22 @@ class _BusinessHost(_Common):
         :return: The return value is a tuple of the form (serial, serial_type)
         """
         if (
-                (serial is not None and type(serial).__module__.find('iris') == 0) 
-                 and 
-                (serial._IsA("IOP.Message") or serial._IsA("Grongier.PEX.Message"))
-           ):
+            serial is not None
+            and type(serial).__module__.startswith('iris')
+            and (
+                serial._IsA("IOP.Message")
+                or serial._IsA("Grongier.PEX.Message")
+            )
+        ):
             return self._deserialize_message(serial)
         elif (
-                (serial is not None and type(serial).__module__.find('iris') == 0) 
-                and 
-                (serial._IsA("IOP.PickleMessage") or serial._IsA("Grongier.PEX.PickleMessage"))
-            ):
+            serial is not None
+            and type(serial).__module__.startswith('iris')
+            and (
+                serial._IsA("IOP.PickleMessage")
+                or serial._IsA("Grongier.PEX.PickleMessage")
+            )
+        ):
             return self._deserialize_pickle_message(serial)
         else:
             return serial
@@ -321,7 +330,11 @@ class _BusinessHost(_Common):
         except Exception:
             raise ImportError("Class not found: " + classname)
 
-        string = _Utils.stream_to_string(serial.jstr)
+        string = ""
+        if (serial.type == 'Stream'):
+            string = _Utils.stream_to_string(serial.json)
+        else:
+            string = serial.json
 
         jdict = json.loads(string, cls=IrisJSONDecoder)
         msg = self._dataclass_from_dict(msg,jdict)

{iris_pex_embedded_python-3.1.1b1 → iris_pex_embedded_python-3.1.1b3}/src/iop/cls/IOP/Message.cls

@@ -7,54 +7,105 @@ Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, %XML.Adaptor)
 
 Parameter BUFFER = 64000;
 
+Property buffer As %String(MAXLEN = "") [ Calculated, Transient ];
+
 Property classname As %String(MAXLEN = "");
 
 Property jsonObject As %DynamicObject(XMLPROJECTION = "None");
 
 Property json As %String(MAXLEN = "");
 
+Property jsonStream As %Stream.GlobalCharacter [ Internal, ReadOnly ];
+
+Property jsonString As %String(MAXLEN = 64000) [ Internal, ReadOnly ];
+
 Property jstr As %Stream.GlobalCharacter [ Internal, Private ];
 
+// for retrocompatibility
+
+Property type As %String(MAXLEN = 6) [ ReadOnly ];
+
+Method bufferGet()
+{
+	Quit ..#BUFFER
+}
+
 Method %OnNew(classname) As %Status [ Private, ServerOnly = 1 ]
 {
 	set ..classname = $g(classname)
 	Quit $$$OK
 }
 
-Method jsonGet()
+Method jstrGet()
 {
-	QUIT ..GetObjectJson()
+	set rsp = $$$NULLOREF
+	// Get as stream no matter what
+	if ..type="String" { 
+		Set rsp = ##class(%Stream.GlobalCharacter).%New()
+		Set sc = rsp.Write(..jsonString)
+	}
+	elseif ..type="Stream" { 
+		set rsp = ..jsonStream
+	}
+	Quit rsp
 }
 
-Method jsonSet(value) As %Status
+Method jstrSet(pInput) As %Status
 {
-	set ..jsonObject = {}.%FromJSON(value)
-	set ..jstr = ##class(%Stream.GlobalCharacter).%New()
-    do ..jstr.Write(value)
-	return $$$OK
+	// Set as stream no matter what
+	set sc = ..jsonSet(pInput)
+	if $$$ISERR(sc) { Quit sc }
+	if ..type="String" { 
+		set stream = ##class(%Stream.GlobalCharacter).%New()
+		Set sc = stream.Write(..jsonString)
+		set r%jsonStream = stream
+		set i%type = "Stream"
+	}
+	Quit sc
 }
 
-Method %DispatchGetProperty(property As %String) As %ObjectHandle
+Method jsonGet()
 {
-	quit $property(..jsonObject,property)
+	Quit $Case(..type
+				, "String":..jsonString
+				, "Stream":..jsonStream
+				, :$$$NULLOREF)
 }
 
-Method %DispatchSetProperty(
-	property As %String,
-	value)
+Method jsonSet(pInput) As %Status
 {
-	set $property(..jsonObject,property) = value
-	quit
+	Set tOldStream=$Case(..type
+				, "String":..jsonString
+				, "Stream":..jsonStream
+				, :$$$NULLOREF)
+	Quit:tOldStream=pInput $$$OK
+	Do:..type'="" Clear()  Set i%type=""
+	If $ISOBJECT(pInput) && pInput.%Extends("%Stream.GlobalCharacter") { 
+		Set r%jsonStream=pInput, i%type="Stream" 
+	}
+	If $IsObject(pInput) && 'pInput.%Extends("%Stream.GlobalCharacter") {  
+		Throw ##class(%Exception.General).%New("Invalid input type, must be a %Stream.GlobalCharacter")
+	}
+	Else {  
+		Set i%jsonString=pInput, i%type="String" 
+	}
+	Quit $$$OK
+Clear()
+	If ..type="String"     { Set r%jsonString="" }
+	ElseIf ..type="Stream" { Set r%jsonStream=$$$NULLOREF }
+	Quit
 }
 
 Method GetObjectJson(ByRef atEnd)
 {
 	set atEnd = 1
-	set json = ..jsonObject.%ToJSON()
-	if json = "{}" {
-		d ..jstr.Rewind()
-		set json = ..jstr.Read(..#BUFFER)
-        set atEnd = ..jstr.AtEnd
+	if ..type = "String" {
+		set json = ..jsonString
+	}
+	elseif ..type = "Stream" {
+		do ..jsonStream.Rewind()
+		set json = ..jsonStream.Read(..#BUFFER)
+		set atEnd = ..jsonStream.AtEnd
 	}
     QUIT json
 }
@@ -115,6 +166,15 @@ Storage Default
 <Value name="3">
 <Value>jstr</Value>
 </Value>
+<Value name="4">
+<Value>jsonStream</Value>
+</Value>
+<Value name="5">
+<Value>type</Value>
+</Value>
+<Value name="6">
+<Value>jsonString</Value>
+</Value>
 </Data>
 <Data name="jsonObject">
 <Attribute>jsonObject</Attribute>

{iris_pex_embedded_python-3.1.1b1 → iris_pex_embedded_python-3.1.1b3}/src/iop/cls/IOP/Test.cls

@@ -2,6 +2,17 @@
 Class IOP.Test Extends %Persistent
 {
 
+/// Description
+ClassMethod TEST() As %Status
+{
+	set msg = ##class(IOP.Message).%New()
+	set msg.classname = "IOP.Message"
+	set msg.json = "{""name"":""John""}"
+	set tset = msg.json
+	set tst = msg.jstr
+	QUIT $$$OK
+}
+
 /// Register
 ClassMethod Register() As %Status
 {

{iris_pex_embedded_python-3.1.1b1 → iris_pex_embedded_python-3.1.1b3/src/iris_pex_embedded_python.egg-info}/PKG-INFO

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