fusion-platform-python-sdk 2.2.2__tar.gz → 2.2.5__tar.gz

{fusion_platform_python_sdk-2.2.2/fusion_platform_python_sdk.egg-info → fusion_platform_python_sdk-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 2.2.2
+Version: 2.2.5
 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.2.2 → fusion_platform_python_sdk-2.2.5}/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.2.2'
-__version_date__ = '2026-04-28T07:42:59Z'
+__version__ = '2.2.5'
+__version_date__ = '2026-09-01T12:45:40Z'
 
 # Exclude certain sub-modules from documentation.
 # @formatter:off

{fusion_platform_python_sdk-2.2.2 → fusion_platform_python_sdk-2.2.5}/fusion_platform/command.py

@@ -1264,16 +1264,19 @@ class Command(Base):
         )
 
         # Create the subparsers.
-        subparsers = parser.add_subparsers(help=i18n.t('command.subparser'), dest='command')
+        subparsers = parser.add_subparsers(description=i18n.t('command.subparser'), dest='command')
         parser.add_argument(i18n.t('command.version_short'), i18n.t('command.version_long'), help=i18n.t('command.version_help'), action='version',
                             version=i18n.t('command.version_content', version=fusion_platform.__version__, version_date=fusion_platform.__version_date__))
 
         subparsers.required = True
-        parser_list = subparsers.add_parser(i18n.t('command.list.command'), help=i18n.t('command.list.help'))
-        parser_display = subparsers.add_parser(i18n.t('command.display.command'), help=i18n.t('command.display.help'))
-        parser_start = subparsers.add_parser(i18n.t('command.start.command'), help=i18n.t('command.start.help'))
-        parser_define = subparsers.add_parser(i18n.t('command.define.command'), help=i18n.t('command.define.help'))
-        parser_download = subparsers.add_parser(i18n.t('command.download.command'), help=i18n.t('command.download.help'))
+        parser_list = subparsers.add_parser(i18n.t('command.list.command'), help=i18n.t('command.list.help'), description=i18n.t('command.list.description'))
+        parser_display = subparsers.add_parser(i18n.t('command.display.command'), help=i18n.t('command.display.help'),
+                                               description=i18n.t('command.display.description'))
+        parser_start = subparsers.add_parser(i18n.t('command.start.command'), help=i18n.t('command.start.help'), description=i18n.t('command.start.description'))
+        parser_define = subparsers.add_parser(i18n.t('command.define.command'), help=i18n.t('command.define.help'),
+                                              description=i18n.t('command.define.description'))
+        parser_download = subparsers.add_parser(i18n.t('command.download.command'), help=i18n.t('command.download.help'),
+                                                description=i18n.t('command.download.description'))
 
         # Add in the common arguments.
         for subparser in [parser_list, parser_display, parser_start, parser_define, parser_download]:

{fusion_platform_python_sdk-2.2.2 → fusion_platform_python_sdk-2.2.5}/fusion_platform/models/process.py

@@ -588,7 +588,7 @@ class Process(Model):
                 break
 
         if found_dispatcher is None:
-            raise ModelError(i18n.t('models.process.cannot_find_dispatcher'))
+            raise ModelError(i18n.t('models.process.cannot_find_dispatcher', dispatcher=name if name is not None else number))
 
         # Add the dispatcher to the end of the existing list.
         dispatchers = list(self._model.get(self.__class__._FIELD_DISPATCHERS, []))  # Convert read-only tuple to list, so we can modify it.
@@ -850,7 +850,7 @@ class Process(Model):
                 break
 
         if found_dispatcher is None:
-            raise ModelError(i18n.t('models.process.cannot_find_dispatcher'))
+            raise ModelError(i18n.t('models.process.cannot_find_dispatcher', dispatcher=number))
 
         # Remove the dispatcher from the existing list.
         dispatchers = list(self._model.get(self.__class__._FIELD_DISPATCHERS, []))  # Convert read-only tuple to list, so we can modify it.
@@ -899,7 +899,7 @@ class Process(Model):
                 break
 
         if found_dispatcher is None:
-            raise ModelError(i18n.t('models.process.cannot_find_dispatcher'))
+            raise ModelError(i18n.t('models.process.cannot_find_dispatcher', dispatcher=number))
 
         # Get the dispatcher so that it can be modified.
         dispatchers = list(self._model.get(self.__class__._FIELD_DISPATCHERS, []))  # Convert read-only tuple to list, so we can access it.
@@ -921,7 +921,7 @@ class Process(Model):
                     break
 
             if found_option is None:
-                raise ModelError(i18n.t('models.process.cannot_find_option'))
+                raise ModelError(i18n.t('models.process.cannot_find_dispatcher_option', option=option_name))
 
             # We can now update the option. All options are expressed as strings with the correct format.
             option_value = Option.get_option_value(found_option, value, coerce_value)
@@ -981,7 +981,7 @@ class Process(Model):
                 break
 
         if found_input is None:
-            raise ModelError(i18n.t('models.process.cannot_find_input'))
+            raise ModelError(i18n.t('models.process.cannot_find_input', input=input.input if input is not None else number))
 
         # Check that all the files in the data object are ready to be used. Along the way, pick out the first file type.
         found_file_type = None
@@ -1041,7 +1041,7 @@ class Process(Model):
                 break
 
         if found_option is None:
-            raise ModelError(i18n.t('models.process.cannot_find_option'))
+            raise ModelError(i18n.t('models.process.cannot_find_option', option=option.name if option is not None else name))
 
         # We can now update the option. All options are expressed as strings with the correct format.
         option_value = Option.get_option_value(found_option, value, coerce_value)
@@ -1113,15 +1113,15 @@ class Process(Model):
             RequestError: if any request fails.
             ModelError: if a model could not be loaded or validated from the Fusion Platform<sup>&reg;</sup>.
         """
+        # Confirm that the model is executing. We do not do this in the loop as the process will be set to stop once all of its executions have finished.
+        if hasattr(self, self.__class__._FIELD_PROCESS_STATUS) and (self.process_status == Process._PROCESS_STATUS_STOP):
+            raise ModelError(i18n.t('models.process.execution_stopped'))
+
         # Wait until we find the next execution.
         while True:
             # Load in the most recent version of the model.
             self.get(organisation_id=self.organisation_id)
 
-            # Check that the model is executing. It may have stopped on error.
-            if hasattr(self, self.__class__._FIELD_PROCESS_STATUS) and (self.process_status == Process._PROCESS_STATUS_STOP):
-                raise ModelError(i18n.t('models.process.execution_stopped'))
-
             # Check whether we have the next execution listed in the model. We sort the list to find the most recent.
             self._logger.debug('checking for next execution')
             executions = []
@@ -1143,7 +1143,7 @@ class Process(Model):
 
             # Stop if we have an execution which is beyond the repeat start date.
             if execution is not None:
-                self._logger.debug('execution %s found', execution.get(self.__class__._FIELD_ID))
+                self._logger.debug('execution %s found', execution)
                 break
 
             # If we have no recent executions, and longer than the allowed period has elapsed since the next execution was meant to start, then raise an exception.

{fusion_platform_python_sdk-2.2.2 → fusion_platform_python_sdk-2.2.5}/fusion_platform/translations.py

@@ -80,11 +80,13 @@ i18n.add_translation('command.dispatch_intermediate', 'Dispatch intermediate com
 i18n.add_translation('command.add_dispatcher', 'Add %{dispatcher} dispatcher?', 'en')
 i18n.add_translation('command.download.process_help', 'the name of the process, the process id or execution id to download', 'en')
 i18n.add_translation('command.download.process_long', 'process', 'en')
-i18n.add_translation('command.download.help', 'downloads the inputs and/or outputs for each process', 'en')
+i18n.add_translation('command.download.description', 'Downloads the inputs and/or outputs for existing processes.', 'en')
+i18n.add_translation('command.download.help', 'downloads the inputs and/or outputs for existing processes', 'en')
 i18n.add_translation('command.download.command', 'download', 'en')
 i18n.add_translation('command.define.process_help', 'the name of the process, the process id or execution id to build the YAML file', 'en')
 i18n.add_translation('command.define.process_long', 'process', 'en')
-i18n.add_translation('command.define.help', 'outputs a YAML file for each existing process', 'en')
+i18n.add_translation('command.define.description', 'Creates new YAML files to define existing processes.', 'en')
+i18n.add_translation('command.define.help', 'creates new YAML files to define existing processes', 'en')
 i18n.add_translation('command.define.command', 'define', 'en')
 i18n.add_translation('command.start.no_wait_for_completion_help', 'do not wait for the execution to complete (default %%(default)s)', 'en')
 i18n.add_translation('command.start.no_wait_for_completion_long', '--no_wait_for_completion', 'en')
@@ -127,15 +129,18 @@ i18n.add_translation('command.start.input_list_long', '--input_list', 'en')
 i18n.add_translation('command.start.input_list_short', '-l', 'en')
 i18n.add_translation('command.start.definition_help', 'the names of the service used to start processes or YAML files which defines everything', 'en')
 i18n.add_translation('command.start.definition_long', 'service_or_yaml', 'en')
-i18n.add_translation('command.start.help', 'starts a process', 'en')
+i18n.add_translation('command.start.description', 'Creates and starts new processes.', 'en')
+i18n.add_translation('command.start.help', 'creates and starts new processes', 'en')
 i18n.add_translation('command.start.command', 'start', 'en')
 i18n.add_translation('command.display.service_or_process_help', 'the names of the service, id, SSD id, process, process id or associated execution id that are to be displayed', 'en')
 i18n.add_translation('command.display.service_or_process_long', 'process_or_service', 'en')
-i18n.add_translation('command.display.help', 'displays service information or a configured process', 'en')
+i18n.add_translation('command.display.description', 'Displays details of services or existing processes.', 'en')
+i18n.add_translation('command.display.help', 'displays details of services or existing processes', 'en')
 i18n.add_translation('command.display.command', 'display', 'en')
-i18n.add_translation('command.list.help', 'lists configured processes', 'en')
+i18n.add_translation('command.list.description', 'Lists all configured processes.', 'en')
+i18n.add_translation('command.list.help', 'lists all configured processes', 'en')
 i18n.add_translation('command.list.command', 'list', 'en')
-i18n.add_translation('command.subparser', 'displays a service or process, or starts, defines or downloads a process', 'en')
+i18n.add_translation('command.subparser', 'Commands are available to display a service or process, or start, define or download a process:', 'en')
 i18n.add_translation('command.version_content', '%%(prog)s %{version} (%{version_date})', 'en')
 i18n.add_translation('command.version_help', 'show the version information and exit', 'en')
 i18n.add_translation('command.version_long', '--version', 'en')
@@ -306,9 +311,10 @@ i18n.add_translation('models.process.execution_stopped', 'Process execution has
 i18n.add_translation('models.process.wrong_file_type', 'File type of supplied data object (%{actual}) does not match the file type for the input (%{expected})', 'en')
 i18n.add_translation('models.process.data_not_ready', 'Data object is not ready to be used in a process', 'en')
 i18n.add_translation('models.process.option_wrong_type', 'Option value should be of type %{type}', 'en')
-i18n.add_translation('models.process.cannot_find_option', 'No such option', 'en')
-i18n.add_translation('models.process.cannot_find_input', 'No such input', 'en')
-i18n.add_translation('models.process.cannot_find_dispatcher', 'No such dispatcher', 'en')
+i18n.add_translation('models.process.cannot_find_dispatcher_option', 'No such dispatcher option \'%{option}\'', 'en')
+i18n.add_translation('models.process.cannot_find_option', 'No such option \'%{option}\'', 'en')
+i18n.add_translation('models.process.cannot_find_input', 'No such input %{input}', 'en')
+i18n.add_translation('models.process.cannot_find_dispatcher', 'No such dispatcher \'%{dispatcher}\'', 'en')
 i18n.add_translation('models.process.option_not_specified', 'Option name or object must be provided to set option', 'en')
 i18n.add_translation('models.process.data_not_specified', 'Data object must be provided to set input', 'en')
 i18n.add_translation('models.process.input_not_specified', 'Input number or object must be provided to set input', 'en')

{fusion_platform_python_sdk-2.2.2 → fusion_platform_python_sdk-2.2.5/fusion_platform_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 2.2.2
+Version: 2.2.5
 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.2.2 → fusion_platform_python_sdk-2.2.5}/setup.py

@@ -19,7 +19,7 @@ PACKAGE_DIR = pathlib.Path(__file__).parent
 # @formatter:off
 setup(
     name='fusion-platform-python-sdk',
-    version='2.2.2',
+    version='2.2.5',
     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',