From c0bcd98fbf510505a12f7039de5a8ace840bb349 Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Fri, 2 Apr 2021 09:50:42 +0200
Subject: [PATCH] Lint again for some reason
---
arkindex_worker/worker/version.py | 9 ++++-----
tests/test_elements_worker/test_worker.py | 6 ++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arkindex_worker/worker/version.py b/arkindex_worker/worker/version.py
index f32fdc3a..39d75aab 100644
--- a/arkindex_worker/worker/version.py
+++ b/arkindex_worker/worker/version.py
@@ -14,7 +14,6 @@ class WorkerVersionMixin(object):
return worker_version
-
def get_ml_result_slug(self, ml_result) -> str:
"""
Helper function to get the worker slug from element, classification or transcription.
@@ -24,13 +23,13 @@ class WorkerVersionMixin(object):
"""
# Handle cached models
- if hasattr(ml_result, 'worker_version_id'):
+ if hasattr(ml_result, "worker_version_id"):
worker_version_id = ml_result.worker_version_id
elif "worker_version" in ml_result:
- worker_version_id = ml_result['worker_version']
+ worker_version_id = ml_result["worker_version"]
# transcriptions have worker_version_id but elements have worker_version
elif "worker_version_id" in ml_result:
- worker_version_id = ml_result['worker_version_id']
+ worker_version_id = ml_result["worker_version_id"]
else:
raise ValueError(f"Unable to get slug from: {ml_result}")
@@ -38,4 +37,4 @@ class WorkerVersionMixin(object):
return
worker_version = self.get_worker_version(worker_version_id)
- return worker_version['worker']['slug']
+ return worker_version["worker"]["slug"]
diff --git a/tests/test_elements_worker/test_worker.py b/tests/test_elements_worker/test_worker.py
index 6c520a9d..ce85d12d 100644
--- a/tests/test_elements_worker/test_worker.py
+++ b/tests/test_elements_worker/test_worker.py
@@ -4,8 +4,8 @@ import json
import pytest
from apistar.exceptions import ErrorResponse
-from arkindex_worker.models import Element
from arkindex_worker.cache import CachedElement
+from arkindex_worker.models import Element
from arkindex_worker.worker import ActivityState
# Common API calls for all workers
@@ -123,9 +123,7 @@ def test_get_ml_result_slug__ok(mocker, fake_dummy_worker, ml_result, expected_s
fake_dummy_worker.get_worker_version = mocker.MagicMock()
fake_dummy_worker.get_worker_version.return_value = {
"id": TEST_VERSION_ID,
- "worker": {
- "slug": "mock_slug"
- }
+ "worker": {"slug": "mock_slug"},
}
slug = fake_dummy_worker.get_ml_result_slug(ml_result)
--
GitLab