flake8 - again

Author: bodintsov

share/admin/util.py

@@ -11,6 +11,7 @@
 from share.models import SourceConfig
 T = TypeVar('T', bound=Type[Model])
 
+
 # TimeLimitedPaginator from https://hakibenita.com/optimizing-the-django-admin-paginator
 class TimeLimitedPaginator(Paginator):
     """
@@ -96,6 +97,7 @@ def links(self, instance: Model) -> str:
         return cls
     return add_links
 
+
 class SourceConfigFilter(SimpleListFilter):
     title = 'Source Config'
     parameter_name = 'source_config'

trove/admin.py

@@ -18,7 +18,7 @@
 @admin.register(ResourceIdentifier, site=admin_site)
 @linked_many('suid_set')
 @linked_many('indexcard_set')
-class ResourceIdentifierAdmin(admin.ModelAdmin): #type: ignore
+class ResourceIdentifierAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'created',
         'modified',
@@ -38,7 +38,7 @@ class ResourceIdentifierAdmin(admin.ModelAdmin): #type: ignore
 @linked_fk('source_record_suid')
 @linked_many('focustype_identifier_set')
 @linked_many('focus_identifier_set')
-class IndexcardAdmin(admin.ModelAdmin): #type: ignore
+class IndexcardAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'uuid',
         'created',
@@ -61,7 +61,7 @@ def _freshen_index(self, queryset: list[Indexcard]) -> None:
 @admin.register(LatestIndexcardRdf, site=admin_site)
 @linked_fk('from_raw_datum')
 @linked_fk('indexcard')
-class LatestIndexcardRdfAdmin(admin.ModelAdmin): #type: ignore
+class LatestIndexcardRdfAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'created',
         'modified',
@@ -83,7 +83,7 @@ def rdf_as_turtle__pre(self, instance: Any) -> str:
 @admin.register(ArchivedIndexcardRdf, site=admin_site)
 @linked_fk('from_raw_datum')
 @linked_fk('indexcard')
-class ArchivedIndexcardRdfAdmin(admin.ModelAdmin): #type: ignore
+class ArchivedIndexcardRdfAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'created',
         'modified',
@@ -106,7 +106,7 @@ def rdf_as_turtle__pre(self, instance: Any) -> str:
 @linked_fk('from_raw_datum')
 @linked_fk('indexcard')
 @linked_fk('supplementary_suid')
-class SupplementaryIndexcardRdfAdmin(admin.ModelAdmin): #type: ignore
+class SupplementaryIndexcardRdfAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'created',
         'modified',
@@ -124,10 +124,11 @@ def rdf_as_turtle__pre(self, instance: SupplementaryIndexcardRdf) -> str:
         return format_html('<pre>{}</pre>', instance.rdf_as_turtle)
     rdf_as_turtle__pre.short_description = 'rdf as turtle' # type: ignore[attr-defined]
 
+
 @admin.register(DerivedIndexcard, site=admin_site)
 @linked_fk('upriver_indexcard')
 @linked_fk('deriver_identifier')
-class DerivedIndexcardAdmin(admin.ModelAdmin): #type: ignore
+class DerivedIndexcardAdmin(admin.ModelAdmin):  # type: ignore
     readonly_fields = (
         'created',
         'modified',

trove/derive/__init__.py

@@ -23,6 +23,7 @@
     oaidc_xml.OaiDcXmlDeriver
 ]
 
+
 def get_deriver_classes(
     deriver_iri_filter: Iterable[str] | None = None,
 ) -> Union[list[DeriverType], tuple[DeriverType, ...]]:

trove/derive/sharev2_elastic.py

@@ -101,6 +101,7 @@
 
 JSONLike = Union[Dict[str, Any], List[Any], Tuple[Any, ...], Any]
 
+
 def strip_empty_values(thing: JSONLike) -> JSONLike:
     if isinstance(thing, dict):
         return {
@@ -221,18 +222,18 @@ def _related_names(self, *predicate_iris: Tuple[Dict[str, Any]]) -> List[None |
             for _obj in _obj_iter
         ]
 
-    def _single_date(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str]=None) -> None | str | Any:
+    def _single_date(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str] = None) -> None | str | Any:
         _val = self._single_value(*predicate_iris, focus_iri=focus_iri)
         if isinstance(_val, primitive_rdf.Literal):
             return _val.unicode_value
         if isinstance(_val, datetime.date):
             return _val.isoformat()
         return _val
 
-    def _single_string(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str]=None) -> None | str | Any:
+    def _single_string(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str] = None) -> None | str | Any:
         return _obj_to_string_or_none(self._single_value(*predicate_iris, focus_iri=focus_iri))
 
-    def _single_value(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str]=None) -> None | str | Any:
+    def _single_value(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str] = None) -> None | str | Any:
         # for sharev2 back-compat, some fields must have a single value
         # (tho now the corresponding rdf property may have many values)
         for _pred in predicate_iris:
@@ -246,7 +247,7 @@ def _single_value(self, *predicate_iris: Tuple[Any], focus_iri: Optional[str]=No
                 continue
         return None
 
-    def _string_list(self, *predicate_paths: Tuple[Any], focus_iri: Optional[str]=None) -> List[Any]:
+    def _string_list(self, *predicate_paths: Tuple[Any], focus_iri: Optional[str] = None) -> List[Any]:
         _object_iter = self.data.q(
             focus_iri or self.focus_iri,
             predicate_paths,

trove/digestive_tract.py

@@ -87,7 +87,7 @@ def swallow(
     return _task.id
 
 
-def extract(raw: share_db.RawDatum, *, undelete_indexcards: bool=False) -> list[trove_db.Indexcard]:
+def extract(raw: share_db.RawDatum, *, undelete_indexcards: bool = False) -> list[trove_db.Indexcard]:
     '''extract: gather rdf graph from a record; store as index card(s)
 
     may create (or update):
@@ -103,7 +103,7 @@ def extract(raw: share_db.RawDatum, *, undelete_indexcards: bool=False) -> list[
     if raw.is_expired:
         raise CannotDigestExpiredDatum(raw)
     _tripledicts_by_focus_iri = {}
-    _extractor = get_rdf_extractor_class(raw.mediatype)(raw.suid.source_config) #type: ignore
+    _extractor = get_rdf_extractor_class(raw.mediatype)(raw.suid.source_config)  # type: ignore
     # TODO normalize (or just validate) tripledict:
     #   - synonymous iris should be grouped (only one as subject-key, others under owl:sameAs)
     #   - focus should have rdf:type
@@ -112,7 +112,7 @@ def extract(raw: share_db.RawDatum, *, undelete_indexcards: bool=False) -> list[
     _extracted_tripledict: primitive_rdf.RdfTripleDictionary = _extractor.extract_rdf(raw.datum)
     if _extracted_tripledict:
         try:
-            _focus_iri = raw.suid.focus_identifier.find_equivalent_iri(_extracted_tripledict) #type: ignore
+            _focus_iri = raw.suid.focus_identifier.find_equivalent_iri(_extracted_tripledict)  # type: ignore
         except ValueError:
             raise DigestiveError(f'could not find {raw.suid.focus_identifier} in {raw}')
         _tripledicts_by_focus_iri[_focus_iri] = _extracted_tripledict
@@ -220,8 +220,8 @@ def _expel_supplementary_rdf(supplementary_rdf_queryset: QuerySet[SupplementaryI
 
 ### BEGIN celery tasks
 
-@celery.shared_task(acks_late=True, bind=True) #type: ignore
-def task__extract_and_derive(task: celery.Task, raw_id: int, urgent: bool=False) -> None:
+@celery.shared_task(acks_late=True, bind=True)  # type: ignore
+def task__extract_and_derive(task: celery.Task, raw_id: int, urgent: bool = False) -> None:
     _raw = (
         share_db.RawDatum.objects
         .select_related('suid__source_config__source')
@@ -241,12 +241,12 @@ def task__extract_and_derive(task: celery.Task, raw_id: int, urgent: bool=False)
             _messenger.notify_indexcard_update(_indexcards, urgent=urgent)
 
 
-@celery.shared_task(acks_late=True, bind=True) #type: ignore
+@celery.shared_task(acks_late=True, bind=True)  # type: ignore
 def task__derive(
     task: celery.Task,
     indexcard_id: int,
     deriver_iri: str | None = None,
-    notify_index: bool=True,
+    notify_index: bool = True,
 ) -> None:
     _indexcard = trove_db.Indexcard.objects.get(id=indexcard_id)
     derive(
@@ -259,7 +259,7 @@ def task__derive(
         IndexMessenger(celery_app=task.app).notify_indexcard_update([_indexcard])
 
 
-@celery.shared_task(acks_late=True) #type: ignore
+@celery.shared_task(acks_late=True)  # type: ignore
 def task__schedule_extract_and_derive_for_source_config(source_config_id: int) -> None:
     _raw_id_qs = (
         share_db.RawDatum.objects
@@ -273,8 +273,8 @@ def task__schedule_extract_and_derive_for_source_config(source_config_id: int) -
         task__extract_and_derive.delay(_raw_id)
 
 
-@celery.shared_task(acks_late=True) #type: ignore
-def task__schedule_all_for_deriver(deriver_iri: str, notify_index: bool=False) -> None:
+@celery.shared_task(acks_late=True)  # type: ignore
+def task__schedule_all_for_deriver(deriver_iri: str, notify_index: bool = False) -> None:
     if not get_deriver_classes([deriver_iri]):
         raise DigestiveError(f'unknown deriver_iri: {deriver_iri}')
     _indexcard_id_qs = (
@@ -285,6 +285,6 @@ def task__schedule_all_for_deriver(deriver_iri: str, notify_index: bool=False) -
         task__derive.apply_async((_indexcard_id, deriver_iri, notify_index))
 
 
-@celery.shared_task(acks_late=True) #type: ignore
+@celery.shared_task(acks_late=True)  # type: ignore
 def task__expel_expired_data() -> None:
     expel_expired_data(datetime.date.today())

trove/models/indexcard.py

@@ -188,15 +188,15 @@ def latest_rdf(self) -> LatestIndexcardRdf:
         return self.trove_latestindexcardrdf_set.get()  # may raise DoesNotExist
 
     @property
-    def archived_rdf_set(self): #type: ignore
+    def archived_rdf_set(self):  # type: ignore
         '''convenience for the "other side" of ArchivedIndexcardRdf.indexcard
 
         returns a RelatedManager
         '''
         return self.trove_archivedindexcardrdf_set # noqa
 
     @property
-    def supplementary_rdf_set(self): #type: ignore
+    def supplementary_rdf_set(self):  # type: ignore
         '''convenience for the "other side" of SupplementaryIndexcardRdf.indexcard
 
         returns a RelatedManager
@@ -206,7 +206,7 @@ def supplementary_rdf_set(self): #type: ignore
     def get_iri(self) -> Any:
         return trove_indexcard_iri(self.uuid)
 
-    def pls_delete(self, *, notify_indexes: bool=True) -> None:
+    def pls_delete(self, *, notify_indexes: bool = True) -> None:
         # do not actually delete Indexcard, just mark deleted:
         if self.deleted is None:
             self.deleted = timezone.now()
@@ -328,7 +328,7 @@ class Meta:
         abstract = True
 
     def __repr__(self) -> str:
-        return f'<{self.__class__.__qualname__}({self.id}, "{self.focus_iri}")' #type: ignore
+        return f'<{self.__class__.__qualname__}({self.id}, "{self.focus_iri}")'  # type: ignore
 
     def __str__(self) -> str:
         return repr(self)
@@ -406,7 +406,7 @@ def __str__(self) -> str:
         return repr(self)
 
     @property
-    def deriver_cls(self): #type: ignore
+    def deriver_cls(self):  # type: ignore
         from trove.derive import get_deriver_classes
         (_deriver_cls,) = get_deriver_classes(self.deriver_identifier.raw_iri_list)
         return _deriver_cls

trove/models/resource_identifier.py

@@ -52,7 +52,7 @@ def validate_sufficiently_unique_iri(suffuniq_iri: str) -> None:
         raise ValidationError('need more iri beyond a scheme')
 
 
-class ResourceIdentifierManager(models.Manager): #type: ignore
+class ResourceIdentifierManager(models.Manager):  # type: ignore
     def queryset_for_iri(self, iri: str)  -> 'QuerySet["ResourceIdentifier"]':
         return self.queryset_for_iris((iri,))
 
@@ -85,7 +85,7 @@ def get_or_create_for_iri(self, iri: str) -> 'ResourceIdentifier':
             _needs_save = True
         if _needs_save:
             _identifier.save()
-        return _identifier #type: ignore
+        return _identifier  # type: ignore
 
     def save_equivalent_identifier_set(
         self,
@@ -195,5 +195,5 @@ def find_equivalent_iri(self, tripledict: primitive_rdf.RdfTripleDictionary) ->
                 )
             )
             if _is_equivalent:
-                return _iri #type: ignore
+                return _iri  # type: ignore
         raise trove_exceptions.IriMismatch(f'could not find "{_identifier_iri}" or equivalent in {set(tripledict.keys())}')

trove/render/html_browse.py

@@ -109,7 +109,7 @@ def __mediatype_link(self, mediatype: str) -> None:
                     _link.text = 'documented use'
                     _link.tail = ')'
 
-    def __render_subj(self, subj_iri: str, start_collapsed: bool=False) -> Optional[None]:
+    def __render_subj(self, subj_iri: str, start_collapsed: bool = False) -> Optional[None]:
         _twopledict = self.__current_data.get(subj_iri, {})
         with self.__visiting(subj_iri):
             with self.__h_tag() as _h_tag:
@@ -233,7 +233,7 @@ def __quoted_data(self, quoted_data: dict[str, Any]) -> Iterator[None]:
             self.__visiting_iris = _outer_visiting_iris
 
     @contextlib.contextmanager
-    def __nest(self, tag_name: str, attrs: Optional[dict[str, Any]]=None, visible: bool=False) -> Iterator[Element]:
+    def __nest(self, tag_name: str, attrs: Optional[dict[str, Any]] = None, visible: bool = False) -> Iterator[Element]:
         _attrs = {**attrs} if attrs else {}
         if visible:
             _attrs['class'] = (
@@ -248,18 +248,18 @@ def __nest(self, tag_name: str, attrs: Optional[dict[str, Any]]=None, visible: b
         finally:
             self.__current_element = _parent_element
 
-    def __leaf(self, tag_name: str, *, text: Optional[str]=None, attrs: Optional[dict[str, Any]]=None) -> None:
+    def __leaf(self, tag_name: str, *, text: Optional[str] = None, attrs: Optional[dict[str, Any]] = None) -> None:
         _leaf_element = SubElement(self.__current_element, tag_name, attrs or {})
         if text is not None:
             _leaf_element.text = text
 
-    def __nest_link(self, iri: str, *, attrs: Optional[dict[str, Any]]=None) -> Any:
+    def __nest_link(self, iri: str, *, attrs: Optional[dict[str, Any]] = None) -> Any:
         return self.__nest('a', attrs={
             **(attrs or {}),
             'href': trove_browse_link(iri),
         })
 
-    def __leaf_link(self, iri: str, *, attrs: Optional[dict[str, Any]]=None) -> None:
+    def __leaf_link(self, iri: str, *, attrs: Optional[dict[str, Any]] = None) -> None:
         with self.__nest_link(iri, attrs=attrs) as _link:
             _link.text = self.iri_shorthand.compact_iri(iri)
 

trove/render/jsonapi.py

@@ -187,15 +187,15 @@ def _render_field(self, predicate_iri: str, object_set: Iterable[Any], *, into:
         _is_attribute = (predicate_iri, RDF.type, JSONAPI_ATTRIBUTE) in self.thesaurus
         _field_key = self._membername_for_iri(predicate_iri)
         _doc_key = 'meta'  # unless configured for jsonapi, default to unstructured 'meta'
-        if ':' not in _field_key: #type: ignore
+        if ':' not in _field_key:  # type: ignore
             if _is_relationship:
                 _doc_key = 'relationships'
             elif _is_attribute:
                 _doc_key = 'attributes'
         if _is_relationship:
             _fieldvalue = self._render_relationship_object(predicate_iri, object_set)
         else:
-            _fieldvalue = self._one_or_many(predicate_iri, self._attribute_datalist(object_set)) #type: ignore
+            _fieldvalue = self._one_or_many(predicate_iri, self._attribute_datalist(object_set))  # type: ignore
         # update the given `into` resource object
         into.setdefault(_doc_key, {})[_field_key] = _fieldvalue
 
@@ -299,15 +299,15 @@ def _render_attribute_datum(self, rdfobject: primitive_rdf.RdfObject) -> dict[An
             return _json_blanknode
         if isinstance(rdfobject, primitive_rdf.Literal):
             if RDF.JSON in rdfobject.datatype_iris:
-                return json.loads(rdfobject.unicode_value) #type: ignore
+                return json.loads(rdfobject.unicode_value)  # type: ignore
             if XSD.integer in rdfobject.datatype_iris:
                 return int(rdfobject.unicode_value)
-            return rdfobject.unicode_value #type: ignore  # TODO: decide how to represent language
+            return rdfobject.unicode_value  # type: ignore  # TODO: decide how to represent language
         elif isinstance(rdfobject, str):
             try:  # maybe it's a jsonapi resource
                 return self.render_identifier_object(rdfobject)
             except Exception:
-                return NAMESPACES_SHORTHAND.compact_iri(rdfobject) #type: ignore
+                return NAMESPACES_SHORTHAND.compact_iri(rdfobject)  # type: ignore
         elif isinstance(rdfobject, (float, int)):
             return rdfobject
         elif isinstance(rdfobject, datetime.date):

trove/render/jsonld.py

@@ -50,7 +50,7 @@ def literal_as_jsonld(self, rdfliteral: rdf.Literal) -> dict[str, Any]:
             return {'@value': rdfliteral.unicode_value}
         if RDF.JSON in rdfliteral.datatype_iris:
             # NOTE: does not reset jsonld context (is that a problem?)
-            return json.loads(rdfliteral.unicode_value) #type: ignore
+            return json.loads(rdfliteral.unicode_value)  # type: ignore
         _language_tag = rdfliteral.language
         if _language_tag:  # standard language tag
             return {