iris-pex-embedded-python 3.1.2__py3-none-any.whl → 3.1.3__py3-none-any.whl

iop/_utils.py

@@ -51,8 +51,9 @@ class _Utils():
         :return: The return value is a string.
         """
         path = os.path.abspath(os.path.normpath(path))
+        fullpath = _Utils.guess_path(module,path)
         try:
-            iris.cls('IOP.Utils').dispatchRegisterComponent(module,classname,path,overwrite,iris_classname)
+            iris.cls('IOP.Utils').dispatchRegisterComponent(module,classname,path,fullpath,overwrite,iris_classname)
         except RuntimeError as e:
             # New message error : Make sure the iop package is installed in iris 
             raise RuntimeError("Iris class : IOP.Utils not found. Make sure the iop package is installed in iris eg: iop --init.") from e
@@ -395,4 +396,26 @@ class _Utils():
         chunks = [string[i:i+n] for i in range(0, len(string), n)]
         for chunk in chunks:
             stream.Write(chunk)
-        return stream
+        return stream
+    
+    @staticmethod
+    def guess_path(module,path):
+        if "." in module:
+            if module.startswith("."):
+                # count the number of dots at the beginning of the module name
+                dots = 0
+                for c in module:
+                    if c == ".":
+                        dots += 1
+                    else:
+                        break
+                # remove the dots from the beginning of the module name
+                module = module[dots:]
+                # go to the parent directory dots times
+                for i in range(dots)-1:
+                    path = os.path.dirname(path)
+                return os.path.join(path, module.replace(".", os.sep) + ".py")
+            else:
+                return os.path.join(path, module.replace(".", os.sep) + ".py")
+        else:
+            return os.path.join(path, module + ".py")

iop/cls/IOP/Utils.cls

@@ -11,11 +11,12 @@ ClassMethod dispatchRegisterComponent(
 	pModule As %String,
 	pRemoteClassname As %String,
 	pCLASSPATHS As %String = "",
+	pFullpath As %String = "",
 	pOverwrite As %Boolean = 0,
 	pProxyClassname As %String = "") As %Status
 {
 	set tSc = $$$OK
-	$$$ThrowOnError(##class(IOP.Utils).RegisterComponent(pModule, pRemoteClassname, pCLASSPATHS, pOverwrite , pProxyClassname))
+	$$$ThrowOnError(##class(IOP.Utils).RegisterComponent(pModule, pRemoteClassname, pCLASSPATHS, pFullpath, pOverwrite , pProxyClassname))
 	return tSc
 }
 
@@ -24,6 +25,7 @@ ClassMethod RegisterComponent(
 	pModule As %String,
 	pRemoteClassname As %String,
 	pCLASSPATHS As %String = "",
+	pFullpath As %String = "",
 	pOverwrite As %Boolean = 0,
 	pProxyClassname As %String = "") As %Status
 {
@@ -38,7 +40,7 @@ ClassMethod RegisterComponent(
 		
 	Try {
 
-		$$$ThrowOnError(..GetRemoteClassInfo(pRemoteClassname,pModule,pCLASSPATHS,.tClassDetails,.tRemoteSettings))
+		$$$ThrowOnError(..GetRemoteClassInfo(pRemoteClassname,pModule,pCLASSPATHS,pFullpath,.tClassDetails,.tRemoteSettings))
 
 		Set tConnectionSettings("Classpaths") = pCLASSPATHS
 		Set tConnectionSettings("Module") = pModule
@@ -103,6 +105,7 @@ ClassMethod GetRemoteClassInfo(
 	pRemoteClassname As %String,
 	pModule As %String,
 	pClasspaths As %String,
+	pFullpath As %String = "",
 	ByRef pClassDetails,
 	ByRef pRemoteSettings) As %Status [ Internal ]
 {
@@ -124,18 +127,15 @@ ClassMethod GetRemoteClassInfo(
 
 		set importlib = ##class(%SYS.Python).Import("importlib")
 		set builtins = ##class(%SYS.Python).Import("builtins")
-		set sys = ##class(%SYS.Python).Import("sys")
-		set os = ##class(%SYS.Python).Import("os")
 		// Load the module form a specific path
-		// Guess the full path to the module
-		set path = ..GuessFullPath(pModule, onePath)
 		Try {
-			set spec = importlib.util."spec_from_file_location"(pModule, path)
+			set spec = importlib.util."spec_from_file_location"(pModule, pFullpath)
 			set module = importlib.util."module_from_spec"(spec)
 			do sys.modules."__setitem__"(pModule, module)
 			do spec.loader."exec_module"(module)
 		}
 		Catch ex {
+			// If the module is not found, try to import the frist one found
 			set module = importlib."import_module"(pModule)
 		}
 
@@ -160,21 +160,6 @@ ClassMethod GetRemoteClassInfo(
 	Quit tSC
 }
 
-ClassMethod GuessFullPath(
-	module As %String,
-	path As %String) As %String
-{
-    If $Find(module, ".") {
-        Set module = $Piece(module, ".", *)
-    }
-    If $Find(path, module) {
-        Set path = $Piece(path, module, 1)
-    }
-    // append the module to the path
-    Set path = path _ module _ ".py"
-    Return path
-}
-
 ClassMethod GenerateProxyClass(
 	pClassname As %String,
 	ByRef pConnectionSettings,

{iris_pex_embedded_python-3.1.2.dist-info → iris_pex_embedded_python-3.1.3.dist-info}/METADATA

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

{iris_pex_embedded_python-3.1.2.dist-info → iris_pex_embedded_python-3.1.3.dist-info}/RECORD

@@ -105,7 +105,7 @@ iop/_outbound_adapter.py,sha256=YTAhLrRf9chEAd53mV6KKbpaHOKNOKJHoGgj5wakRR0,726
 iop/_pickle_message.py,sha256=noKfc2VkXufV3fqjKvNHN_oANQ1YN9ffCaSV0XSTAIE,331
 iop/_private_session_duplex.py,sha256=klzWKwRRBoKUSz85D3DNYuCpDcZe_kWLNCWq5JtR0yc,5044
 iop/_private_session_process.py,sha256=pGjWFOQhWpQxUVpTtvNKTPvDxgzjfw0VC4Aqj3KUq8w,1704
-iop/_utils.py,sha256=UYfBINcrwK9Uh3sfd8xA46RzGE8N5rmGz6wLhHnxExE,17165
+iop/_utils.py,sha256=b1vFnAXbcNV4uN9zojIeSeLgr0CuSt9bBgguZra0ve8,18105
 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
@@ -116,7 +116,7 @@ iop/cls/IOP/Message.cls,sha256=n0r0FslXdDfPcHIiAlW7n596DDsDSNlTX8UTPaMnSV8,9911
 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=1fkb3ff-FhRRx5nIqPUzj7sndlo0ptHfOvMoC4bw0eY,14073
+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
@@ -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.2.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.1.2.dist-info/METADATA,sha256=Kx_H2-6EMcf6mzT3B-eHL2uI3VByXxlssESfquC7u1M,50120
-iris_pex_embedded_python-3.1.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-iris_pex_embedded_python-3.1.2.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.1.2.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
-iris_pex_embedded_python-3.1.2.dist-info/RECORD,,
+iris_pex_embedded_python-3.1.3.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.1.3.dist-info/METADATA,sha256=tOAb3jq9OHmTL3V9-G8pqf-BqQyFh5GlMsTzRdkcFpA,50120
+iris_pex_embedded_python-3.1.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+iris_pex_embedded_python-3.1.3.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.1.3.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
+iris_pex_embedded_python-3.1.3.dist-info/RECORD,,

{iris_pex_embedded_python-3.1.2.dist-info → iris_pex_embedded_python-3.1.3.dist-info}/WHEEL

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