fusion-platform-python-sdk 1.16.6__tar.gz → 1.17.6__tar.gz

{fusion_platform_python_sdk-1.16.6/fusion_platform_python_sdk.egg-info → fusion_platform_python_sdk-1.17.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fusion-platform-python-sdk
-Version: 1.16.6
+Version: 1.17.6
 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
@@ -8,11 +8,11 @@ Author-email: support@d-cat.co.uk
 License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: marshmallow
@@ -48,7 +48,7 @@ API, and this is defined within the corresponding OpenAPI 3.0 specification, whi
 
 ## Installation
 
-The SDK has been built for Python 3, and is tested against Python 3.8, 3.9, 3.10, 3.11 and 3.12. To install the SDK into a suitable Python environment containing
+The SDK has been built for Python 3, and is tested against Python 3.9, 3.10, 3.11, 3.12 and 3.13. To install the SDK into a suitable Python environment containing
 `pip`, execute the following:
 
 ```shell

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/README.md

@@ -12,7 +12,7 @@ API, and this is defined within the corresponding OpenAPI 3.0 specification, whi
 
 ## Installation
 
-The SDK has been built for Python 3, and is tested against Python 3.8, 3.9, 3.10, 3.11 and 3.12. To install the SDK into a suitable Python environment containing
+The SDK has been built for Python 3, and is tested against Python 3.9, 3.10, 3.11, 3.12 and 3.13. To install the SDK into a suitable Python environment containing
 `pip`, execute the following:
 
 ```shell

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/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__ = '1.16.6'
-__version_date__ = '2025-02-11T12:17:15Z'
+__version__ = '1.17.6'
+__version_date__ = '2025-03-26T16:04:58Z'
 
 # Exclude certain sub-modules from documentation.
 # @formatter:off

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/command.py

@@ -39,7 +39,7 @@ Localise.setup()
 
 import fusion_platform
 from fusion_platform.base import Base
-from fusion_platform.common.utilities import json_default
+from fusion_platform.common.utilities import json_default, string_blank
 from fusion_platform.models.data import Data
 from fusion_platform.models.model import Model
 from fusion_platform.session import RequestError
@@ -103,7 +103,9 @@ class Command(Base):
     _METRIC_S3_INPUT_SIZE = 'input_size'
     _METRIC_S3_OUTPUT_SIZE = 'output_size'
     _METRIC_S3_TRANSFER_BYTES = 's3_transfer_bytes'
+    _METRIC_GCS_TRANSFER_BYTES = 'gcs_transfer_bytes'
     _METRIC_EXTERNAL_TRANSFER_BYTES = 'external_transfer_bytes'
+    _METRIC_INTERNAL_TRANSFER_BYTES = 'internal_transfer_bytes'
 
     # Process other field constants.
     _MODEL_FIELDS = ['output_storage_period', 'run_type', 'repeat_count', 'repeat_start', 'repeat_end', 'repeat_gap', 'repeat_offset']
@@ -193,6 +195,7 @@ class Command(Base):
             while not finished:
                 # Either find the dispatchers from what has been loaded from the YAML file or prompt the user.
                 add = False
+                dispatch_intermediate = False
                 dispatcher_options = {}
 
                 if dispatchers is not None:
@@ -204,6 +207,8 @@ class Command(Base):
                         selected_dispatcher = filtered_dispatchers[0]
                         selected_dispatcher[Model._FIELD_USED] = True
                         add = True
+                        dispatch_intermediate = selected_dispatcher.get(Model._FIELD_DISPATCH_INTERMEDIATE) if selected_dispatcher.get(
+                            Model._FIELD_DISPATCH_INTERMEDIATE) is not None else False
                         dispatcher_options = selected_dispatcher.get(Model._FIELD_OPTIONS) if selected_dispatcher.get(Model._FIELD_OPTIONS) is not None else {}
 
                 else:
@@ -213,8 +218,29 @@ class Command(Base):
                     if (response is not None) and response.lower().startswith(i18n.t('command.prompt_yes').lower()[0]):
                         add = True
 
+                        if hasattr(dispatcher, Model._FIELD_DISPATCH_INTERMEDIATE):
+                            response = self.__get_input(i18n.t('command.dispatch_intermediate'),
+                                                        constrained_values=[i18n.t('command.prompt_no'), i18n.t('command.prompt_yes')])
+
+                            if (response is not None) and response.lower().startswith(i18n.t('command.prompt_yes').lower()[0]):
+                                dispatch_intermediate = True
+
                         for option in dispatcher.options:
-                            option_value = self.__get_input(option.name)
+                            finished_options = False
+                            option_value = None
+
+                            while not finished_options:
+                                constrained_values = option.constrained_values if option.data_type == fusion_platform.DATA_TYPE_CONSTRAINED else None
+
+                                prompt_constrained_values = i18n.t('models.process.option.representation_constrained_values',
+                                                                   constrained_values=constrained_values) if constrained_values is not None else ''
+                                prompt_required = i18n.t('models.process.option.representation_required') if option.required else ''
+                                prompt = i18n.t('command.prompt_option', title=option.title, name=option.name, data_type=option.data_type,
+                                                constrained_values=prompt_constrained_values, required=prompt_required)
+
+                                option_value = self.__get_input(prompt, default=option.value, constrained_values=constrained_values)
+                                finished_options = (not option.required) or (
+                                        option.required and (option_value is not None) and (not string_blank(str(option_value))))
 
                             if option_value is not None:
                                 dispatcher_options[option.name] = option_value
@@ -224,7 +250,8 @@ class Command(Base):
                     dispatchers_added += 1
 
                     for option_name, option_value in dispatcher_options.items():
-                        process.update(dispatcher_number=dispatchers_added, option_name=option_name, value=option_value)
+                        process.update(dispatcher_number=dispatchers_added, option_name=option_name, value=option_value, coerce_value=True,
+                                       dispatch_intermediate=dispatch_intermediate)
                 else:
                     finished = True
 
@@ -233,6 +260,18 @@ class Command(Base):
 
         return process
 
+    def __data_name_to_file_name(self, data_name):
+        """
+        Converts a data item name into a sane file name (without extension).
+
+        Args:
+            data_name: The data item name to convert.
+
+        Returns:
+            The corresponding file name.
+        """
+        return re.sub(r"[^A-Za-z_\-]", '_', str(data_name)) if data_name is not None else None
+
     def define_process(self, organisation, process_name, download_inputs=False, download_storage=False):
         """
         Obtains the process definition for a process.
@@ -254,12 +293,19 @@ class Command(Base):
         # Get the underlying service name.
         service, _ = organisation.find_services(ssd_id=process.ssd_id)
 
-        # Get the options and dispatchers.
+        # Get the options and dispatchers, optionally add in whether intermediate services are being dispatched.
         options = {option.name: self.__format_value(option.value, data_type=option.data_type) for option in process.options}
-        dispatchers = [
-            {Model._FIELD_NAME: dispatcher.name,
-             Model._FIELD_OPTIONS: {option.name: self.__format_value(option.value, data_type=option.data_type) for option in dispatcher.options}} for dispatcher in
-            process.dispatchers]
+        dispatchers = []
+
+        for dispatcher in process.dispatchers:
+            found_dispatcher = {Model._FIELD_NAME: dispatcher.name}
+
+            if hasattr(dispatcher, Model._FIELD_DISPATCH_INTERMEDIATE):
+                found_dispatcher[Model._FIELD_DISPATCH_INTERMEDIATE] = dispatcher.dispatch_intermediate
+
+            found_dispatcher[Model._FIELD_OPTIONS] = {option.name: self.__format_value(option.value, data_type=option.data_type) for option in dispatcher.options}
+
+            dispatchers.append(found_dispatcher)
 
         # Add in the standard options.
         for field in Command._MODEL_FIELDS:
@@ -418,7 +464,8 @@ class Command(Base):
 
         return found
 
-    def __download_execution(self, process, download_inputs, download_outputs, download_storage, download_intermediate, download_components, output_dir, execution):
+    def __download_execution(self, process, download_inputs, download_outputs, download_storage, download_intermediate, download_components, output_dir, wait,
+                             execution):
         """
         Downloads an execution.
 
@@ -430,6 +477,7 @@ class Command(Base):
             download_intermediate: Should intermediate components be downloaded?
             download_components: The names of the components that should be downloaded? If None or [], then all components are downloaded.
             output_dir: The output directory.
+            wait: Wait for the execution to complete?
             execution: The execution to be downloaded.
 
         Returns:
@@ -441,10 +489,10 @@ class Command(Base):
         metrics = []
         downloads = []
 
-        # Wait for the execution to complete. We explicitly wait in this method to keep the SDK free.
+        # Optionally wait for the execution to complete. We explicitly wait in this method to keep the SDK free.
         complete = False
 
-        while not complete:
+        while wait and (not complete):
             try:
                 complete = execution.check_complete()
             except:
@@ -480,15 +528,20 @@ class Command(Base):
         if (started_at is None) or (execution.started_at < started_at):
             started_at = execution.started_at
 
-        if (ended_at is None) or (execution.ended_at > ended_at):
-            ended_at = execution.ended_at
+        execution_ended_at = execution.ended_at if hasattr(execution, Model._FIELD_ENDED_AT) and (execution.ended_at is not None) else datetime.now(timezone.utc)
+
+        if (ended_at is None) or (execution_ended_at > ended_at):
+            ended_at = execution_ended_at
 
         for j, component in enumerate(components):
             # Download the component.
             component_name = '_'.join([item for item in re.sub(r'[\W]', '_', component.name).split('_') if len(item) > 0])
             component_dir = f"{str(j + 1)}_{component_name[:25]}"
             component_options = {item.get(Model._FIELD_NAME): item.get(Model._FIELD_VALUE) for item in component.options} if hasattr(component,
-                                                                                                                                     Model._FIELD_OPTIONS) else {}
+                                                                                                                                     Model._FIELD_OPTIONS) and (
+                                                                                                                                     component.options is not None) else {}
+            component_success = component.success if hasattr(component, Model._FIELD_SUCCESS) and (component.success is not None) else False
+            component_runtime = component.runtime if hasattr(component, Model._FIELD_RUNTIME) and (component.runtime is not None) else 0
 
             # Save the metrics for each component in the execution.
             # @formatter:off
@@ -497,25 +550,22 @@ class Command(Base):
                 Command._METRICS_PROCESS: process.name,
                 Command._METRICS_DURATION: ended_at - started_at if (started_at is not None) and (ended_at is not None) else 0,
                 Command._METRICS_COMPONENT: component.name,
-                Command._METRICS_SUCCESS: component.success,
+                Command._METRICS_SUCCESS: component_success,
                 Command._METRICS_CPU: component.cpu,
                 Command._METRICS_MEMORY: component.memory,
-                Command._METRICS_RUNTIME: component.runtime
+                Command._METRICS_RUNTIME: component_runtime
             }
             # @formatter:on
 
             # Only D-CAT services have metrics.
-            s3_transfer_bytes = 0
-            external_transfer_bytes = 0
-
             if hasattr(component, Command._METRICS_METRICS) and (component.metrics is not None):
-                s3_transfer_bytes = sum(
-                    [metric[Command._METRIC_S3_TRANSFER_BYTES] for metric in component.metrics if metric[Command._METRIC_S3_TRANSFER_BYTES] is not None])
-                external_transfer_bytes = sum([metric[Command._METRIC_EXTERNAL_TRANSFER_BYTES] for metric in component.metrics if
-                                               metric[Command._METRIC_EXTERNAL_TRANSFER_BYTES] is not None])
-
-            metric[Command._METRIC_S3_TRANSFER_BYTES] = s3_transfer_bytes
-            metric[Command._METRIC_EXTERNAL_TRANSFER_BYTES] = external_transfer_bytes
+                for key in [
+                    Command._METRIC_S3_TRANSFER_BYTES,
+                    Command._METRIC_GCS_TRANSFER_BYTES,
+                    Command._METRIC_EXTERNAL_TRANSFER_BYTES,
+                    Command._METRIC_INTERNAL_TRANSFER_BYTES
+                ]:
+                    metric[key] = sum([metric[key] for metric in component.metrics if metric.get(key) is not None])
 
             # Find each input, output and storage to download. While traversing each, save the input and output size. The size might not be immediately available
             # for every file, so wait for all items to be analysed.
@@ -543,7 +593,8 @@ class Command(Base):
                 # Download the data item once it is complete.
                 data_item.check_analysis_complete(wait=True)
 
-                download_dir = os.path.join(execution_dir, component_dir, f"{data_type}_{str(k)}")
+                name = re.sub('_+', '_', f"{data_type.capitalize()}_{str(k)}_{self.__data_name_to_file_name(data_item.name)}").rstrip('_')
+                download_dir = os.path.join(execution_dir, component_dir, name)
                 os.makedirs(download_dir, exist_ok=True)
 
                 # We also create the corresponding STAC definitions.
@@ -574,8 +625,8 @@ class Command(Base):
                     with open(os.path.join(download_dir, stac_file_name), 'w') as stac_file:
                         stac_file.write(json.dumps(stac_definition, default=json_default))
 
-            metric[Command._METRIC_S3_INPUT_SIZE] = sum(input_sizes)
-            metric[Command._METRIC_S3_OUTPUT_SIZE] = sum(output_sizes)
+            metric[Command._METRIC_S3_INPUT_SIZE] = sum(input_sizes) if len(input_sizes) > 0 else ''
+            metric[Command._METRIC_S3_OUTPUT_SIZE] = sum(output_sizes) if len(output_sizes) > 0 else ''
             metrics.append(metric)
 
         return downloads, metrics
@@ -649,7 +700,7 @@ class Command(Base):
                 progress_bar.close()
 
     def download_process_execution(self, organisation, process_name, download_inputs, download_outputs, download_storage, download_intermediate,
-                                   download_components, save_metrics):
+                                   download_components, save_metrics, wait_for_execution_to_complete):
         """
         Downloads the inputs and/or outputs from a process or execution(s).
 
@@ -662,6 +713,7 @@ class Command(Base):
             download_intermediate: Should intermediate components be downloaded?
             download_components: The names of the components that should be downloaded? If None or [], then all components are downloaded.
             save_metrics: Save process metrics to file?
+            wait_for_execution_to_complete: Optionally wait for completion of the execution?
 
         Returns:
             The process model.
@@ -707,7 +759,8 @@ class Command(Base):
 
         # 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.
-        self.__print(logging.INFO, i18n.t('command.download_executions', executions=len(executions)))
+        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,
                             unit='execution')  # Unit matches keyword argument.
         progress_bar.set_postfix(execution=1)
@@ -715,7 +768,7 @@ class Command(Base):
         try:
             # Now download each execution in batches.
             partial_download_execution = partial(self.__download_execution, process, download_inputs, download_outputs, download_storage, download_intermediate,
-                                                 download_components, output_dir)
+                                                 download_components, output_dir, wait_for_execution_to_complete)
             results = []
 
             with Pool(nodes=batch_size) as pool:
@@ -855,7 +908,7 @@ class Command(Base):
             The user response.
         """
         default = constrained_values[0] if (default is None) and (constrained_values is not None) and (len(constrained_values) > 0) else default
-        input_prompt = f"{input_prompt}{' [' + default + ']' if default is not None else ''}: "
+        input_prompt = f"{input_prompt}{' [' + str(default) + ']' if default is not None else ''}: "
         constrained_values = [''] + constrained_values if constrained_values is not None else constrained_values
 
         # Set up any validation against constrained values.
@@ -1089,7 +1142,8 @@ class Command(Base):
                     # Also perform the download, if required.
                     if arguments.download:
                         process = self.download_process_execution(organisation, process_name, arguments.inputs, arguments.outputs, arguments.storage,
-                                                                  arguments.intermediate, arguments.component, arguments.metrics)
+                                                                  arguments.intermediate, arguments.component, arguments.metrics,
+                                                                  not arguments.no_wait_for_completion)
 
                         # And optionally remove the process and its inputs.
                         if arguments.remove:
@@ -1112,7 +1166,7 @@ class Command(Base):
                 for process_name in arguments.process:
                     # Download the process.
                     process = self.download_process_execution(organisation, process_name, arguments.inputs, arguments.outputs, arguments.storage,
-                                                              arguments.intermediate, arguments.component, arguments.metrics)
+                                                              arguments.intermediate, arguments.component, arguments.metrics, not arguments.no_wait_for_completion)
 
                     # And optionally remove the process and its inputs.
                     if arguments.remove:
@@ -1189,6 +1243,8 @@ class Command(Base):
                                   default=False, action="store_true")
         parser_start.add_argument(i18n.t('command.start.component_short'), i18n.t('command.start.component_long'), help=i18n.t('command.start.component_help'),
                                   nargs='*')
+        parser_start.add_argument(i18n.t('command.start.no_wait_for_completion_short'), i18n.t('command.start.no_wait_for_completion_long'),
+                                  help=i18n.t('command.start.no_wait_for_completion_help'), default=False, action="store_true")
 
         # Define arguments.
         parser_define.add_argument(i18n.t('command.define.process_long'), help=i18n.t('command.define.process_help'), nargs='+')
@@ -1213,6 +1269,8 @@ class Command(Base):
                                      default=False, action="store_true")
         parser_download.add_argument(i18n.t('command.start.component_short'), i18n.t('command.start.component_long'), help=i18n.t('command.start.component_help'),
                                      nargs='*')
+        parser_download.add_argument(i18n.t('command.start.no_wait_for_completion_short'), i18n.t('command.start.no_wait_for_completion_long'),
+                                     help=i18n.t('command.start.no_wait_for_completion_help'), default=False, action="store_true")
 
         return parser.parse_args()
 
@@ -1378,7 +1436,7 @@ class Command(Base):
 
     def __process_name_to_file_name(self, process_name):
         """
-        Converts a process name into a same file name (without extension).
+        Converts a process name into a sane file name (without extension).
 
         Args:
             process_name: The process name to convert.

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/models/model.py

@@ -92,6 +92,7 @@ class Model(Base):
     _FIELD_OUTPUTS = 'outputs'
     _FIELD_PROCESS_STATUS = 'process_status'
     _FIELD_RESOLUTION = 'resolution'
+    _FIELD_RUNTIME = 'runtime'
     _FIELD_SD = 'sd'
     _FIELD_SELECTOR = 'selector'
     _FIELD_SELECTORS = 'selectors'
@@ -99,6 +100,7 @@ class Model(Base):
     _FIELD_STAC_ITEM = 'stac_item'
     _FIELD_STAC_ITEM_FILE = 'stac_item_file'
     _FIELD_STARTED_AT = 'started_at'
+    _FIELD_SUCCESS = 'success'
     _FIELD_PUBLISHABLE = 'publishable'
     _FIELD_SIZE = 'size'
     _FIELD_UNIT = 'unit'
@@ -770,7 +772,7 @@ class Model(Base):
         Returns:
             A string representation of the object.
         """
-        return f"{self.__class__.__name__}{self.attributes}"
+        return i18n.t('models.model.representation', name=self.__class__.__name__, attributes=self.attributes)
 
     def to_csv(self, exclude=None):
         """

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/models/process.py

@@ -228,7 +228,12 @@ class Option(Model):
         Returns:
             A string representation of the object.
         """
-        return f"{self.title} ('{self.name}', {self.data_type}{' ' + str(self.constrained_values) if self.data_type == fusion_platform.DATA_TYPE_CONSTRAINED else ''}{', required' if self.required else ''}) = {self.value}: {self.description}"
+        constrained_values = i18n.t('models.process.option.representation_constrained_values',
+                                    constrained_values=self.constrained_values) if self.data_type == fusion_platform.DATA_TYPE_CONSTRAINED else ''
+        required = i18n.t('models.process.option.representation_required') if self.required else ''
+
+        return i18n.t('models.process.option.representation', title=self.title, name=self.name, data_type=self.data_type, constrained_values=constrained_values,
+                      required=required, value=self.value, description=self.description)
 
 
 # Define a model class for an input which overrides the representation to display more relevant information.
@@ -243,7 +248,10 @@ class Input(Model):
         Returns:
             A string representation of the object.
         """
-        return f"{self.title} ({self.file_type}) = {self.name + ' (' + str(self.id) + ')' if hasattr(self, self.__class__._FIELD_NAME) and hasattr(self, self.__class__._FIELD_ID) else None}: {self.description}"
+        name = i18n.t('models.process.input.representation_name', name=self.name) if hasattr(self, self.__class__._FIELD_NAME) else ''
+        id = i18n.t('models.process.input.representation_id', id=self.id) if hasattr(self, self.__class__._FIELD_ID) else ''
+
+        return i18n.t('models.process.input.representation', title=self.title, file_type=self.file_type, name=name, id=id, description=self.description)
 
 
 # Define a model class for a dispatcher which overrides the representation to display more relevant information.
@@ -268,7 +276,10 @@ class Dispatcher(Model):
         Returns:
             A string representation of the object.
         """
-        return f"{self.name} ({self.ssd_id}, intermediate {self.dispatch_intermediate if hasattr(self, self.__class__._FIELD_DISPATCH_INTERMEDIATE) else False}): {self.documentation_summary}"
+        dispatch_intermediate = self.dispatch_intermediate if hasattr(self, self.__class__._FIELD_DISPATCH_INTERMEDIATE) else False
+
+        return i18n.t('models.process.dispatcher.representation', name=self.name, ssd_id=self.ssd_id, dispatch_intermediate=dispatch_intermediate,
+                      documentation_summary=self.documentation_summary)
 
 
 # Define the model schema classes. These are maintained from the API definitions.

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/models/process_service_execution.md

@@ -51,5 +51,7 @@
     * **tmp_total_bytes**: The total temporary disk space in bytes.
     * **tmp_free_bytes**: The free temporary disk space in bytes.
     * **s3_transfer_bytes**: The number of bytes transferred in from S3.
-    * **external_transfer_bytes**: The number of bytes transferred in externally, excluding S3.
+    * **gcs_transfer_bytes**: The number of bytes transferred in from Google Cloud Storage.
+    * **external_transfer_bytes**: The number of bytes transferred in externally.
+    * **internal_transfer_bytes**: The number of bytes transferred in internally.
     * **comment**: Any comment recorded with the metric.

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/models/process_service_execution.py

@@ -93,7 +93,9 @@ class ProcessServiceExecutionMetricSchema(Schema):
     tmp_total_bytes = fields.Integer(allow_none=True)
     tmp_free_bytes = fields.Integer(allow_none=True)
     s3_transfer_bytes = fields.Integer(allow_none=True)
+    gcs_transfer_bytes = fields.Integer(allow_none=True)
     external_transfer_bytes = fields.Integer(allow_none=True)
+    internal_transfer_bytes = fields.Integer(allow_none=True)
     comment = fields.String(allow_none=True)
 
     class Meta:

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/fusion_platform/translations.py

@@ -46,6 +46,7 @@ i18n.add_translation('command.log_field', '%{field}: %{value}', 'en')
 i18n.add_translation('command.log_subdivider', '................................................................................................', 'en')
 i18n.add_translation('command.log_divider', '------------------------------------------------------------------------------------------------', 'en')
 i18n.add_translation('command.log_bookend', '************************************************************************************************', 'en')
+i18n.add_translation('command.wait_for_completion', ' and waiting for completion', 'en')
 i18n.add_translation('command.wait_for_next', 'Waiting for next execution...', 'en')
 i18n.add_translation('command.using_storage', 'Uploading storage \'%{filename}\' with id %{storage_id} to \'%{storage_name}\'', 'en')
 i18n.add_translation('command.using_service', 'Using service \'%{service}\'', 'en')
@@ -58,6 +59,7 @@ i18n.add_translation('command.remove_process', 'Removing input \'%{process}\'',
 i18n.add_translation('command.remove_input', 'Removing input \'%{input}\'', 'en')
 i18n.add_translation('command.prompt_yes', 'Yes', 'en')
 i18n.add_translation('command.prompt_no', 'No', 'en')
+i18n.add_translation('command.prompt_option', '%{title} (\'%{name}\', %{data_type}%{constrained_values}%{required})', 'en')
 i18n.add_translation('command.password', 'Password', 'en')
 i18n.add_translation('command.organisation', 'Organisation', 'en')
 i18n.add_translation('command.find_inputs', 'Finding %{inputs} input file(s)...', 'en')
@@ -66,11 +68,12 @@ i18n.add_translation('command.email', 'Email', 'en')
 i18n.add_translation('command.download_process_execution', 'Downloading \'%{process}\' (inputs %{inputs}, outputs %{outputs}, storage %{storage}, intermediate %{intermediate}, metrics %{metrics}, components %{components})', 'en')
 i18n.add_translation('command.download_process', 'Downloading process \'%{process}\' to %{output}', 'en')
 i18n.add_translation('command.download_files', 'Downloading %{files} file(s)...', 'en')
-i18n.add_translation('command.download_executions', 'Gathering files for %{executions} execution(s)...', 'en')
+i18n.add_translation('command.download_executions', 'Gathering files%{wait} for %{executions} execution(s)...', 'en')
 i18n.add_translation('command.download_execution', 'Downloading execution %{execution} to %{output}', 'en')
 i18n.add_translation('command.define_storage', 'Defining storage file(s) for %{slices} slice(s)...', 'en')
 i18n.add_translation('command.define_process', 'Defining \'%{process}\' (inputs %{inputs}, storage %{storage})', 'en')
 i18n.add_translation('command.define_inputs', 'Defining %{files} input file(s)...', 'en')
+i18n.add_translation('command.dispatch_intermediate', 'Dispatch intermediate components?', 'en')
 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')
@@ -80,6 +83,9 @@ i18n.add_translation('command.define.process_help', 'the name of the process, th
 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.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')
+i18n.add_translation('command.start.no_wait_for_completion_short', '-n', 'en')
 i18n.add_translation('command.start.metrics_help', 'save process metrics to file (default %%(default)s)', 'en')
 i18n.add_translation('command.start.metrics_long', '--metrics', 'en')
 i18n.add_translation('command.start.metrics_short', '-t', 'en')
@@ -280,6 +286,7 @@ i18n.add_translation('models.model.no_such_keys', 'No such keys %{keys}', 'en')
 i18n.add_translation('models.model.readonly_property', 'Property %{property} is read-only and cannot be set', 'en')
 i18n.add_translation('models.model.not_persisted', 'Model is not persisted in the Fusion Platform(r)', 'en')
 i18n.add_translation('models.model.already_persisted', 'Model is already persisted in the Fusion Platform(r)', 'en')
+i18n.add_translation('models.model.representation', '%{name}%{attributes}', 'en')
 i18n.add_translation('models.process.failed_copy', 'Failed to get process from copy response', 'en')
 i18n.add_translation('models.process.execution_should_have_started', 'Process execution should have started by now', 'en')
 i18n.add_translation('models.process.execution_stopped', 'Process execution has been stopped', 'en')
@@ -298,4 +305,11 @@ i18n.add_translation('models.process.option.constrained_values.description', 'Th
 i18n.add_translation('models.process.option.constrained_values.title', 'Constrained Values', 'en')
 i18n.add_translation('models.process.option.constrained_names.description', 'The constrained value names for the option.', 'en')
 i18n.add_translation('models.process.option.constrained_names.title', 'Constrained Names', 'en')
+i18n.add_translation('models.process.option.representation_required', ', required', 'en')
+i18n.add_translation('models.process.option.representation_constrained_values', ' %{constrained_values}', 'en')
+i18n.add_translation('models.process.option.representation', '%{title} (\'%{name}\', %{data_type}%{constrained_values}%{required}) = %{value}: %{description}', 'en')
+i18n.add_translation('models.process.input.representation_id', ' (%{id})', 'en')
+i18n.add_translation('models.process.input.representation_name', ' %{name}', 'en')
+i18n.add_translation('models.process.input.representation', '%{title} (%{file_type}) =%{name}%{id}: %{description}', 'en')
+i18n.add_translation('models.process.dispatcher.representation', '%{name} (%{ssd_id}, intermediate %{dispatch_intermediate}): %{documentation_summary}', 'en')
 # @formatter:on

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6/fusion_platform_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fusion-platform-python-sdk
-Version: 1.16.6
+Version: 1.17.6
 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
@@ -8,11 +8,11 @@ Author-email: support@d-cat.co.uk
 License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: marshmallow
@@ -48,7 +48,7 @@ API, and this is defined within the corresponding OpenAPI 3.0 specification, whi
 
 ## Installation
 
-The SDK has been built for Python 3, and is tested against Python 3.8, 3.9, 3.10, 3.11 and 3.12. To install the SDK into a suitable Python environment containing
+The SDK has been built for Python 3, and is tested against Python 3.9, 3.10, 3.11, 3.12 and 3.13. To install the SDK into a suitable Python environment containing
 `pip`, execute the following:
 
 ```shell

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/setup.py

@@ -19,7 +19,7 @@ PACKAGE_DIR = pathlib.Path(__file__).parent
 # @formatter:off
 setup(
     name='fusion-platform-python-sdk',
-    version='1.16.6',
+    version='1.17.6',
     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',
@@ -30,11 +30,11 @@ setup(
     classifiers=[
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     packages=find_packages(exclude='tests'),
     include_package_data=True,

{fusion_platform_python_sdk-1.16.6 → fusion_platform_python_sdk-1.17.6}/tests/test_session.py

@@ -66,7 +66,7 @@ class TestSession(CustomTestCase):
             session = Session()
 
             with pytest.raises(RequestError):
-                session.download_file('https://www.d-cat.co.uk/.well-known/acme-challenge/test.html', destination)
+                session.download_file('https://www.d-cat.co.uk/assets/test.html', destination)
 
             self.assertFalse(os.path.exists(destination))
             session.download_file('https://www.d-cat.co.uk/home', destination, self.download_callback)