sort by asc

Author: dittos

frontend/src/routes/imageDetail.tsx

@@ -133,9 +133,12 @@ function DetailOverlaySidebar({
       ))}
     </div>
     <div className="col-3 border-start p-2 overflow-y-auto bg-body-tertiary">
-      {selectedImage.tweet_id && selectedImage.tweet_username && (
-        <p className="card-text">source: <a href={`https://twitter.com/_/status/${selectedImage.tweet_id}`} target="_blank">@{selectedImage.tweet_username}</a></p>
-      )}
+      <p className="card-text">
+        {selectedImage.tweet_id && selectedImage.tweet_username && (
+          <div>source: <a href={`https://twitter.com/_/status/${selectedImage.tweet_id}`} target="_blank">@{selectedImage.tweet_username}</a></div>
+        )}
+        <div>collected at: {new Date(selectedImage.collected_at).toLocaleDateString()}</div>
+      </p>
 
       {(faces?.length ?? 0) > 0 && (<>
         <div className="mb-2 fw-bold">faces</div>

frontend/src/routes/searchResult.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Link, LoaderFunction, Outlet, useLoaderData, useLocation } from 'react-router-dom'
 import { useState } from 'react'
 import { applyQuickFilters } from '../utils/tagQuery'
-import { extractIndexSearchParams, extractRootSearchParams, removeTag } from '../utils/search'
+import { extractIndexSearchParams, extractRootSearchParams, removeTag, setSort } from '../utils/search'
 import { RootLink, useExtractedSearchParams } from '../components/SearchLink'
 
 export const searchResultLoader: LoaderFunction = async ({ request }) => {
@@ -14,6 +14,7 @@ export const searchResultLoader: LoaderFunction = async ({ request }) => {
     images: await (await fetch('/api/images?' + new URLSearchParams({
       ...(tag && {tag}),
       ...(page && {page: String(page)}),
+      ...(root.sort && {sort: root.sort}),
     }))).json()
   }
 }
@@ -38,7 +39,13 @@ export function SearchResultRoute() {
           ))}
         </div>
       )}
-      <p className="mb-4">total {images.count} images</p>
+
+      <p className="mb-4">
+        total {images.count} images
+        / sort by date:{' '}
+        <RootLink search={setSort(search, 'desc')} className={search.sort === 'desc' ? 'fw-bold' : ''}>desc</RootLink>{' '}
+        <RootLink search={setSort(search, 'asc')} className={search.sort === 'asc' ? 'fw-bold' : ''}>asc</RootLink>
+      </p>
 
       <div className="d-flex flex-wrap">
         {imageList.map((image: any) => (

frontend/src/utils/search.ts

@@ -4,13 +4,16 @@ export type RootSearchParams = {
   tag?: string
   sfw?: TagQuery.QuickFilterState
   realistic?: TagQuery.QuickFilterState
+  sort?: 'asc' | 'desc'
 }
 
 export function extractRootSearchParams(searchParams: URLSearchParams): RootSearchParams {
+  const sortParam = searchParams.get('sort')
   return {
     tag: searchParams.get('tag') ?? undefined,
     sfw: searchParams.get('sfw') as TagQuery.QuickFilterState,
     realistic: searchParams.get('realistic') as TagQuery.QuickFilterState,
+    sort: sortParam === 'asc' || sortParam === 'desc' ? sortParam : 'desc',
   }
 }
 
@@ -59,3 +62,10 @@ export function setQuickFilterState(search: RootSearchParams, key: 'sfw' | 'real
     [key]: state,
   }
 }
+
+export function setSort(search: RootSearchParams, sort: 'asc' | 'desc'): RootSearchParams {
+  return {
+    ...search,
+    sort,
+  }
+}

pix/api/images.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import List, Optional, Union
+from typing import List, Literal, Optional, Union
 from fastapi import APIRouter, HTTPException
 import numpy as np
 from pydantic import BaseModel
@@ -53,15 +53,15 @@ class ListImagesResult(BaseModel):
 
 
 @images_router.get("/api/images")
-def list_images(page: int = 1, tag: Optional[str] = None) -> ListImagesResult:
+def list_images(page: int = 1, tag: Optional[str] = None, sort: Optional[Literal['asc', 'desc']] = None) -> ListImagesResult:
     limit = 20
     offset = (page - 1) * limit
     image_repo = AppGraph.get_instance(ImageRepo)
     if tag:
-        images = image_repo.list_by_tag_collected_at_desc(tag, offset, limit + 1)
+        images = image_repo.list_by_tag_collected_at_desc(tag, offset, limit + 1, descending=sort != 'asc')
         count = image_repo.count_by_tag(tag)
     else:
-        images = image_repo.list_by_collected_at_desc(offset, limit + 1)
+        images = image_repo.list_by_collected_at_desc(offset, limit + 1, descending=sort != 'asc')
         count = image_repo.count()
     has_next_page = len(images) > limit
     images = images[:limit]

pix/model/image.py

@@ -117,21 +117,27 @@ class ImageRepo(Repo[Image]):
     def count(self) -> int:
         return self.db.execute(sa.select(sa.func.count()).select_from(self.table)).first()[0]
 
-    def list_by_collected_at_desc(self, offset: int, limit: int) -> List[Image]:
+    def list_by_collected_at_desc(self, offset: int, limit: int, descending: bool = True) -> List[Image]:
+        order_by = self.idx_collected_at.c.collected_at
+        if descending:
+            order_by = order_by.desc()
         return [self._doc_from_row(row) for row in self.db.execute(
             sa.select(self.table)
                 .join(self.idx_collected_at.table, self.table.c.id == self.idx_collected_at.c.id)
-                .order_by(self.idx_collected_at.c.collected_at.desc())
+                .order_by(order_by)
                 .offset(offset)
                 .limit(limit)
         )]
 
-    def list_by_tag_collected_at_desc(self, tag: str, offset: int, limit: int) -> List[Image]:
+    def list_by_tag_collected_at_desc(self, tag: str, offset: int, limit: int, descending: bool = True) -> List[Image]:
+        order_by = self.idx_collected_at.c.collected_at
+        if descending:
+            order_by = order_by.desc()
         return [self._doc_from_row(row) for row in self.db.execute(
             sa.select(self.table)
                 .join(self.idx_collected_at.table, self.idx_collected_at.c.id == self.table.c.id)
                 .where(*self._tag_condition(self.table, tag))
-                .order_by(self.idx_collected_at.c.collected_at.desc())
+                .order_by(order_by)
                 .offset(offset)
                 .limit(limit)
         )]
@@ -169,6 +175,15 @@ def list_needs_embedding(self, embedding_type: str) -> List[Image]:
                 ))
                 .where(self.idx_embedding_types.c.embedding_type.is_(None))
         )]
+
+    def list_has_embedding(self, embedding_type: str) -> List[Image]:
+        return [self._doc_from_row(row) for row in self.db.execute(
+            sa.select(self.table)
+                .join(self.idx_embedding_types.table, (
+                    (self.table.c.id == self.idx_embedding_types.c.id)
+                    & (self.idx_embedding_types.c.embedding_type == embedding_type)
+                ))
+        )]
 
     def list_all_tags_with_count(self, q: Union[str, None]) -> List[Tuple[str, int]]:
         query = sa.select(self.idx_tag_score.c.tag, sa.func.count())