iris-pex-embedded-python 3.1.1b2__tar.gz → 3.1.1b4__tar.gz

{iris_pex_embedded_python-3.1.1b2/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.1.1b4}/PKG-INFO

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

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/pyproject.toml

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

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/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,8 @@ class _BusinessHost(_Common):
         msg = iris.cls('IOP.Message')._New()
         msg.classname = module + "." + classname
 
-        if hasattr(message, 'buffer') and len(json_string) > msg.buffer:
-            msg.json = _Utils.string_to_stream(json_string)
+        if hasattr(msg, 'buffer') and len(json_string) > msg.buffer:
+            msg.json = _Utils.string_to_stream(json_string,msg.buffer)
         else:
             msg.json = json_string
 
@@ -291,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

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/src/iop/_director.py

@@ -258,9 +258,9 @@ class _Director():
                 message = iris.cls("IOP.Message")._New()
                 message.classname = classname
                 if body:
-                    message.jstr = _Utils.string_to_stream(body)
+                    message.json = _Utils.string_to_stream(body)
                 else:
-                    message.jstr = _Utils.string_to_stream("{}")
+                    message.json = _Utils.string_to_stream("{}")
         # serialize the message
         business_host = _BusinessHost()
         serial_message = business_host._dispatch_serializer(message)

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/src/iop/_utils.py

@@ -1,9 +1,11 @@
 import os
+import sys
 import ast
 import iris
 import inspect
 import xmltodict
 import pkg_resources
+import importlib
 
 class _Utils():
     @staticmethod
@@ -186,20 +188,17 @@ class _Utils():
                 * key: the name of the production
                 * value: a dictionary containing the settings for the production
         """
-        # try to load the settings file
-        if filename:
-            import sys
-            path = None
-            # check if the filename is absolute or relative
-            if os.path.isabs(filename):
-                path = os.path.dirname(filename)
+        try:
+            # if the filename is not provided
+            if filename is None:
+                settings = importlib.import_module('settings')
             else:
-                raise ValueError("The filename must be absolute")
-            # add the path to the system path
-            sys.path.append(path)
-        import settings
-        # get the path of the settings file
-        path = os.path.dirname(inspect.getfile(settings))
+                # import the settings file
+                settings = _Utils.import_module_from_path('settings',filename)
+            # get the path of the settings file
+            path = os.path.dirname(inspect.getfile(settings))
+        except ModuleNotFoundError as e:
+            raise ModuleNotFoundError("settings.py not found") from e
         try:
             # set the classes settings
             _Utils.set_classes_settings(settings.CLASSES,path)
@@ -211,7 +210,22 @@ class _Utils():
         except AttributeError:
             print("No productions to register")
 
-
+    @staticmethod
+    def import_module_from_path(module_name, file_path):
+        if not os.path.isabs(file_path):
+            file_path = os.path.abspath(file_path)
+        # check is a file is persent at the path
+        if not os.path.isfile(file_path):
+            # append settings.py to the path
+            file_path = os.path.join(file_path,'settings.py')
+        
+        spec = importlib.util.spec_from_file_location(module_name, file_path)
+        if spec is None:
+            raise ImportError(f"Cannot find module named {module_name} at {file_path}")
+        
+        module = importlib.util.module_from_spec(spec)
+        sys.modules[module_name] = module
+        return module
 
     @staticmethod
     def set_classes_settings(class_items,root_path=None):
@@ -360,17 +374,17 @@ class _Utils():
         return data
 
     @staticmethod
-    def stream_to_string(stream)-> str:
+    def stream_to_string(stream,buffer=1000000)-> str:
         string = ""
         stream.Rewind()
         while not stream.AtEnd:
-            string += stream.Read(4092)
+            string += stream.Read(buffer)
         return string
     
     @staticmethod
-    def string_to_stream(string:str):
+    def string_to_stream(string:str,buffer=1000000):
         stream = iris.cls('%Stream.GlobalCharacter')._New()
-        n = 4092
+        n = buffer
         chunks = [string[i:i+n] for i in range(0, len(string), n)]
         for chunk in chunks:
             stream.Write(chunk)

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/src/iop/cls/IOP/Message.cls

@@ -5,7 +5,7 @@
 Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, %XML.Adaptor)
 {
 
-Parameter BUFFER = 64000;
+Parameter BUFFER = 1000000;
 
 Property buffer As %String(MAXLEN = "") [ Calculated, Transient ];
 
@@ -15,9 +15,9 @@ Property jsonObject As %DynamicObject(XMLPROJECTION = "None");
 
 Property json As %String(MAXLEN = "");
 
-Property jsonStream As %Stream.GlobalCharacter [ Internal, ReadOnly ];
+Property jsonStream As %Stream.GlobalCharacter [ Internal, Private ];
 
-Property jsonString As %String(MAXLEN = 64000) [ Internal, ReadOnly ];
+Property jsonString As %String(MAXLEN = 1000000) [ Internal, Private ];
 
 Property jstr As %Stream.GlobalCharacter [ Internal, Private ];
 
@@ -80,13 +80,25 @@ Method jsonSet(pInput) As %Status
 				, :$$$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")
+
+	If $ISOBJECT(pInput) {
+		if pInput.%Extends("%Stream.GlobalCharacter") { 
+			Set ..jsonStream=pInput, i%type="Stream" 
+		}
+		else { 
+			Throw ##class(%Exception.General).%New("Invalid input type, must be a %Stream.GlobalCharacter or a %String")
+		}
 	}
-	Else {  
+	Else  {
+		if $LENGTH(pInput)>..#BUFFER { 
+			// write in a stream
+			Set stream = ##class(%Stream.GlobalCharacter).%New()
+			for i=1:..#BUFFER:$LENGTH(pInput) {
+				Set sc = stream.Write($EXTRACT(pInput,i,(i+..#BUFFER)))
+				Quit:$$$ISERR(sc)
+			}
+			Set ..jsonStream=stream, i%type="Stream"
+		}
 		Set i%jsonString=pInput, i%type="String" 
 	}
 	Quit $$$OK

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/src/iop/cls/IOP/Test.cls

@@ -3,7 +3,7 @@ Class IOP.Test Extends %Persistent
 {
 
 /// Description
-ClassMethod TEST() As %Status
+ClassMethod TestJsonStringMessage() As %Status
 {
 	set msg = ##class(IOP.Message).%New()
 	set msg.classname = "IOP.Message"
@@ -13,6 +13,18 @@ ClassMethod TEST() As %Status
 	QUIT $$$OK
 }
 
+ClassMethod TestJsonStreamMessage() As %Status
+{
+	set msg = ##class(IOP.Message).%New()
+	set msg.classname = "IOP.Message"
+	set stream = ##class(%Stream.GlobalCharacter).%New()
+	set sc = stream.Write("{""name"":""John""}")
+	set msg.json = stream
+	set tset = msg.json
+	set tst = msg.jstr
+	QUIT $$$OK
+}
+
 /// Register
 ClassMethod Register() As %Status
 {

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4}/src/iop/cls/IOP/Utils.cls

@@ -120,7 +120,7 @@ ClassMethod GetRemoteClassInfo(
 				set onePath = $p(extraClasspaths,"|",i)
 				set onePath = ##class(%File).NormalizeDirectory(onePath)
 				if onePath?1"$$IRISHOME"1P.E set onePath = $e($system.Util.InstallDirectory(),1,*-1)_$e(onePath,11,*)
-				if onePath'="" do sys.path.append(onePath)
+				if onePath'="" && '$FIND(sys.path,onePath) do sys.path.insert(0, onePath)
 			}
 		}
 		;

{iris_pex_embedded_python-3.1.1b2 → iris_pex_embedded_python-3.1.1b4/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.1b2
+Version: 3.1.1b4
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License