Merge pull request #154 from statisticsnorway/update-deps

Update dependencies

Author: pawbu

job_executor/adapter/job_service.py

@@ -27,13 +27,13 @@ def get_jobs(
     if job_status is not None:
         query_fields.append(f"status={job_status}")
     if operations is not None:
-        query_fields.append(f'operation={",".join(operations)}')
+        query_fields.append(f"operation={','.join(operations)}")
     if ignore_completed is not None:
         query_fields.append(f"ignoreCompleted={str(ignore_completed).lower()}")
 
     request_url = f"{JOB_SERVICE_URL}/jobs"
     if query_fields:
-        request_url += f'?{"&".join(query_fields)}'
+        request_url += f"?{'&'.join(query_fields)}"
 
     response = execute_request("GET", request_url, True)
     return [Job(**job) for job in response.json()]

job_executor/app.py

@@ -59,7 +59,7 @@ def fix_interrupted_jobs():
 def fix_interrupted_job(job):
     job_operation = job.parameters.operation
     logger.info(
-        f"{job.job_id}: Rolling back job with operation " f'"{job_operation}"'
+        f'{job.job_id}: Rolling back job with operation "{job_operation}"'
     )
     if job_operation in ["ADD", "CHANGE", "PATCH_METADATA"]:
         if job.status == "importing":
@@ -74,16 +74,14 @@ def fix_interrupted_job(job):
             job_service.update_job_status(
                 job.job_id,
                 "built",
-                "Reset to built status will be due to "
-                "unexpected interruption",
+                "Reset to built status will be due to unexpected interruption",
             )
         else:
             rollback.rollback_worker_phase_import_job(
                 job.job_id, job_operation, job.parameters.target
             )
             logger.info(
-                f'{job.job_id}: Setting status to "failed" for '
-                f"interrupted job"
+                f'{job.job_id}: Setting status to "failed" for interrupted job'
             )
             job_service.update_job_status(
                 job.job_id,
@@ -123,8 +121,7 @@ def fix_interrupted_job(job):
         )
     else:
         log_message = (
-            f"Unrecognized job operation {job_operation}"
-            f"for job {job.job_id}"
+            f"Unrecognized job operation {job_operation}for job {job.job_id}"
         )
         logger.error(log_message)
         raise RollbackException(log_message)

job_executor/exception/__init__.py

@@ -1,58 +1,43 @@
-class BuilderStepError(Exception):
-    ...
+class BuilderStepError(Exception): ...
 
 
-class HttpResponseError(Exception):
-    ...
+class HttpResponseError(Exception): ...
 
 
-class HttpRequestError(Exception):
-    ...
+class HttpRequestError(Exception): ...
 
 
-class VersioningException(Exception):
-    ...
+class VersioningException(Exception): ...
 
 
-class ReleaseStatusException(Exception):
-    ...
+class ReleaseStatusException(Exception): ...
 
 
-class NoSuchDraftException(Exception):
-    ...
+class NoSuchDraftException(Exception): ...
 
 
-class ExistingDraftException(Exception):
-    ...
+class ExistingDraftException(Exception): ...
 
 
-class UnknownOperationException(Exception):
-    ...
+class UnknownOperationException(Exception): ...
 
 
-class PatchingError(Exception):
-    ...
+class PatchingError(Exception): ...
 
 
-class MetadataException(Exception):
-    ...
+class MetadataException(Exception): ...
 
 
-class BumpException(Exception):
-    ...
+class BumpException(Exception): ...
 
 
-class LocalStorageError(Exception):
-    ...
+class LocalStorageError(Exception): ...
 
 
-class UnnecessaryUpdateException(Exception):
-    ...
+class UnnecessaryUpdateException(Exception): ...
 
 
-class StartupException(Exception):
-    ...
+class StartupException(Exception): ...
 
 
-class RollbackException(Exception):
-    ...
+class RollbackException(Exception): ...

job_executor/model/datastore.py

@@ -385,10 +385,10 @@ def _version_pending_operations(
                 self._log(
                     job_id, "Renaming data file and updating data_versions"
                 )
-                new_data_versions[
-                    dataset_name
-                ] = local_storage.rename_parquet_draft_to_release(
-                    dataset_name, new_version
+                new_data_versions[dataset_name] = (
+                    local_storage.rename_parquet_draft_to_release(
+                        dataset_name, new_version
+                    )
                 )
         return new_metadata_datasets, new_data_versions
 

job_executor/model/datastore_version.py

@@ -157,9 +157,7 @@ def release_pending(self) -> Tuple[List[DataStructureUpdate], str]:
         return pending_updates, update_type
 
     def _write_to_file(self):
-        local_storage.write_draft_version(
-            self.model_dump(by_alias=True)
-        )
+        local_storage.write_draft_version(self.model_dump(by_alias=True))
 
     def set_draft_release_status(self, dataset_name: str, new_status: str):
         dataset_update = next(

job_executor/model/datastore_versions.py

@@ -91,7 +91,7 @@ def dotted_to_underscored_version(version: str) -> str:
 
 
 def underscored_to_dotted_version(version: str) -> str:
-    return f'{version.replace("_", ".")}.0'
+    return f"{version.replace('_', '.')}.0"
 
 
 def bump_dotted_version_number(version: str, update_type: str) -> str:

job_executor/model/metadata.py

@@ -179,8 +179,7 @@ def validate_patching_fields(
             message += f"shortName: {self.name} to {other.name}\n"
         if with_key_type and self.key_type.name != other.key_type.name:
             message += (
-                f"unitType.name: {self.key_type.name} "
-                f"to {other.key_type.name}"
+                f"unitType.name: {self.key_type.name} to {other.key_type.name}"
             )
 
         if message:
@@ -272,8 +271,7 @@ def patch(self, other: "Variable") -> "Variable":
         return Variable(**patched)
 
 
-class AttributeVariable(Variable):
-    ...
+class AttributeVariable(Variable): ...
 
 
 class TemporalEnd(CamelModel):