Refactor Python settings management in Utils and Common classes for improved clarity and functionality

Author: grongierisc

src/iop/_utils.py

@@ -88,6 +88,9 @@ def get_python_settings() -> Tuple[str,str,str]:
         pythonpath = _Utils._get_python_path()
         pythonversion = sys.version[:4]
 
+        if not pythonlib:
+            pythonlib = ""
+            
         return pythonlib, pythonpath, pythonversion
 
     @staticmethod

src/iop/cls/IOP/Common.cls

@@ -86,7 +86,7 @@ Method OnInit() As %Status
     set tSC = $$$OK
     try {
         LOCK +^PythonSettings:5
-        do ..SetPythonSettings(..%PythonRuntimeLibrary, ..%PythonPath, ..%PythonRuntimeLibraryVersion)
+        do ##class(IOP.Utils).SetPythonSettings(..%PythonRuntimeLibrary, ..%PythonPath, ..%PythonRuntimeLibraryVersion)
 
         do ..DisplayPythonVersion()
 
@@ -105,37 +105,6 @@ Method OnInit() As %Status
     quit tSC
 }
 
-ClassMethod SetPythonSettings(
-	pPythonLib,
-	pPythonPath,
-	pPythonVersion)
-{
-    set currentNS = $namespace
-    set $NAMESPACE = "%SYS"
-    try {
-        // Get Config
-        $$$ThrowOnError(##Class(Config.config).Get(.Properties))
-        // Set the Python interpreter path
-        if ..%PythonInterpreterPath'="" {
-            set Properties("PythonPath") = pPythonPath
-        }
-    
-        // Set the Python runtime library
-        if ..%PythonRuntimeLibrary'="" {
-            set Properties("PythonRuntimeLibrary") = pPythonLib
-        }
-    
-        // Set the Python runtime library version
-        if ..%PythonRuntimeLibraryVersion'="" {
-            set Properties("PythonRuntimeLibraryVersion") = pPythonVersion
-        }
-        $$$ThrowOnError(##Class(Config.config).Modify(.Properties))
-    } catch ex {
-        
-    }
-    set $NAMESPACE = currentNS
-}
-
 Method DisplayPythonVersion()
 {
     set sys = ##class(%SYS.Python).Import("sys")

src/iop/cls/IOP/Utils.cls

@@ -23,23 +23,6 @@ ClassMethod dispatchRegisterComponent(
 	return tSc
 }
 
-ClassMethod SetPythonSettings(
-	pPythonLib As %String = "",
-	pPythonPath As %String = "",
-	pPythonVersion As %String = "") As %Status
-{
-	#dim tSC As %Status = $$$OK
-	#dim ex As %Exception.AbstractException
-	
-	Try {
-		Do ##class(IOP.Common).SetPythonSettings(pPythonLib, pPythonPath, pPythonVersion)
-	} Catch ex {
-		Set tSC = ex.AsStatus()
-	}
-	
-	Quit tSC
-}
-
 /// "bo","Duplex","/irisdev/app/src/python/demo/duplex/",1,"Duplex.Duplex"
 ClassMethod RegisterComponent(
 	pModule As %String,
@@ -64,7 +47,7 @@ ClassMethod RegisterComponent(
 	Try {
 		LOCK +^PythonSettings:10
 		// Set the Python settings
-		$$$ThrowOnError(##class(IOP.Utils).SetPythonSettings(pPythonLib, pPythonPath, pPythonVersion))
+		do ..SetPythonSettings(pPythonLib, pPythonPath, pPythonVersion)
 
 		$$$ThrowOnError(..GetRemoteClassInfo(pRemoteClassname,pModule,pCLASSPATHS,pFullpath,.tClassDetails,.tRemoteSettings))
 
@@ -478,4 +461,37 @@ ClassMethod dispatchTestComponent(
 	Quit tOutput
 }
 
+ClassMethod SetPythonSettings(
+	pPythonLib,
+	pPythonPath,
+	pPythonVersion)
+{
+    set currentNS = $namespace
+    set $NAMESPACE = "%SYS"
+    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 msg = $System.Status.GetOneStatusText(ex.AsStatus(),1)
+        set ^PLOG=msg
+    }
+
+    set $NAMESPACE = currentNS
+}
+
 }