iris-pex-embedded-python 3.4.4b6__tar.gz → 3.5.0b2__tar.gz

{iris_pex_embedded_python-3.4.4b6/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.5.0b2}/PKG-INFO

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

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2}/pyproject.toml

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

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2}/src/iop/_utils.py

@@ -1,12 +1,12 @@
 import os
 import sys
-import ast
-import inspect
 import importlib
 import importlib.util
 import importlib.resources
 import json
-from typing import Any, Dict, Optional, Union
+import inspect
+import ast
+from typing import Any, Dict, Optional, Union, Tuple
 
 import xmltodict
 from pydantic import TypeAdapter
@@ -80,6 +80,31 @@ class _Utils():
         """
         _Utils.raise_on_error(_iris.get_iris().cls('IOP.Message.JSONSchema').Import(schema_str,categories,schema_name))
 
+    @staticmethod
+    def get_python_settings() -> Tuple[str,str,str]:
+        import iris_utils._cli
+
+        pythonlib = iris_utils._cli.find_libpython()
+        pythonpath = _Utils._get_python_path()
+        pythonversion = sys.version[:4]
+
+        if not pythonlib:
+            pythonlib = ""
+            
+        return pythonlib, pythonpath, pythonversion
+
+    @staticmethod
+    def _get_python_path() -> str:
+
+        if "VIRTUAL_ENV" in os.environ:
+            return os.path.join(
+                os.environ["VIRTUAL_ENV"],
+                "lib", 
+                f"python{sys.version[:4]}", 
+                "site-packages"
+            )
+        return ""
+
     @staticmethod
     def register_component(module:str,classname:str,path:str,overwrite:int=1,iris_classname:str='Python'):
         """
@@ -99,8 +124,9 @@ class _Utils():
         """
         path = os.path.abspath(os.path.normpath(path))
         fullpath = _Utils.guess_path(module,path)
+        pythonlib, pythonpath, pythonversion = _Utils.get_python_settings()
         try:
-            _iris.get_iris().cls('IOP.Utils').dispatchRegisterComponent(module,classname,path,fullpath,overwrite,iris_classname)
+            _iris.get_iris().cls('IOP.Utils').dispatchRegisterComponent(module,classname,path,fullpath,overwrite,iris_classname,pythonlib,pythonpath,pythonversion)
         except RuntimeError as e:
             # New message error : Make sure the iop package is installed in iris 
             raise RuntimeError("Iris class : IOP.Utils not found. Make sure the iop package is installed in iris eg: iop --init.") from e

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2}/src/iop/cls/IOP/BusinessProcess.cls

@@ -131,6 +131,18 @@ Storage Default
 <Value name="10">
 <Value>%traceback</Value>
 </Value>
+<Value name="11">
+<Value>%PythonPath</Value>
+</Value>
+<Value name="12">
+<Value>%PythonRuntimeLibrary</Value>
+</Value>
+<Value name="13">
+<Value>%PythonRuntimeLibraryVersion</Value>
+</Value>
+<Value name="14">
+<Value>%Venv</Value>
+</Value>
 </Data>
 <Data name="persistentProperties">
 <Attribute>persistentProperties</Attribute>

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2}/src/iop/cls/IOP/Common.cls

@@ -29,6 +29,14 @@ Property %PythonInterpreterPath As %String(MAXLEN = 255);
 
 Property %traceback As %Boolean [ InitialExpression = 1 ];
 
+Property %Venv As %Boolean [ InitialExpression = 0 ];
+
+Property %PythonPath As %String(MAXLEN = 255);
+
+Property %PythonRuntimeLibrary As %String(MAXLEN = 255);
+
+Property %PythonRuntimeLibraryVersion As %String;
+
 /// Get Class
 Method GetClass() As %SYS.Python
 {
@@ -78,18 +86,47 @@ Method DisplayTraceback(ex) As %Status
 Method OnInit() As %Status
 {
     set tSC = $$$OK
+
     try {
+        LOCK +^PythonSettings:5
+
+        if ..%Venv {
+            $$$ThrowOnError(##class(IOP.Utils).SetPythonSettings(..%PythonRuntimeLibrary, ..%PythonPath, ..%PythonRuntimeLibraryVersion))
+        }
+
+        do ..DisplayPythonVersion()
+
         do $system.Python.Debugging(..%traceback)
+
         $$$ThrowOnError(..Connect())
+        LOCK -^PythonSettings
+
         do ..%class."_debugpy"($this)
+
         do ..%class."_dispatch_on_init"($this)
     } catch ex {
 
         set tSC = ..DisplayTraceback(ex)
     }
+    LOCK -^PythonSettings
     quit tSC
 }
 
+Method DisplayPythonVersion()
+{
+    set sys = ##class(%SYS.Python).Import("sys")
+    set version = sys.version
+    set versionInfo = sys."version_info"
+    set major = versionInfo.major
+    set minor = versionInfo.minor
+    set micro = versionInfo.micro
+    set releaseLevel = versionInfo.releaselevel
+    set serial = versionInfo.serial
+
+    $$$LOGINFO("Python Version: "_ version)
+    $$$LOGINFO("Version Info: "_ major_ "."_ minor_ "."_ micro_" ("_ releaseLevel_ ", "_serial_ ")")
+}
+
 ClassMethod SetPythonPath(pClasspaths)
 {
     set sys = ##class(%SYS.Python).Import("sys")
@@ -196,6 +233,11 @@ Method SetPropertyValues()
     set tSQL = tSQL _ " and name <> '%port'"
     set tSQL = tSQL _ " and name <> '%PythonInterpreterPath'"
     set tSQL = tSQL _ " and name <> '%traceback'"
+    set tSQL = tSQL _ " and name <> '%PythonPath'"
+    set tSQL = tSQL _ " and name <> '%PythonRuntimeLibrary'"
+    set tSQL = tSQL _ " and name <> '%PythonRuntimeLibraryVersion'"
+    set tSQL = tSQL _ " and name <> '%settings'"
+    set tSQL = tSQL _ " and name <> '%Venv'"
 
     set tStmt = ##class(%SQL.Statement).%New()
 

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2}/src/iop/cls/IOP/Utils.cls

@@ -13,10 +13,13 @@ ClassMethod dispatchRegisterComponent(
 	pCLASSPATHS As %String = "",
 	pFullpath As %String = "",
 	pOverwrite As %Boolean = 0,
-	pProxyClassname As %String = "") As %Status
+	pProxyClassname As %String = "",
+	pPythonLib,
+	pPythonPath,
+	pPythonVersion) As %Status
 {
 	set tSc = $$$OK
-	$$$ThrowOnError(##class(IOP.Utils).RegisterComponent(pModule, pRemoteClassname, pCLASSPATHS, pFullpath, pOverwrite , pProxyClassname))
+	$$$ThrowOnError(##class(IOP.Utils).RegisterComponent(pModule, pRemoteClassname, pCLASSPATHS, pFullpath, pOverwrite , pProxyClassname,pPythonLib, pPythonPath, pPythonVersion))
 	return tSc
 }
 
@@ -27,7 +30,10 @@ ClassMethod RegisterComponent(
 	pCLASSPATHS As %String = "",
 	pFullpath As %String = "",
 	pOverwrite As %Boolean = 0,
-	pProxyClassname As %String = "") As %Status
+	pProxyClassname As %String = "",
+	pPythonLib,
+	pPythonPath,
+	pPythonVersion) As %Status
 {
 	#dim tSC As %Status = $$$OK
 	#dim ex As %Exception.AbstractException
@@ -39,6 +45,9 @@ ClassMethod RegisterComponent(
 	Quit:(""=pModule) $$$ERROR($$$EnsErrGeneral,"Must specify the module of the remote code.")
 		
 	Try {
+		LOCK +^PythonSettings:10
+		// Set the Python settings
+		do ..SetPythonSettings(pPythonLib, pPythonPath, pPythonVersion)
 
 		$$$ThrowOnError(..GetRemoteClassInfo(pRemoteClassname,pModule,pCLASSPATHS,pFullpath,.tClassDetails,.tRemoteSettings))
 
@@ -47,13 +56,13 @@ ClassMethod RegisterComponent(
 		Set tConnectionSettings("Classname") = pRemoteClassname
 		Set:(""=pProxyClassname) pProxyClassname = "User."_pRemoteClassname
 		
-		$$$ThrowOnError(..GenerateProxyClass(pProxyClassname,.tConnectionSettings,tClassDetails,tRemoteSettings,pOverwrite))
+		$$$ThrowOnError(..GenerateProxyClass(pProxyClassname,.tConnectionSettings,tClassDetails,tRemoteSettings,pOverwrite, pPythonLib, pPythonPath, pPythonVersion))
 
 	} Catch ex {
 		set msg = $System.Status.GetOneStatusText(ex.AsStatus(),1)
 		set tSC = $$$ERROR($$$EnsErrGeneral,msg)
 	}
-
+	LOCK -PythonSettings
 	Quit tSC
 }
 
@@ -165,7 +174,10 @@ ClassMethod GenerateProxyClass(
 	ByRef pConnectionSettings,
 	pClassDetails As %String = "",
 	pRemoteSettings As %String = "",
-	pOverwrite As %Boolean = 0) As %Status [ Internal, Private ]
+	pOverwrite As %Boolean = 0,
+	pPythonLib,
+	pPythonPath,
+	pPythonVersion) As %Status [ Internal, Private ]
 {
 	#dim tSC As %Status = $$$OK
 	#dim ex As %Exception.AbstractException
@@ -226,7 +238,9 @@ ClassMethod GenerateProxyClass(
 		}
 		
 		#; Do not display any of the connection settings
-		#dim tSETTINGSParamValue As %String = "%classname:Python $type,%module:Python $type,%settings:Python $type,%classpaths:Python $type,%enable:Python Debug $type,%timeout:Python Debug $type,%port:Python Debug $type,%PythonInterpreterPath:Python Debug $type,%traceback:Python Debug $type"
+ 		#dim tSETTINGSParamValue As %String = "%classname:Python $type,%module:Python $type,%settings:Python $type,%classpaths:Python $type"
+		set tSETTINGSParamValue = tSETTINGSParamValue_","_"%enable:Python Debug $type,%timeout:Python Debug $type,%port:Python Debug $type,%PythonInterpreterPath:Python Debug $type,%traceback:Python Debug $type"
+		set tSETTINGSParamValue = tSETTINGSParamValue_","_"%PythonPath:Python Settings $type,%PythonRuntimeLibrary:Python Settings $type,%PythonRuntimeLibraryVersion:Python Settings $type,%Venv:Python Settings $type"
 		
 		#dim tPropClassname As %Dictionary.PropertyDefinition = ##class(%Dictionary.PropertyDefinition).%New()
 		Set tPropClassname.Name = "%classname"
@@ -255,6 +269,38 @@ ClassMethod GenerateProxyClass(
 		Set tPropLanguage.InitialExpression = $$$quote(pConnectionSettings("Module"))
 		Set tSC = tCOSClass.Properties.Insert(tPropLanguage)
 		Quit:$$$ISERR(tSC)
+
+		if pPythonLib'="" {
+			#dim tPropPythonLib As %Dictionary.PropertyDefinition = ##class(%Dictionary.PropertyDefinition).%New()
+			Set tPropPythonLib.Name = "%PythonRuntimeLibrary"
+			Set tPropPythonLib.Type = "%String"
+			Set tPropPythonLib.Internal = 1
+			Set tSC = tPropPythonLib.Parameters.SetAt("","MAXLEN")
+			Quit:$$$ISERR(tSC)
+			Set tPropPythonLib.InitialExpression = $$$quote(pPythonLib)
+			Set tSC = tCOSClass.Properties.Insert(tPropPythonLib)
+			Quit:$$$ISERR(tSC)
+		}
+		if pPythonPath'="" {
+			#dim tPropPythonPath As %Dictionary.PropertyDefinition = ##class(%Dictionary.PropertyDefinition).%New()
+			Set tPropPythonPath.Name = "%PythonPath"
+			Set tPropPythonPath.Type = "%String"
+			Set tSC = tPropPythonPath.Parameters.SetAt("","MAXLEN")
+			Quit:$$$ISERR(tSC)
+			Set tPropPythonPath.Internal = 1
+			Set tPropPythonPath.InitialExpression = $$$quote(pPythonPath)
+			Set tSC = tCOSClass.Properties.Insert(tPropPythonPath)
+			Quit:$$$ISERR(tSC)
+		}
+		if pPythonVersion'="" {
+			#dim tPropPythonVersion As %Dictionary.PropertyDefinition = ##class(%Dictionary.PropertyDefinition).%New()
+			Set tPropPythonVersion.Name = "%PythonRuntimeLibraryVersion"
+			Set tPropPythonVersion.Type = "%String"
+			Set tPropPythonVersion.Internal = 1
+			Set tPropPythonVersion.InitialExpression = $$$quote(pPythonVersion)
+			Set tSC = tCOSClass.Properties.Insert(tPropPythonVersion)
+			Quit:$$$ISERR(tSC)
+		}
 		
 		If $Case(tSuperClass,"IOP.BusinessService":1,"IOP.BusinessOperation":1,"IOP.DuplexService":1,"IOP.DuplexOperation":1,:0) {
 			set builtins = ##class(%SYS.Python).Import("builtins")
@@ -419,4 +465,39 @@ ClassMethod dispatchTestComponent(
 	Quit tOutput
 }
 
+ClassMethod SetPythonSettings(
+	pPythonLib,
+	pPythonPath,
+	pPythonVersion) As %Status
+{
+    set currentNS = $namespace
+    set $NAMESPACE = "%SYS"
+	set tSC = $$$OK
+
+    try {
+        // Get Config
+        $$$ThrowOnError(##Class(Config.config).Get(.Properties))
+        // Set the Python interpreter path
+        if pPythonPath'="" {
+            set Properties("PythonPath") = pPythonPath
+        }
+    
+        // Set the Python runtime library
+        if pPythonLib'="" {
+            set Properties("PythonRuntimeLibrary") = pPythonLib
+        }
+    
+        // Set the Python runtime library version
+        if pPythonVersion'="" {
+            set Properties("PythonRuntimeLibraryVersion") = pPythonVersion
+        }
+        $$$ThrowOnError(##Class(Config.config).Modify(.Properties))
+    } catch ex {
+        set tSC = ex.AsStatus()
+    }
+
+    set $NAMESPACE = currentNS
+	Quit tSC
+}
+
 }

{iris_pex_embedded_python-3.4.4b6 → iris_pex_embedded_python-3.5.0b2/src/iris_pex_embedded_python.egg-info}/PKG-INFO

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