Skip to content

Reduce redundancy in ImageManager definition #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianhelba merged 1 commit into from
Jun 10, 2026
Merged

Reduce redundancy in ImageManager definition #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions isic/core/models/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def from_search_query(self, query: str):
return self.filter(parse_query(django_parser, query) or Q())


class ImageManager(models.Manager["Image"]):
def get_queryset(self) -> ImageQuerySet:
return ImageQuerySet(self.model, using=self._db)
_BaseImageManager = models.Manager.from_queryset(ImageQuerySet)


class ImageManager(_BaseImageManager):
def with_elasticsearch_properties(self):
return self.select_related("accession__cohort").annotate(
coll_pks=ArrayAgg("collections", distinct=True, default=[]),
Expand All @@ -63,12 +63,6 @@ def with_elasticsearch_properties(self):
def has_embedding(self):
return self.filter(embedding_relation__isnull=False)

def public(self):
return self.filter(public=True)

def private(self):
return self.filter(public=False)


class Image(CreationSortedTimeStampedModel):
class Meta(CreationSortedTimeStampedModel.Meta):
Expand Down
8 changes: 4 additions & 4 deletions isic/core/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from isic.core.search import build_elasticsearch_query

if TYPE_CHECKING:
from django.db.models.query import QuerySet
from isic.core.models.image import ImageQuerySet


class SearchQueryIn(Schema):
Expand Down Expand Up @@ -72,12 +72,12 @@ def from_token_representation(cls, token) -> tuple[User, SearchQueryIn]:
return user, cls(query=token["query"], collections=token["collections"])

def to_queryset(
self, user: User | AnonymousUser, qs: QuerySet[Image] | None = None
) -> QuerySet[Image]:
self, user: User | AnonymousUser, qs: ImageQuerySet | None = None
) -> ImageQuerySet:
qs = qs if qs is not None else Image.objects.all()

if self.query:
qs = qs.from_search_query(self.query) # type: ignore[attr-defined]
qs = qs.from_search_query(self.query)

if self.collections:
qs = qs.filter( # type: ignore[union-attr]
Expand Down