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

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

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

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

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

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

@@ -266,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
 

{iris_pex_embedded_python-3.1.1b3 → iris_pex_embedded_python-3.1.1b5}/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.1b3 → iris_pex_embedded_python-3.1.1b5}/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
@@ -174,7 +176,7 @@ class _Utils():
         return module
 
     @staticmethod
-    def migrate(filename=None,root_path=None):
+    def migrate(filename=None):
         """ 
         Read the settings.py file and register all the components
         settings.py file has two dictionaries:
@@ -186,18 +188,21 @@ 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
-            sys.path.append(path)
-        import settings
+            # 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
         # get the path of the settings file
         path = os.path.dirname(inspect.getfile(settings))
         try:
@@ -210,8 +215,26 @@ class _Utils():
             _Utils.set_productions_settings(settings.PRODUCTIONS,path)
         except AttributeError:
             print("No productions to register")
+        try:
+            # remove the path from the system path (with or without the trailing slash)
+            sys.path.remove(path+'/')
+            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):
@@ -360,17 +383,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.1b3 → iris_pex_embedded_python-3.1.1b5}/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.1b3 → iris_pex_embedded_python-3.1.1b5}/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.1b3 → iris_pex_embedded_python-3.1.1b5}/src/iop/cls/IOP/Utils.cls

@@ -104,12 +104,10 @@ ClassMethod GetRemoteClassInfo(
 	pModule As %String,
 	pClasspaths As %String,
 	ByRef pClassDetails,
-	ByRef pRemoteSettings) As %Status [ Internal, Private ]
+	ByRef pRemoteSettings) As %Status [ Internal ]
 {
 	#dim tSC As %Status = $$$OK
 	#dim ex As %Exception.AbstractException
-	#dim tGateway As %External.Gateway
-	#dim tGatewayProxy As %Net.Remote.Object
 	
 	Try {
 		if pClasspaths '="" {
@@ -120,14 +118,19 @@ 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'="" do ##class(IOP.Common).SetPythonPath(onePath)
 			}
 		}
-		;
 
 		set importlib = ##class(%SYS.Python).Import("importlib")
 		set builtins = ##class(%SYS.Python).Import("builtins")
-		set module = importlib."import_module"(pModule)
+		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 class = builtins.getattr(module, pRemoteClassname)
 		set tClass = class."__new__"(class)
 

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