iris-pex-embedded-python 3.5.2b1__tar.gz → 3.5.2b2__tar.gz

{iris_pex_embedded_python-3.5.2b1 → iris_pex_embedded_python-3.5.2b2}/PKG-INFO

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

{iris_pex_embedded_python-3.5.2b1 → iris_pex_embedded_python-3.5.2b2}/pyproject.toml

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

{iris_pex_embedded_python-3.5.2b1 → iris_pex_embedded_python-3.5.2b2}/src/iop/_utils.py

@@ -264,9 +264,9 @@ class _Utils():
     def migrate_remote(filename=None):
         """
         Read a settings file from the filename
-        If the settings.py file has a key 'REMOTE_SETTING' then it will use the value of that key
+        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_SETTING is a RemoteSettings dictionary with the following keys:
+        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')
@@ -285,7 +285,7 @@ class _Utils():
         '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_SETTING', None) if settings else None
+        remote_settings: Optional[RemoteSettings] = getattr(settings, 'REMOTE_SETTINGS', None) if settings else None
 
         if not remote_settings:
             _Utils.migrate(filename)
@@ -293,7 +293,7 @@ class _Utils():
         
         # Validate required fields
         if 'url' not in remote_settings:
-            raise ValueError("REMOTE_SETTING must contain 'url' field")
+            raise ValueError("REMOTE_SETTINGS must contain 'url' field")
         
         # prepare the payload with defaults
         payload = {
@@ -333,11 +333,9 @@ class _Utils():
             timeout=10
         )
 
-        # check the response status
-        if response.status_code != 200:
-            raise RuntimeError(f"Failed to migrate: {response.status_code} - {response.text}")
-        else:
-            print(f"Migration successful: {response.status_code} - {response.text}")
+        print(f"Response from remote migration: {response.text}")
+
+        response.raise_for_status()  # Raise an error for bad responses
 
     @staticmethod
     def migrate(filename=None):
@@ -360,6 +358,8 @@ class _Utils():
         
         _Utils._cleanup_sys_path(path)
 
+        raise ValueError("Migration is not implemented yet. Please use the remote migration feature.")
+
     @staticmethod
     def _load_settings(filename):
         """Load settings module from file or default location.

{iris_pex_embedded_python-3.5.2b1 → iris_pex_embedded_python-3.5.2b2}/src/iop/cls/IOP/Projection.cls

@@ -18,6 +18,7 @@ ClassMethod CreateProjection(
         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

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

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

@@ -1,90 +0,0 @@
-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
-{
-    // 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))
-
-	return $$$OK
-}
-
-}