Functional interface datastore (#191)

* functional_interface_datastore: function wrappers

* functional_interface_datastore: use function wrappers

* functional_interface_datastore: update tests

* functional_interface_datastore: ruff

Author: DanielElisenberg

job_executor/domain/datastore.py

@@ -509,3 +509,84 @@ def delete_archived_input(self, job_id: str, dataset_name: str) -> None:
             self._log(job_id, "An unexpected error occured", "ERROR")
             self._log(job_id, str(e), "EXC", e)
             job_service.update_job_status(job_id, JobStatus.FAILED)
+
+
+def patch_metadata(
+    datastore: Datastore, job_id: str, dataset_name: str, description: str
+) -> None:
+    """
+    Patch metadata for a released dataset with updated metadata
+    file.
+    """
+    datastore.patch_metadata(job_id, dataset_name, description)
+
+
+def add(
+    datastore: Datastore, job_id: str, dataset_name: str, description: str
+) -> None:
+    """
+    Import metadata and data as draft for a new dataset that
+    has not been released in a previous versions.
+    """
+    datastore.add(job_id, dataset_name, description)
+
+
+def change(
+    datastore: Datastore, job_id: str, dataset_name: str, description: str
+) -> None:
+    """
+    Import metadata and data as draft for as an update
+    for a dataset that has already been released in a
+    previous version.
+    """
+    datastore.change(job_id, dataset_name, description)
+
+
+def remove(
+    datastore: Datastore, job_id: str, dataset_name: str, description: str
+) -> None:
+    """
+    Remove a released dataset that has been released in
+    a previous version from future versions of the datastore.
+    """
+    datastore.remove(job_id, dataset_name, description)
+
+
+def delete_draft(
+    datastore: Datastore, job_id: str, dataset_name: str, rollback_remove: bool
+) -> None:
+    """
+    Delete a dataset from the draft version of the datastore.
+    """
+    datastore.delete_draft(job_id, dataset_name, rollback_remove)
+
+
+def set_draft_release_status(
+    datastore: Datastore, job_id: str, dataset_name: str, new_status: str
+) -> None:
+    """
+    Set a new release status for a dataset in the draft version.
+    """
+    datastore.set_draft_release_status(job_id, dataset_name, new_status)
+
+
+def bump_version(
+    datastore: Datastore,
+    job_id: str,
+    bump_manifesto: DatastoreVersion,
+    description: str,
+) -> None:
+    """
+    Release a new version of the datastore with the pending
+    operations in the draft version of the datastore.
+    """
+    datastore.bump_version(job_id, bump_manifesto, description)
+
+
+def delete_archived_input(
+    datastore: Datastore, job_id: str, dataset_name: str
+) -> None:
+    """
+    Delete the archived dataset from archive directory.
+    """
+    datastore.delete_archived_input(job_id, dataset_name)

job_executor/manager/__init__.py

@@ -2,7 +2,7 @@
 from multiprocessing import Process, Queue
 
 from job_executor.adapter import job_service
-from job_executor.domain import rollback
+from job_executor.domain import datastore, rollback
 from job_executor.domain.datastore import Datastore
 from job_executor.model.job import Job, JobStatus, Operation
 from job_executor.model.worker import Worker
@@ -23,7 +23,10 @@ class Manager:
     """
 
     def __init__(
-        self, max_workers: int, max_bytes_all_workers: int, datastore: Datastore
+        self,
+        max_workers: int,
+        max_bytes_all_workers: int,
+        this_datastore: Datastore,
     ) -> None:
         """
         :param default_max_workers: The maximum number of workers
@@ -34,7 +37,7 @@ def __init__(
         """
         self.max_workers = max_workers
         self.max_bytes_all_workers = max_bytes_all_workers
-        self.datastore = datastore
+        self.datastore = this_datastore
         self.workers: list[Worker] = []
 
     @property
@@ -144,51 +147,65 @@ def handle_manager_job(self, job: Job) -> None:
         # Ignoring a lot of types here as we already have done the validation
         # in the pydantic model.
         if operation == Operation.BUMP:
-            self.datastore.bump_version(
+            datastore.bump_version(
+                self.datastore,
                 job_id,
                 job.parameters.bump_manifesto,  # type: ignore
                 job.parameters.description,  # type: ignore
             )
         elif operation == Operation.PATCH_METADATA:
-            self.datastore.patch_metadata(
+            datastore.patch_metadata(
+                self.datastore,
                 job_id,
                 job.parameters.target,
                 job.parameters.description,  # type: ignore
             )
         elif operation == Operation.SET_STATUS:
-            self.datastore.set_draft_release_status(
+            datastore.set_draft_release_status(
+                self.datastore,
                 job_id,
                 job.parameters.target,
                 job.parameters.release_status,  # type: ignore
             )
         elif operation == Operation.ADD:
-            self.datastore.add(
+            datastore.add(
+                self.datastore,
                 job_id,
                 job.parameters.target,
                 job.parameters.description,  # type: ignore
             )
         elif operation == Operation.CHANGE:
-            self.datastore.change(
+            datastore.change(
+                self.datastore,
                 job_id,
                 job.parameters.target,
                 job.parameters.description,  # type: ignore
             )
         elif operation == Operation.REMOVE:
-            self.datastore.remove(
+            datastore.remove(
+                self.datastore,
                 job_id,
                 job.parameters.target,
                 job.parameters.description,  # type: ignore
             )
         elif operation == Operation.ROLLBACK_REMOVE:
-            self.datastore.delete_draft(
-                job_id, job.parameters.target, rollback_remove=True
+            datastore.delete_draft(
+                self.datastore,
+                job_id,
+                job.parameters.target,
+                rollback_remove=True,
             )
         elif operation == Operation.DELETE_DRAFT:
-            self.datastore.delete_draft(
-                job_id, job.parameters.target, rollback_remove=False
+            datastore.delete_draft(
+                self.datastore,
+                job_id,
+                job.parameters.target,
+                rollback_remove=False,
             )
         elif operation == Operation.DELETE_ARCHIVE:
-            self.datastore.delete_archived_input(job_id, job.parameters.target)
+            datastore.delete_archived_input(
+                self.datastore, job_id, job.parameters.target
+            )
         else:
             job_service.update_job_status(
                 job.job_id, JobStatus.FAILED, log="Unknown operation for job"