superdesk · petrjasek · Feb 7, 2023 · Feb 6, 2023
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.10'
-    - run: pip install black
+    - run: pip install black~=23.0
     - run: black --check .
 
   flake8:

diff --git a/apps/archive/__init__.py b/apps/archive/__init__.py
@@ -45,7 +45,6 @@
 
 
 def init_app(app) -> None:
-
     endpoint_name = "ingest"
     service: Any = AppIngestService(endpoint_name, backend=superdesk.get_backend())
     IngestResource(endpoint_name, app=app, service=service)

diff --git a/apps/archive/autocomplete.py b/apps/archive/autocomplete.py
@@ -25,7 +25,6 @@ class AutocompleteResource(superdesk.Resource):
 
 
 class AutocompleteService(superdesk.Service):
-
     field_mapping = {
         "slugline": "slugline.keyword",
     }

diff --git a/apps/archive/commands.py b/apps/archive/commands.py
@@ -91,7 +91,6 @@ def run(self):
         logger.info("{} Starting to remove expired content.".format(self.log_msg))
 
         try:
-
             logger.info("{} Removing expired content for expiry.".format(self.log_msg))
             # all functions should be called, even the first one throw exception,
             # so they are wrapped with log_exeption

diff --git a/apps/archive_broadcast/__init__.py b/apps/archive_broadcast/__init__.py
@@ -18,7 +18,6 @@
 
 
 def init_app(app) -> None:
-
     endpoint_name = ARCHIVE_BROADCAST_NAME
     service = ArchiveBroadcastService(endpoint_name, backend=superdesk.get_backend())
     ArchiveBroadcastResource(endpoint_name, app=app, service=service)

diff --git a/apps/archive_broadcast/broadcast.py b/apps/archive_broadcast/broadcast.py
@@ -56,7 +56,6 @@ class ArchiveBroadcastResource(Resource):
 
 
 class ArchiveBroadcastService(BaseService):
-
     packageService = PackageService()
 
     def create(self, docs):

diff --git a/apps/archived/__init__.py b/apps/archived/__init__.py
@@ -14,7 +14,6 @@
 
 
 def init_app(app) -> None:
-
     endpoint_name = "archived"
     service = ArchivedService(endpoint_name, backend=superdesk.get_backend())
     ArchivedResource(endpoint_name, app=app, service=service)
diff --git a/apps/auth/db/commands.py b/apps/auth/db/commands.py
@@ -43,7 +43,6 @@ class CreateUserCommand(superdesk.Command):
     )
 
     def run(self, username, password, email, admin=False, support=False):
-
         # force type conversion to boolean
         user_type = "administrator" if admin else "user"
 

diff --git a/apps/contacts/service.py b/apps/contacts/service.py
@@ -21,7 +21,6 @@
 
 class ContactsService(Service):
     def get(self, req, lookup):
-
         # by default the response will have the inactive entries filtered out
         if "all" not in req.args:
             lookup["is_active"] = True

diff --git a/apps/content_filters/filter_condition/filter_condition.py b/apps/content_filters/filter_condition/filter_condition.py
@@ -55,7 +55,6 @@ def contains_not(self):
         return self.operator.contains_not()
 
     def does_match(self, article):
-
         if not self.field.is_in_article(article) and type(self.operator) is not ExistsOperator:
             return (
                 type(self.operator) is NotInOperator

diff --git a/apps/content_filters/filter_condition/filter_condition_value.py b/apps/content_filters/filter_condition/filter_condition_value.py
@@ -16,7 +16,6 @@
 
 
 class FilterConditionValue:
-
     mongo_mapper = {
         FilterConditionOperatorsEnum.startswith: "^{}",
         FilterConditionOperatorsEnum.like: ".*{}.*",

diff --git a/apps/content_types/content_types.py b/apps/content_types/content_types.py
@@ -437,7 +437,7 @@ def get_subject_name(fields_map):
 
 
 def set_field_name(editor, field_names):
-    for (field, name) in field_names.items():
+    for field, name in field_names.items():
         editor.setdefault(field, {})["field_name"] = name
 
 

diff --git a/apps/desks.py b/apps/desks.py
@@ -366,7 +366,6 @@ def get_by_user(self, user_id):
 
 
 class SluglineDesksResource(Resource):
-
     url = 'desks/<regex("[a-f0-9]{24}"):desk_id>/sluglines'
     datasource = {
         "source": "published",

diff --git a/apps/ldap/ldap.py b/apps/ldap/ldap.py
@@ -126,7 +126,6 @@ def authenticate_and_fetch_profile(self, username, password, username_for_profil
 
 class ADAuthService(AuthService):
     def on_create(self, docs):
-
         user_service = get_resource_service("users")
         for doc in docs:
             user = self.authenticate(doc)
@@ -196,7 +195,6 @@ class ImportUserProfileService(UsersService):
     """Service Class for endpoint /import_profile"""
 
     def on_create(self, docs):
-
         logged_in_user = get_user().get("username")
         for index, doc in enumerate(docs):
             # ensuring the that logged in user is importing the profile.

diff --git a/apps/legal_archive/commands.py b/apps/legal_archive/commands.py
@@ -61,7 +61,6 @@ def upsert_into_legal_archive(self, item_id):
         :param dict item_id: id of the document from 'archive' collection.
         """
         try:
-
             logger.info("Import item into legal {}.".format(item_id))
 
             doc = get_resource_service(ARCHIVE).find_one(req=None, _id=item_id)
@@ -169,7 +168,6 @@ def upsert_into_legal_archive(self, item_id):
                 and article_in_legal_archive[config.VERSION] < legal_archive_doc[config.VERSION]
                 and len(versions_to_insert) == 0
             ):
-
                 resource_def = app.config["DOMAIN"][ARCHIVE]
                 versioned_doc = deepcopy(legal_archive_doc)
                 versioned_doc[versioned_id_field(resource_def)] = legal_archive_doc[config.ID_FIELD]

diff --git a/apps/packages/package_service.py b/apps/packages/package_service.py
@@ -107,7 +107,7 @@ def on_create(self, docs):
         package_create_signal.send(self, docs=docs)
 
     def on_created(self, docs):
-        for (doc, assoc) in [(doc, assoc) for doc in docs for assoc in self._get_associations(doc)]:
+        for doc, assoc in [(doc, assoc) for doc in docs for assoc in self._get_associations(doc)]:
             self.update_link(doc, assoc)
 
     def on_update(self, updates, original):
@@ -181,7 +181,7 @@ def check_that_all_groups_are_referenced_in_root(self, root, groups):
             raise SuperdeskApiError.forbiddenError(message=message)
 
     def check_package_associations(self, docs):
-        for (doc, group) in ((doc, group) for doc in docs for group in doc.get(GROUPS, [])):
+        for doc, group in ((doc, group) for doc in docs for group in doc.get(GROUPS, [])):
             associations = group.get(REFS, [])
             self.check_for_duplicates(doc, associations)
             for assoc in associations:

diff --git a/apps/picture_crop/__init__.py b/apps/picture_crop/__init__.py
@@ -83,7 +83,6 @@ def create(self, docs, **kwargs):
 
 
 class PictureCropResource(superdesk.Resource):
-
     item_methods = []
     resource_methods = ["POST"]
     privileges = {"POST": "archive"}

diff --git a/apps/prepopulate/app_initialize.py b/apps/prepopulate/app_initialize.py
@@ -283,7 +283,7 @@ def run(self, entity_name=None, path=None, sample_data=False, force=False, init_
         # put mapping to elastic
         try:
             app.data.init_elastic(app)
-        except (elasticsearch.exceptions.TransportError) as err:
+        except elasticsearch.exceptions.TransportError as err:
             logger.error(err)
 
             if app.config.get("REBUILD_ELASTIC_ON_INIT_DATA_ERROR"):

diff --git a/apps/publish/__init__.py b/apps/publish/__init__.py
@@ -38,7 +38,6 @@
 
 
 def init_app(app) -> None:
-
     endpoint_name = "archive_publish"
     service: Any = ArchivePublishService(endpoint_name, backend=get_backend())
     ArchivePublishResource(endpoint_name, app=app, service=service)

diff --git a/apps/publish/content/publish.py b/apps/publish/content/publish.py
@@ -92,7 +92,6 @@ def set_desk(self, updates, original):
             and request.args
             and request.args.get("desk_id")
         ):
-
             desk_id = request.args["desk_id"]
             updates["task"] = updates.get("task", original.get("task", {}))
             updates["task"]["desk"] = desk_id

diff --git a/apps/publish/content/resend.py b/apps/publish/content/resend.py
@@ -39,7 +39,6 @@ class ResendResource(ArchiveResource):
 
 
 class ResendService(Service):
-
     digital = partial(
         filter, lambda s: (s.get("subscriber_type", "") in {SUBSCRIBER_TYPES.DIGITAL, SUBSCRIBER_TYPES.ALL})
     )

diff --git a/apps/publish/content/tests.py b/apps/publish/content/tests.py
@@ -905,7 +905,6 @@ def test_reload_filters_if_updated(self):
 
 
 class TimeoutTest(TestCase):
-
     published_items = [
         {
             "_id": ObjectId("58006b8d1d41c88eace5179d"),

diff --git a/apps/publish/enqueue/enqueue_corrected.py b/apps/publish/enqueue/enqueue_corrected.py
@@ -15,7 +15,6 @@
 
 
 class EnqueueCorrectedService(EnqueueService):
-
     publish_type = "correct"
     published_state = "corrected"
 

diff --git a/apps/publish/enqueue/enqueue_killed.py b/apps/publish/enqueue/enqueue_killed.py
@@ -23,7 +23,6 @@
 
 
 class EnqueueKilledService(EnqueueService):
-
     publish_type = "kill"
     published_state = "killed"
 

diff --git a/apps/publish/enqueue/enqueue_service.py b/apps/publish/enqueue/enqueue_service.py
@@ -483,7 +483,6 @@ def queue_transmission(self, doc, subscribers, subscriber_codes=None, associatio
             queued = False
             no_formatters = []
             for subscriber in subscribers:
-
                 try:
                     if (
                         doc[ITEM_TYPE] not in [CONTENT_TYPE.TEXT, CONTENT_TYPE.PREFORMATTED]

diff --git a/apps/spellcheck/spellcheck.py b/apps/spellcheck/spellcheck.py
@@ -43,7 +43,6 @@ def suggest(word):
 
 
 class SpellcheckResource(superdesk.Resource):
-
     resource_methods = ["POST"]
     item_methods = []
 

diff --git a/apps/workqueue/workqueue.py b/apps/workqueue/workqueue.py
@@ -21,5 +21,4 @@ class WorkqueueResource(superdesk.Resource):
 
 
 class WorkqueueService(superdesk.Service):
-
     pass
diff --git a/apps/workspace/workspace.py b/apps/workspace/workspace.py
@@ -13,7 +13,6 @@
 
 
 class WorkspaceResource(superdesk.Resource):
-
     schema = {
         "name": {"type": "string", "unique_to_user": True},
         "widgets": {"type": "list"},

diff --git a/content_api/search/resource.py b/content_api/search/resource.py
@@ -14,7 +14,6 @@
 
 
 class SearchResource(Resource):
-
     item_url = 'regex("[\w,.:-]+")'
     schema = schema
 

diff --git a/superdesk/activity.py b/superdesk/activity.py
@@ -31,7 +31,6 @@
 
 
 def init_app(app) -> None:
-
     endpoint_name = "activity"
     service = ActivityService(endpoint_name, backend=superdesk.get_backend())
     ActivityResource(endpoint_name, app=app, service=service)

diff --git a/superdesk/auth_server/clients.py b/superdesk/auth_server/clients.py
@@ -20,7 +20,6 @@
 
 
 class AuthServerClientsResource(superdesk.Resource):
-
     schema = {
         "name": {
             "type": "string",

diff --git a/superdesk/celery_app.py b/superdesk/celery_app.py
@@ -137,7 +137,6 @@ def __get_redis(app_ctx):
 
 
 def update_key(key, flag=False, db=None):
-
     if db is None:
         db = app.redis
 

diff --git a/superdesk/data_updates/00002_20170214-145336_vocabularies.py b/superdesk/data_updates/00002_20170214-145336_vocabularies.py
@@ -12,7 +12,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
     product_types = {
         "_id": "product_types",

diff --git a/superdesk/data_updates/00004_20170908-140205_users.py b/superdesk/data_updates/00004_20170908-140205_users.py
@@ -11,7 +11,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "users"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00005_20171023-152436_vocabularies.py b/superdesk/data_updates/00005_20171023-152436_vocabularies.py
@@ -11,7 +11,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00005_20171110-170620_archive.py b/superdesk/data_updates/00005_20171110-170620_archive.py
@@ -11,7 +11,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "archive"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00007_20180321-092824_archive.py b/superdesk/data_updates/00007_20180321-092824_archive.py
@@ -26,12 +26,10 @@ def get_updated_editor_state(editor_state):
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "archive"  # will use multiple resources, keeping this here so validation passes
 
     def forwards(self, mongodb_collection, mongodb_database):
         for resource in ["archive", "archive_autosave", "published"]:
-
             collection = mongodb_database[resource]
 
             for item in collection.find({"editor_state": {"$exists": True}}):

diff --git a/superdesk/data_updates/00008_20180404-165521_archive.py b/superdesk/data_updates/00008_20180404-165521_archive.py
@@ -11,12 +11,10 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "archive"  # will use multiple resources, keeping this here so validation passes
 
     def forwards(self, mongodb_collection, mongodb_database):
         for resource in ["archive", "archive_autosave", "published"]:
-
             collection = mongodb_database[resource]
 
             for item in collection.find({"editor_state": {"$exists": True}}):
@@ -30,7 +28,6 @@ def forwards(self, mongodb_collection, mongodb_database):
 
     def backwards(self, mongodb_collection, mongodb_database):
         for resource in ["archive", "archive_autosave", "published"]:
-
             collection = mongodb_database[resource]
 
             for item in collection.find({"fields_meta": {"$exists": True}}):

diff --git a/superdesk/data_updates/00009_20180425-010702_vocabularies.py b/superdesk/data_updates/00009_20180425-010702_vocabularies.py
@@ -12,7 +12,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
     update_fields = ["name", "qcode"]
 

diff --git a/superdesk/data_updates/00010_20180510-172012_vocabularies.py b/superdesk/data_updates/00010_20180510-172012_vocabularies.py
@@ -11,7 +11,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00011_20180516-175617_vocabularies.py b/superdesk/data_updates/00011_20180516-175617_vocabularies.py
@@ -11,7 +11,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00012_20180605-151019_vocabularies.py b/superdesk/data_updates/00012_20180605-151019_vocabularies.py
@@ -12,7 +12,6 @@
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "vocabularies"
 
     def forwards(self, mongodb_collection, mongodb_database):

diff --git a/superdesk/data_updates/00014_20181114-153727_archive.py b/superdesk/data_updates/00014_20181114-153727_archive.py
@@ -41,11 +41,9 @@ def __init__(self, id):
 
 
 class DataUpdate(BaseDataUpdate):
-
     resource = "archive"
 
     def forwards(self, mongodb_collection, mongodb_database):
-
         # building multiple trees
         tree_items = {}
         for item in mongodb_collection.find({"translated_from": {"$exists": True}}):