iris-pex-embedded-python 3.4.1b9__py3-none-any.whl → 3.4.1b11__py3-none-any.whl

iop/_business_operation.py

@@ -47,7 +47,6 @@ class _BusinessOperation(_BusinessHost):
 
     def _dispatch_on_init(self, host_object: Any) -> None:
         """For internal use only."""
-        self._debugpy(host_object=host_object)
         create_dispatch(self)
         self.on_init()
         return

iop/_business_process.py

@@ -141,7 +141,6 @@ class _BusinessProcess(_BusinessHost):
     def _dispatch_on_init(self, host_object: Any) -> None:
         """For internal use only."""
         self._restore_persistent_properties(host_object)
-        self._debugpy(host_object=host_object)
         create_dispatch(self)
         self.on_init()
         self._save_persistent_properties(host_object)

iop/_business_service.py

@@ -18,9 +18,6 @@ class _BusinessService(_BusinessHost):
 
     def _dispatch_on_init(self, host_object) -> None:
         """For internal use only."""
-
-        self._debugpy(host_object=host_object)
-
         self.on_init()
 
         return

iop/_common.py

@@ -8,6 +8,8 @@ from . import _iris
 
 from iop._log_manager import LogManager, logging
 
+from iop._debugpy import debugpython
+
 class _Common(metaclass=abc.ABCMeta):
     """Base class that defines common methods for all component types.
     
@@ -59,78 +61,8 @@ class _Common(metaclass=abc.ABCMeta):
 
     def _dispatch_on_init(self, host_object: Any) -> None:
         """Initialize component when started."""
-        self._debugpy(host_object)
         self.on_init()
 
-    def _debugpy(self, host_object: Any) -> None:
-        """Enable debugpy for debugging purposes."""
-        # iris.cls('%SYS.Python').Debugging(1)
-        from iop._debugpy import enable_debugpy, wait_for_debugpy_connected, find_free_port, is_debugpy_installed
-        import sys, os
-
-        # hack to set __file__ for os module in debugpy
-        # This is a workaround for the issue where debugpy cannot find the __file__ attribute of the os module.
-        if not hasattr(os, '__file__'):
-            setattr(os, '__file__', __file__)
-
-        if host_object is not None:
-            port = host_object.port
-            timeout = host_object.timeout
-            enabled = host_object.enable
-            python_interpreter_path = host_object.PythonInterpreterPath
-        else:
-            self.log_alert("No host object found, cannot enable debugpy.")
-            return
-        
-        if python_interpreter_path != "":
-            # the user has set a specific python interpreter path, so we need to set the path to the python executable
-            # to the one that is running this script
-            if os.path.exists(python_interpreter_path):
-                sys.executable = python_interpreter_path
-            else:
-                self.log_alert(f"Python path {python_interpreter_path} does not exist, cannot set python path for debugpy.")
-                return
-        elif sys.executable.find('irisdb') > 0:
-            # the executable is the IRIS executable, so we need to set the path to the python executable
-            # to the one that is running this script
-            installdir = os.environ.get('IRISINSTALLDIR') or os.environ.get('ISC_PACKAGE_INSTALLDIR')
-            if installdir is not None:
-                if sys.platform == 'win32':
-                    python_path = os.path.join(installdir, 'bin', 'irispython.exe')
-                else:
-                    python_path = os.path.join(installdir, 'bin', 'irispython')
-                if os.path.exists(python_path):
-                    sys.executable = python_path
-                else:
-                    self.log_alert(f"Python path {python_path} does not exist, cannot set python path for debugpy.")
-                    return
-            else:
-                self.log_alert("IRISINSTALLDIR or ISC_PACKAGE_INSTALLDIR not set, cannot set python path for debugpy.")
-                return
-
-        if enabled:
-            self.log_info(f"Debugpy is running in {sys.executable}.")
-            if is_debugpy_installed():
-                if port is None or port <= 0:
-                    port = find_free_port()
-                self.log_info(f"Debugpy enabled.")
-                try:
-                    enable_debugpy(port=port, address=None)
-                except Exception as e:
-                    self.log_alert(f"Error enabling debugpy: {e}")
-                    return
-
-                self.trace(f"Waiting for {timeout} sec to debugpy connection on port {port}...")
-                if wait_for_debugpy_connected(timeout=timeout, port=port):
-                    self.log_info("Debugpy connected.")
-                else:
-                    self.log_alert(f"Debugpy connection timed out after {timeout} seconds.")
-            else:
-                self.log_alert("Debugpy is not installed.")
-        else:
-            self.log_info("Debugpy is not enabled.")
-
-
     def _dispatch_on_tear_down(self, host_object: Any) -> None:
         self.on_tear_down()
 
@@ -138,6 +70,11 @@ class _Common(metaclass=abc.ABCMeta):
         """Internal method to set IRIS handles."""
         pass
 
+    def _debugpy(self, host) -> None:
+        """Set up debugpy for debugging."""
+        if debugpython is not None:
+            debugpython(self=self, host_object=host)
+
     # Component information methods
     @classmethod
     def _get_info(cls) -> List[str]:

iop/_debugpy.py

@@ -3,9 +3,10 @@ import threading
 import time
 import contextlib
 import socket
+import os
+import sys
 from contextlib import closing
-
-from typing import Optional, Tuple, Union, Sequence, cast, Callable, TypeVar, Dict, Any
+from typing import Optional, cast, Any, Dict
 
 def find_free_port(start: Optional[int] = None, end: Optional[int] = None) -> int:
     port = start
@@ -32,38 +33,113 @@ def find_free_port(start: Optional[int] = None, end: Optional[int] = None) -> in
             return find_free_port(None)
         raise
 
-
 def is_debugpy_installed() -> bool:
     try:
         __import__("debugpy")
+        return True
     except ImportError:
         return False
-    return True
 
+def _get_python_interpreter_path(install_dir: Optional[str]) -> Optional[str]:
+    """Get the path to the Python interpreter."""
+    if not install_dir:
+        return None
+        
+    python_exe = 'irispython.exe' if sys.platform == 'win32' else 'irispython'
+    python_path = os.path.join(install_dir, 'bin', python_exe)
+    
+    return python_path if os.path.exists(python_path) else None
+
+def _get_debugpy_config(python_path: str) -> Dict[str, str]:
+    """Get the debugpy configuration."""
+    return {"python": python_path}
+
+def configure_debugpy(self, python_path: Optional[str] = None) -> bool:
+    """Configure debugpy with the appropriate Python interpreter."""
+    import debugpy
+
+    if not python_path:
+        install_dir = os.environ.get('IRISINSTALLDIR') or os.environ.get('ISC_PACKAGE_INSTALLDIR')
+        python_path = _get_python_interpreter_path(install_dir)
+        
+    if not python_path:
+        self.log_alert("Could not determine Python interpreter path")
+        return False
+
+    try:
+        debugpy.configure(_get_debugpy_config(python_path))
+        self.log_info(f"Debugpy configured with Python interpreter: {python_path}")
+        return True
+    except Exception as e:
+        self.log_alert(f"Failed to configure debugpy: {e}")
+        return False
 
-def wait_for_debugpy_connected(timeout: float = 30,port=0) -> bool:
-    import debugpy  # noqa: T100
+def wait_for_debugpy_connected(timeout: float = 30, port: int = 0) -> bool:
+    """Wait for debugpy client to connect."""
+    import debugpy
 
     if not is_debugpy_installed():
         return False
 
-    class T(threading.Thread):
-        daemon = True
-        def run(self):
-            time.sleep(timeout)
-            debugpy.wait_for_client.cancel()
-    T().start()
-    debugpy.wait_for_client()
-    if debugpy.is_client_connected():
-        return True
+    def timeout_handler():
+        time.sleep(timeout)
+        debugpy.wait_for_client.cancel()
+
+    threading.Thread(target=timeout_handler, daemon=True).start()
+    
+    try:
+        debugpy.wait_for_client()
+        return debugpy.is_client_connected()
+    except Exception:
+        import pydevd # type: ignore
+        pydevd.stoptrace()
+        return False
 
-    return False
+def enable_debugpy(port: int, address: str = "0.0.0.0") -> None:
+    """Enable debugpy server on specified port and address."""
+    import debugpy
+    debugpy.listen((address, port))
 
-def enable_debugpy(port: int, address = None) -> bool:
+def debugpython(self, host_object: Any) -> None:
+    """Enable and configure debugpy for debugging purposes."""
+    # hack to set __file__ for os module in debugpy
+    # This is a workaround for the issue where debugpy cannot find the __file__ attribute of the os module.
+    if not hasattr(os, '__file__'):
+        setattr(os, '__file__', __file__)
 
-    import debugpy  # noqa: T100
 
-    if address is None:
-        address = "0.0.0.0"
+    if host_object is None:
+        self.log_alert("No host object found, cannot enable debugpy.")
+        return
 
-    debugpy.listen((address, port))
+    if host_object.enable != 1:
+        self.log_info("Debugpy is not enabled.")
+        return
+
+    if not is_debugpy_installed():
+        self.log_alert("Debugpy is not installed.")
+        return
+
+    # Configure Python interpreter
+    if host_object.PythonInterpreterPath != '':
+        success = configure_debugpy(self, host_object.PythonInterpreterPath)
+    else:
+        success = configure_debugpy(self)
+
+    if not success:
+        return
+
+    # Setup debugging server
+    port = host_object.port if host_object.port and host_object.port > 0 else find_free_port()
+    
+    try:
+        enable_debugpy(port=port)
+        self.log_info(f"Debugpy enabled on port {port}")
+        
+        self.trace(f"Waiting {host_object.timeout} seconds for debugpy connection...")
+        if wait_for_debugpy_connected(timeout=host_object.timeout, port=port):
+            self.log_info("Debugpy connected successfully")
+        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}")

iop/cls/IOP/Common.cls

@@ -40,7 +40,9 @@ Method GetModule() As %String
 Method %OnNew(pConfigName As %String) As %Status
 {
     $$$ThrowOnError(..Connect())
-	Quit $method($this,"initConfig",.pConfigName) ; call subclass
+	$$$ThrowOnError($method($this,"initConfig",.pConfigName)) ; call subclass
+    do ..%class."_debugpy"($this)
+    Quit $$$OK
 }
 
 Method OnInit() As %Status

{iris_pex_embedded_python-3.4.1b9.dist-info → iris_pex_embedded_python-3.4.1b11.dist-info}/METADATA

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

{iris_pex_embedded_python-3.4.1b9.dist-info → iris_pex_embedded_python-3.4.1b11.dist-info}/RECORD

@@ -31,12 +31,12 @@ iop/__init__.py,sha256=1C589HojSVK0yJf1KuTPA39ZjrOYO0QFLv45rqbZpA4,1183
 iop/__main__.py,sha256=pQzVtkDhAeI6dpNRC632dVk2SGZZIEDwDufdgZe8VWs,98
 iop/_async_request.py,sha256=ae950UFSlOHjmXGifbjHV4SFiJAMefrTVLs6lGEkgXE,2242
 iop/_business_host.py,sha256=x9wMNfs_IXBczEeGHsrnAo8mgFrlAhwtrWkSC-W9vqA,9699
-iop/_business_operation.py,sha256=2k7TY-Cjv3zOsTPdwYUT7mEpF33dpVFP8aQjVnbo6nQ,3086
-iop/_business_process.py,sha256=cWaqhJSiPyH36evjCIcHQn6Zt6_VGScbVXA5hhBBUO8,8596
-iop/_business_service.py,sha256=Nb4vK-kR3QPe5PfOGukQuj3tz2giT1OpO-SKamVKKPU,4040
+iop/_business_operation.py,sha256=ml4BIn1BfrGx8AUGISFR71DZIUCP8vZ2yn9SQjaSzTM,3038
+iop/_business_process.py,sha256=hj6nDIP5Mz5UYbm0vDjvs9lPSEYVQxGJl6tQRcDGTBk,8548
+iop/_business_service.py,sha256=wdhEKkqNHWt09XYGrvIpSuDDI4MyCGm2rKdvGQJ93EI,3988
 iop/_cli.py,sha256=fhaUpq3rTb4P2QPuuqoeatsphMLBPj9xtbvFPJv-2Mo,7941
-iop/_common.py,sha256=TWMC0hlWewi2Ynoxk9oIJ3d0HltCHdizSrwAJwyXAa4,16999
-iop/_debugpy.py,sha256=-6BZYU_IV9iesTlunogKqDimV7PRtUkNMfOZCjFdI5k,1732
+iop/_common.py,sha256=YJrEAsf0xT-nGsCYPARwg4jrSGTYuMfMe56A8GJ46oA,13754
+iop/_debugpy.py,sha256=HAZOBuYGsVi4bQ8cV1Bas0dbH9stcs_dGDSVJJ2QqfE,4702
 iop/_decorators.py,sha256=ZpgEETLdKWv58AoSMfXnm3_mA-6qPphIegjG-npDgwg,2324
 iop/_director.py,sha256=d1XXJn8T8VF9rmT-joJdz_ElS2UR6myRaXaMFC_2brA,11498
 iop/_dispatch.py,sha256=I3TAhvTuk8j4VcROI9vAitJ0a7Nk1BYAWKRrLeNsjr0,3203
@@ -53,7 +53,7 @@ iop/_utils.py,sha256=zguWjvZQkzAScHXl4OomZr2ZtPljDqVAs1CFllQZn5g,20092
 iop/cls/IOP/BusinessOperation.cls,sha256=lrymqZ8wHl5kJjXwdjbQVs5sScV__yIWGh-oGbiB_X0,914
 iop/cls/IOP/BusinessProcess.cls,sha256=s3t38w1ykHqM26ETcbCYLt0ocjZyVVahm-_USZkuJ1E,2855
 iop/cls/IOP/BusinessService.cls,sha256=7ebn32J9PiZXUgXuh5Xxm_7X6zHBiqkJr9c_dWxbPO8,1021
-iop/cls/IOP/Common.cls,sha256=vrS9yo4aUgMiLwfhBFJvj7hG6zYQfcSIiu5o1hdppuU,11355
+iop/cls/IOP/Common.cls,sha256=yq3HskJOuX-jMtU6UW2EwhU9ur1m-v9ZLtTYu4lp5zw,11416
 iop/cls/IOP/Director.cls,sha256=M43LoTb6lwSr0J81RFxi1YLW1mwda09wQ7Xqr3nBtxo,2008
 iop/cls/IOP/InboundAdapter.cls,sha256=GeoCm6q5HcLJ5e4VxgqXiErJXqolBbpKwpunaNzpvjU,610
 iop/cls/IOP/Message.cls,sha256=ZrYQHosgfTG9wv7i-WQ8j71YXZMmL4_mN16xtIDwcRg,25180
@@ -72,9 +72,9 @@ iop/cls/IOP/PrivateSession/Message/Start.cls,sha256=uk-WTe66GicCshgmVy3F5ugHiAyP
 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.4.1b9.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.4.1b9.dist-info/METADATA,sha256=NU02nEfoQUtxznuO6Hc5TwfK9uZonh7CZBoXtAgmnw0,4449
-iris_pex_embedded_python-3.4.1b9.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-iris_pex_embedded_python-3.4.1b9.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.4.1b9.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
-iris_pex_embedded_python-3.4.1b9.dist-info/RECORD,,
+iris_pex_embedded_python-3.4.1b11.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.4.1b11.dist-info/METADATA,sha256=bem1ObaaQxBoN5RVcrtCe7d0ERQr_OJBxbXA7GcPPVo,4450
+iris_pex_embedded_python-3.4.1b11.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+iris_pex_embedded_python-3.4.1b11.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.4.1b11.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
+iris_pex_embedded_python-3.4.1b11.dist-info/RECORD,,

{iris_pex_embedded_python-3.4.1b9.dist-info → iris_pex_embedded_python-3.4.1b11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any