iris-pex-embedded-python 3.4.2b2__tar.gz → 3.4.3__tar.gz

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/PKG-INFO

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

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/pyproject.toml

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

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/_debugpy.py

@@ -112,7 +112,7 @@ def debugpython(self, host_object: Any) -> None:
         self.log_alert("No host object found, cannot enable debugpy.")
         return
 
-    if host_object.enable != 1:
+    if host_object._enable != 1:
         self.log_info("Debugpy is not enabled.")
         return
 
@@ -121,7 +121,7 @@ def debugpython(self, host_object: Any) -> None:
         return
 
     # Configure Python interpreter
-    if host_object.PythonInterpreterPath != '':
+    if host_object._PythonInterpreterPath != '':
         success = configure_debugpy(self, host_object.PythonInterpreterPath)
     else:
         success = configure_debugpy(self)
@@ -130,16 +130,16 @@ def debugpython(self, host_object: Any) -> None:
         return
 
     # Setup debugging server
-    port = host_object.port if host_object.port and host_object.port > 0 else find_free_port()
+    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.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")
+            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}")

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/BusinessOperation.cls

@@ -15,7 +15,7 @@ Method OnMessage(
 	try {
 		set response = ..%class."_dispatch_on_message"(request)
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }
@@ -27,7 +27,7 @@ Method OnKeepalive(pStatus As %Status = {$$$OK}) As %Status
 		$$$ThrowOnError(##super(pStatus))
 		do ..%class."on_keepalive"()
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/BusinessProcess.cls

@@ -32,8 +32,13 @@ Method dispatchSendRequestAsync(
 	completionKey,
 	description)
 {
-    set tSC = ..SendRequestAsync(target,request,responseRequired,completionKey,description)
-    if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	Try {
+		$$$ThrowOnError(..SendRequestAsync(target,request,responseRequired,completionKey,description))
+	}
+	Catch ex {
+		set tSC = ..DisplayTraceback(ex)
+	}
+
     quit
 }
 
@@ -45,7 +50,7 @@ Method OnRequest(
 	try {
 		set response = ..%class."_dispatch_on_request"($this,request)
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }
@@ -62,7 +67,7 @@ Method OnResponse(
 	try {
 		set response = ..%class."_dispatch_on_response"($this,request,response,callRequest,callResponse,pCompletionKey)
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }
@@ -75,7 +80,7 @@ Method OnComplete(
 	try {
 		set response = ..%class."_dispatch_on_complete"($this,request,response)
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }
@@ -111,6 +116,21 @@ Storage Default
 <Value name="5">
 <Value>%class</Value>
 </Value>
+<Value name="6">
+<Value>%enable</Value>
+</Value>
+<Value name="7">
+<Value>%timeout</Value>
+</Value>
+<Value name="8">
+<Value>%port</Value>
+</Value>
+<Value name="9">
+<Value>%PythonInterpreterPath</Value>
+</Value>
+<Value name="10">
+<Value>%traceback</Value>
+</Value>
 </Data>
 <Data name="persistentProperties">
 <Attribute>persistentProperties</Attribute>

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/BusinessService.cls

@@ -9,8 +9,13 @@ Parameter SETTINGS = "%classname:Python BusinessService,%module:Python BusinessS
 
 Method dispatchProcessInput(pInput As %RegisteredObject) As %RegisteredObject
 {
-	
-	quit ..%class."on_process_input"(pInput)
+	try {
+		set response = ..%class."_dispatch_on_process_input"(pInput)
+	} catch ex {
+		set tSC = ..DisplayTraceback(ex)
+		throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	}
+	quit response
 }
 
 Method OnProcessInput(
@@ -27,7 +32,7 @@ Method OnProcessInput(
 			set ..%WaitForNextCallInterval = ..%class."_wait_for_next_call_interval"
 		} catch {}
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/Common.cls

@@ -19,6 +19,16 @@ Property %settings As %String(MAXLEN = "");
 /// Instance of class
 Property %class As %SYS.Python;
 
+Property %enable As %Boolean;
+
+Property %timeout As %Numeric [ InitialExpression = 30 ];
+
+Property %port As %Numeric [ InitialExpression = 0 ];
+
+Property %PythonInterpreterPath As %String(MAXLEN = 255);
+
+Property %traceback As %Boolean;
+
 /// Get Class
 Method GetClass() As %SYS.Python
 {
@@ -37,15 +47,45 @@ Method GetModule() As %String
     Return ..%module
 }
 
+Method DisplayTraceback(ex) As %Status
+{
+    set tSC = ex.AsStatus()
+    // Check if traceback is enabled
+    if ..%traceback {
+        // 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)
+            }
+            $$$LOGERROR(tbString)
+            set tSC = $$$ERROR($$$EnsErrGeneral,"Exception in Python class: "_..%classname_" - "_exType_" - "_exValue)
+        }
+    }
+    return tSC
+}
+
 Method OnInit() As %Status
 {
     set tSC = $$$OK
     try {
+        do $system.Python.Debugging(..%traceback)
         $$$ThrowOnError(..Connect())
         do ..%class."_debugpy"($this)
         do ..%class."_dispatch_on_init"($this)
     } catch ex {
-        set tSC = ex.AsStatus()
+
+        set tSC = ..DisplayTraceback(ex)
     }
     quit tSC
 }
@@ -146,13 +186,14 @@ Method SetPropertyValues()
     // First list all the properties of the current class
     set class = $CLASSNAME()
     set tSQL = "SELECT * FROM %Dictionary.PropertyDefinition WHERE parent = ?"
-    set tSQL = tSQL _ " AND name <> 'timeout'"
-    set tSQL = tSQL _ " and name <> 'enable'"
+    set tSQL = tSQL _ " AND name <> '%timeout'"
+    set tSQL = tSQL _ " and name <> '%enable'"
     set tSQL = tSQL _ " and name <> '%classpaths'"
     set tSQL = tSQL _ " and name <> '%classname'"
     set tSQL = tSQL _ " and name <> '%module'"
-    set tSQL = tSQL _ " and name <> 'port'"
-    set tSQL = tSQL _ " and name <> 'PythonInterpreterPath'"
+    set tSQL = tSQL _ " and name <> '%port'"
+    set tSQL = tSQL _ " and name <> '%PythonInterpreterPath'"
+    set tSQL = tSQL _ " and name <> '%traceback'"
 
     set tStmt = ##class(%SQL.Statement).%New()
 

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/InboundAdapter.cls

@@ -14,7 +14,7 @@ Method OnTask() As %Status
 		$$$ThrowOnError(..Connect())
 		do ..%class."on_task"()
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/Message.cls

@@ -453,7 +453,7 @@ ClassMethod HandleProperty(
 {
     Set type = value.type
     
-    If type = "string" || type = "number" || type = "boolean" {
+    If (type = "string") || (type = "number") || (type = "boolean") {
         Do ..HandlePrimitiveType(type, idx, .pContents)
     }
     ElseIf type = "array" {
@@ -465,6 +465,13 @@ ClassMethod HandleProperty(
     ElseIf $IsObject(value.allOf) {
         Do ..HandleAllOfType(value, key, idx, .pContents, schema)
     }
+    ElseIf value.%Get("$ref")'="" {
+        Set tDef = schema."$defs".%Get($Piece(value."$ref", "/", *))
+        Do ..HandleObjectType(tDef, idx, .pContents)
+    }
+    Else {
+        Set pContents(idx,"type") = type
+    }
     
     If type = "array" Set key = key_"()"
     Set pContents = idx
@@ -491,9 +498,8 @@ ClassMethod HandleArrayType(
 	schema As %DynamicObject)
 {
     Set pContents(idx,"type") = "()"
-    If $IsObject(value.items) && $IsObject(value.items.allOf) {
-        Do ..HandleAllOfType(value.items, key, idx, .pContents, schema)
-    }
+    // Handle array as a Handle Property
+    Do ..HandleProperty(value.items, key, idx, .pContents, schema)
 }
 
 ClassMethod HandleObjectType(
@@ -504,7 +510,7 @@ ClassMethod HandleObjectType(
     Set pContents(idx,"type") = "object"
     If $IsObject(value.properties) {
         Do ..SchemaToContents(value, .subContents)
-        Merge @pContents(idx) = subContents
+        Merge pContents(idx) = subContents
     }
 }
 

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/OutboundAdapter.cls

@@ -28,7 +28,7 @@ Method OnKeepalive(pStatus As %Status = {$$$OK}) As %Status
 		$$$ThrowOnError(##super(pStatus))
 		do ..%class."on_keepalive"()
 	} catch ex {
-		set tSC = ex.AsStatus()
+		set tSC = ..DisplayTraceback(ex)
 	}
 	quit tSC
 }

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/src/iop/cls/IOP/Utils.cls

@@ -226,7 +226,7 @@ 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"
+		#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 tPropClassname As %Dictionary.PropertyDefinition = ##class(%Dictionary.PropertyDefinition).%New()
 		Set tPropClassname.Name = "%classname"
@@ -270,10 +270,6 @@ ClassMethod GenerateProxyClass(
 				Quit:$$$ISERR(tSC)
 			}
 		}
-
-		set type = ""
-		set:($Case(tSuperClass,"IOP.InboundAdapter":1,"IOP.OutboundAdapter":1,:0)) type = "Adapter"
-		set tSETTINGSParamValue = $REPLACE(tSETTINGSParamValue,"$type",type)
 		
 		#dim tCustomProp As %Dictionary.PropertyDefinition
 		#dim tPropInfo,tPropName,tDataType,tDefault,tDesc,tPropCat,tContext As %String
@@ -310,60 +306,14 @@ ClassMethod GenerateProxyClass(
 			Set tSC = tCOSClass.Properties.Insert(tCustomProp)
 			Quit:$$$ISERR(tSC)
 
-			Set tPropCat = "Python Attributes"
+			Set tPropCat = "Python Attributes $type"
 			Set tSETTINGSParamValue = tSETTINGSParamValue_","_tPropName_":"_tPropCat
 		}
 		Quit:$$$ISERR(tSC)
 
-		#; Add debug settings, three settings are always available debug a boolean, port an integer and a timeout an integer
-		Set tPropCat = "Python Debug"
-		#; Debug property
-		Set tPropDebug = ##class(%Dictionary.PropertyDefinition).%New()
-		Set tPropDebug.Name = "enable"
-		Set tPropDebug.Type = "%Boolean"
-		Set tPropDebug.InitialExpression = $$$quote(0)
-		Set tPropDebug.Description = "Enable or disable debug"
-		
-		Set tSC = tCOSClass.Properties.Insert(tPropDebug)
-		Quit:$$$ISERR(tSC)
-
-		#; Add the settings parameter
-		Set tSETTINGSParamValue = tSETTINGSParamValue_",enable:"_tPropCat
-
-		#; Port property
-		Set tPropPort = ##class(%Dictionary.PropertyDefinition).%New()
-		Set tPropPort.Name = "port"
-		Set tPropPort.Type = "%Integer"
-		Set tPropPort.InitialExpression = $$$quote(0)
-		Set tPropPort.Description = "Port to use for the debug connection, if 0 an random port will be used"
-		Set tSC = tCOSClass.Properties.Insert(tPropPort)
-		Quit:$$$ISERR(tSC)
-
-		#; Add the settings parameter
-		Set tSETTINGSParamValue = tSETTINGSParamValue_",port:"_tPropCat
-
-		#; Timeout property
-		Set tPropTimeout = ##class(%Dictionary.PropertyDefinition).%New()
-		Set tPropTimeout.Name = "timeout"
-		Set tPropTimeout.Type = "%Integer"
-		Set tPropTimeout.InitialExpression = $$$quote(30)
-		Set tSC = tCOSClass.Properties.Insert(tPropTimeout)
-		Quit:$$$ISERR(tSC)
-
-		#; Add the settings parameter
-		Set tSETTINGSParamValue = tSETTINGSParamValue_",timeout:"_tPropCat
-
-		#; PythonInterpreterPath property
-		Set tPropInterpre = ##class(%Dictionary.PropertyDefinition).%New()
-		Set tPropInterpre.Name = "PythonInterpreterPath"
-		Set tPropInterpre.Type = "%String"
-		Set tPropInterpre.Description = "Path to the Python interpreter, if not set the default one will be used"
-		Do tPropInterpre.Parameters.SetAt("255","MAXLEN")
-		Set tSC = tCOSClass.Properties.Insert(tPropInterpre)
-		Quit:$$$ISERR(tSC)
-
-		#; Add the settings parameter
-		Set tSETTINGSParamValue = tSETTINGSParamValue_",PythonInterpreterPath:"_tPropCat
+		set type = ""
+		set:($Case(tSuperClass,"IOP.InboundAdapter":1,"IOP.OutboundAdapter":1,:0)) type = "Adapter"
+		set tSETTINGSParamValue = $REPLACE(tSETTINGSParamValue,"$type",type)
 
 		#dim tSETTINGSParam As %Dictionary.ParameterDefinition = ##class(%Dictionary.ParameterDefinition).%New()
 		Set tSETTINGSParam.Name = "SETTINGS"

{iris_pex_embedded_python-3.4.2b2 → iris_pex_embedded_python-3.4.3}/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.2b2
+Version: 3.4.3
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License