iris-pex-embedded-python 3.1.1b1__py3-none-any.whl → 3.1.1b2__py3-none-any.whl

iop/_business_host.py

@@ -265,8 +265,10 @@ class _BusinessHost(_Common):
         msg = iris.cls('IOP.Message')._New()
         msg.classname = module + "." + classname
 
-        stream = _Utils.string_to_stream(json_string)
-        msg.jstr = stream
+        if hasattr(message, 'buffer') and len(json_string) > msg.buffer:
+            msg.json = _Utils.string_to_stream(json_string)
+        else:
+            msg.json = json_string
 
         return msg
 
@@ -321,7 +323,11 @@ class _BusinessHost(_Common):
         except Exception:
             raise ImportError("Class not found: " + classname)
 
-        string = _Utils.stream_to_string(serial.jstr)
+        string = ""
+        if (serial.type == 'Stream'):
+            string = _Utils.stream_to_string(serial.json)
+        else:
+            string = serial.json
 
         jdict = json.loads(string, cls=IrisJSONDecoder)
         msg = self._dataclass_from_dict(msg,jdict)

iop/cls/IOP/Message.cls

@@ -7,54 +7,105 @@ Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, %XML.Adaptor)
 
 Parameter BUFFER = 64000;
 
+Property buffer As %String(MAXLEN = "") [ Calculated, Transient ];
+
 Property classname As %String(MAXLEN = "");
 
 Property jsonObject As %DynamicObject(XMLPROJECTION = "None");
 
 Property json As %String(MAXLEN = "");
 
+Property jsonStream As %Stream.GlobalCharacter [ Internal, ReadOnly ];
+
+Property jsonString As %String(MAXLEN = 64000) [ Internal, ReadOnly ];
+
 Property jstr As %Stream.GlobalCharacter [ Internal, Private ];
 
+// for retrocompatibility
+
+Property type As %String(MAXLEN = 6) [ ReadOnly ];
+
+Method bufferGet()
+{
+	Quit ..#BUFFER
+}
+
 Method %OnNew(classname) As %Status [ Private, ServerOnly = 1 ]
 {
 	set ..classname = $g(classname)
 	Quit $$$OK
 }
 
-Method jsonGet()
+Method jstrGet()
 {
-	QUIT ..GetObjectJson()
+	set rsp = $$$NULLOREF
+	// Get as stream no matter what
+	if ..type="String" { 
+		Set rsp = ##class(%Stream.GlobalCharacter).%New()
+		Set sc = rsp.Write(..jsonString)
+	}
+	elseif ..type="Stream" { 
+		set rsp = ..jsonStream
+	}
+	Quit rsp
 }
 
-Method jsonSet(value) As %Status
+Method jstrSet(pInput) As %Status
 {
-	set ..jsonObject = {}.%FromJSON(value)
-	set ..jstr = ##class(%Stream.GlobalCharacter).%New()
-    do ..jstr.Write(value)
-	return $$$OK
+	// Set as stream no matter what
+	set sc = ..jsonSet(pInput)
+	if $$$ISERR(sc) { Quit sc }
+	if ..type="String" { 
+		set stream = ##class(%Stream.GlobalCharacter).%New()
+		Set sc = stream.Write(..jsonString)
+		set r%jsonStream = stream
+		set i%type = "Stream"
+	}
+	Quit sc
 }
 
-Method %DispatchGetProperty(property As %String) As %ObjectHandle
+Method jsonGet()
 {
-	quit $property(..jsonObject,property)
+	Quit $Case(..type
+				, "String":..jsonString
+				, "Stream":..jsonStream
+				, :$$$NULLOREF)
 }
 
-Method %DispatchSetProperty(
-	property As %String,
-	value)
+Method jsonSet(pInput) As %Status
 {
-	set $property(..jsonObject,property) = value
-	quit
+	Set tOldStream=$Case(..type
+				, "String":..jsonString
+				, "Stream":..jsonStream
+				, :$$$NULLOREF)
+	Quit:tOldStream=pInput $$$OK
+	Do:..type'="" Clear()  Set i%type=""
+	If $ISOBJECT(pInput) && pInput.%Extends("%Stream.GlobalCharacter") { 
+		Set r%jsonStream=pInput, i%type="Stream" 
+	}
+	If $IsObject(pInput) && 'pInput.%Extends("%Stream.GlobalCharacter") {  
+		Throw ##class(%Exception.General).%New("Invalid input type, must be a %Stream.GlobalCharacter")
+	}
+	Else {  
+		Set i%jsonString=pInput, i%type="String" 
+	}
+	Quit $$$OK
+Clear()
+	If ..type="String"     { Set r%jsonString="" }
+	ElseIf ..type="Stream" { Set r%jsonStream=$$$NULLOREF }
+	Quit
 }
 
 Method GetObjectJson(ByRef atEnd)
 {
 	set atEnd = 1
-	set json = ..jsonObject.%ToJSON()
-	if json = "{}" {
-		d ..jstr.Rewind()
-		set json = ..jstr.Read(..#BUFFER)
-        set atEnd = ..jstr.AtEnd
+	if ..type = "String" {
+		set json = ..jsonString
+	}
+	elseif ..type = "Stream" {
+		do ..jsonStream.Rewind()
+		set json = ..jsonStream.Read(..#BUFFER)
+		set atEnd = ..jsonStream.AtEnd
 	}
     QUIT json
 }
@@ -115,6 +166,15 @@ Storage Default
 <Value name="3">
 <Value>jstr</Value>
 </Value>
+<Value name="4">
+<Value>jsonStream</Value>
+</Value>
+<Value name="5">
+<Value>type</Value>
+</Value>
+<Value name="6">
+<Value>jsonString</Value>
+</Value>
 </Data>
 <Data name="jsonObject">
 <Attribute>jsonObject</Attribute>

iop/cls/IOP/Test.cls

@@ -2,6 +2,17 @@
 Class IOP.Test Extends %Persistent
 {
 
+/// Description
+ClassMethod TEST() As %Status
+{
+	set msg = ##class(IOP.Message).%New()
+	set msg.classname = "IOP.Message"
+	set msg.json = "{""name"":""John""}"
+	set tset = msg.json
+	set tst = msg.jstr
+	QUIT $$$OK
+}
+
 /// Register
 ClassMethod Register() As %Status
 {

{iris_pex_embedded_python-3.1.1b1.dist-info → iris_pex_embedded_python-3.1.1b2.dist-info}/METADATA

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

{iris_pex_embedded_python-3.1.1b1.dist-info → iris_pex_embedded_python-3.1.1b2.dist-info}/RECORD

@@ -92,7 +92,7 @@ intersystems_iris/pex/_OutboundAdapter.py,sha256=ao2Ubbta2DcrQGdzDUD_j1Zsk8bvUfc
 intersystems_iris/pex/__init__.py,sha256=l_I1dpnluWawbFrGMDC0GLHpuHwjbpd-nho8otFX6TE,1379
 iop/__init__.py,sha256=zHFF0Znipx1fwHYUEBZjNOYoZH1ro7z4IgYDU32kdn0,1067
 iop/__main__.py,sha256=pQzVtkDhAeI6dpNRC632dVk2SGZZIEDwDufdgZe8VWs,98
-iop/_business_host.py,sha256=KYlyxZtRU4nnAy94CtQHvBLpZAhPKnAzPovlY5UON9I,27933
+iop/_business_host.py,sha256=Z0h9Yp-Q8u-Jh8n-h0R8M3tiDFPJdL2pDcgjeTEnvn4,28150
 iop/_business_operation.py,sha256=P824IzO89LCKnoNHZk64OZBDHcomHpjhKmMT89bS6TI,3500
 iop/_business_process.py,sha256=F4NIQcwQ5u8yiAPpaN14OAXxbKJsRAGm5S4lrbgA3oI,13296
 iop/_business_service.py,sha256=sX8J-2-0Go6uIuPYa0A5N9Nn9rY5lV6a05v4q78qDC8,3726
@@ -112,10 +112,10 @@ iop/cls/IOP/BusinessService.cls,sha256=7ebn32J9PiZXUgXuh5Xxm_7X6zHBiqkJr9c_dWxbP
 iop/cls/IOP/Common.cls,sha256=vYTnsL-ch-vTjpigBtwOHgrnOQMmuTkqXT9F-vWE650,11068
 iop/cls/IOP/Director.cls,sha256=DlxyFvsJjB1FVImFVNkRpQy7XXIMRoDZOLpEdMlwgOU,1885
 iop/cls/IOP/InboundAdapter.cls,sha256=GeoCm6q5HcLJ5e4VxgqXiErJXqolBbpKwpunaNzpvjU,610
-iop/cls/IOP/Message.cls,sha256=ecLsPKUcW0jUx1tDpyrMDlaTgrs61L8ecuuZTCbCxV8,8209
+iop/cls/IOP/Message.cls,sha256=DXXYF57YS-IQAyru8MQiEBo9UE3vgn6518_yVl2BepE,9660
 iop/cls/IOP/OutboundAdapter.cls,sha256=9eOwy5ojwcTzwrHs6LNrFQvUD8aqcoNCZrILN1ycdDM,958
 iop/cls/IOP/PickleMessage.cls,sha256=S3y7AClQ8mAILjxPuHdCjGosBZYzGbUQ5WTv4mYPNMQ,1673
-iop/cls/IOP/Test.cls,sha256=ztoFWo2I3-Nc6J1Yps9uHuS2gYqw2qrzhFMQdyhhn64,1559
+iop/cls/IOP/Test.cls,sha256=I11dVr44_XKgg-i_JvgPq9AeHwNnlfD226bgM5MSx7E,1775
 iop/cls/IOP/Utils.cls,sha256=VwIeWxbeC6LkoDuBN0vhias-pkeLp7mbcC_4MPnzQ8g,13757
 iop/cls/IOP/Duplex/Operation.cls,sha256=K_fmgeLjPZQbHgNrc0kd6DUQoW0fDn1VHQjJxHo95Zk,525
 iop/cls/IOP/Duplex/Process.cls,sha256=xbefZ4z84a_IUhavWN6P_gZBzqkdJ5XRTXxro6iDvAg,6986
@@ -135,9 +135,9 @@ iris/iris_ipm.pyi,sha256=j7CNUZcjeDu5sgeWUZJO_Qi4vQmHh6aD-jPWv8OdoUs,374
 iris/iris_utils.py,sha256=kg80O3yRpHIutM-mCyr4xCeTvKWPE-Kai-b6Dxw4vQ4,9882
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
-iris_pex_embedded_python-3.1.1b1.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.1.1b1.dist-info/METADATA,sha256=SPruoM59LAfll2SeNNGpqD_NFqgb2ZjlYFZtfA-kqsU,49482
-iris_pex_embedded_python-3.1.1b1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-iris_pex_embedded_python-3.1.1b1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.1.1b1.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
-iris_pex_embedded_python-3.1.1b1.dist-info/RECORD,,
+iris_pex_embedded_python-3.1.1b2.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.1.1b2.dist-info/METADATA,sha256=ntJ_H35hi4dL3SLkXgSaAzRN_pAX4l2KMpccSzd1Scs,49482
+iris_pex_embedded_python-3.1.1b2.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
+iris_pex_embedded_python-3.1.1b2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.1.1b2.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
+iris_pex_embedded_python-3.1.1b2.dist-info/RECORD,,

{iris_pex_embedded_python-3.1.1b1.dist-info → iris_pex_embedded_python-3.1.1b2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any