fusion-platform-python-sdk 2.0.8__tar.gz → 2.1.2__tar.gz

{fusion_platform_python_sdk-2.0.8/fusion_platform_python_sdk.egg-info → fusion_platform_python_sdk-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 2.0.8
+Version: 2.1.2
 Summary: Python SDK used to interact with the Fusion Platform(r)
 Home-page: https://github.com/d-cat-support/fusion-platform-python-sdk
 Author: Digital Content Analysis Technology Ltd

{fusion_platform_python_sdk-2.0.8 → fusion_platform_python_sdk-2.1.2}/fusion_platform/__init__.py

@@ -11,8 +11,8 @@ API, and this is defined within the corresponding OpenAPI 3.0 specification, whi
 """
 
 # Do not modify the following two lines as they are maintained by the version.sh script.
-__version__ = '2.0.8'
-__version_date__ = '2025-10-28T09:19:33Z'
+__version__ = '2.1.2'
+__version_date__ = '2026-02-05T14:08:19Z'
 
 # Exclude certain sub-modules from documentation.
 # @formatter:off

{fusion_platform_python_sdk-2.0.8 → fusion_platform_python_sdk-2.1.2}/fusion_platform/command.py

@@ -25,7 +25,7 @@ import uuid
 
 from dateutil.relativedelta import relativedelta
 import i18n
-from pathos.multiprocessing import ProcessPool as Pool
+from pathos.multiprocessing import ThreadPool as Pool
 from prompt_toolkit import print_formatted_text as print, prompt
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.validation import Validator
@@ -777,7 +777,6 @@ class Command(Base):
             executions = [execution]
 
         # Do all the downloads in batches. We use small batches so that we do not swamp memory.
-        batch_size = 2 * os.cpu_count()  # Downloads don't swamp CPU.
         wait = i18n.t('command.wait_for_completion') if wait_for_execution_to_complete else ''
         self.__print(logging.INFO, i18n.t('command.download_executions', wait=wait, executions=len(executions)))
         progress_bar = tqdm(total=len(executions), bar_format=Command.__PROGRESS_BAR_FORMAT, colour=Command.__PROGRESS_BAR_COLOUR_ACTIVE,
@@ -790,8 +789,11 @@ class Command(Base):
                                                  download_components, output_dir, wait_for_execution_to_complete)
             results = []
 
-            with Pool(nodes=batch_size) as pool:
-                for i, result in enumerate(pool.uimap(partial_download_execution, executions)):
+            # We use a thread pool as it preserves the marshmallow configuration and log level. Using a ProcessPool resulted in fields being labelled as missing
+            # when the schema definition allowed for them to be None. When no parameters are supplied ThreadPool will use all available vCPUs which is sufficiently
+            # fast.
+            with Pool() as pool:
+                for i, result in enumerate(pool.imap(partial_download_execution, executions)):
                     progress_bar.set_postfix(execution=i + 1)
                     progress_bar.update(1)
                     results.append(result)
@@ -1002,12 +1004,15 @@ class Command(Base):
 
         # If the service cannot be found, try to find it by its id or SSD id.
         if service is None:
-            service = next((item for item in organisation.services if (str(item.id) == service_name) or (str(item.ssd_id) == service_name)), None)
+            service = next(
+                (item for item in organisation.services if (item.name == service_name) or (str(item.id) == service_name) or (str(item.ssd_id) == service_name)),
+                None)
 
         # If the service still cannot be found, then try it as a specific service for the organisation.
         if service is None:
             try:
-                service = next((item for item in organisation.own_services if (str(item.id) == service_name) or (str(item.ssd_id) == service_name)), None)
+                service = next((item for item in organisation.own_services if
+                                (item.name == service_name) or (str(item.id) == service_name) or (str(item.ssd_id) == service_name)), None)
             except RequestError:
                 # We will get a RequestError if the user is not sufficiently privileged to list the organisation's own services. We therefore ignore this error.
                 pass
@@ -1086,17 +1091,17 @@ class Command(Base):
                     groups[execution.group_id].append(execution)
 
             # Calculate the overall progress and for each group.
-            progress = sum([execution.progress for execution in executions]) // len(executions)
-            group_progress = ''
+            progress = sum([execution.progress for execution in executions]) // len(executions) if len(executions) > 0 else 0
+            group_progress_summary = ''
 
             for i, group in enumerate(groups.values()):
-                progress = sum([execution.progress for execution in group]) // len(group)
-                group_progress += i18n.t('command.log_process_group', group_number=(i + 1), executions=len(group), progress=progress)
+                group_progress = sum([execution.progress for execution in group]) // len(group)
+                group_progress_summary += i18n.t('command.log_process_group', group_number=(i + 1), executions=len(group), progress=group_progress)
 
             # Log the process information.
             self.__print(logging.INFO,
                          i18n.t('command.log_process_summary', process=process.name, executions=len(executions), progress=progress, groups=len(groups),
-                                group_progress=group_progress))
+                                group_progress=group_progress_summary))
 
     def login(self, deployment, email, organisation_name):
         """
@@ -1161,7 +1166,7 @@ class Command(Base):
         arguments = self.__parse_arguments()
 
         # Change the print and logging to the desired level.
-        self._logger.setLevel(logging.CRITICAL)
+        self._logger.setLevel(logging.WARNING)
 
         if arguments.debug:
             self._logger.setLevel(logging.DEBUG)

{fusion_platform_python_sdk-2.0.8 → fusion_platform_python_sdk-2.1.2/fusion_platform_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 2.0.8
+Version: 2.1.2
 Summary: Python SDK used to interact with the Fusion Platform(r)
 Home-page: https://github.com/d-cat-support/fusion-platform-python-sdk
 Author: Digital Content Analysis Technology Ltd

{fusion_platform_python_sdk-2.0.8 → fusion_platform_python_sdk-2.1.2}/setup.py

@@ -19,7 +19,7 @@ PACKAGE_DIR = pathlib.Path(__file__).parent
 # @formatter:off
 setup(
     name='fusion-platform-python-sdk',
-    version='2.0.8',
+    version='2.1.2',
     description='Python SDK used to interact with the Fusion Platform(r)',
     long_description=(PACKAGE_DIR / 'README.md').read_text(),
     long_description_content_type='text/markdown',