iris-pex-embedded-python 3.4.2b2__py3-none-any.whl → 3.4.3b2__py3-none-any.whl

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}")

iop/cls/IOP/Common.cls

@@ -19,6 +19,14 @@ 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);
+
 /// Get Class
 Method GetClass() As %SYS.Python
 {

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
     }
 }
 

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"
 		
 		#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.dist-info → iris_pex_embedded_python-3.4.3b2.dist-info}/METADATA

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

{iris_pex_embedded_python-3.4.2b2.dist-info → iris_pex_embedded_python-3.4.3b2.dist-info}/RECORD

@@ -36,7 +36,7 @@ iop/_business_process.py,sha256=hj6nDIP5Mz5UYbm0vDjvs9lPSEYVQxGJl6tQRcDGTBk,8548
 iop/_business_service.py,sha256=wdhEKkqNHWt09XYGrvIpSuDDI4MyCGm2rKdvGQJ93EI,3988
 iop/_cli.py,sha256=fhaUpq3rTb4P2QPuuqoeatsphMLBPj9xtbvFPJv-2Mo,7941
 iop/_common.py,sha256=YJrEAsf0xT-nGsCYPARwg4jrSGTYuMfMe56A8GJ46oA,13754
-iop/_debugpy.py,sha256=HAZOBuYGsVi4bQ8cV1Bas0dbH9stcs_dGDSVJJ2QqfE,4702
+iop/_debugpy.py,sha256=eoxrfxeucufkykLMr8Ga5SuiKRGqcfE8npt1wDx1haA,4710
 iop/_decorators.py,sha256=ZpgEETLdKWv58AoSMfXnm3_mA-6qPphIegjG-npDgwg,2324
 iop/_director.py,sha256=d1XXJn8T8VF9rmT-joJdz_ElS2UR6myRaXaMFC_2brA,11498
 iop/_dispatch.py,sha256=I3TAhvTuk8j4VcROI9vAitJ0a7Nk1BYAWKRrLeNsjr0,3203
@@ -53,14 +53,14 @@ iop/_utils.py,sha256=zguWjvZQkzAScHXl4OomZr2ZtPljDqVAs1CFllQZn5g,20092
 iop/cls/IOP/BusinessOperation.cls,sha256=lrymqZ8wHl5kJjXwdjbQVs5sScV__yIWGh-oGbiB_X0,914
 iop/cls/IOP/BusinessProcess.cls,sha256=s3t38w1ykHqM26ETcbCYLt0ocjZyVVahm-_USZkuJ1E,2855
 iop/cls/IOP/BusinessService.cls,sha256=7ebn32J9PiZXUgXuh5Xxm_7X6zHBiqkJr9c_dWxbPO8,1021
-iop/cls/IOP/Common.cls,sha256=kcK2LrsPxJzU5cDIDUtwrPaDCf7rE73EY-iwHACACFw,12370
+iop/cls/IOP/Common.cls,sha256=AQW6Hp_pwyQWPIGGzIFshswuMoW1kcv94g9QClzoo5U,12574
 iop/cls/IOP/Director.cls,sha256=M43LoTb6lwSr0J81RFxi1YLW1mwda09wQ7Xqr3nBtxo,2008
 iop/cls/IOP/InboundAdapter.cls,sha256=GeoCm6q5HcLJ5e4VxgqXiErJXqolBbpKwpunaNzpvjU,610
-iop/cls/IOP/Message.cls,sha256=ZrYQHosgfTG9wv7i-WQ8j71YXZMmL4_mN16xtIDwcRg,25180
+iop/cls/IOP/Message.cls,sha256=6_iZzQaY0cA9FjXg0qECYZC6We8soAIrUwRBrlerC4w,25373
 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
-iop/cls/IOP/Utils.cls,sha256=8MaKvQSX8ncjS0v3FTGyfb5HdA0urmozlfRJnCDLakc,17339
+iop/cls/IOP/Utils.cls,sha256=PGaEk0CKXobWrVM7UjQgZGVQ0MP4TkKr-TKJyGfj4Qg,15468
 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
@@ -72,9 +72,9 @@ iop/cls/IOP/PrivateSession/Message/Start.cls,sha256=uk-WTe66GicCshgmVy3F5ugHiAyP
 iop/cls/IOP/PrivateSession/Message/Stop.cls,sha256=7g3gKFUjNg0WXBLuWnj-VnCs5G6hSE09YTzGEp0zbGc,1390
 iop/cls/IOP/Service/WSGI.cls,sha256=VLNCXEwmHW9dBnE51uGE1nvGX6T4HjhqePT3LVhsjAE,10440
 iop/wsgi/handlers.py,sha256=NrFLo_YbAh-x_PlWhAiWkQnUUN2Ss9HoEm63dDWCBpQ,2947
-iris_pex_embedded_python-3.4.2b2.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.4.2b2.dist-info/METADATA,sha256=1UU2H2FbUmFoM_RDH68t2lpoiYywUxEaugefes57d88,4449
-iris_pex_embedded_python-3.4.2b2.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-iris_pex_embedded_python-3.4.2b2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.4.2b2.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
-iris_pex_embedded_python-3.4.2b2.dist-info/RECORD,,
+iris_pex_embedded_python-3.4.3b2.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.4.3b2.dist-info/METADATA,sha256=pWZI7p4AvXsPwmzwfi3-4v6xi6TZdXnykAztDSqZz2E,4449
+iris_pex_embedded_python-3.4.3b2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+iris_pex_embedded_python-3.4.3b2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.4.3b2.dist-info/top_level.txt,sha256=4p0q6hCATmYIVMVi3I8hOUcJE1kwzyBeHygWv_rGvrU,13
+iris_pex_embedded_python-3.4.3b2.dist-info/RECORD,,

{iris_pex_embedded_python-3.4.2b2.dist-info → iris_pex_embedded_python-3.4.3b2.dist-info}/WHEEL

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