iris-pex-embedded-python 3.2.0__py3-none-any.whl → 3.2.0b1__py3-none-any.whl

iop/cls/IOP/Message/JSONSchema.cls

@@ -9,31 +9,6 @@ Property JSONSchema As %String(MAXLEN = "");
 
 Index NameIndex On Name [ IdKey, Unique ];
 
-/// Import a JSON Schema from file
-ClassMethod ImportFromFile(
-	pFileName As %String,
-	pCategory As %String = "",
-	pName As %String) As %Status
-{
-    Set pStatus = $$$OK
-    Try {
-        If '##class(%File).Exists(pFileName) {
-            Set pStatus = $$$ERROR($$$GeneralError, "File not found")
-            Return pStatus
-        }
-        Set tFile = ##class(%File).%New(pFileName)
-        $$$ThrowOnError(tFile.Open("R"))
-        Set tSchema = ""
-        While 'tFile.AtEnd {
-            Set tSchema = tSchema _ tFile.ReadLine()
-        }
-        Set pStatus = ..Import(tSchema, pCategory, pName)
-    } Catch ex {
-        Set pStatus = ex.AsStatus()
-    }
-    Return pStatus
-}
-
 /// Store the JSON Schema in this object
 ClassMethod Import(
 	pSchema As %String,

iop/cls/IOP/Message.cls

@@ -1,4 +1,4 @@
-Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, Ens.VDoc.Interface)
+Class IOP.Message Extends (Ens.MessageBody, %CSP.Page, %XML.Adaptor, Ens.VDoc.Interface)
 {
 
 Parameter DOCCLASSNAME = "JSON Document";
@@ -27,20 +27,6 @@ Property jstr As %Stream.GlobalCharacter [ Internal, Private ];
 
 Property type As %String(MAXLEN = 6) [ ReadOnly ];
 
-/// Gets the next index in an array
-Method GetNextIndex(
-	pPath As %String,
-	pIndex As %String,
-	ByRef pStatus As %Status = {$$$OK}) As %String
-{
-    Set f=$F(pPath,"()")  If 'f Set pStatus=$$$ERROR($$$EnsErrGeneral,"Can't iterate on no-array type '"_pPath_"'") Quit ""
-    if pIndex="" Set pIndex=0
-    Set tValue = ..GetValueAt($EXTRACT(pPath, 1, $LENGTH(pPath)-2))
-    Set builtins = ##class(%SYS.Python).Builtins()
-    if pIndex>=builtins.len(tValue) Quit ""
-    Quit pIndex+1
-}
-
 Method GetValueAt(
 	pPropertyPath As %String = "",
 	pFormat As %String,
@@ -157,12 +143,6 @@ Method CopyValues(
     Return tSC
 }
 
-/// Sets a value at the specified property path in the JSON document
-/// @param pValue Value to set
-/// @param pPropertyPath Path to the property (e.g. "property1.property2" or "array()")
-/// @param pAction Action to perform ("set", "append", "remove", "insert")
-/// @param pKey Optional key for specialized operations, required for insert
-/// @returns %Status
 Method SetValueAt(
 	pValue As %String = "",
 	pPropertyPath As %String = "",
@@ -170,86 +150,32 @@ Method SetValueAt(
 	pKey As %String = "") As %Status
 {
     Set tSC = $$$OK
+    // if pAction is set, use jsonpath to set the value
     Try {
-        // Validate input parameters
-        If pPropertyPath = "" Return $$$ERROR($$$GeneralError, "Property path cannot be empty")
-        If '$LISTFIND($LISTBUILD("set","append","remove","insert"), pAction) Return $$$ERROR($$$GeneralError, "Invalid action: "_pAction)
-        If (pAction = "insert") && (pKey = "") Return $$$ERROR($$$GeneralError, "Key is required for insert action")
+        // Convert pPropertyPath to a a jsonpath
+        Set tPath = ..ConvertPath(pPropertyPath)
 
-        // Initialize Python objects
         Set pyjson = ##class(%SYS.Python).Import("json")
         Set jp = ##class(%SYS.Python).Import("jsonpath_ng")
         Set builtins = ##class(%SYS.Python).Builtins()
 
-        // Handle append operations
-        Set tAppend = (pAction = "append")
-        If tAppend, $EXTRACT(pPropertyPath, *-1, *) = "()" {
-            Set pPropertyPath = $EXTRACT(pPropertyPath, 1, *-2)
+        if ..json = "" {
+            Set ..json = "{}"
         }
-
-        // Initialize empty JSON if needed
-        Set:..json="" ..json = "{}"
-        
-        // Parse JSON and prepare path
         Set tJSON = pyjson.loads(..json)
-        Set tPath = ..ConvertPath(pPropertyPath)
-        Set parser = jp.parse(tPath)
 
-        If pAction = "set" {
-            // Simple set operation
+        Set parser = jp.parse(tPath)
+        if pAction = "set" {
             Set tJSON = parser."update_or_create"(tJSON, pValue)
         }
-        ElseIf pAction = "remove" {
-            // Remove operation
-            Set matches = parser.find(tJSON)
-            If matches."__len__"() > 0 {
-                // Not yet implemented
-                Set tSC = $$$ERROR($$$GeneralError, "Remove operation not yet implemented")
-            }
-        }
-        ElseIf pAction = "insert" {
-            // Handle dictionary insert/update
-            Set matches = parser.find(tJSON)
-            If matches."__len__"() = 0 {
-                // Create new dictionary if path doesn't exist
-                Set tDict = builtins.dict()
-                Do tDict."__setitem__"(pKey, pValue)
-                Set tJSON = parser."update_or_create"(tJSON, tDict)
-            }
-            Else {
-                // Update existing dictionary
-                Set tDict = matches."__getitem__"(0)."value"
-                Do tDict."__setitem__"(pKey, pValue)
-                Set tJSON = parser."update"(tJSON, tDict)
-            }
-        }
-        ElseIf tAppend {
-            // Handle append operation
-            Set tFindValue = parser."find"(tJSON)
-            If tFindValue."__len__"() = 0 {
-                // Create new array if path doesn't exist
-                Set:(tAppend) tValue = builtins.list()
-                Do:tAppend tValue.append(pValue)
-                Set tJSON = parser."update_or_create"(tJSON, $Select(tAppend: tValue, 1: pValue))
-            }
-            Else {
-                // Append to existing array
-                Do tFindValue."__getitem__"(0)."value".append(pValue)
-                Set tJSON = parser."update"(tJSON, tFindValue."__getitem__"(0)."value")
-            }
-        }
 
-        // Update JSON storage
-        Set ..json = pyjson.dumps(tJSON)
+        Set tResult = pyjson.dumps(tJSON)
+        Set ..json = tResult
         Set ..classname = ..DocType
-
-    }
-    Catch ex {
+        
+    } Catch ex {
         Set tSC = ex.AsStatus()
-        // Log error details
-        $$$LOGWARNING("Error in SetValueAt: "_$System.Status.GetErrorText(tSC))
     }
-    
     Return tSC
 }
 
@@ -401,7 +327,7 @@ ClassMethod GetContentArray(
         If $$$ISERR(tSC) Return tSC
         set schema = {}.%FromJSON(json)
 
-        $$$ThrowOnError(##class(IOP.Message).SchemaToContents(schema, .tContents))
+        $$$ThrowOnError(##class(IOP.Message.Document).SchemaToContents(schema, .tContents))
 
         Merge @pContents = tContents
     }

{iris_pex_embedded_python-3.2.0.dist-info → iris_pex_embedded_python-3.2.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: iris_pex_embedded_python
-Version: 3.2.0
+Version: 3.2.0b1
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -49,7 +49,6 @@ Requires-Dist: xmltodict>=0.12.0
 Requires-Dist: iris-embedded-python-wrapper>=0.0.6
 Requires-Dist: setuptools>=40.8.0
 Requires-Dist: dc-schema>=0.0.8
-Requires-Dist: jsonpath-ng>=1.7.0
 
 # IoP (Interoperability On Python)
 

{iris_pex_embedded_python-3.2.0.dist-info → iris_pex_embedded_python-3.2.0b1.dist-info}/RECORD

@@ -112,7 +112,7 @@ iop/cls/IOP/BusinessService.cls,sha256=7ebn32J9PiZXUgXuh5Xxm_7X6zHBiqkJr9c_dWxbP
 iop/cls/IOP/Common.cls,sha256=4f4ZpLj8fsj8IKJDNb9pKoCokzo522JHWX0OqpAaC5g,11192
 iop/cls/IOP/Director.cls,sha256=M43LoTb6lwSr0J81RFxi1YLW1mwda09wQ7Xqr3nBtxo,2008
 iop/cls/IOP/InboundAdapter.cls,sha256=GeoCm6q5HcLJ5e4VxgqXiErJXqolBbpKwpunaNzpvjU,610
-iop/cls/IOP/Message.cls,sha256=EJWt0ifN3v-QxFit-xvU4Brodx58_jWeYZDoiyHuHa8,25156
+iop/cls/IOP/Message.cls,sha256=er1TcG1UDKIpiStyXT0-zKHWxIrikmV6yzUTvFGYSB0,21932
 iop/cls/IOP/OutboundAdapter.cls,sha256=9eOwy5ojwcTzwrHs6LNrFQvUD8aqcoNCZrILN1ycdDM,958
 iop/cls/IOP/PickleMessage.cls,sha256=S3y7AClQ8mAILjxPuHdCjGosBZYzGbUQ5WTv4mYPNMQ,1673
 iop/cls/IOP/Test.cls,sha256=gAC9PEfMZsvAEWIa241-ug2FWAhITbN1SOispZzJPnI,2094
@@ -120,7 +120,7 @@ iop/cls/IOP/Utils.cls,sha256=ZTBr02spm4ppxVBfhnUwb08BmhTjG5-ZbItRshYHs1I,13746
 iop/cls/IOP/Duplex/Operation.cls,sha256=K_fmgeLjPZQbHgNrc0kd6DUQoW0fDn1VHQjJxHo95Zk,525
 iop/cls/IOP/Duplex/Process.cls,sha256=xbefZ4z84a_IUhavWN6P_gZBzqkdJ5XRTXxro6iDvAg,6986
 iop/cls/IOP/Duplex/Service.cls,sha256=sTMOQUCMBgVitmQkM8bbsrmrRtCdj91VlctJ3I7b8WU,161
-iop/cls/IOP/Message/JSONSchema.cls,sha256=SL26n8Z0D81SAGL2NthI10NFdT4Oe1x_GQiaTYPwkoo,3252
+iop/cls/IOP/Message/JSONSchema.cls,sha256=KLx7qYbfRehuvof1j3bBYiaVtqKPxuddrmDaKl5S_rE,2570
 iop/cls/IOP/PrivateSession/Duplex.cls,sha256=8a_dO7E2RTzuxzoufryjlS41l-99NmTtOcmFXOnSwA8,7957
 iop/cls/IOP/PrivateSession/Message/Ack.cls,sha256=y6-5uSVod36bxeQuT2ytPN4TUAfM1mvGGJuTbWbpNv4,941
 iop/cls/IOP/PrivateSession/Message/Poll.cls,sha256=z3ALYmGYQasTcyYNyBeoHzJdNXI4nBO_N8Cqo9l4sQY,942
@@ -130,9 +130,9 @@ iop/cls/IOP/Service/WSGI.cls,sha256=VLNCXEwmHW9dBnE51uGE1nvGX6T4HjhqePT3LVhsjAE,
 iop/wsgi/handlers.py,sha256=NrFLo_YbAh-x_PlWhAiWkQnUUN2Ss9HoEm63dDWCBpQ,2947
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
-iris_pex_embedded_python-3.2.0.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.2.0.dist-info/METADATA,sha256=pccc6u5ZCNCsCR_WmN8skwon3__mAcaeGXxcmW2gDuk,4425
-iris_pex_embedded_python-3.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-iris_pex_embedded_python-3.2.0.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.2.0.dist-info/top_level.txt,sha256=VWDlX4YF4qFVRGrG3-Gs0kgREol02i8gIpsHNbhfFPw,42
-iris_pex_embedded_python-3.2.0.dist-info/RECORD,,
+iris_pex_embedded_python-3.2.0b1.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.2.0b1.dist-info/METADATA,sha256=EfLIlTJcv2YZAgp8jrL4hGJXyGPmcHAvrZqdjfqKS8Y,4393
+iris_pex_embedded_python-3.2.0b1.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+iris_pex_embedded_python-3.2.0b1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.2.0b1.dist-info/top_level.txt,sha256=VWDlX4YF4qFVRGrG3-Gs0kgREol02i8gIpsHNbhfFPw,42
+iris_pex_embedded_python-3.2.0b1.dist-info/RECORD,,

{iris_pex_embedded_python-3.2.0.dist-info → iris_pex_embedded_python-3.2.0b1.dist-info}/WHEEL

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