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

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

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

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

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

{iris_pex_embedded_python-3.5.1b1 → iris_pex_embedded_python-3.5.1b3}/src/iop/_debugpy.py

@@ -142,4 +142,46 @@ def debugpython(self, host_object: Any) -> None:
         else:
             self.log_alert(f"Debugpy connection timed out after {host_object._timeout} seconds")
     except Exception as e:
-        self.log_alert(f"Error enabling debugpy: {e}")
+        self.log_alert(f"Error enabling debugpy: {e}")
+
+def debugpy_in_iris(iris_dir, port) -> bool:
+
+    if not hasattr(os, '__file__'):
+        setattr(os, '__file__', __file__)
+
+    if not is_debugpy_installed():
+        print("debugpy is not installed.")
+        return False
+    if not iris_dir:
+        print("IRIS directory is not specified.")
+        return False
+    
+    import debugpy
+    python_path = _get_python_interpreter_path(mgr_dir_to_install_dir(iris_dir))
+    if not python_path:
+        return False
+    debugpy.configure(_get_debugpy_config(python_path))
+
+    try:
+        enable_debugpy(port=port)
+    except Exception as e:
+        print(f"Failed to enable debugpy: {e}")
+        return False
+
+    print(f"Debugpy is waiting for connection on port {port}...")
+    if wait_for_debugpy_connected(timeout=30, port=port):
+        print(f"Debugpy is connected on port {port}")
+        return True
+    else:
+        print(f"Debugpy connection timed out after 30 seconds on port {port}")
+        return False
+
+def mgr_dir_to_install_dir(mgr_dir: str) -> Optional[str]:
+    """Convert manager directory to install directory."""
+    import os
+    if not mgr_dir:
+        return None
+    install_dir = os.path.dirname(os.path.dirname(mgr_dir))
+    if os.path.exists(install_dir):
+        return install_dir
+    return None

{iris_pex_embedded_python-3.5.1b1 → iris_pex_embedded_python-3.5.1b3}/src/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)
 	}

{iris_pex_embedded_python-3.5.1b1 → iris_pex_embedded_python-3.5.1b3}/src/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,61 +145,41 @@ 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
 {
     set tSC = $$$OK
     try {
+        // Initialize Python class instance
+        $$$ThrowOnError(..InitializePythonClass())
         
-        set container = $this
+        // Set IRIS handles based on component type
+        do ..SetIrisHandles()
         
-        //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")
-            set builtins = ##class(%SYS.Python).Import("builtins")
-            set module = importlib."import_module"(..%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)
-        } elseif $this.%Extends("IOP.BusinessProcess") {
-            do ..%class."_set_iris_handles"($this,$$$NULLOREF)
-        } else {
-            do ..%class."_set_iris_handles"($this,..Adapter)
-        }
-        ;
+        // Apply property values to Python instance
         do ..SetPropertyValues()
-        ;
+        
+        // Notify Python class of connection
         try {
             do ..%class."_dispatch_on_connected"($this)
         } catch ex {
             $$$LOGWARNING(ex.DisplayString())
         }
-        ;
+        
     } catch ex {
         set msg = $System.Status.GetOneStatusText(ex.AsStatus(),1)
         set tSC = $$$ERROR($$$EnsErrGeneral,msg)
@@ -352,9 +330,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)
 
@@ -531,4 +509,61 @@ Method OnMsgGeneratorPoll(
     quit tSC
 }
 
+Method InitializePythonClass() As %Status [ Private ]
+{
+    set tSC = $$$OK
+    try {
+        // Check if module is already imported
+        set sys = ##class(%SYS.Python).Import("sys")
+        set module = sys.modules.get(..%module, $$$NULLOREF)
+        
+        if $isObject(module) {
+            $$$LOGINFO("Module "_..%module_" is already imported in sys.modules")
+            set ..%class = ..CreateClassInstance(module)
+        } else {
+            // Setup classpaths if specified
+            if ..%classpaths '= "" {
+                do ..SetupClasspaths()
+            }
+            
+            // Import module and create class instance
+            set module = ##class(%SYS.Python).Import(..%module)
+            set ..%class = ..CreateClassInstance(module)
+        }
+    } catch ex {
+        set tSC = ex.AsStatus()
+    }
+    quit tSC
+}
+
+Method CreateClassInstance(module As %SYS.Python) As %SYS.Python [ Private ]
+{
+    set builtins = ##class(%SYS.Python).Import("builtins")
+    set class = builtins.getattr(module, ..%classname)
+    quit class."__new__"(class)
+}
+
+Method SetupClasspaths() [ Private ]
+{
+    set delimiter = $s($system.Version.GetOS()="Windows":";",1:":")
+    set extraClasspaths = $tr(..%classpaths, delimiter, "|")
+    
+    for i=1:1:$l(extraClasspaths,"|") {
+        set onePath = $p(extraClasspaths,"|",i)
+        set onePath = ##class(%File).NormalizeDirectory(onePath)
+        do ..SetPythonPath(onePath)
+    }
+}
+
+Method SetIrisHandles() [ Private ]
+{
+    if ..%Extends("IOP.InboundAdapter") || ..%Extends("IOP.OutboundAdapter") {
+        do ..%class."_set_iris_handles"($this, ..BusinessHost)
+    } elseif $this.%Extends("IOP.BusinessProcess") {
+        do ..%class."_set_iris_handles"($this, $$$NULLOREF)
+    } else {
+        do ..%class."_set_iris_handles"($this, ..Adapter)
+    }
+}
+
 }

iris_pex_embedded_python-3.5.1b3/src/iop/cls/IOP/Wrapper.cls

@@ -0,0 +1,58 @@
+Class IOP.Wrapper Extends %RegisteredObject
+{
+
+ClassMethod Import(
+	moduleName As %String,
+	path As %String = "",
+	debugPort As %Integer = 0) As %Status
+{
+    set tSC = $$$OK
+    Try {
+        do ##class(IOP.Common).SetPythonPath(path)
+        // For traceback debugging
+        do $system.Python.Debugging(1)
+        if debugPort > 0 {
+            
+            set debugpy = ##class(%SYS.Python).Import("iop._debugpy")
+            do debugpy."debugpy_in_iris"($zu(12),debugPort)
+        }
+
+        // Import the module
+        set tModule = ##class(%SYS.Python).Import(moduleName)
+
+    }
+    Catch ex {
+        Set tSC= ##class(IOP.Wrapper).DisplayTraceback(ex)
+        throw ex
+    }
+    return tModule
+}
+
+ClassMethod DisplayTraceback(ex) As %Status
+{
+    set tSC = ex.AsStatus()
+
+    // Import Modules
+    set sys = ##class(%SYS.Python).Import("sys")
+    set tracebackModule = ##class(%SYS.Python).Import("traceback")
+    set builtins = ##class(%SYS.Python).Import("builtins")
+    // Get the last traceback
+    set traceback = sys."last_traceback"
+    set exType = sys."last_type"."__name__"
+    set exValue = sys."last_value"."__str__"()
+    // Check if traceback is an object
+    if $isObject(traceback) {
+        // Format the traceback
+        set tb = tracebackModule."format_exception"(sys."last_type", sys."last_value", traceback)
+        set tbString = ""
+        for i=0:1:(tb."__len__"()-1) {
+            set tbString = tbString _ $c(10)_$c(13) _ tb."__getitem__"(i)
+        }
+        w tbString
+        set tSC = $$$ERROR("Exception in Python - "_exType_" - "_exValue)
+    }
+    
+    return tSC
+}
+
+}

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

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

{iris_pex_embedded_python-3.5.1b1 → iris_pex_embedded_python-3.5.1b3}/src/iris_pex_embedded_python.egg-info/SOURCES.txt

@@ -66,6 +66,7 @@ src/iop/cls/IOP/OutboundAdapter.cls
 src/iop/cls/IOP/PickleMessage.cls
 src/iop/cls/IOP/Test.cls
 src/iop/cls/IOP/Utils.cls
+src/iop/cls/IOP/Wrapper.cls
 src/iop/cls/IOP/Duplex/Operation.cls
 src/iop/cls/IOP/Duplex/Process.cls
 src/iop/cls/IOP/Duplex/Service.cls