add filters

bridge/filters.py

@@ -8,7 +8,7 @@
 
 @strawberry.input
 class IDFilterMixin:
-    ids: list[strawberry.ID] | None
+    ids: list[strawberry.ID] | None = None
 
     def filter_ids(self, queryset, info):
         if self.ids is None:
@@ -18,7 +18,7 @@ def filter_ids(self, queryset, info):
 
 @strawberry.input
 class SearchFilterMixin:
-    search: str | None
+    search: str | None = None
 
     def filter_search(self, queryset, info):
         if self.search is None:
@@ -30,7 +30,9 @@ def filter_search(self, queryset, info):
 
 
 @strawberry.input
-class ProjectFilter(IDFilterMixin, SearchFilterMixin):
+class ProjectFilter:
+    ids: list[strawberry.ID] | None = None
+    search: str | None = None
     pass
 
 @strawberry.input

bridge/queries/dataset.py

@@ -4,7 +4,20 @@
 import strawberry
 
 def datasets(filters: filters.DatasetFilter | None = None, pagination: pagination.OffsetPaginationInput | None = None) -> types.Dataset:
+
     x = get_conn().listDatasets()
+
+    if filters:
+        if filters.ids:
+            x = [y for y in x if str(y.getId()) in filters.ids]
+            print(x.getID() for x in x)
+        if filters.search:
+            x = [y for y in x if filters.search in y.getName()]
+
+    if pagination:
+        x = x[pagination.offset : pagination.offset + pagination.limit]
+
+
     return [types.Dataset(value=y) for y in x]
 
 

bridge/queries/image.py

@@ -6,6 +6,18 @@
 
 def images(filters: filters.ImageFilter | None = None, pagination: pagination.OffsetPaginationInput | None = None) -> types.Image:
     x = get_conn().listImages()
+
+    if filters:
+        if filters.ids:
+            x = [y for y in x if str(y.getId()) in filters.ids]
+            print(x.getID() for x in x)
+        if filters.search:
+            x = [y for y in x if filters.search in y.getName()]
+
+    if pagination:
+        x = x[pagination.offset : pagination.offset + pagination.limit]
+
+
     return [types.Image(value=y) for y in x]
 
 

bridge/queries/projects.py

@@ -5,6 +5,17 @@
 
 def projects(filters: filters.ProjectFilter | None = None, pagination: pagination.OffsetPaginationInput | None = None) -> types.Project:
     x = get_conn().listProjects()
+
+    if filters:
+        if filters.ids:
+            x = [y for y in x if str(y.getId()) in filters.ids]
+            print(x.getID() for x in x)
+        if filters.search:
+            x = [y for y in x if filters.search in y.getName()]
+
+    if pagination:
+        x = x[pagination.offset : pagination.offset + pagination.limit]
+
     return [types.Project(value=y) for y in x]
 
 

bridge/views.py

@@ -76,10 +76,12 @@ def render_thumbnail(request, id):
     @param request:     http request
     @param iid:         Image ID
     """
-    print(request)
+
+    size = request.GET.get("size", 200)
+
     jpeg_data = _render_thumbnail(
          id=id,
-         size=request.GET.get("size", (200,))
+         size=(size,)
     )
     rsp = HttpResponse(jpeg_data, content_type="image/jpeg")
     return rsp