iris-pex-embedded-python 3.5.6b6__tar.gz → 3.5.6b8__tar.gz

{iris_pex_embedded_python-3.5.6b6/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.5.6b8}/PKG-INFO

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

{iris_pex_embedded_python-3.5.6b6 → iris_pex_embedded_python-3.5.6b8}/pyproject.toml

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

{iris_pex_embedded_python-3.5.6b6 → iris_pex_embedded_python-3.5.6b8}/src/iop/_remote.py

@@ -16,7 +16,7 @@ import json
 import os
 import signal
 import time
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 import requests
 import urllib3
@@ -50,19 +50,19 @@ class _RemoteDirector:
         return resp.json()
 
     def _post(self, path: str, body: Optional[dict] = None) -> Any:
-        b = {"namespace": self._namespace, **(body or {})}
         resp = requests.post(
-            f"{self._base}{path}", json=b, auth=self._auth,
-            verify=self._verify, timeout=30,
+            f"{self._base}{path}", json=(body or {}),
+            params={"namespace": self._namespace},
+            auth=self._auth, verify=self._verify, timeout=30,
         )
         resp.raise_for_status()
         return resp.json()
 
     def _put(self, path: str, body: Optional[dict] = None) -> Any:
-        b = {"namespace": self._namespace, **(body or {})}
         resp = requests.put(
-            f"{self._base}{path}", json=b, auth=self._auth,
-            verify=self._verify, timeout=30,
+            f"{self._base}{path}", json=(body or {}),
+            params={"namespace": self._namespace},
+            auth=self._auth, verify=self._verify, timeout=30,
         )
         resp.raise_for_status()
         return resp.json()
@@ -190,18 +190,22 @@ class _RemoteDirector:
         target: Optional[str],
         message=None,           # ignored remotely — not serialisable over HTTP
         classname: Optional[str] = None,
-        body: Optional[str] = None,
+        body: Optional[Union[str, dict]] = None,
     ) -> dict:
         """Returns a dict: {"classname": "...", "body": "...", "truncated": false}"""
         payload: dict = {"target": target or ""}
         if classname:
             payload["classname"] = classname
-        if body:
+        if body is not None:
             payload["body"] = body
         try:
             return self._check_error(self._post("/test", payload))
         except requests.exceptions.HTTPError as exc:
-            raise RuntimeError(str(exc)) from exc
+            try:
+                err_msg = exc.response.json().get("error", str(exc))
+            except Exception:
+                err_msg = str(exc)
+            raise RuntimeError(err_msg) from exc
 
     # ------------------------------------------------------------------
     # Export

{iris_pex_embedded_python-3.5.6b6 → iris_pex_embedded_python-3.5.6b8}/src/iop/cls/IOP/Service/Remote/Rest/v1.cls

@@ -44,6 +44,15 @@ ClassMethod GetNsParam() As %String [ Internal, Private ]
 	Quit $select(ns="":"USER", 1:ns)
 }
 
+/// Return the namespace, preferring a body field over the query parameter.
+ClassMethod ResolveNs(dyna As %DynamicObject = "") As %String [ Internal, Private ]
+{
+	Set ns = ""
+	If $isobject(dyna) { Set ns = dyna.%Get("namespace") }
+	If ns = "" { Set ns = ..GetNsParam() }
+	Quit ns
+}
+
 ClassMethod GetStatus() As %Status
 {
 	Try {
@@ -68,7 +77,7 @@ ClassMethod PostStart() As %Status
 {
 	Try {
 		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Set ns = ..ResolveNs(dyna)
 		Set production = dyna.%Get("production")
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		If production = "" { Set production = $Get(^Ens.Configuration("csp","LastProduction")) }
@@ -82,8 +91,8 @@ ClassMethod PostStart() As %Status
 ClassMethod PostStop() As %Status
 {
 	Try {
-		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Try { Set dyna = {}.%FromJSON(%request.Content) } Catch { Set dyna = {} }
+		Set ns = ..ResolveNs(dyna)
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		$$$ThrowOnError(##class(Ens.Director).StopProduction())
 		Return ..%WriteResponse({"status": "stopped"}.%ToJSON())
@@ -95,8 +104,8 @@ ClassMethod PostStop() As %Status
 ClassMethod PostKill() As %Status
 {
 	Try {
-		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Try { Set dyna = {}.%FromJSON(%request.Content) } Catch { Set dyna = {} }
+		Set ns = ..ResolveNs(dyna)
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		$$$ThrowOnError(##class(Ens.Director).StopProduction(10, 1))
 		Return ..%WriteResponse({"status": "killed"}.%ToJSON())
@@ -108,8 +117,8 @@ ClassMethod PostKill() As %Status
 ClassMethod PostRestart() As %Status
 {
 	Try {
-		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Try { Set dyna = {}.%FromJSON(%request.Content) } Catch { Set dyna = {} }
+		Set ns = ..ResolveNs(dyna)
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		$$$ThrowOnError(##class(Ens.Director).RestartProduction())
 		Return ..%WriteResponse({"status": "restarted"}.%ToJSON())
@@ -121,8 +130,8 @@ ClassMethod PostRestart() As %Status
 ClassMethod PostUpdate() As %Status
 {
 	Try {
-		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Try { Set dyna = {}.%FromJSON(%request.Content) } Catch { Set dyna = {} }
+		Set ns = ..ResolveNs(dyna)
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		$$$ThrowOnError(##class(Ens.Director).UpdateProduction())
 		Return ..%WriteResponse({"status": "updated"}.%ToJSON())
@@ -169,7 +178,7 @@ ClassMethod PutDefault() As %Status
 {
 	Try {
 		Set dyna = {}.%FromJSON(%request.Content)
-		Set ns = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Set ns = ..ResolveNs(dyna)
 		Set production = dyna.%Get("production")
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 		Set ^Ens.Configuration("csp","LastProduction") = production
@@ -246,13 +255,19 @@ ClassMethod GetExport() As %Status
 ClassMethod PostTest() As %Status
 {
 	Try {
+		// Capture output to avoid writing directly to the response stream, which would break the JSON format. We'll include captured output in the response.
+		set sc = $$BeginCapture^%SYS.Capture(.msg)
+
 		Set dyna = {}.%FromJSON(%request.Content)
 		Set target    = dyna.%Get("target")
 		Set classname = dyna.%Get("classname")
 		Set body      = dyna.%Get("body")
-		Set ns        = dyna.%Get("namespace")  If ns = "" { Set ns = "USER" }
+		Set ns        = ..ResolveNs(dyna)
 		If ns '= "" { Do ..NamespaceCheck(ns)  New $NAMESPACE  Set $NAMESPACE = ns }
 
+		// Normalize body: if it arrived as a JSON object, serialize it to a string
+		If $isobject(body) { Set body = body.%ToJSON() }
+
 		// Build the request message
 		If classname '= "" {
 			Set message = ##class(IOP.Message).%New()
@@ -277,8 +292,10 @@ ClassMethod PostTest() As %Status
 			Set result.classname = ""
 			Set result.body = ""
 		}
+		set sc = $$EndCapture^%SYS.Capture(msg,.msgArray)
 		Return ..%WriteResponse(result.%ToJSON())
 	} Catch ex {
+		set sc = $$EndCapture^%SYS.Capture(msg,.msgArray)
 		Return ..%WriteErrorResponse(ex.DisplayString())
 	}
 }
@@ -309,7 +326,7 @@ ClassMethod PutMigrate() As %DynamicObject
 		// Get the request body
 		set dyna = {}.%FromJSON(%request.Content)
 		set body = dyna.%Get("body")
-		set namespace = dyna.%Get("namespace")
+		set namespace = ..ResolveNs(dyna)
 		set targetDirectory = dyna.%Get("remote_folder")
 		set packageName = dyna.%Get("package")
 		// check for namespace existence and user permissions against namespace

{iris_pex_embedded_python-3.5.6b6 → iris_pex_embedded_python-3.5.6b8/src/iris_pex_embedded_python.egg-info}/PKG-INFO

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