stablize

Author: danactive

Makefile

@@ -18,22 +18,27 @@ load-weights:
 	docker run --name extract-model \
 		-v $$HOME/.cache/huggingface:/root/.cache/huggingface \
 		-e MODEL_REPO="$(MODEL_REPO)" \
+		-e MODEL_REVISION="$(MODEL_REVISION)" \
 		-e FILENAMES="$(FILENAMES)" \
 		weights-loader \
-		sh -c 'python /dock/hugging-offline.py --repo-id "$$MODEL_REPO" --filenames $$FILENAMES > /dock/build.log 2>&1'
+		sh -c 'python /dock/hugging-offline.py --repo-id "$$MODEL_REPO" --revision "$$MODEL_REVISION" --filenames $$FILENAMES > /dock/build.log 2>&1'
 	@echo "Part 3/3 Copying weights to local directory and display log"
 	docker cp extract-model:/dock/models/. ./models/
 	docker cp extract-model:/dock/build.log ./weights.log || true
 	docker rm extract-model
 	cat ./weights.log || true
 
 load-aesthetic-scorer:
+	@[ -n "$(AESTHETIC_SCORER_REVISION)" ] || (echo "Set AESTHETIC_SCORER_REVISION to an immutable commit hash before download"; exit 1)
 	$(MAKE) load-clip-vit-base-patch32
 	$(MAKE) load-weights MODEL_REPO="rsinema/aesthetic-scorer" \
+		MODEL_REVISION="$(AESTHETIC_SCORER_REVISION)" \
 		FILENAMES="model.pt preprocessor_config.json tokenizer.json tokenizer_config.json special_tokens_map.json merges.txt vocab.json"
 
 load-clip-vit-base-patch32:
+	@[ -n "$(CLIP_VIT_REVISION)" ] || (echo "Set CLIP_VIT_REVISION to an immutable commit hash before download"; exit 1)
 	$(MAKE) load-weights MODEL_REPO="openai/clip-vit-base-patch32" \
+		MODEL_REVISION="$(CLIP_VIT_REVISION)" \
 		FILENAMES="pytorch_model.bin config.json preprocessor_config.json tokenizer.json tokenizer_config.json special_tokens_map.json merges.txt vocab.json"
 
 build-ai-api:

app/api/admin/rename/route.ts

@@ -14,6 +14,9 @@ async function POST(req: NextRequest) {
     if (isZodError(err)) {
       return NextResponse.json(errorSchema(simplifyZodMessages(err)), { status: 400 })
     }
+    if (err instanceof ReferenceError) {
+      return NextResponse.json(errorSchema(err.message), { status: 400 })
+    }
     return NextResponse.json(errorSchema('Internal Server Error'), { status: 500 })
   }
 }

apps/load-weights/hugging-offline.py

@@ -26,7 +26,7 @@ def log_huggingface_whoami():
     except Exception as e:
         logger.error(f"❌ Unable to verify Hugging Face authentication: {e}")
 
-def download_weights(repo_id: str, filenames: list[str]):
+def download_weights(repo_id: str, filenames: list[str], revision: str | None = None):
     log_huggingface_whoami()
     # Create destination path
     dest_dir = os.path.join("models", repo_id.replace("/", "_"))
@@ -35,7 +35,11 @@ def download_weights(repo_id: str, filenames: list[str]):
     for filename in filenames:
         logger.info(f"📥 Downloading {filename} from {repo_id} on Hugging Face Hub...")
         try:
-            path = hf_hub_download(repo_id=repo_id, filename=filename)
+            path = hf_hub_download(
+                repo_id=repo_id,
+                filename=filename,
+                revision=revision or None,
+            )
             # Move and rename
             dest_path = os.path.join(dest_dir, filename)
             shutil.copy(path, dest_path)
@@ -68,5 +72,10 @@ def download_weights(repo_id: str, filenames: list[str]):
     default=["pytorch_model.bin", "config.json"],
     help="List of filenames to download (space-separated)"
   )
+  parser.add_argument(
+    "--revision",
+    default=None,
+    help="Optional immutable model revision/commit to pin downloads"
+  )
   args = parser.parse_args()
-  download_weights(args.repo_id, args.filenames)
+  download_weights(args.repo_id, args.filenames, args.revision)

src/components/All/Items.tsx

@@ -1,3 +1,4 @@
+import type { MouseEvent, RefObject } from 'react'
 import type { ImageGalleryRef } from 'react-image-gallery'
 import { useCallback } from 'react'
 
@@ -12,18 +13,18 @@ const SHOW_THUMB_MIN_LEN = 3
 interface InputProps {
   items: ServerSideAllItem[];
   keyword: string;
-  refImageGallery: React.RefObject<ImageGalleryRef | null>;
+  refImageGallery: RefObject<ImageGalleryRef | null>;
 }
 
 function All({ items, keyword, refImageGallery }: InputProps) {
-  const showThumbnail = keyword.length > SHOW_THUMB_MIN_LEN
+  const showThumbnail = keyword.length >= SHOW_THUMB_MIN_LEN
   const { width, height } = config.resizeDimensions.thumb
 
   const selectThumb = useCallback((index: number) => {
     refImageGallery.current?.slideToIndex(index)
   }, [refImageGallery])
 
-  const handleSlideToClick = useCallback((e: React.MouseEvent<HTMLUListElement>) => {
+  const handleSlideToClick = useCallback((e: MouseEvent<HTMLUListElement>) => {
     const btn = (e.target as HTMLElement).closest('button[data-slide-index]')
     const idx = btn?.getAttribute('data-slide-index')
     if (idx != null) selectThumb(Number(idx))
@@ -38,7 +39,7 @@ function All({ items, keyword, refImageGallery }: InputProps) {
             {!showThumbnail && item.caption}
             {showThumbnail && <Img src={item.thumbPath} alt={item.caption} title={item.corpus} width={width} height={height} />}
           </Link>
-          <button className={styles.slideTo} type="button" data-slide-index={index}><a>Slide to</a></button>
+          <button className={styles.slideTo} type="button" data-slide-index={index}>Slide to</button>
         </li>
       ))}
     </ul>

src/hooks/useSearch.tsx

@@ -128,7 +128,6 @@ export default function useSearch<ItemType extends ServerSideItem>({
           ? (currentItem as any).filename[0]
           : (currentItem as any).filename)
       : null
-    const coordinates = (currentItem as any)?.coordinates as [number, number] | null
 
     if (selectById && identifier) {
       selectById(identifier, true)
@@ -210,6 +209,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
                   variant="plain"
                   onClick={handleClear}
                   title="Clear search and view adjacent photos"
+                  aria-label="Clear advanced query"
                 >
                   ×
                 </Button>
@@ -226,6 +226,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
                     variant="plain"
                     onClick={() => handleRemoveKeywordToken(idx)}
                     title={`Remove keyword token ${token}`}
+                    aria-label={`Remove keyword token ${token}`}
                   >
                     ×
                   </Button>
@@ -245,6 +246,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
               variant="plain"
               onClick={() => onClearMapFilter?.()}
               title="Clear map filter"
+              aria-label="Clear map filter"
             >
               ×
             </Button>

src/lib/filenames.ts

@@ -111,12 +111,20 @@ function futureFilenamesOutputs(sourceFilenames: string[], prefix: string, xmlSt
   return outputFormats()
 }
 
-function exactModeOutputs(orderedBases: string[], exactFilenameBase: string) {
+function exactModeOutputs(
+  orderedBases: string[],
+  exactFilenameBase: string,
+  sourceFilenames: string[] = orderedBases.map((base) => `${base}.jpg`),
+) {
+  if (orderedBases.length !== 1) {
+    throw new ReferenceError('Exact filename mode requires a single selected base')
+  }
+
   const files = orderedBases.map(() => exactFilenameBase)
   const items: AlbumXmlItem[] = files.map((file) => ({
     base: file,
     filename: `${file}.jpg`,
-    isVideo: false,
+    isVideo: videoTypeInList(sourceFilenames, orderedBases[0]),
   }))
   // Exact mode starts at 101 so first item id is MMDD01.
   return { files, xml: buildAlbumXml(items, 101) }

src/lib/rename.ts

@@ -66,7 +66,7 @@ async function renamePaths({
   const effectivePrefix = trimmed
 
   const generated = useExact
-    ? exactModeOutputs(orderedBases, effectivePrefix)
+    ? exactModeOutputs(orderedBases, effectivePrefix, filtered)
     : futureFilenamesOutputs(orderedBases, effectivePrefix)
   const baseToNewBase = new Map(orderedBases.map((b, i) => [b, generated.files[i]]))
 

src/utils/person-age.ts

@@ -60,7 +60,7 @@ export function buildAgeSummary(items: Item[]): { ages: { age: number; count: nu
     it.persons.forEach((p) => {
       if (!p.dob) return
       const age = calcAgeAtDate(p.dob, photoDate)
-      if (age !== null) counts.set(age, (counts.get(age) || 0) + 1)
+      if (age !== null && age >= 0) counts.set(age, (counts.get(age) || 0) + 1)
     })
   })
   return {