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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iris_pex_embedded_python
-Version: 3.1.1
+Version: 3.1.1b1
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -115,7 +115,6 @@ This proof of concept aims to show how the **iris interoperability framework** c
   - [7.11. version](#711-version)
   - [7.12. log](#712-log)
 - [8. Credits](#8-credits)
-- [9. Benchmarks](#9-benchmarks)
 
 ## 1.2. Example
 
@@ -1384,20 +1383,3 @@ output :
 Most of the code came from PEX for Python by Mo Cheng and Summer Gerry.
 
 Works only on IRIS 2021.2 +
-
-# 9. Benchmarks
-
-8 senarios with thoses parameters :
-- 100 messages
-- body : simple string `test`
-
-| Scenario | Time (s) |
-| --- | --- |
-| Python BP to Python BO with Iris Message | 0.739 |
-| Python BP to Python BO with Python Message | 0.732 |
-| ObjetScript BP to Python BO with Iris Message | 0.594 |
-| ObjetScript BP to Python BO with Python Message | 0.642 |
-| Python BP to ObjetScript BO with Iris Message | 0.642 |
-| Python BP to ObjetScript BO with Python Message | 0.675 |
-| ObjetScript BP to ObjetScript BO with Iris Message | 0.159 |
-| ObjetScript BP to ObjetScript BO with Python Message | 0.182 |

{iris_pex_embedded_python-3.1.1 → iris_pex_embedded_python-3.1.1b1}/README.md

@@ -66,7 +66,6 @@ This proof of concept aims to show how the **iris interoperability framework** c
   - [7.11. version](#711-version)
   - [7.12. log](#712-log)
 - [8. Credits](#8-credits)
-- [9. Benchmarks](#9-benchmarks)
 
 ## 1.2. Example
 
@@ -1334,21 +1333,4 @@ output :
 
 Most of the code came from PEX for Python by Mo Cheng and Summer Gerry.
 
-Works only on IRIS 2021.2 +
-
-# 9. Benchmarks
-
-8 senarios with thoses parameters :
-- 100 messages
-- body : simple string `test`
-
-| Scenario | Time (s) |
-| --- | --- |
-| Python BP to Python BO with Iris Message | 0.739 |
-| Python BP to Python BO with Python Message | 0.732 |
-| ObjetScript BP to Python BO with Iris Message | 0.594 |
-| ObjetScript BP to Python BO with Python Message | 0.642 |
-| Python BP to ObjetScript BO with Iris Message | 0.642 |
-| Python BP to ObjetScript BO with Python Message | 0.675 |
-| ObjetScript BP to ObjetScript BO with Iris Message | 0.159 |
-| ObjetScript BP to ObjetScript BO with Python Message | 0.182 |
+Works only on IRIS 2021.2 +

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

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

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

@@ -34,14 +34,15 @@ 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 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)
+        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)
         return dispatch_serializer
     
     def input_serialzer_param(position:int,name:str):
@@ -54,20 +55,19 @@ class _BusinessHost(_Common):
         """
         def input_serialzer_param(fonction):
             @wraps(fonction)
-            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)
+            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)
             return dispatch_serializer
         return input_serialzer_param
 
@@ -93,14 +93,15 @@ 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 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)
+        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)
         return dispatch_deserializer
 
     def output_serialzer(fonction):
@@ -235,20 +236,18 @@ class _BusinessHost(_Common):
         :param message: The message to be serialized
         :return: The serialized 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:
+        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
-
-        # 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.")
+        elif (message is None or message == ""):
+            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.")
 
     def _serialize_message(self,message):
         """ Converts a python dataclass message into an iris iop.message.
@@ -266,10 +265,8 @@ class _BusinessHost(_Common):
         msg = iris.cls('IOP.Message')._New()
         msg.classname = module + "." + classname
 
-        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
+        stream = _Utils.string_to_stream(json_string)
+        msg.jstr = stream
 
         return msg
 
@@ -292,22 +289,16 @@ 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__.startswith('iris')
-            and (
-                serial._IsA("IOP.Message")
-                or serial._IsA("Grongier.PEX.Message")
-            )
-        ):
+                (serial is not None and type(serial).__module__.find('iris') == 0) 
+                 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__.startswith('iris')
-            and (
-                serial._IsA("IOP.PickleMessage")
-                or serial._IsA("Grongier.PEX.PickleMessage")
-            )
-        ):
+                (serial is not None and type(serial).__module__.find('iris') == 0) 
+                and 
+                (serial._IsA("IOP.PickleMessage") or serial._IsA("Grongier.PEX.PickleMessage"))
+            ):
             return self._deserialize_pickle_message(serial)
         else:
             return serial
@@ -330,11 +321,7 @@ class _BusinessHost(_Common):
         except Exception:
             raise ImportError("Class not found: " + classname)
 
-        string = ""
-        if (serial.type == 'Stream'):
-            string = _Utils.stream_to_string(serial.json)
-        else:
-            string = serial.json
+        string = _Utils.stream_to_string(serial.jstr)
 
         jdict = json.loads(string, cls=IrisJSONDecoder)
         msg = self._dataclass_from_dict(msg,jdict)

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

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

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

@@ -1,11 +1,9 @@
 import os
-import sys
 import ast
 import iris
 import inspect
 import xmltodict
 import pkg_resources
-import importlib
 
 class _Utils():
     @staticmethod
@@ -176,7 +174,7 @@ class _Utils():
         return module
 
     @staticmethod
-    def migrate(filename=None):
+    def migrate(filename=None,root_path=None):
         """ 
         Read the settings.py file and register all the components
         settings.py file has two dictionaries:
@@ -188,21 +186,18 @@ class _Utils():
                 * key: the name of the production
                 * value: a dictionary containing the settings for the production
         """
-        path = None
         # 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)
             else:
                 raise ValueError("The filename must be absolute")
-            # add the path to the system path to the beginning
-            sys.path.insert(0,os.path.normpath(path))
-            # import settings from the specified file
-            settings = _Utils.import_module_from_path('settings',filename)
-        else:
-            # import settings from the settings module
-            import settings
+            # 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))
         try:
@@ -215,24 +210,8 @@ class _Utils():
             _Utils.set_productions_settings(settings.PRODUCTIONS,path)
         except AttributeError:
             print("No productions to register")
-        try:
-            sys.path.remove(path)
-        except ValueError:
-            pass
 
-    @staticmethod
-    def import_module_from_path(module_name, file_path):
-        if not os.path.isabs(file_path):
-            raise ValueError("The file path must be absolute")
-        
-        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
-        spec.loader.exec_module(module)
-        return module
+
 
     @staticmethod
     def set_classes_settings(class_items,root_path=None):
@@ -381,17 +360,17 @@ class _Utils():
         return data
 
     @staticmethod
-    def stream_to_string(stream,buffer=1000000)-> str:
+    def stream_to_string(stream)-> str:
         string = ""
         stream.Rewind()
         while not stream.AtEnd:
-            string += stream.Read(buffer)
+            string += stream.Read(4092)
         return string
     
     @staticmethod
-    def string_to_stream(string:str,buffer=1000000):
+    def string_to_stream(string:str):
         stream = iris.cls('%Stream.GlobalCharacter')._New()
-        n = buffer
+        n = 4092
         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.1 → iris_pex_embedded_python-3.1.1b1}/src/iop/cls/IOP/Director.cls

@@ -9,8 +9,6 @@ Class IOP.Director [ Inheritance = right, ProcedureBlock, System = 4 ]
 
 ClassMethod dispatchCreateBusinessService(pTargetDispatchName As %String) As Ens.BusinessService
 {
-	// Hack to prevent job to be registered in the production
-	do ##class(Ens.Job).UnRegister(pTargetDispatchName,$JOB)
 	set tSC = ##class(Ens.Director).CreateBusinessService(pTargetDispatchName,.service)
 	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
 	quit service

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

@@ -5,9 +5,7 @@
 Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, %XML.Adaptor)
 {
 
-Parameter BUFFER = 1000000;
-
-Property buffer As %String(MAXLEN = "") [ Calculated, Transient ];
+Parameter BUFFER = 64000;
 
 Property classname As %String(MAXLEN = "");
 
@@ -15,109 +13,48 @@ Property jsonObject As %DynamicObject(XMLPROJECTION = "None");
 
 Property json As %String(MAXLEN = "");
 
-Property jsonStream As %Stream.GlobalCharacter [ Internal, Private ];
-
-Property jsonString As %String(MAXLEN = 1000000) [ Internal, Private ];
-
 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 jstrGet()
+Method jsonGet()
 {
-	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
+	QUIT ..GetObjectJson()
 }
 
-Method jstrSet(pInput) As %Status
+Method jsonSet(value) As %Status
 {
-	// 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
+	set ..jsonObject = {}.%FromJSON(value)
+	set ..jstr = ##class(%Stream.GlobalCharacter).%New()
+    do ..jstr.Write(value)
+	return $$$OK
 }
 
-Method jsonGet()
+Method %DispatchGetProperty(property As %String) As %ObjectHandle
 {
-	Quit $Case(..type
-				, "String":..jsonString
-				, "Stream":..jsonStream
-				, :$$$NULLOREF)
+	quit $property(..jsonObject,property)
 }
 
-Method jsonSet(pInput) As %Status
+Method %DispatchSetProperty(
+	property As %String,
+	value)
 {
-	Set tOldStream=$Case(..type
-				, "String":..jsonString
-				, "Stream":..jsonStream
-				, :$$$NULLOREF)
-	Quit:tOldStream=pInput $$$OK
-	Do:..type'="" Clear()  Set i%type=""
-
-	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  {
-		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
-Clear()
-	If ..type="String"     { Set r%jsonString="" }
-	ElseIf ..type="Stream" { Set r%jsonStream=$$$NULLOREF }
-	Quit
+	set $property(..jsonObject,property) = value
+	quit
 }
 
 Method GetObjectJson(ByRef atEnd)
 {
 	set atEnd = 1
-	if ..type = "String" {
-		set json = ..jsonString
-	}
-	elseif ..type = "Stream" {
-		do ..jsonStream.Rewind()
-		set json = ..jsonStream.Read(..#BUFFER)
-		set atEnd = ..jsonStream.AtEnd
+	set json = ..jsonObject.%ToJSON()
+	if json = "{}" {
+		d ..jstr.Rewind()
+		set json = ..jstr.Read(..#BUFFER)
+        set atEnd = ..jstr.AtEnd
 	}
     QUIT json
 }
@@ -178,15 +115,6 @@ 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.1 → iris_pex_embedded_python-3.1.1b1}/src/iop/cls/IOP/Test.cls

@@ -2,29 +2,6 @@
 Class IOP.Test Extends %Persistent
 {
 
-/// Description
-ClassMethod TestJsonStringMessage() 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
-}
-
-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.1 → iris_pex_embedded_python-3.1.1b1}/src/iop/cls/IOP/Utils.cls

@@ -104,10 +104,12 @@ ClassMethod GetRemoteClassInfo(
 	pModule As %String,
 	pClasspaths As %String,
 	ByRef pClassDetails,
-	ByRef pRemoteSettings) As %Status [ Internal ]
+	ByRef pRemoteSettings) As %Status [ Internal, Private ]
 {
 	#dim tSC As %Status = $$$OK
 	#dim ex As %Exception.AbstractException
+	#dim tGateway As %External.Gateway
+	#dim tGatewayProxy As %Net.Remote.Object
 	
 	Try {
 		if pClasspaths '="" {
@@ -118,19 +120,14 @@ 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 ##class(IOP.Common).SetPythonPath(onePath)
+				if onePath'="" do sys.path.append(onePath)
 			}
 		}
+		;
 
 		set importlib = ##class(%SYS.Python).Import("importlib")
 		set builtins = ##class(%SYS.Python).Import("builtins")
-		set sys = ##class(%SYS.Python).Import("sys")
-		// Load the module form a specific path
-        set spec = importlib.util."spec_from_file_location"(pModule, onePath_pModule_".py")
-        set module = importlib.util."module_from_spec"(spec)
-        do sys.modules."__setitem__"(pModule, module)
-        do spec.loader."exec_module"(module)
-		// Get the class
+		set module = importlib."import_module"(pModule)
 		set class = builtins.getattr(module, pRemoteClassname)
 		set tClass = class."__new__"(class)
 

{iris_pex_embedded_python-3.1.1 → iris_pex_embedded_python-3.1.1b1/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.1
+Version: 3.1.1b1
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -115,7 +115,6 @@ This proof of concept aims to show how the **iris interoperability framework** c
   - [7.11. version](#711-version)
   - [7.12. log](#712-log)
 - [8. Credits](#8-credits)
-- [9. Benchmarks](#9-benchmarks)
 
 ## 1.2. Example
 
@@ -1384,20 +1383,3 @@ output :
 Most of the code came from PEX for Python by Mo Cheng and Summer Gerry.
 
 Works only on IRIS 2021.2 +
-
-# 9. Benchmarks
-
-8 senarios with thoses parameters :
-- 100 messages
-- body : simple string `test`
-
-| Scenario | Time (s) |
-| --- | --- |
-| Python BP to Python BO with Iris Message | 0.739 |
-| Python BP to Python BO with Python Message | 0.732 |
-| ObjetScript BP to Python BO with Iris Message | 0.594 |
-| ObjetScript BP to Python BO with Python Message | 0.642 |
-| Python BP to ObjetScript BO with Iris Message | 0.642 |
-| Python BP to ObjetScript BO with Python Message | 0.675 |
-| ObjetScript BP to ObjetScript BO with Iris Message | 0.159 |
-| ObjetScript BP to ObjetScript BO with Python Message | 0.182 |