fusion-platform-python-sdk 1.17.9__tar.gz → 2.0.7__tar.gz

{fusion_platform_python_sdk-1.17.9/fusion_platform_python_sdk.egg-info → fusion_platform_python_sdk-2.0.7}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fusion-platform-python-sdk
-Version: 1.17.9
+Version: 2.0.7
 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.9 → fusion_platform_python_sdk-2.0.7}/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.9'
-__version_date__ = '2025-04-29T13:10:22Z'
+__version__ = '2.0.7'
+__version_date__ = '2025-10-07T07:06:32Z'
 
 # Exclude certain sub-modules from documentation.
 # @formatter:off
@@ -142,7 +142,7 @@ def get_log_level():
     return logger.level
 
 
-def login(email=None, user_id=None, password=None, api_url=None):
+def login(email=None, user_id=None, password=None, api_url=None, session_options=None):
     """
     Attempts to log into the Fusion Platform<sup>&reg;</sup> to return a user model for the active session.
 
@@ -151,6 +151,7 @@ def login(email=None, user_id=None, password=None, api_url=None):
         user_id: The user account user id. Either an email address or a user id must be provided.
         password: The password for the user account.
         api_url: The optional custom API URL to use. Defaults to the production Fusion Platform<sup>&reg;</sup>.
+        session_options: The optional options to be passed to the session.
 
     Returns:
         The corresponding user model for the account on successful login.
@@ -160,7 +161,7 @@ def login(email=None, user_id=None, password=None, api_url=None):
         RequestError: on login failure.
     """
     # Create the session and attempt to login.
-    session = Session()
+    session = Session(options=session_options)
     session.login(email, user_id, password, api_url)
 
     # Now load the corresponding user model using the user id obtained from the session.

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/fusion_platform/command.py

@@ -510,8 +510,6 @@ class Command(Base):
             The list of file tuples to be downloaded (file model, download path), and the metrics.
         """
         download_components = [] if download_components is None else download_components
-        started_at = process.created_at
-        ended_at = None
         metrics = []
         downloads = []
 
@@ -526,7 +524,7 @@ class Command(Base):
                 complete = True
 
             if not complete:
-                sleep(Model._API_UPDATE_WAIT_PERIOD)
+                sleep(process._session.api_update_wait_period)
 
         # Now download the inputs and/or outputs.
         execution_dir = output_dir
@@ -551,15 +549,6 @@ 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)
-
-        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])
@@ -567,6 +556,8 @@ class Command(Base):
             component_options = {item.get(Model._FIELD_NAME): item.get(Model._FIELD_VALUE) for item in component.options} if hasattr(component,
                                                                                                                                      Model._FIELD_OPTIONS) and (
                                                                                                                                      component.options is not None) else {}
+            component_started_at = component.started_at if hasattr(component, Model._FIELD_STARTED_AT) and (component.started_at is not None) else None
+            component_ended_at = component.ended_at if hasattr(component, Model._FIELD_ENDED_AT) and (component.ended_at is not None) else None
             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
 
@@ -575,7 +566,7 @@ class Command(Base):
             metric = {
                 Command._METRICS_EXECUTION: group_index if group_index is not None else 1,
                 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_DURATION: (component_ended_at - component_started_at).total_seconds() if (component_started_at is not None) and (component_ended_at is not None) else 0,
                 Command._METRICS_COMPONENT: component.name,
                 Command._METRICS_SUCCESS: component_success,
                 Command._METRICS_CPU: component.cpu,
@@ -1015,7 +1006,11 @@ class Command(Base):
 
         # If the service still cannot be found, then try it as a specific service for the organisation.
         if service is None:
-            service = next((item for item in organisation.own_services if (str(item.id) == service_name) or (str(item.ssd_id) == service_name)), None)
+            try:
+                service = next((item for item in organisation.own_services if (str(item.id) == service_name) or (str(item.ssd_id) == service_name)), None)
+            except RequestError:
+                # We will get a RequestError if the user is not sufficiently privileged to list the organisation's own services. We therefore ignore this error.
+                pass
 
         if service is None:
             raise CommandError(i18n.t('command.no_such_service', service=service_name))

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/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,24 +169,33 @@ 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
 
             # We are waiting, so block for a short while.
-            sleep(self.__class__._API_UPDATE_WAIT_PERIOD)
+            sleep(self._session.api_update_wait_period)
 
         return complete
 
@@ -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.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/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'
@@ -146,9 +148,6 @@ class Model(Base):
     _METADATA_HIDE = 'hide'
     _METADATA_READ_ONLY = 'read_only'
 
-    # API job update frequency check.
-    _API_UPDATE_WAIT_PERIOD = 10  # Time in seconds to wait between checking jobs on the API.
-
     def __init__(self, session, schema=None):
         """
         Initialises the object.

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/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):
@@ -1159,4 +1151,4 @@ class Process(Model):
                 raise ModelError(i18n.t('models.process.execution_should_have_started'))
 
             # We are waiting, so block for a short while.
-            sleep(self.__class__._API_UPDATE_WAIT_PERIOD)
+            sleep(self._session.api_update_wait_period)

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/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):
@@ -202,7 +198,7 @@ class ProcessExecution(Model):
                 break
 
             # We are waiting, so block for a short while.
-            sleep(self.__class__._API_UPDATE_WAIT_PERIOD)
+            sleep(self._session.api_update_wait_period)
 
         return complete
 

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/fusion_platform/models/process_service_execution.md

@@ -11,8 +11,12 @@
 * **started_at**: When did the execution start?
 * **ended_at**: When did the execution end?
 * **runtime**: The execution runtime in seconds.
+* **architecture**: The processor architecture used to run the image.
 * **cpu**: The number of CPUs used to run the image.
+* **gpu**: The number of GPUs used to run the image.
 * **memory**: The memory in megabytes used to run the image.
+* **storage**: The local storage space in gigabytes used to run the image.
+* **instance_type**: The instance type allocated for use by the service.
 * **actions**: The custom actions associated with this execution.
     * **name**: The name of the value.
     * **values**: The values required for the action.
@@ -50,6 +54,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.9 → fusion_platform_python_sdk-2.0.7}/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):
@@ -149,8 +148,13 @@ class ProcessServiceExecutionSchema(Schema):
     runtime = fields.Integer(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
 
     # Removed input_size.
+    architecture = fields.String(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     cpu = fields.Decimal(required=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    gpu = fields.Decimal(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
     memory = fields.Decimal(required=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    storage = fields.Decimal(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+    instance_type = fields.String(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
+
     actions = fields.List(fields.Nested(ProcessServiceExecutionActionSchema()), allow_none=True)
     options = fields.List(fields.Nested(ProcessServiceExecutionOptionSchema()), allow_none=True,
                           metadata={'read_only': True})  # Changed to prevent this being updated.
@@ -159,9 +163,8 @@ class ProcessServiceExecutionSchema(Schema):
     # Removed storage_id.
     intermediate = fields.Boolean(allow_none=True)
     # Removed task_id.
-    # Removed task_definition_id.
-    # Removed access_point_ids.
-    # Removed security_group_id.
+    # Removed task_starts.
+    # Removed instance_id.
     success = fields.Boolean(allow_none=True, metadata={'read_only': True})  # Changed to prevent this being updated.
 
     metrics = fields.List(fields.Nested(ProcessServiceExecutionMetricSchema()), allow_none=True,
@@ -172,7 +175,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.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/fusion_platform/models/service.md

@@ -46,8 +46,8 @@
     * **url**: The URL which can be executed to receive the value of the action.
     * **title**: The title for the action.
     * **description**: The description of the action.
-* **urls**: The list of allowed external URLs the service can access.
-* **cidrs**: The list of allowed external IP addresses as CIDRs the service can access.
+* **urls**: 
+* **cidrs**: 
 * **input_expressions**: The list of expressions which are applied to the inputs of the service.
     * **lhs_ssd_id**: The SSD associated with the left-hand side of the input expression.
     * **lhs_input**: The input associated with the left-hand side of the input expression.

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/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.9 → fusion_platform_python_sdk-2.0.7}/fusion_platform/session.py

@@ -93,15 +93,22 @@ class Session(Base):
     # Default Fusion Platform<sup>&reg;</sup> API endpoint.
     API_URL_DEFAULT = 'https://api.thefusionplatform.com'
 
+    # Session option fields and their defaults.
+    API_UPDATE_WAIT_PERIOD = 'api_update_wait_period'  # Time in seconds to wait between checking jobs on the API.
+    API_UPDATE_WAIT_PERIOD_DEFAULT = 10
+
     # Mask keys.
     _MASK_KEYS = ['password', 'old_password', 'new_password', 'access_token', 'id_token', 'refresh_token']
 
     # Download temporary file name extension.
     DOWNLOAD_EXTENSION = '.download'
 
-    def __init__(self):
+    def __init__(self, options=None):
         """
         Initialises the object.
+
+            Args:
+                options: The optional session options.
         """
         super(Session, self).__init__()
 
@@ -110,6 +117,11 @@ class Session(Base):
         self.__bearer_token = None
         self.__api_url = Session.API_URL_DEFAULT
 
+        # Extract any options.
+        options = {} if options is None else options
+        self.api_update_wait_period = options.get(Session.API_UPDATE_WAIT_PERIOD, Session.API_UPDATE_WAIT_PERIOD_DEFAULT)
+        self._logger.debug('api_update_wait_period: %d', self.api_update_wait_period)
+
     def download_file(self, url, destination, callback=None):
         """
         Downloads a file to the destination path. The destination directories are created if they do not exist. The optional callback function receives three
@@ -267,6 +279,9 @@ class Session(Base):
                     except:
                         pass  # Ignore the inability to extract the error message.
 
+                    if message is None:
+                        message = response
+
                     raise RequestError(i18n.t('session.request_failed', message=message))
 
                 payload = response.json()

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7/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.9
+Version: 2.0.7
 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.9 → fusion_platform_python_sdk-2.0.7}/setup.py

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

{fusion_platform_python_sdk-1.17.9 → fusion_platform_python_sdk-2.0.7}/tests/test_session.py

@@ -53,7 +53,12 @@ class TestSession(CustomTestCase):
         """
         Test initialisation of the class to ensure no exceptions are raised.
         """
-        Session()
+        session = Session()
+        self.assertEqual(Session.API_UPDATE_WAIT_PERIOD_DEFAULT, session.api_update_wait_period)
+
+        api_update_wait_period_default = 45
+        session = Session(options={Session.API_UPDATE_WAIT_PERIOD: api_update_wait_period_default})
+        self.assertEqual(api_update_wait_period_default, session.api_update_wait_period)
 
     def test_download_file(self):
         """