Merge pull request #70 from drscholly/fix/versioning

Bugfix about versioning and empty module

Author: drscholly

toolbox/api/datagalaxy_api_modules.py

@@ -39,7 +39,7 @@ def list_objects(self, workspace_name: str, include_links=False) -> list:
             raise Exception(body_json['error'])
         logging.info(
             f'list_objects - {len(body_json["results"])} objects found on '
-            f'workspace "{workspace_name}" in module {self.module}')
+            f'workspace {workspace_name} in module {self.module}')
         result_pages = [body_json['results']]
         next_page = body_json["next_page"]
         while next_page is not None:
@@ -49,7 +49,7 @@ def list_objects(self, workspace_name: str, include_links=False) -> list:
             body_json = response.json()
             logging.info(
                 f'list_objects - {len(body_json["results"])} objects found on '
-                f'workspace "{workspace_name}" in module {self.module}')
+                f'workspace {workspace_name} in module {self.module}')
             next_page = body_json["next_page"]
             result_pages.append(body_json['results'])
         return result_pages

toolbox/api/datagalaxy_api_workspaces.py

@@ -34,8 +34,9 @@ def get_workspace(self, name: str) -> dict:
         return None
 
     def list_versions(self, id_workspace: str) -> dict:
-        headers = {'Authorization': f"Bearer {self.token}", 'limit': '5000'}
-        response = requests.get(f"{self.url}/workspaces/{id_workspace}/versions", headers=headers)
+        headers = {'Authorization': f"Bearer {self.token}"}
+        params = {'limit': '5000'}
+        response = requests.get(f"{self.url}/workspaces/{id_workspace}/versions", headers=headers, params=params)
         code = response.status_code
         body_json = response.json()
         if code == 200:

toolbox/commands/copy_module.py

@@ -1,4 +1,5 @@
 from typing import Optional
+import logging
 
 from toolbox.api.datagalaxy_api_modules import DataGalaxyApiModules
 from toolbox.commands.utils import config_workspace
@@ -62,6 +63,9 @@ def copy_module(module: str,
 
     # Fetch objects from source workspace
     source_objects = source_module_api.list_objects(workspace_source_name)
+    if source_objects == [[]]:
+        logging.warning(f'copy-module - No object in source workspace {workspace_source_name}, aborting.')
+        return 1
 
     # Specific for Dictionary
     if module == "Dictionary":