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

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

@@ -1,12 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 1.17.6
+Version: 1.18.3
 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
 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.9
 Classifier: Programming Language :: Python :: 3.10
@@ -31,6 +30,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/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.17.6'
-__version_date__ = '2025-03-26T16:04:58Z'
+__version__ = '1.18.3'
+__version_date__ = '2025-07-04T14:43:33Z'
 
 # Exclude certain sub-modules from documentation.
 # @formatter:off

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

@@ -8,28 +8,28 @@ author: Matthew Casey
 
 import argparse
 from argparse import RawTextHelpFormatter
+from collections import defaultdict
 from copy import deepcopy
 import csv
 from datetime import datetime, timedelta, timezone
-from dateutil.relativedelta import relativedelta
 from decimal import Decimal
 from functools import partial
-import i18n
 import json
 import logging
-from marshmallow.utils import _Missing
 import os
-from pathos.multiprocessing import ProcessPool as Pool
-from prompt_toolkit import prompt
-from prompt_toolkit import print_formatted_text as print
-from prompt_toolkit.completion import WordCompleter
-from prompt_toolkit.validation import Validator
 import re
 import shutil
 import tempfile
 from time import sleep
-from tqdm import tqdm
 import uuid
+
+from dateutil.relativedelta import relativedelta
+import i18n
+from pathos.multiprocessing import ProcessPool as Pool
+from prompt_toolkit import print_formatted_text as print, prompt
+from prompt_toolkit.completion import WordCompleter
+from prompt_toolkit.validation import Validator
+from tqdm import tqdm
 import yaml
 
 # Make sure localisation is set up before any SDK-specific imports.
@@ -455,9 +455,35 @@ class Command(Base):
 
             self.__print_process(process)
 
-            # Display the status of any execution.
+            # Group executions, if they are in groups.
+            groups = defaultdict(list)
+
             for execution in process.executions:
-                self.__print_execution(execution)
+                if (hasattr(execution, Model._FIELD_GROUP_ID) and (execution.group_id is not None)) and (
+                        hasattr(execution, Model._FIELD_GROUP_INDEX) and (execution.group_index is not None)) and (
+                        hasattr(execution, Model._FIELD_GROUP_COUNT) and (execution.group_count is not None)):
+                    groups[execution.group_id].append(execution)
+
+            # Display the status of any execution, in groups if used.
+            if len(groups) > 0:
+                group_number = 1
+
+                for group_id, group_executions in groups.items():
+                    self.__print(logging.INFO,
+                                 i18n.t('command.log_execution_group_id', group_number=group_number, group_count=len(groups), group_id=group_id))
+
+                    for execution in sorted(group_executions, key=lambda execution: execution.group_index):
+                        self.__print_execution(execution, label=i18n.t('command.log_execution_group_index', group_index=execution.group_index,
+                                                                       group_count=execution.group_count))
+
+                    group_number += 1
+                    self.__print(logging.INFO, i18n.t('command.log_bookend'))
+
+            else:
+                for execution in process.executions:
+                    self.__print_execution(execution)
+
+                self.__print(logging.INFO, i18n.t('command.log_bookend'))
 
         except CommandError as e:
             self.__print(logging.DEBUG, str(e))
@@ -507,8 +533,8 @@ class Command(Base):
         group_count = None
         group_index = None
 
-        if hasattr(execution, Model._FIELD_GROUP_INDEX) and (execution.group_index is not None) and (not isinstance(execution.group_index, _Missing)) and hasattr(
-                execution, Model._FIELD_GROUP_COUNT) and (execution.group_count is not None) and (not isinstance(execution.group_count, _Missing)):
+        if hasattr(execution, Model._FIELD_GROUP_INDEX) and (execution.group_index is not None) and (isinstance(execution.group_index, int)) and hasattr(
+                execution, Model._FIELD_GROUP_COUNT) and (execution.group_count is not None) and (isinstance(execution.group_count, int)):
             group_count = execution.group_count
             group_index = execution.group_index
             number_of_group_digits = len(str(group_count))
@@ -528,7 +554,8 @@ class Command(Base):
         if (started_at is None) or (execution.started_at < started_at):
             started_at = execution.started_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)
+        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
@@ -700,7 +727,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, wait_for_execution_to_complete):
+                                   download_components, save_metrics, stac_only, wait_for_execution_to_complete):
         """
         Downloads the inputs and/or outputs from a process or execution(s).
 
@@ -713,6 +740,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?
+            stac_only: Save only stac assets?
             wait_for_execution_to_complete: Optionally wait for completion of the execution?
 
         Returns:
@@ -723,9 +751,9 @@ class Command(Base):
         if (not download_inputs) and (not download_outputs) and (not download_storage):
             download_outputs = True
 
-        self.__print(logging.INFO,
-                     i18n.t('command.download_process_execution', process=process_name, inputs=download_inputs, outputs=download_outputs, storage=download_storage,
-                            intermediate=download_intermediate, metrics=save_metrics, components=download_components))
+        self.__print(logging.INFO, i18n.t('command.download_process_execution', process=process_name, inputs=download_inputs, outputs=download_outputs,
+                                          storage=download_storage, intermediate=download_intermediate, stac_only=stac_only, metrics=save_metrics,
+                                          components=download_components))
 
         # We are downloading from an existing process.
         process, execution = self.get_process_or_execution(organisation, process_name)
@@ -790,8 +818,9 @@ class Command(Base):
             downloads.extend(execution_downloads)
             metrics.extend(execution_metrics)
 
-        # Download the files.
-        self.__download_files(downloads)
+        # Download the files unless we only want the stac information
+        if not stac_only:
+            self.__download_files(downloads)
 
         # Save the metrics to file.
         if save_metrics and (len(metrics) > 0):
@@ -1042,6 +1071,38 @@ class Command(Base):
         """
         return uuid.uuid5(uuid.NAMESPACE_URL, f"{process_id}_{group_count}_{group_index}_{ssd_id}_{chain_index}")
 
+    def list_processes(self, organisation):
+        """
+        Lists all configured processes.
+
+        Args:
+            organisation: The logged in organisation.
+        """
+        for process in organisation.processes:
+            executions = [execution for execution in process.executions]
+
+            # Get information about any groups.
+            groups = defaultdict(list)
+
+            for execution in executions:
+                if (hasattr(execution, Model._FIELD_GROUP_ID) and (execution.group_id is not None)) and (
+                        hasattr(execution, Model._FIELD_GROUP_INDEX) and (execution.group_index is not None)) and (
+                        hasattr(execution, Model._FIELD_GROUP_COUNT) and (execution.group_count is not None)):
+                    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 = ''
+
+            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)
+
+            # 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))
+
     def login(self, deployment, email, organisation_name):
         """
         Logs into the desired Fusion Platform(r) deployment and allows the user to select an organisation.
@@ -1117,12 +1178,16 @@ class Command(Base):
             # Login to the correct deployment and select the organisation.
             organisation, _, _ = self.login(arguments.deployment, arguments.email, arguments.organisation)
 
-            # Perform the display, start, define or download.
-            if arguments.command == i18n.t('command.display.command'):
-                # Display a service or process with the specified name or ids. If a service is displayed, we do not display a process.
+            # Perform the list, display, start, define or download.
+            if arguments.command == i18n.t('command.list.command'):
+                # List all processes.
+                self.list_processes(organisation)
+
+            elif arguments.command == i18n.t('command.display.command'):
+                # Display a service or process with the specified name or ids. If a process is displayed, we do not display a service.
                 for process_or_service in arguments.process_or_service:
-                    if not self.display_service(organisation, process_or_service):
-                        if not self.display_process(organisation, process_or_service):
+                    if not self.display_process(organisation, process_or_service):
+                        if not self.display_service(organisation, process_or_service):
                             self.__print(logging.WARNING, i18n.t('command.no_process_or_service', process_or_service=process_or_service))
 
             elif arguments.command == i18n.t('command.start.command'):
@@ -1142,7 +1207,7 @@ 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, arguments.stac,
                                                                   not arguments.no_wait_for_completion)
 
                         # And optionally remove the process and its inputs.
@@ -1166,7 +1231,8 @@ 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, not arguments.no_wait_for_completion)
+                                                              arguments.intermediate, arguments.component, arguments.metrics, arguments.stac,
+                                                              not arguments.no_wait_for_completion)
 
                     # And optionally remove the process and its inputs.
                     if arguments.remove:
@@ -1203,13 +1269,14 @@ class Command(Base):
                             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'))
 
         # Add in the common arguments.
-        for subparser in [parser_display, parser_start, parser_define, parser_download]:
+        for subparser in [parser_list, parser_display, parser_start, parser_define, parser_download]:
             subparser.add_argument(i18n.t('command.deployment_short'), i18n.t('command.deployment_long'), help=i18n.t('command.deployment_help'),
                                    default=Command._DEPLOYMENT_PRODUCTION_IRL)
             subparser.add_argument(i18n.t('command.email_short'), i18n.t('command.email_long'), help=i18n.t('command.email_help'))
@@ -1222,9 +1289,10 @@ class Command(Base):
 
         # Start arguments.
         parser_start.add_argument(i18n.t('command.start.definition_long'), help=i18n.t('command.start.definition_help'), nargs='+')
-        parser_start.add_argument(i18n.t('command.start.input_list_short'), i18n.t('command.start.input_list_long'), help=i18n.t('command.start.input_list_help'),
+        parser_start.add_argument(i18n.t('command.start.input_list_short'), i18n.t('command.start.input_list_long'),
+                                  help=i18n.t('command.start.input_list_help'), nargs='*')
+        parser_start.add_argument(i18n.t('command.start.options_short'), i18n.t('command.start.options_long'), help=i18n.t('command.start.options_help'),
                                   nargs='*')
-        parser_start.add_argument(i18n.t('command.start.options_short'), i18n.t('command.start.options_long'), help=i18n.t('command.start.options_help'), nargs='*')
         parser_start.add_argument(i18n.t('command.start.wait_for_start_short'), i18n.t('command.start.wait_for_start_long'),
                                   help=i18n.t('command.start.wait_for_start_help'), default=False, action="store_true")
         parser_start.add_argument(i18n.t('command.start.download_short'), i18n.t('command.start.download_long'), help=i18n.t('command.start.download_help'),
@@ -1245,6 +1313,8 @@ class Command(Base):
                                   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")
+        parser_start.add_argument(i18n.t('command.start.stac_only_short'), i18n.t('command.start.stac_only_long'), help=i18n.t('command.start.stac_only_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='+')
@@ -1267,10 +1337,12 @@ class Command(Base):
                                      help=i18n.t('command.start.intermediate_help'), default=False, action="store_true")
         parser_download.add_argument(i18n.t('command.start.metrics_short'), i18n.t('command.start.metrics_long'), help=i18n.t('command.start.metrics_help'),
                                      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.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")
+        parser_download.add_argument(i18n.t('command.start.stac_only_short'), i18n.t('command.start.stac_only_long'), help=i18n.t('command.start.stac_only_help'),
+                                     default=False, action="store_true")
 
         return parser.parse_args()
 
@@ -1290,18 +1362,20 @@ class Command(Base):
             else:
                 print(message)
 
-    def __print_execution(self, execution):
+    def __print_execution(self, execution, label=None):
         """
         Prints an execution. This just shows the status in a simple format.
 
         Args:
             execution: The execution to be logged.
+            label: Optional label for the execution. Default None.
         """
+        label = '' if label is None else label
 
         # Form the status of the execution.
         status = ''
-        group = ''
-        abort_reason = i18n.t('command.log_execution_abort_reason', abort_reason=execution.abort_reason) if hasattr(execution, Model._FIELD_ABORT_REASON) else ''
+        abort_reason = i18n.t('command.log_execution_abort_reason', abort_reason=execution.abort_reason) if hasattr(execution,
+                                                                                                                    Model._FIELD_ABORT_REASON) else ''
         exit_type = i18n.t('command.log_execution_exit_type', exit_type=execution.exit_type) if hasattr(execution, Model._FIELD_EXIT_TYPE) else ''
 
         if execution.success:
@@ -1323,16 +1397,10 @@ class Command(Base):
         ended_at = i18n.t('command.log_execution_ended_at', ended_at=execution.ended_at.strftime('%Y-%m-%d %H:%M:%S')) if hasattr(execution,
                                                                                                                                   Model._FIELD_ENDED_AT) else ''
         period = i18n.t('command.log_execution_period', started_at=started_at, ended_at=ended_at)
-        duration = i18n.t('command.log_execution_duration', minutes=round((execution.ended_at - execution.started_at).total_seconds() // 60)) if hasattr(execution,
-                                                                                                                                                         Model._FIELD_ENDED_AT) and (
-                                                                                                                                                         execution.ended_at is not None) else ''
-
-        if (hasattr(execution, Model._FIELD_GROUP_ID) and (execution.group_id is not None)) and (
-                hasattr(execution, Model._FIELD_GROUP_INDEX) and (execution.group_index is not None)) and (
-                hasattr(execution, Model._FIELD_GROUP_COUNT) and (execution.group_count is not None)):
-            group = i18n.t('command.log_execution_group', group_id=execution.group_id, group_index=execution.group_index, group_count=execution.group_count)
+        duration = i18n.t('command.log_execution_duration', minutes=round((execution.ended_at - execution.started_at).total_seconds() // 60)) if hasattr(
+            execution, Model._FIELD_ENDED_AT) and (execution.ended_at is not None) else ''
 
-        self.__print(logging.INFO, i18n.t('command.log_execution', id=execution.id, period=period, status=status, duration=duration, group=group))
+        self.__print(logging.INFO, i18n.t('command.log_execution', id=execution.id, label=label, period=period, status=status, duration=duration))
 
     def __print_process(self, process):
         """

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/credit.py

@@ -26,7 +26,6 @@ class CreditMonthlySpendSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class CreditSsdsSchema(Schema):
@@ -41,7 +40,6 @@ class CreditSsdsSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class CreditSchema(Schema):
@@ -73,7 +71,6 @@ class CreditSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class Credit(Model):

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/data.py

@@ -57,7 +57,6 @@ class DataSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class Data(Model):
@@ -150,12 +149,14 @@ class Data(Model):
             # Make sure we record the thread so we can monitor it, even if it fails.
             self.__upload_threads[file_id] = thread
 
-    def check_analysis_complete(self, wait=False):
+    def check_analysis_complete(self, wait=False, extended_analysis=False):
         """
-        Checks that the analysis of all files associated with this data object is complete. Optionally waits for the analysis to complete.
+        Checks that the analysis of all files associated with this data object is complete. Optionally waits for the analysis to complete. Also, optionally checks
+        whether the extended analysis has completed as compared to just the basic analysis which is required for a file to be used.
 
         Args:
             wait: Optionally wait for the analysis to complete? Default False.
+            extended_analysis: Optionally check whether the extended analysis has completed, rather than only the required basic analysis. Default False.
 
         Returns:
             True if the analysis is complete for all files.
@@ -168,18 +169,27 @@ class Data(Model):
             complete = True
 
             # Load in each of the file models and check that every file has been uploaded, and has a publishable or error field to indicate that the analysis is
-            # complete.
+            # complete. For extended analysis, the number of ingesters is checked and how many of these have completed.
             for file in self.files:
                 self._logger.debug('file %s: %s', file.file_name, file.attributes)
 
-                has_fields = hasattr(file, self.__class__._FIELD_SIZE) and (
+                has_basic_fields = hasattr(file, self.__class__._FIELD_SIZE) and (
                         hasattr(file, self.__class__._FIELD_PUBLISHABLE) or hasattr(file, self.__class__._FIELD_ERROR))
 
-                if not has_fields:
-                    self._logger.debug('file %s not yet analysed', file.file_name)
+                if not has_basic_fields:
+                    self._logger.debug('file %s basic analysis not complete', file.file_name)
                     complete = False
                     break
 
+                if extended_analysis:
+                    number_of_ingesters = file.number_of_ingesters if hasattr(file, self.__class__._FIELD_NUMBER_OF_INGESTERS) else 0
+                    ingesters = file.ingesters if hasattr(file, self.__class__._FIELD_INGESTERS) else {}
+
+                    if len(ingesters) < number_of_ingesters:
+                        self._logger.debug('file %s extended analysis not complete', file.file_name)
+                        complete = False
+                        break
+
             # Break the loop if we are not waiting or are complete.
             if (not wait) or complete:
                 break
@@ -252,19 +262,21 @@ class Data(Model):
             if len(self.__upload_threads) > 0:
                 self.create_complete(wait=wait)  # Ignore response.
 
-    def create_complete(self, wait=False):
+    def create_complete(self, wait=False, extended_analysis=False):
         """
         Checks whether the data object file(s) upload and analysis have completed. If an error has occurred during the upload and analysis, then this will raise
-        a corresponding exception. Optionally waits for the upload and analysis to complete.
+        a corresponding exception. Optionally waits for the upload and analysis to complete. Also, optionally checks whether the extended analysis has completed as
+        compared to just the basic analysis which is required for a file to be used.
 
         Note, a failure of one file upload will not stop the upload of other files. Therefore, if an exception is raised, further calls to this method are required
         until all upload and analysis (or errored) has completed and this method returns True.
 
         Args:
             wait: Optionally wait for the upload and analysis to complete? Default False.
+            extended_analysis: Optionally check whether the extended analysis has completed, rather than only the required basic analysis. Default False.
 
         Returns:
-            True if the upload and analysis are complete for all files.
+            True if the upload and (basic or extended) analysis are complete for all files.
 
         Raises:
             RequestError: if any request fails.
@@ -313,7 +325,7 @@ class Data(Model):
 
         try:
             if uploads_finished:
-                complete = self.check_analysis_complete(wait=wait)
+                complete = self.check_analysis_complete(wait=wait, extended_analysis=extended_analysis)
 
         except Exception as e:
             # An error occurred, make sure we treat this as complete to prevent an indefinite loop.

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/data_file.md

@@ -13,6 +13,8 @@
 * **area**: The optional total area covered by the file content in metres squared.
 * **length**: The optional total length covered by the file content in metres.
 * **points**: The optional total number of points in the file.
+* **lines**: The optional total number of lines in the file.
+* **polygons**: The optional total number of polygons in the file.
 * **size**: The size of the file in bytes.
 * **error**: Was there an error encountered during analysis of the file?
 * **publishable**: Is the file suitable for publishing as it is without optimisation?
@@ -27,6 +29,8 @@
     * **area**: The optional area for the selector in metres squared.
     * **length**: The optional length for the selector in metres.
     * **points**: The optional total number of points in the selector.
+    * **lines**: The optional total number of lines in the selector.
+    * **polygons**: The optional total number of polygons in the selector.
     * **initial_values**: The first initial values associated with the selector.
     * **minimum**: The minimum value associated with the selector values.
     * **maximum**: The maximum value associated with the selector values.
@@ -35,6 +39,8 @@
     * **histogram_minimum**: The histogram maximum value associated with the selector values.
     * **histogram_maximum**: The histogram maximum value associated with the selector values.
     * **histogram**: The histogram associated with the selector values.
+* **number_of_ingesters**: The expected number of ingesters that may be used to analyse an uploaded, publishable file.
+* **ingesters**: The ingester analysis.
 * **downloads**: How many times has the file been downloaded?
 * **geojson**: The content of the associated file if it is a GeoJSON file (of limited size).
 * **title**: The title for the selector.

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/data_file.py

@@ -32,6 +32,8 @@ class DataFileSelectorSchema(Schema):
     area = fields.Decimal(allow_none=True)
     length = fields.Decimal(allow_none=True)
     points = fields.Integer(allow_none=True)
+    lines = fields.Integer(allow_none=True)
+    polygons = fields.Integer(allow_none=True)
 
     initial_values = fields.List(fields.String(required=True), allow_none=True)
     minimum = fields.Decimal(allow_none=True)
@@ -48,7 +50,6 @@ class DataFileSelectorSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class DataFileSchema(Schema):
@@ -80,6 +81,8 @@ class DataFileSchema(Schema):
     area = fields.Decimal(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     length = fields.Decimal(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     points = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    lines = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    polygons = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
 
     size = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     error = fields.Boolean(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
@@ -90,6 +93,9 @@ class DataFileSchema(Schema):
 
     selectors = fields.List(fields.Nested(DataFileSelectorSchema()), allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
 
+    number_of_ingesters = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    ingesters = fields.Dict(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+
     downloads = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     geojson = fields.String(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
 
@@ -106,7 +112,6 @@ class DataFileSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class DataFile(Model):

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

@@ -80,6 +80,7 @@ class Model(Base):
     _FIELD_HISTOGRAM_MINIMUM = 'histogram_minimum'
     _FIELD_HISTOGRAM_MAXIMUM = 'histogram_maximum'
     _FIELD_ID = 'id'
+    _FIELD_INGESTERS = 'ingesters'
     _FIELD_INPUT = 'input'
     _FIELD_INPUTS = 'inputs'
     _FIELD_KEYWORDS = 'keywords'
@@ -88,6 +89,7 @@ class Model(Base):
     _FIELD_MINIMUM = 'minimum'
     _FIELD_NAME = 'name'
     _FIELD_NON_AGGREGATOR_COUNT = 'non_aggregator_count'
+    _FIELD_NUMBER_OF_INGESTERS = 'number_of_ingesters'
     _FIELD_OPTIONS = 'options'
     _FIELD_OUTPUTS = 'outputs'
     _FIELD_PROCESS_STATUS = 'process_status'

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/organisation.py

@@ -32,7 +32,6 @@ class OrganisationUserSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class OrganisationSchema(Schema):
@@ -87,7 +86,6 @@ class OrganisationSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class Organisation(Model):

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

@@ -298,7 +298,6 @@ class ProcessChainOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessChainSchema(Schema):
@@ -317,7 +316,6 @@ class ProcessChainSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessExecutionStatusSchema(Schema):
@@ -342,7 +340,6 @@ class ProcessExecutionStatusSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessSelectorSchema(Schema):
@@ -360,7 +357,6 @@ class ProcessSelectorSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessInputSchema(Schema):
@@ -386,7 +382,6 @@ class ProcessInputSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessOptionSchema(Schema):
@@ -416,7 +411,6 @@ class ProcessOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessDispatcherSchema(Schema):
@@ -435,7 +429,6 @@ class ProcessDispatcherSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessSchema(Schema):
@@ -498,7 +491,6 @@ class ProcessSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class Process(Model):

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/process_execution.py

@@ -32,7 +32,6 @@ class ProcessExecutionChainOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessExecutionChainSchema(Schema):
@@ -51,7 +50,6 @@ class ProcessExecutionChainSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessExecutionOptionSchema(Schema):
@@ -74,7 +72,6 @@ class ProcessExecutionOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessExecutionSchema(Schema):
@@ -119,7 +116,6 @@ class ProcessExecutionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessExecution(Model):

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

@@ -50,6 +50,10 @@
     * **swap_free_bytes**: The free swap space in bytes.
     * **tmp_total_bytes**: The total temporary disk space in bytes.
     * **tmp_free_bytes**: The free temporary disk space in bytes.
+    * **tmp_used_bytes**: The used temporary disk space in bytes.
+    * **scratch_total_bytes**: The total scratch disk space in bytes.
+    * **scratch_free_bytes**: The free scratch disk space in bytes.
+    * **scratch_used_bytes**: The used scratch disk space in bytes.
     * **s3_transfer_bytes**: The number of bytes transferred in from S3.
     * **gcs_transfer_bytes**: The number of bytes transferred in from Google Cloud Storage.
     * **external_transfer_bytes**: The number of bytes transferred in externally.

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

@@ -46,7 +46,6 @@ class ProcessServiceExecutionActionValueSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionActionSchema(Schema):
@@ -64,7 +63,6 @@ class ProcessServiceExecutionActionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionActionsSchema(Schema):
@@ -78,7 +76,6 @@ class ProcessServiceExecutionActionsSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionMetricSchema(Schema):
@@ -92,6 +89,10 @@ class ProcessServiceExecutionMetricSchema(Schema):
     swap_free_bytes = fields.Integer(allow_none=True)
     tmp_total_bytes = fields.Integer(allow_none=True)
     tmp_free_bytes = fields.Integer(allow_none=True)
+    tmp_used_bytes = fields.Integer(allow_none=True)
+    scratch_total_bytes = fields.Integer(allow_none=True)
+    scratch_free_bytes = fields.Integer(allow_none=True)
+    scratch_used_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)
@@ -103,7 +104,6 @@ class ProcessServiceExecutionMetricSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionOptionSchema(Schema):
@@ -120,7 +120,6 @@ class ProcessServiceExecutionOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionSchema(Schema):
@@ -172,7 +171,6 @@ class ProcessServiceExecutionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecution(Model):

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/process_service_execution_log.py

@@ -36,7 +36,6 @@ class ProcessServiceExecutionLogSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ProcessServiceExecutionLog(Model):

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/service.py

@@ -50,7 +50,6 @@ class ServiceActionValueSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceActionSchema(Schema):
@@ -68,7 +67,6 @@ class ServiceActionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceDefinitionLinkageSchema(Schema):
@@ -83,7 +81,6 @@ class ServiceDefinitionLinkageSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceDefinitionSchema(Schema):
@@ -99,7 +96,6 @@ class ServiceDefinitionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceGroupAggregatorOptionSchema(Schema):
@@ -115,7 +111,6 @@ class ServiceGroupAggregatorOptionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceGroupAggregatorSchema(Schema):
@@ -132,7 +127,6 @@ class ServiceGroupAggregatorSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceInputExpressionSchema(Schema):
@@ -150,7 +144,6 @@ class ServiceInputExpressionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceOptionExpressionSchema(Schema):
@@ -166,7 +159,6 @@ class ServiceOptionExpressionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceValidationSchema(Schema):
@@ -181,7 +173,6 @@ class ServiceValidationSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceOrganisationChargeExpressionSchema(Schema):
@@ -197,7 +188,6 @@ class ServiceOrganisationChargeExpressionSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class ServiceSchema(Schema):
@@ -268,7 +258,6 @@ class ServiceSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class Service(Model):

{fusion_platform_python_sdk-1.17.6 → fusion_platform_python_sdk-1.18.3}/fusion_platform/models/user.py

@@ -29,7 +29,6 @@ class UserOrganisationSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class UserSchema(Schema):
@@ -81,7 +80,6 @@ class UserSchema(Schema):
         When loading an object, make sure we exclude any unknown fields, rather than raising an exception, and put fields in their definition order.
         """
         unknown = EXCLUDE
-        ordered = True
 
 
 class User(Model):

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

@@ -20,7 +20,10 @@ i18n.add_translation('command.no_such_organisation', 'No such organisation \'%{o
 i18n.add_translation('command.no_such_input', 'No such input \'%{input_name}\'', 'en')
 i18n.add_translation('command.no_executions', 'No executions for process \'%{process}\'', 'en')
 i18n.add_translation('command.invalid_login_response', 'Incorrect username or password', 'en')
-i18n.add_translation('command.log_execution_group', ' (group \'%{group_id}\' %{group_index} of %{group_count})', 'en')
+i18n.add_translation('command.log_process_summary', '\'%{process}\': %{executions} execution(s) in %{groups} group(s) (%{progress}%% complete);%{group_progress}', 'en')
+i18n.add_translation('command.log_process_group', ' %{group_number}: %{executions} execution(s) (%{progress}%% complete);', 'en')
+i18n.add_translation('command.log_execution_group_index', ' %{group_index} of %{group_count}', 'en')
+i18n.add_translation('command.log_execution_group_id', 'Group %{group_number} of %{group_count} (%{group_id}):', 'en')
 i18n.add_translation('command.log_execution_duration', ' - %{minutes} minute(s)', 'en')
 i18n.add_translation('command.log_execution_period', ' (%{started_at}%{ended_at})', 'en')
 i18n.add_translation('command.log_execution_ended_at', ' -> %{ended_at}', 'en')
@@ -39,7 +42,7 @@ i18n.add_translation('command.log_dispatchers', 'Dispatchers:', 'en')
 i18n.add_translation('command.log_options', 'Options:', 'en')
 i18n.add_translation('command.log_outputs', 'Outputs:', 'en')
 i18n.add_translation('command.log_inputs', 'Inputs:', 'en')
-i18n.add_translation('command.log_execution', 'Execution \'%{id}\'%{period}: %{status}%{duration}%{group}', 'en')
+i18n.add_translation('command.log_execution', 'Execution%{label} \'%{id}\'%{period}: %{status}%{duration}', 'en')
 i18n.add_translation('command.log_service', 'Service \'%{service}\'', 'en')
 i18n.add_translation('command.log_process', 'Process \'%{process}\'', 'en')
 i18n.add_translation('command.log_field', '%{field}: %{value}', 'en')
@@ -65,7 +68,7 @@ i18n.add_translation('command.organisation', 'Organisation', 'en')
 i18n.add_translation('command.find_inputs', 'Finding %{inputs} input file(s)...', 'en')
 i18n.add_translation('command.executing', 'Executing...', 'en')
 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_execution', 'Downloading \'%{process}\' (inputs %{inputs}, outputs %{outputs}, storage %{storage}, intermediate %{intermediate}, STAC only %{stac_only}, 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%{wait} for %{executions} execution(s)...', 'en')
@@ -83,9 +86,12 @@ 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_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.stac_only_help', 'only download the STAC metadata for the files (default %%(default)s)', 'en')
+i18n.add_translation('command.start.stac_only_long', '--stac', 'en')
+i18n.add_translation('command.start.stac_only_short', '-a', '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')
@@ -127,6 +133,8 @@ i18n.add_translation('command.display.service_or_process_help', 'the names of th
 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.command', 'display', 'en')
+i18n.add_translation('command.list.help', 'lists 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.version_content', '%%(prog)s %{version} (%{version_date})', 'en')
 i18n.add_translation('command.version_help', 'show the version information and exit', 'en')
@@ -147,6 +155,7 @@ i18n.add_translation('command.deployment_short', '-y', 'en')
 i18n.add_translation('command.epilog', '''
 For more detailed options, use:
 
+  fusion_platform list --help
   fusion_platform display --help
   fusion_platform start --help
   fusion_platform define --help
@@ -158,7 +167,11 @@ Use this command to display service information and processes, and to start, dow
 defined by a YAML file.
 
 Usage:
-  The following will display information about one or more services or processes from the given \'service_or_process_name\'.
+  The following will list all currently configured processes:
+
+    fusion_platform list
+
+  The following will display information about one or more services or processes from the given \'service_or_process_name\':
 
     fusion_platform display <service_or_process_name> ...
 

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

@@ -1,12 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 1.17.6
+Version: 1.18.3
 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
 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.9
 Classifier: Programming Language :: Python :: 3.10
@@ -31,6 +30,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

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

@@ -19,7 +19,7 @@ PACKAGE_DIR = pathlib.Path(__file__).parent
 # @formatter:off
 setup(
     name='fusion-platform-python-sdk',
-    version='1.17.6',
+    version='1.18.3',
     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',
@@ -28,7 +28,6 @@ setup(
     author_email='support@d-cat.co.uk',
     license='MIT',
     classifiers=[
-        'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',