types without django-stubs

aaxelb · aaxelb · commit 8ab88dc4fa2f · 2025-07-02T15:10:05.000-04:00
diff --git a/mypy.ini b/mypy.ini
@@ -50,23 +50,30 @@ disallow_untyped_calls = False
 disallow_incomplete_defs = False
 disallow_untyped_defs = False
 warn_return_any = False
+disable_error_code = var-annotated,attr-defined
 
 ## django migrations are whatever
 [mypy-*.migrations.*]
 strict = False
-#disable_error_code = var-annotated,import-untyped,import-not-found
 disallow_subclassing_any = False
 
 ## tests are looser
 [mypy-tests.*]
 disallow_untyped_defs = False
 
-## trove code (trying to be) well-annotated (but still uses django...)
+## trove code aiming to someday be well-annotated (except for the django...)
 [mypy-trove.*]
-disallow_subclassing_any = False
 disallow_untyped_decorators = False
 disallow_any_generics = False
 warn_return_any = False
-[mypy-trove.views.*]
+
+[mypy-trove.views.*,trove.admin,trove.apps]
+disallow_subclassing_any = False
+disallow_untyped_defs = False
+disallow_incomplete_defs = False
+
+[mypy-trove.models.*]
+disallow_subclassing_any = False
 disallow_untyped_defs = False
 disallow_incomplete_defs = False
+disable_error_code = var-annotated,attr-defined
diff --git a/share/admin/__init__.py b/share/admin/__init__.py
@@ -76,7 +76,7 @@ def source_(self, obj):
 
     def enabled(self, obj):
         return not obj.disabled
-    enabled.boolean = True  # type: ignore[attr-defined]
+    enabled.boolean = True
 
     @admin.action(description='schedule re-derive of all cards for each selected source config')
     def schedule_derive(self, request, queryset):
diff --git a/share/admin/celery.py b/share/admin/celery.py
@@ -100,15 +100,15 @@ def status_(self, obj):
             self.STATUS_COLORS.get(obj.status, 'black'),
             obj.status.title()
         )
-    status_.short_description = 'Status'  # type: ignore[attr-defined]
+    status_.short_description = 'Status'
 
     def meta_(self, obj):
         return pprint.pformat(obj.meta)
-    meta_.short_description = 'Meta'  # type: ignore[attr-defined]
+    meta_.short_description = 'Meta'
 
     def source_(self, obj):
         return obj.meta.get('source_config') or obj.meta.get('source')
-    source_.short_description = 'Source'  # type: ignore[attr-defined]
+    source_.short_description = 'Source'
 
     def retry(self, request, queryset):
         for task in queryset:
@@ -117,4 +117,4 @@ def retry(self, request, queryset):
                 task.meta.get('kwargs', {}),
                 task_id=str(task.task_id)
             )
-    retry.short_description = 'Retry Tasks'  # type: ignore[attr-defined]
+    retry.short_description = 'Retry Tasks'
diff --git a/share/admin/util.py b/share/admin/util.py
@@ -57,7 +57,7 @@ def link(self, instance):
             linked_obj = getattr(instance, field_name)
             return admin_link_html(linked_obj)
         link_field = '{}_link'.format(field_name)
-        link.short_description = field_name.replace('_', ' ')  # type: ignore[attr-defined]
+        link.short_description = field_name.replace('_', ' ')
         setattr(cls, link_field, link)
         append_to_cls_property(cls, 'readonly_fields', link_field)
         append_to_cls_property(cls, 'exclude', field_name)
@@ -89,7 +89,7 @@ def links(self, instance: Model) -> str:
                 ))
             )
         links_field = f'{field_name}_links'
-        links.short_description = field_name.replace('_', ' ')  # type: ignore[attr-defined]
+        links.short_description = field_name.replace('_', ' ')
         setattr(cls, links_field, links)
         append_to_cls_property(cls, 'readonly_fields', links_field)
         append_to_cls_property(cls, 'exclude', field_name)
diff --git a/share/models/fields.py b/share/models/fields.py
@@ -48,13 +48,10 @@ def __init__(self, *args, object_hook=None, **kwargs):
 
 
 class DateTimeAwareJSONField(models.JSONField):
-    def __init__(self, *args, encoder=None, decoder=None, **kwargs):
-        return super().__init__(
-            *args,
-            **kwargs,
-            encoder=DateTimeAwareJSONEncoder,
-            decoder=DateTimeAwareJSONDecoder,
-        )
+    def __init__(self, *args, **kwargs):
+        kwargs['encoder'] = DateTimeAwareJSONEncoder
+        kwargs['decoder'] = DateTimeAwareJSONDecoder
+        return super().__init__(*args, **kwargs)
 
 
 class ShareURLField(models.TextField):
@@ -69,10 +66,10 @@ def deconstruct(self):
         kwargs.pop('max_length', None)
         return name, path, args, kwargs
 
-    def formfield(self, **kwargs):
+    def formfield(self, **kwargs):  # type: ignore[override]
         # As with CharField, this will cause URL validation to be performed
         # twice.
-        defaults = {
+        defaults: dict = {
             'form_class': forms.URLField,
         }
         if self.null and self.unique:
@@ -89,7 +86,7 @@ class EncryptedJSONField(models.BinaryField):
     """
     prefix = b'jwe:::'
 
-    def get_db_prep_value(self, input_json, **kwargs):
+    def get_db_prep_value(self, input_json, **kwargs):  # type: ignore[override]
         if not input_json:
             return None
 
diff --git a/share/models/index_backfill.py b/share/models/index_backfill.py
@@ -160,6 +160,7 @@ def task__schedule_index_backfill(self, index_backfill_pk):
         _messenger = IndexMessenger(celery_app=self.app, index_strategys=[_index_strategy])
         _messagetype = _index_strategy.backfill_message_type
         assert _messagetype in _index_strategy.supported_message_types
+        _target_queryset: models.QuerySet
         if _messagetype == MessageType.BACKFILL_INDEXCARD:
             _target_queryset = (
                 trove_db.Indexcard.objects
diff --git a/share/search/index_strategy/elastic8.py b/share/search/index_strategy/elastic8.py
@@ -105,7 +105,7 @@ def compute_strategy_checksum(cls):
         return ChecksumIri.digest_json(
             checksumalgorithm_name='sha-256',
             salt=cls.__name__,
-            raw_json=_current_json,
+            raw_json=_current_json,  # type: ignore[arg-type]
         )
 
     # abstract method from IndexStrategy
diff --git a/share/search/index_strategy/trovesearch_denorm.py b/share/search/index_strategy/trovesearch_denorm.py
@@ -31,12 +31,10 @@
 )
 from trove.trovesearch.search_params import (
     CardsearchParams,
-    Propertypath,
     SearchFilter,
     SearchText,
     ValueType,
     ValuesearchParams,
-    is_globpath,
 )
 from trove.trovesearch.search_handle import (
     CardsearchHandle,
@@ -46,6 +44,10 @@
     ValuesearchHandle,
     ValuesearchResult,
 )
+from trove.util.propertypath import (
+    is_globpath,
+    Propertypath,
+)
 from trove.vocab import osfmap
 from trove.vocab.namespaces import OWL, RDF
 from . import _trovesearch_util as ts
diff --git a/share/search/messages.py b/share/search/messages.py
@@ -7,7 +7,6 @@
 import typing
 
 from share.search import exceptions
-from share.util import chunked
 
 
 logger = logging.getLogger(__name__)
@@ -98,7 +97,11 @@ def compose_however(message_type: typing.Union[int, MessageType], target_id: int
         '''pass-thru to PreferedDaemonMessageSubclass.compose
         '''
         assert isinstance(target_id, int)
-        return V3Message.compose(message_type, target_id)
+        return V3Message.compose((
+            MessageType.from_int(message_type)
+            if isinstance(message_type, int)
+            else message_type
+        ), target_id)
 
     @classmethod
     def from_received_message(cls, kombu_message):
@@ -202,7 +205,7 @@ def compose(cls, message_type: MessageType, target_id: int) -> dict:
         }
 
     @property
-    def _message_twople(self) -> (int, int):
+    def _message_twople(self) -> tuple[int, int]:
         return self.kombu_message.payload['m']
 
     @property
diff --git a/trove/digestive_tract.py b/trove/digestive_tract.py
@@ -65,7 +65,7 @@ def ingest(
             expiration_date=expiration_date,
         )
         for _card in _extracted_cards:
-            task__derive.delay(_card.id, urgent=urgent)
+            task__derive.delay(_card.pk, urgent=urgent)
 
 
 @transaction.atomic
@@ -109,7 +109,7 @@ def sniff(
         _suid.focus_identifier = _focus_identifier
         _suid.save()
     else:
-        if _suid.focus_identifier_id != _focus_identifier.id:
+        if _suid.focus_identifier_id != _focus_identifier.pk:
             raise DigestiveError(f'suid focus_identifier should not change! suid={_suid}, focus changed from {_suid.focus_identifier} to {_focus_identifier}')
     return _suid
 
@@ -249,7 +249,7 @@ def _expel_supplementary_descriptions(supplementary_rdf_queryset: QuerySet[trove
             _affected_indexcards.add(_supplement.indexcard)
         _supplement.delete()
     for _indexcard in _affected_indexcards:
-        task__derive.delay(_indexcard.id)
+        task__derive.delay(_indexcard.pk)
 
 
 ### BEGIN celery tasks
diff --git a/trove/models/derived_indexcard.py b/trove/models/derived_indexcard.py
@@ -35,7 +35,7 @@ class Meta:
         ]
 
     def __repr__(self) -> str:
-        return f'<{self.__class__.__qualname__}({self.id}, {self.upriver_indexcard.uuid}, "{self.deriver_identifier.sufficiently_unique_iri}")'
+        return f'<{self.__class__.__qualname__}({self.pk}, {self.upriver_indexcard.uuid}, "{self.deriver_identifier.sufficiently_unique_iri}")'
 
     def __str__(self) -> str:
         return repr(self)
diff --git a/trove/models/indexcard.py b/trove/models/indexcard.py
@@ -50,7 +50,7 @@ def save_indexcards_from_tripledicts(
                 restore_deleted=restore_deleted,
                 expiration_date=expiration_date,
             )
-            _focus_identifier_ids = {str(_fid.id) for _fid in _indexcard.focus_identifier_set.all()}
+            _focus_identifier_ids = {str(_fid.pk) for _fid in _indexcard.focus_identifier_set.all()}
             if not _seen_focus_identifier_ids.isdisjoint(_focus_identifier_ids):
                 _duplicates = (
                     ResourceIdentifier.objects
@@ -63,7 +63,7 @@ def save_indexcards_from_tripledicts(
         for _indexcard_to_delete in (
             Indexcard.objects
             .filter(source_record_suid=suid)
-            .exclude(id__in=[_card.id for _card in _indexcards])
+            .exclude(id__in=[_card.pk for _card in _indexcards])
         ):
             _indexcard_to_delete.pls_delete()
             _indexcards.append(_indexcard_to_delete)
@@ -85,7 +85,7 @@ def supplement_indexcards_from_tripledicts(
                 focus_iri=_focus_iri,
                 expiration_date=expiration_date,
             ))
-        _seen_indexcard_ids = {_card.id for _card in _indexcards}
+        _seen_indexcard_ids = {_card.pk for _card in _indexcards}
         # supplementary data seen previously on this suid (but not this time) should be deleted
         for _supplement_to_delete in (
             SupplementaryResourceDescription.objects
diff --git a/trove/models/resource_identifier.py b/trove/models/resource_identifier.py
@@ -149,7 +149,7 @@ class Meta:
         ]
 
     def __repr__(self) -> str:
-        return f'<{self.__class__.__qualname__}({self.id}, "{self.sufficiently_unique_iri}")'
+        return f'<{self.__class__.__qualname__}({self.pk}, "{self.sufficiently_unique_iri}")'
 
     def __str__(self) -> str:
         return repr(self)
diff --git a/trove/trovesearch/trovesearch_gathering.py b/trove/trovesearch/trovesearch_gathering.py
@@ -73,7 +73,7 @@
 )
 
 
-class _TypedFocus(gather.Focus):
+class _TypedFocus(gather.Focus):  # type: ignore
     TYPE_IRI: ClassVar[str]  # (expected on subclasses)
     ADDITIONAL_TYPE_IRIS: ClassVar[tuple[str, ...]] = ()  # (optional on subclasses)
 
diff --git a/trove/views/ingest.py b/trove/views/ingest.py
@@ -10,6 +10,8 @@
 from trove import digestive_tract
 from trove import exceptions as trove_exceptions
 from trove.util.queryparams import parse_booly_str
+if __debug__:
+    from share.models import ShareUser
 
 
 logger = logging.getLogger(__name__)
@@ -25,6 +27,7 @@ def post(self, request: HttpRequest) -> HttpResponse:
         # TODO: permissions by focus_iri domain (compare with user's Source)?
         if not request.user.is_authenticated:
             return http.HttpResponse(status=HTTPStatus.UNAUTHORIZED)
+        assert isinstance(request.user, ShareUser)
         if FeatureFlag.objects.flag_is_up(FeatureFlag.FORBID_UNTRUSTED_FEED) and not request.user.is_trusted:
             return http.HttpResponse(status=HTTPStatus.FORBIDDEN)
         # TODO: declare/validate params with dataclass
@@ -66,6 +69,7 @@ def delete(self, request: HttpRequest) -> HttpResponse:
         # TODO: cleaner permissions
         if not request.user.is_authenticated:
             return http.HttpResponse(status=HTTPStatus.UNAUTHORIZED)
+        assert isinstance(request.user, ShareUser)
         if FeatureFlag.objects.flag_is_up(FeatureFlag.FORBID_UNTRUSTED_FEED) and not request.user.is_trusted:
             return http.HttpResponse(status=HTTPStatus.FORBIDDEN)
         # TODO: declare/validate params with dataclass

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ def compute_strategy_checksum(cls):`
`105`	`105`	`return ChecksumIri.digest_json(`
`106`	`106`	`checksumalgorithm_name='sha-256',`
`107`	`107`	`salt=cls.__name__,`
`108`		`- raw_json=_current_json,`
	`108`	`+ raw_json=_current_json, # type: ignore[arg-type]`
`109`	`109`	`)`
`110`	`110`
`111`	`111`	`# abstract method from IndexStrategy`