iris-pex-embedded-python 3.5.1b1__py3-none-any.whl → 3.5.1b2__py3-none-any.whl

iop/cls/IOP/BusinessOperation.cls

@@ -7,13 +7,13 @@ Class IOP.BusinessOperation Extends (Ens.BusinessOperation, IOP.Common) [ Inheri
 
 Parameter SETTINGS = "%classname:Python BusinessOperation,%module:Python BusinessOperation,%settings:Python BusinessOperation,%classpaths:Python BusinessOperation";
 
-Method OnMessage(
-	request As %Library.Persistent,
-	Output response As %Library.Persistent) As %Status
+Method MessageHandler(
+	pRequest As %Library.Persistent,
+	Output pResponse As %Library.Persistent) As %Status
 {
 	set tSC = $$$OK
 	try {
-		set response = ..%class."_dispatch_on_message"(request)
+		set pResponse = ..%class."_dispatch_on_message"(pRequest)
 	} catch ex {
 		set tSC = ..DisplayTraceback(ex)
 	}

iop/cls/IOP/Common.cls

@@ -104,7 +104,6 @@ Method OnInit() As %Status
     set tSC = $$$OK
 
     try {
-        LOCK +^PythonSettings:5
 
         if ..%Venv {
             $$$ThrowOnError(##class(IOP.Utils).SetPythonSettings(..%PythonRuntimeLibrary, ..%PythonPath, ..%PythonRuntimeLibraryVersion))
@@ -115,7 +114,6 @@ Method OnInit() As %Status
         do $system.Python.Debugging(..%traceback)
 
         $$$ThrowOnError(..Connect())
-        LOCK -^PythonSettings
 
         do ..%class."_debugpy"($this)
 
@@ -124,7 +122,7 @@ Method OnInit() As %Status
 
         set tSC = ..DisplayTraceback(ex)
     }
-    LOCK -^PythonSettings
+
     quit tSC
 }
 
@@ -147,18 +145,19 @@ ClassMethod SetPythonPath(pClasspaths)
 {
     set sys = ##class(%SYS.Python).Import("sys")
 
-    for i=0:1:(sys.path."__len__"()-1) {
-        Try {
-            if sys.path."__getitem__"(i) = pClasspaths {
-                do sys.path."__delitem__"(i)
-            }
-        }
-        Catch ex {
-            // do nothing
+    // Add the classpaths to the Python sys.path only if they are not already present
+    // Check if the path is already in sys.path
+    set found = 0
+    for j=1:1:sys.path."__len__"() {
+        if sys.path."__getitem__"(j-1) = pClasspaths {
+            set found = 1
+            quit
         }
-
     }
-    do sys.path.insert(0, pClasspaths)
+    if found = 0 {
+        // If not found, add to sys.path
+        do sys.path."append"(pClasspaths)
+    }
 }
 
 Method Connect() As %Status
@@ -167,24 +166,39 @@ Method Connect() As %Status
     try {
         
         set container = $this
-        
-        //set classpass
-        if ..%classpaths '="" {
-            set delimiter = $s($system.Version.GetOS()="Windows":";",1:":")
-            set extraClasspaths = $tr(container.%classpaths,delimiter,"|")
-            for i=1:1:$l(extraClasspaths,"|") {
-                set onePath = $p(extraClasspaths,"|",i)
-                set onePath = ##class(%File).NormalizeDirectory(onePath)
-                do ..SetPythonPath(onePath)
-            }
-        }
-        if $isObject(..%class)=0 {
-            set importlib = ##class(%SYS.Python).Import("importlib")
+
+        // Before anything, try to check if the module is already present in the sys.modules
+        set sys = ##class(%SYS.Python).Import("sys")
+        set moduleName = ..%module
+        set module = sys.modules.get(moduleName, $$$NULLOREF)
+        if $isObject(module) {
+            $$$LOGINFO("Module "_moduleName_" is already imported in sys.modules")
+            // If the module is already present, we can skip the import
             set builtins = ##class(%SYS.Python).Import("builtins")
-            set module = importlib."import_module"(..%module)
             set class = builtins.getattr(module, ..%classname)
             set ..%class = class."__new__"(class)
         }
+        else {
+
+            //set classpass
+            if ..%classpaths '="" {
+                set delimiter = $s($system.Version.GetOS()="Windows":";",1:":")
+                set extraClasspaths = $tr(container.%classpaths,delimiter,"|")
+                for i=1:1:$l(extraClasspaths,"|") {
+                    set onePath = $p(extraClasspaths,"|",i)
+                    set onePath = ##class(%File).NormalizeDirectory(onePath)
+                    do ..SetPythonPath(onePath)
+                }
+            }
+
+            if $isObject(..%class)=0 {
+                set builtins = ##class(%SYS.Python).Import("builtins")
+                set module = ##class(%SYS.Python).Import(..%module)
+                set class = builtins.getattr(module, ..%classname)
+                set ..%class = class."__new__"(class)
+            }
+        }
+
         ;
         if ..%Extends("IOP.InboundAdapter") || ..%Extends("IOP.OutboundAdapter") {
             do ..%class."_set_iris_handles"($this,..BusinessHost)
@@ -352,9 +366,9 @@ ClassMethod OnGetConnections(
                 if onePath'="" do sys.path.append(onePath)
             }
     }
-    set importlib = ##class(%SYS.Python).Import("importlib")
+
     set builtins = ##class(%SYS.Python).Import("builtins")
-    set module = importlib."import_module"(tModule)
+    set module = ##class(%SYS.Python).Import(tModule)
     set class = builtins.getattr(module, tClassname)
     set tClass = class."__new__"(class)
 

{iris_pex_embedded_python-3.5.1b1.dist-info → iris_pex_embedded_python-3.5.1b2.dist-info}/METADATA

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

{iris_pex_embedded_python-3.5.1b1.dist-info → iris_pex_embedded_python-3.5.1b2.dist-info}/RECORD

@@ -51,10 +51,10 @@ iop/_private_session_duplex.py,sha256=c6Q0k-qnZi_JcIOdpUx1Edu44zVbUE2Kf2aCHM8Eq8
 iop/_private_session_process.py,sha256=rvZFO6nWVwZtaEWJkSHyLTV-vhzDqQhsVi7INQLLwWI,1685
 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/BusinessOperation.cls,sha256=td4tFxy9KbZ6u5QEr9xCuCNjcqEJavdeYHErNrt-szk,941
 iop/cls/IOP/BusinessProcess.cls,sha256=XJxzbiV0xokzRm-iI2Be5UIJLE3MlXr7W3WS_LkOCYs,3363
 iop/cls/IOP/BusinessService.cls,sha256=fplKrbQgA7cQgjKIqDR2IK2iD1iNHmT-QvWrozhE4n4,1189
-iop/cls/IOP/Common.cls,sha256=lRnvXarMTyHWgtqtQjF84mAtYYPViiem-m5riB-RYZw,17149
+iop/cls/IOP/Common.cls,sha256=GsFrrWY732-2Hzu5iiRS1C2Am_w2oDZmv-ZYa4Zeqy8,17769
 iop/cls/IOP/Director.cls,sha256=M43LoTb6lwSr0J81RFxi1YLW1mwda09wQ7Xqr3nBtxo,2008
 iop/cls/IOP/InboundAdapter.cls,sha256=H-gZfUy8M9YxAZXfp5HVYl3uLo-7Xg9YgojioB_eYMY,619
 iop/cls/IOP/Message.cls,sha256=6_iZzQaY0cA9FjXg0qECYZC6We8soAIrUwRBrlerC4w,25373
@@ -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.1b1.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.5.1b1.dist-info/METADATA,sha256=0JwhOA7L2CteIK4EfvFBiEFR3rS6tDO1QAyuHJi77wk,4415
-iris_pex_embedded_python-3.5.1b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iris_pex_embedded_python-3.5.1b1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.5.1b1.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
-iris_pex_embedded_python-3.5.1b1.dist-info/RECORD,,
+iris_pex_embedded_python-3.5.1b2.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.5.1b2.dist-info/METADATA,sha256=80F-3Ci14m0KlmqHejgX3iYgi_gk6fjLx5adBUfQE34,4415
+iris_pex_embedded_python-3.5.1b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iris_pex_embedded_python-3.5.1b2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.5.1b2.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
+iris_pex_embedded_python-3.5.1b2.dist-info/RECORD,,