Revamp app structure

app.py

@@ -4,70 +4,103 @@
 # Imports
 import os
 import glob
-import random
-import pathlib
-import subprocess
 from typing import Optional
 import PIL.Image
 import gradio as gr
+import app_novic
 
-# Ensure access to NOVIC code
-REPO_ROOT = pathlib.Path(__file__).parent.resolve()
-SENTINEL = REPO_ROOT / '.submodules_done'
-if not SENTINEL.exists():
-	print("Initialising git submodules...")
-	subprocess.run(['git', 'submodule', 'update', '--init', '--recursive'], cwd=REPO_ROOT, check=True)
-	SENTINEL.touch()
+# Model checkpoints
+MODEL_CHECKPOINTS = {
+	'NOVIC SigLIP B/16 FT2': os.path.join('ovod_20240610_105233', 'ovod_chunk0899_20240612_005748.train'),
+	'NOVIC SigLIP SO/14 FT2': os.path.join('ovod_20240626_001447', 'ovod_chunk0899_20240627_112729.train'),
+	'NOVIC DFN-5B H/14-378 FT2': os.path.join('ovod_20240620_162925', 'ovod_chunk0899_20240621_202727.train'),
+	'NOVIC DFN-5B H/14-378 FT0': os.path.join('ovod_20240628_142131', 'ovod_chunk0433_20240630_235415.train'),
+}
 
 # Sample images
 IMAGE_EXTS = ('jpg', 'jpeg', 'png', 'webp')
 SAMPLE_IMAGES = sorted(image_path for image_ext in IMAGE_EXTS for image_path in glob.glob(os.path.join('sample_images', f'*.{image_ext}')))
 
-# Classify image
-def classify_image(image: Optional[PIL.Image.Image]) -> dict[str, float]:
-
-	if image is None:
+# Classify an image
+def classify_image(image: Optional[PIL.Image.Image], model: Optional[str]) -> dict[str, float]:
+	if image is None or model is None:
 		return {}
-
-	labels = ('thing', 'item', 'stuff', 'object', 'entity')
-	probs = [random.random() for _ in labels]
-	prob_sum = sum(probs)
-	return {label: prob / prob_sum for label, prob in zip(labels, probs)}
+	checkpoint = os.path.join('checkpoints', MODEL_CHECKPOINTS[model])
+	return app_novic.classify_image(image=image, checkpoint=checkpoint)
 
 # Gradio UI
-demo = gr.Interface(
-	fn=classify_image,
-	inputs=gr.Image(
-		height=400,
-		image_mode='RGB',
-		type='pil',
-		label='Input image',
-		show_label=True,
-		interactive=True,
-		show_fullscreen_button=True,
-	),
-	outputs=gr.Label(
-		num_top_classes=3,
-		label='Predicted label',
-		show_label=True,
-		show_heading=True,
-	),
-	examples=SAMPLE_IMAGES,
-	examples_per_page=20,
-	live=True,
-	title="🖼️ NOVIC: Unconstrained Open Vocabulary Image Classification",
-	description="*Select* an image from the examples shown below **OR** *Upload* an image file from your computer **OR** *Capture* an image using an attached camera **OR** *Copy-paste* an image from your clipboard. The label predictions on the right will update automatically!",
-	article=None,
+with gr.Blocks(
 	theme=None,
-	flagging_mode='never',
 	analytics_enabled=True,
-	api_name='classify',
-	allow_duplication=False,
-	clear_btn=gr.Button(value='Clear', variant='secondary'),
-	show_progress='full',
+	title="🖼️ NOVIC Demo",
 	fill_width=False,
-	deep_link=True,
-)
+) as demo:
+
+	gr.HTML("<h1 style='text-align: center; margin-bottom: 1rem'>🖼️ NOVIC: Unconstrained Open Vocabulary Image Classification</h1><div style='text-align: center'><i>Select</i> an example image below <b>OR</b> <i>Upload</i> an image file <b>OR</b> <i>Capture</i> a camera image <b>OR</b> <i>Copy-paste</i> an image from your clipboard ⇒ The label predictions on the right will update automatically!<br>Note that CPU inference is naturally <i>much</i> slower than GPU inference.</div>")
+
+	with gr.Row(equal_height=True):
+
+		with gr.Column(scale=1):
+			input_model = gr.Dropdown(
+				choices=list(MODEL_CHECKPOINTS),
+				value='NOVIC DFN-5B H/14-378 FT0',
+				type='value',
+				multiselect=False,
+				allow_custom_value=False,
+				filterable=False,
+				label='NOVIC model',
+				show_label=True,
+				interactive=True,
+			)
+			input_image = gr.Image(
+				height=400,
+				image_mode='RGB',
+				type='pil',
+				label='Input image',
+				show_label=True,
+				interactive=True,
+				show_fullscreen_button=True,
+			)
+
+		with gr.Column(scale=1):
+			output_label = gr.Label(
+				num_top_classes=3,
+				label='Predicted label',
+				show_label=True,
+				scale=1,
+				show_heading=True,
+			)
+
+	with gr.Row(equal_height=True):
+		gr.ClearButton(
+			components=[input_image],
+			value='Clear input image',
+			variant='secondary',
+			size='lg',
+			scale=1,
+		)
+		gr.DeepLinkButton(
+			variant='secondary',
+			size='lg',
+			scale=1,
+		)
+
+	gr.Examples(
+		examples=SAMPLE_IMAGES,
+		inputs=input_image,
+		cache_examples=False,
+		examples_per_page=100,
+		label='Example images',
+	)
+
+	gr.on(
+		triggers=[input_image.change, input_model.change],
+		fn=classify_image,
+		inputs=[input_image, input_model],  # noqa
+		outputs=output_label,
+		api_name='classify',
+		show_progress='full',
+	)
 
 # Run demo
 if __name__ == '__main__':

app_novic.py

@@ -0,0 +1,35 @@
+# NOVIC interface
+
+# Imports
+import sys
+import random  # TODO: TEMP
+import pathlib
+import subprocess
+import PIL.Image
+# TODO: Then start coding infer.py (ANY additional import has to be clarified with novic_spaces/requirements.txt (pip install -r requirements.txt) and novic/requirements-infer.txt
+
+# Ensure access to NOVIC code
+REPO_ROOT = pathlib.Path(__file__).parent.resolve()
+NOVIC_DIR = REPO_ROOT / 'novic'
+NOVIC_TEST = NOVIC_DIR / '__init__.py'
+if not NOVIC_TEST.exists():
+	print("Initialising git submodules as NOVIC code was not found yet...")
+	subprocess.run(['git', 'submodule', 'update', '--init', '--recursive'], cwd=REPO_ROOT, check=True)
+	if not NOVIC_TEST.exists():
+		raise RuntimeError("Failed to find NOVIC code")
+if str(NOVIC_DIR) not in sys.path:
+	sys.path.insert(0, str(NOVIC_DIR))
+
+# NOVIC imports
+import infer  # TODO: TEMP
+print(infer)  # TODO: TEMP
+
+# Classify an image
+def classify_image(image: PIL.Image.Image, checkpoint: str) -> dict[str, float]:
+	# TODO: TEMP
+	print(image, checkpoint)
+	labels = ('thing', 'item', 'stuff', 'object', 'entity')
+	probs = [random.random() for _ in labels]
+	prob_sum = sum(probs)
+	return {label: prob / prob_sum for label, prob in zip(labels, probs)}
+# EOF

novic

@@ -1 +1 @@
-Subproject commit bd292d4b22db87fd04b213e8b4184b5d6fbfdc41
+Subproject commit 553f618ae2cbea281ff2926a526e1cfa23e20086

requirements.txt

@@ -1 +1,7 @@
+# python>=3.10
+numpy
+open_clip_torch==2.23
 pillow
+torch
+tqdm
+unidecode