iris-pex-embedded-python 3.5.1b3__tar.gz → 3.5.2__tar.gz

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/PKG-INFO

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

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/pyproject.toml

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

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/src/iop/_cli.py

@@ -147,7 +147,7 @@ class Command:
         if migrate_path is not None:
             if not os.path.isabs(migrate_path):
                 migrate_path = os.path.join(os.getcwd(), migrate_path)
-            _Utils.migrate(migrate_path)
+            _Utils.migrate_remote(migrate_path)
 
     def _handle_log(self) -> None:
         if self.args.log == 'not_set':

iris_pex_embedded_python-3.5.2/src/iop/_remote.py

@@ -0,0 +1,91 @@
+# This module provides a REST API for remote I/O operations
+# It uses Flask to handle incoming requests and route them to the appropriate I/O functions
+# It should be able to help the migrate command of IoP Cli to work remotely:
+# this means copy all the .py files from the current directory of (settings.py) to the remote server
+# and run the api migrate from the remote server
+# the default folder is based on the NAMESPACE variable in settings.py
+from flask import Flask, request, jsonify
+
+@app.route('/remote_io', methods=['POST'])
+def remote_io():
+    data = request.json
+    if not data or 'operation' not in data:
+        return jsonify({'error': 'Invalid request'}), 400
+    
+    operation = data['operation']
+    # Here you would implement the logic to handle the operation
+    # For example, you could call a function that performs the I/O operation
+    # and return the result as JSON.
+    
+    # Placeholder response for demonstration purposes
+    response = {'status': 'success', 'operation': operation}
+    return jsonify(response), 200
+
+# ClassMethod UploadPackage(
+# 	namespace As %String,
+# 	body As %DynamicArray) As %DynamicObject
+# {
+#     // check for namespace existence and user permissions against namespace
+# 	If '..NamespaceCheck(namespace) {
+# 		Return ""
+# 	}
+# 	New $NAMESPACE
+# 	Set $NAMESPACE = namespace
+	
+# 	//Create directory for custom packages
+# 	Do ##class(%ZHSLIB.HealthShareMgr).GetDBNSInfo(namespace,.out)
+# 	Set customPackagesPath = ##class(%Library.File).NormalizeDirectory("fhir_packages", out.globalsDatabase.directory)
+# 	If '##class(%Library.File).DirectoryExists(customPackagesPath) {
+# 		If '##class(%Library.File).CreateDirectory(customPackagesPath) {
+# 			$$$ThrowStatus($$$ERROR($$$DirectoryCannotCreate, customPackagesPath))
+# 		}
+# 	}
+	
+# 	//Find package name
+# 	Set iterator =  body.%GetIterator()
+# 	Set packageName = ""
+# 	While iterator.%GetNext(, .fileObject ) {
+# 		If fileObject.name = "package.json" {
+# 			Set packageName = fileObject.data.name_"@"_fileObject.data.version
+# 		}	
+# 	}
+# 	If packageName = "" {
+# 		Do ..%ReportRESTError($$$HTTP400,$$$ERROR($$$HSFHIRErrPackageNotFound))
+# 		Return ""
+# 	}
+	
+# 	Set packagePath = ##class(%Library.File).NormalizeDirectory(packageName, customPackagesPath)
+# 	// If the package already exists then we must be meaning to re-load it. Delete files/directory/metadata and recreate fresh.
+# 	If ##class(%Library.File).DirectoryExists(packagePath) {
+# 		If '##class(%Library.File).RemoveDirectoryTree(packagePath) {
+# 			$$$ThrowStatus($$$ERROR($$$DirectoryPermission , packagePath))
+# 		}
+# 	}
+# 	If '##class(%Library.File).CreateDirectory(packagePath) {
+# 		$$$ThrowStatus($$$ERROR($$$DirectoryCannotCreate, customPackagesPath))
+# 	}
+# 	Set pkg = ##class(HS.FHIRMeta.Storage.Package).FindById(packageName)
+# 	If $ISOBJECT(pkg) {
+# 		// Will fail and throw if the package is in-use or has dependencies preventing it from being deleted.
+# 		Do ##class(HS.FHIRServer.ServiceAdmin).DeleteMetadataPackage(packageName)
+# 	}
+# 	Kill pkg
+
+# 	//Unpack JSON objects		
+# 	Set iterator = body.%GetIterator()
+# 	While iterator.%GetNext(.key , .fileObject ) {
+# 		Set fileName = ##class(%Library.File).NormalizeFilename(fileObject.name,packagePath)
+# 		Set fileStream = ##class(%Stream.FileCharacter).%New()
+# 		Set fileStream.TranslateTable = "UTF8"
+# 		$$$ThrowOnError(fileStream.LinkToFile(fileName))
+# 		Do fileObject.data.%ToJSON(.fileStream)
+# 		$$$ThrowOnError(fileStream.%Save())
+# 	}
+	
+# 	//Import package
+# 	Do ##class(HS.FHIRMeta.Load.NpmLoader).importPackages(packagePath)
+# 	Set pkg = ..GetOnePackage(packageName, namespace)
+# 	Do ..%SetStatusCode($$$HTTP201)
+# 	Do ..%SetHeader("location", %request.Application _ "packages/" _ packageName _ "?namespace=" _ namespace)
+# 	Return pkg
+# }

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/src/iop/_utils.py

@@ -6,14 +6,24 @@ import importlib.resources
 import json
 import inspect
 import ast
-from typing import Any, Dict, Optional, Union, Tuple
+from typing import Any, Dict, Optional, Union, Tuple, TypedDict
 
 import xmltodict
+import requests
 from pydantic import TypeAdapter
 
 from . import _iris
 from ._message import _Message, _PydanticMessage
 
+class RemoteSettings(TypedDict, total=False):
+    """Typed dictionary for remote migration settings."""
+    url: str  # Required: the host url to connect to
+    namespace: str  # Optional: the namespace to use (default: 'USER')
+    package: str  # Optional: the package to use (default: 'python')
+    remote_folder: str  # Optional: the folder to use (default: '')
+    username: str  # Optional: the username to use to connect (default: '')
+    password: str  # Optional: the password to use to connect (default: '')
+
 class _Utils():
     @staticmethod
     def raise_on_error(sc):
@@ -250,6 +260,83 @@ class _Utils():
 
         return module
 
+    @staticmethod
+    def migrate_remote(filename=None):
+        """
+        Read a settings file from the filename
+        If the settings.py file has a key 'REMOTE_SETTINGS' then it will use the value of that key
+        as the remote host to connect to.
+        the REMOTE_SETTINGS is a RemoteSettings dictionary with the following keys:
+            * 'url': the host url to connect to (mandatory)
+            * 'namespace': the namespace to use (optional, default is 'USER')
+            * 'package': the package to use (optional, default is 'python')
+            * 'remote_folder': the folder to use (optional, default is '')
+            * 'username': the username to use to connect (optional, default is '')
+            * 'password': the password to use to connect (optional, default is '')
+        
+        The remote host is a rest API that will be used to register the components
+        The payload will be a json object with the following keys:
+            * 'namespace': the namespace to use
+            * 'package': the package to use
+            * 'body': the body of the request, it will be a json object with the following keys:
+                * 'name': name of the file
+                * 'data': the data of the file, it will be an UTF-8 encoded string
+
+        'body' will be constructed with all the files in the folder if the folder is not empty else use root folder of settings.py
+        """
+        settings, path = _Utils._load_settings(filename)
+        remote_settings: Optional[RemoteSettings] = getattr(settings, 'REMOTE_SETTINGS', None) if settings else None
+
+        if not remote_settings:
+            _Utils.migrate(filename)
+            return
+        
+        # Validate required fields
+        if 'url' not in remote_settings:
+            raise ValueError("REMOTE_SETTINGS must contain 'url' field")
+        
+        # prepare the payload with defaults
+        payload = {
+            'namespace': remote_settings.get('namespace', 'USER'),
+            'package': remote_settings.get('package', 'python'),
+            'remote_folder': remote_settings.get('remote_folder', ''),
+            'body': []
+        }
+        
+        # get the folder to register
+        folder = _Utils._get_folder_path(filename, path)
+
+        # iterate over all files in the folder
+        for root, _, files in os.walk(folder):
+            for file in files:
+                if file.endswith('.py') or file.endswith('.cls'):
+                    file_path = os.path.join(root, file)
+                    relative_path = os.path.relpath(file_path, folder)
+                    # Normalize path separators for cross-platform compatibility
+                    relative_path = relative_path.replace(os.sep, '/')
+                    with open(file_path, 'r', encoding='utf-8') as f:
+                        data = f.read()
+                        payload['body'].append({
+                            'name': relative_path,
+                            'data': data
+                        })
+        
+        # send the request to the remote settings
+        response = requests.put(
+            url=f"{remote_settings['url']}/api/iop/migrate",
+            json=payload,
+            headers={
+                'Content-Type': 'application/json',
+                'Accept': 'application/json'
+            },
+            auth=(remote_settings.get('username', ''), remote_settings.get('password', '')),
+            timeout=10
+        )
+
+        print(f"Response from remote migration: {response.text}")
+
+        response.raise_for_status()  # Raise an error for bad responses
+
     @staticmethod
     def migrate(filename=None):
         """ 
@@ -265,43 +352,96 @@ class _Utils():
             * SCHEMAS
                 List of classes
         """
-        path = None
-        # try to load the settings file
+        settings, path = _Utils._load_settings(filename)
+        
+        _Utils._register_settings_components(settings, path)
+        
+        _Utils._cleanup_sys_path(path)
+
+    @staticmethod
+    def _load_settings(filename):
+        """Load settings module from file or default location.
+        
+        Returns:
+            tuple: (settings_module, path_added_to_sys)
+        """
+        path_added = None
+        
         if filename:
             # check if the filename is absolute or relative
-            if os.path.isabs(filename):
-                path = os.path.dirname(filename)
-            else:
+            if not os.path.isabs(filename):
                 raise ValueError("The filename must be absolute")
+            
             # add the path to the system path to the beginning
-            sys.path.insert(0,os.path.normpath(path))
+            path_added = os.path.normpath(os.path.dirname(filename))
+            sys.path.insert(0, path_added)
             # import settings from the specified file
-            settings = _Utils.import_module_from_path('settings',filename)
+            settings = _Utils.import_module_from_path('settings', filename)
         else:
             # import settings from the settings module
-            import settings # type: ignore
-        # get the path of the settings file
-        path = os.path.dirname(inspect.getfile(settings))
+            import settings  # type: ignore
+            
+        return settings, path_added
+
+    @staticmethod
+    def _get_folder_path(filename, path_added_to_sys):
+        """Get the folder path for migration operations.
+        
+        Args:
+            filename: Original filename parameter
+            path_added_to_sys: Path that was added to sys.path
+            
+        Returns:
+            str: Folder path to use for migration
+        """
+        if filename:
+            return os.path.dirname(filename)
+        else:
+            return os.getcwd()
+
+    @staticmethod
+    def _register_settings_components(settings, path):
+        """Register all components from settings (classes, productions, schemas).
+        
+        Args:
+            settings: Settings module containing CLASSES, PRODUCTIONS, SCHEMAS
+            path: Base path for component registration
+        """
+        # Use settings file location if path not provided
+        if not path:
+            path = os.path.dirname(inspect.getfile(settings))
+            
         try:
             # set the classes settings
-            _Utils.set_classes_settings(settings.CLASSES,path)
+            _Utils.set_classes_settings(settings.CLASSES, path)
         except AttributeError:
             print("No classes to register")
+        
         try:
             # set the productions settings
-            _Utils.set_productions_settings(settings.PRODUCTIONS,path)
+            _Utils.set_productions_settings(settings.PRODUCTIONS, path)
         except AttributeError:
             print("No productions to register")
+        
         try:
             # set the schemas
             for cls in settings.SCHEMAS:
                 _Utils.register_message_schema(cls)
         except AttributeError:
             print("No schemas to register")
-        try:
-            sys.path.remove(os.path.normpath(path))
-        except ValueError:
-            pass
+
+    @staticmethod
+    def _cleanup_sys_path(path):
+        """Remove path from sys.path if it was added.
+        
+        Args:
+            path: Path to remove from sys.path
+        """
+        if path:
+            try:
+                sys.path.remove(os.path.normpath(path))
+            except ValueError:
+                pass
 
     @staticmethod
     def import_module_from_path(module_name, file_path):

iris_pex_embedded_python-3.5.2/src/iop/cls/IOP/Projection.cls

@@ -0,0 +1,49 @@
+Class IOP.Projection Extends %Projection.AbstractProjection
+{
+
+/// Projection to make install on compile
+Projection Reference As Projection;
+
+/// Call of the projection
+ClassMethod CreateProjection(
+	cls As %String,
+	ByRef params) As %Status
+{
+    set tSC = $$$OK
+    set tCurrentNamespace = $Namespace
+
+    Try {
+        set $NAMESPACE = "%SYS"
+        // Create a new Web App for IOP Remote Handler
+        set webName = "/api/iop" 
+        set webProperties("NameSpace") = tCurrentNamespace 
+        set webProperties("Enabled") = 1 
+        set webProperties("DispatchClass") = "IOP.Service.Remote.Handler"
+        set webProperties("AutheEnabled") = 32 
+        set webProperties("ServeFiles")=2
+        set webProperties("Recurse")=1
+        if ##class(Security.Applications).Exists(webName) {
+            // If the web application already exists, delete it first
+            $$$ThrowOnError(##class(Security.Applications).Delete(webName))
+        }
+        $$$ThrowOnError(##class(Security.Applications).Create(webName, .webProperties))
+    }
+    Catch ex {
+
+        Write !,"Error creating web application: ", ex.DisplayString(), !
+
+    }
+
+    znspace tCurrentNamespace
+    Return tSC
+}
+
+ClassMethod RemoveProjection(
+	cls As %String,
+	ByRef params,
+	recompile As %Boolean) As %Status
+{
+    Quit $$$OK
+}
+
+}

iris_pex_embedded_python-3.5.2/src/iop/cls/IOP/Service/Remote/Handler.cls

@@ -0,0 +1,30 @@
+Class IOP.Service.Remote.Handler Extends %CSP.REST
+{
+
+Parameter CHARSET = "utf-8";
+
+Parameter CONVERTINPUTSTREAM = 1;
+
+Parameter CONTENTTYPE = "application/json";
+
+/// This parameter influences the CORS support. The default is an empty string meaning 'not specified'.
+/// If set to true (1) then CORS processing is ON. If set to false (0) then CORS processing is OFF.
+/// If left unset "" then the decision to process CORS is delegated to the setting on the URL map route.
+Parameter HandleCorsRequest = 1;
+
+Parameter UseSession As Integer = 0;
+
+/// Ignore any writes done directly by the REST method.
+Parameter IgnoreWrites = 0;
+
+XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
+{
+<Routes>
+<!-- Iop Management -->
+<Map Prefix="/v1" Forward="IOP.Service.Remote.Rest.v1"/>
+<!-- make the default forward to the highest current version of the API -->
+<Map Prefix="/*" Forward="IOP.Service.Remote.Rest.v1"/>
+</Routes>
+}
+
+}

iris_pex_embedded_python-3.5.2/src/iop/cls/IOP/Service/Remote/Rest/v1.cls

@@ -0,0 +1,97 @@
+Class IOP.Service.Remote.Rest.v1 Extends %CSP.REST
+{
+
+XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
+{
+<Routes>
+<Route Url="/migrate"                        Method="PUT" Call="PutMigrate"/>
+<Route Url="/version"                        Method="GET" Call="GetVersion"/>
+</Routes>
+}
+
+ClassMethod GetVersion() As %String
+{
+    // Return the version of the IOP service
+    Return {
+		"version": "1.0.0",
+		"description": "Interoperability Embedded Python Service API"
+	}.%ToJSON()
+}
+
+ClassMethod NamespaceCheck(pNamespace As %String) As %Boolean [ Internal, Private ]
+{
+	If '##class(%SYS.Namespace).Exists(pNamespace) {
+		throw $$$ERROR("NamespaceDoesNotExist")
+	}
+	Return 1
+}
+
+ClassMethod PutMigrate() As %DynamicObject
+{
+	Try {
+		// Get the request body
+		set dyna = {}.%FromJSON(%request.Content)
+		set body = dyna.%Get("body")
+		set namespace = dyna.%Get("namespace")
+		set targetDirectory = dyna.%Get("remote_folder")
+		set packageName = dyna.%Get("package")
+		// check for namespace existence and user permissions against namespace
+		If '..NamespaceCheck(namespace) {
+			Return ""
+		}
+		New $NAMESPACE
+		Set $NAMESPACE = namespace
+
+		
+		//Create directory for custom packages
+		If targetDirectory '= "" {
+			If '##class(%Library.File).DirectoryExists(targetDirectory) {
+				If '##class(%Library.File).CreateDirectory(targetDirectory) {
+					$$$ThrowStatus($$$ERROR($$$DirectoryCannotCreate, targetDirectory))
+				}
+			}
+		}
+		Else {
+			// Set targetDirectory to the CODE DATABASE directory
+			do ##class(%SYS.Namespace).GetAllNSInfo("USER",.info)
+			Set targetDirectory = info("RoutineDB","Directory")
+		}
+		
+		Set packagePath = ##class(%Library.File).NormalizeDirectory(packageName, targetDirectory)
+		// If the package already exists then we must be meaning to re-load it. Delete files/directory/metadata and recreate fresh.
+		If ##class(%Library.File).DirectoryExists(packagePath) {
+			If '##class(%Library.File).RemoveDirectoryTree(packagePath) {
+				$$$ThrowStatus($$$ERROR($$$DirectoryPermission , packagePath))
+			}
+		}
+		If '##class(%Library.File).CreateDirectory(packagePath) {
+			$$$ThrowStatus($$$ERROR($$$DirectoryCannotCreate, packagePath))
+		}
+
+		//Unpack JSON objects		
+		Set iterator = body.%GetIterator()
+		While iterator.%GetNext(.key , .fileObject ) {
+			// If fileObject.name has '/' then it is a path, we need to normalize it
+			Set fileName = ##class(%Library.File).NormalizeFilename(fileObject.name,packagePath)
+			do ##class(%Library.File).CreateDirectoryChain(##class(%Library.File).GetDirectory(fileName))
+			Set fileStream = ##class(%Stream.FileCharacter).%New()
+			Set fileStream.TranslateTable = "UTF8"
+			$$$ThrowOnError(fileStream.LinkToFile(fileName))
+			Do fileStream.Write(fileObject.data)
+			$$$ThrowOnError(fileStream.%Save())
+		}
+
+		//Do the iop migration
+
+		set iopUtils = ##class(IOP.Wrapper).Import("iop._utils")
+    	do iopUtils."_Utils".migrate(##class(%Library.File).NormalizeFilename("settings.py", packagePath))
+	}
+	Catch ex {
+		$$$ThrowOnError(ex.AsStatus())
+	}
+
+
+	return $$$OK
+}
+
+}

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/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.1b3
+Version: 3.5.2
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-3.5.1b3 → iris_pex_embedded_python-3.5.2}/src/iris_pex_embedded_python.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ src/iop/_message_validator.py
 src/iop/_outbound_adapter.py
 src/iop/_private_session_duplex.py
 src/iop/_private_session_process.py
+src/iop/_remote.py
 src/iop/_serialization.py
 src/iop/_utils.py
 src/iop/cls/IOP/BusinessOperation.cls
@@ -64,6 +65,7 @@ src/iop/cls/IOP/InboundAdapter.cls
 src/iop/cls/IOP/Message.cls
 src/iop/cls/IOP/OutboundAdapter.cls
 src/iop/cls/IOP/PickleMessage.cls
+src/iop/cls/IOP/Projection.cls
 src/iop/cls/IOP/Test.cls
 src/iop/cls/IOP/Utils.cls
 src/iop/cls/IOP/Wrapper.cls
@@ -82,6 +84,8 @@ src/iop/cls/IOP/PrivateSession/Message/Poll.cls
 src/iop/cls/IOP/PrivateSession/Message/Start.cls
 src/iop/cls/IOP/PrivateSession/Message/Stop.cls
 src/iop/cls/IOP/Service/WSGI.cls
+src/iop/cls/IOP/Service/Remote/Handler.cls
+src/iop/cls/IOP/Service/Remote/Rest/v1.cls
 src/iop/wsgi/handlers.py
 src/iris_pex_embedded_python.egg-info/PKG-INFO
 src/iris_pex_embedded_python.egg-info/SOURCES.txt