Report errors with set sc = ##class(isc.py.Callout).GetStatus()

Added to interoperability too

Author: eduard93

isc/py/Callout.cls

@@ -110,5 +110,21 @@ ClassMethod Unload() As %Integer
 	quit result
 }
 
+/// Returns last occured exception in Python and clears it
+/// write ##class(isc.py.Callout).GetStatus()
+ClassMethod GetStatus() As %Status
+{
+	do ##class(isc.py.Callout).SimpleString("import sys, traceback")
+	set haxExc = ##class(isc.py.Callout).SimpleString("zzzerr = hasattr(sys, 'last_type')", "zzzerr")
+	
+	quit:haxExc="False" $$$OK
+	
+	set excText = ##class(isc.py.Callout).SimpleString("zzzerr = traceback.format_exception(sys.last_type, sys.last_value, sys.last_traceback)", "zzzerr")
+	set excText = $zcvt($zcvt(excText, "I", "UTF8"), "I", "JSON")
+	do ##class(isc.py.Callout).SimpleString("del zzzerr, sys.last_type, sys.last_value, sys.last_traceback")
+	
+	quit $$$ERROR($$$GeneralError, excText)
+}
+
 }
 

isc/py/ens/Operation.cls

@@ -24,6 +24,7 @@ XData MessageMap
 /// Execute arbitrary Python code
 Method Execute(request As isc.py.msg.ExecutionRequest, Output response As isc.py.msg.ExecutionResponse) As %Status
 {
+	#dim sc As %Status = $$$OK
 	set response = ##class(isc.py.msg.ExecutionResponse).%New()
 	set variables = $lfs(request.Variables)
 	quit:'$Listvalid(variables) $$$ERROR($$$AttributeValueMustBeList, "variables")
@@ -36,18 +37,20 @@ Method Execute(request As isc.py.msg.ExecutionRequest, Output response As isc.py
 		set lineSeparator = ""
 	}
 
-	set value = ..Adapter.Execute(request.Code, variable, lineSeparator)
+	set value = ..Adapter.Execute(request.Code, variable, lineSeparator, .sc)
+	quit:$$$ISERR(sc) sc
 
 	do:variable'="" response.Variables.SetAt(value, variable)
 
 	for i=2:1:$ll(variables) {
 		set variable = $lg(variables, i)
 		continue:variable=""
-		set value =  ..Adapter.Execute("", variable)
+		set value = ..Adapter.Execute("", variable, , .sc)
 		do response.Variables.SetAt(value, variable)
+		quit:$$$ISERR(sc)
 	}
 
-	quit $$$OK
+	quit sc
 }
 
 /// Save context

isc/py/ens/OutboundAdapter.cls

@@ -14,8 +14,9 @@ Method OnTearDown() As %Status
 /// code - Python code to execute
 /// variable - variable name, which value is returned
 /// lineSeparator - separate code into lines. Defaults to $c(10).
-Method Execute(code = "", variable = "", lineSeparator As %String = {$c(10)}) As %String
+Method Execute(code = "", variable = "", lineSeparator As %String = {$c(10)}, Output sc As %Status) As %String
 {
+	set sc = $$$OK
 	if lineSeparator'="" {
 		set codeList=$lfs(code, lineSeparator)
 	} else {
@@ -26,11 +27,20 @@ Method Execute(code = "", variable = "", lineSeparator As %String = {$c(10)}) As
 		set line = $lg(codeList, i)
 		$$$TRACE(line)
 		do ##class(isc.py.Callout).SimpleString(line)
+		set sc = ##class(isc.py.Callout).GetStatus()
+		if $$$ISERR(sc) {
+			set sc = $$$ADDSC($$$ERROR($$$GeneralError, "Code: " _ line), sc)
+			/// TODO continue despite error?
+			quit
+		}
 	}
+	quit:$$$ISERR(sc) ""
 
 	set line = $lg(codeList, $ll(codeList))
 	$$$TRACE(line)
 	set result = ##class(isc.py.Callout).SimpleString(line, variable)
+	set sc = ##class(isc.py.Callout).GetStatus()
+	set:$$$ISERR(sc) sc = $$$ADDSC($$$ERROR($$$GeneralError, "Code: " _ line _ ", Variable: " _ variable), sc)
 	quit result
 }