database update

frontend/src/App.css

@@ -1,8 +1,39 @@
+html, body {
+  margin: 0;
+  padding: 0;
+  overflow-x: hidden;
+  width: 100%;
+}
+
 #root {
-  max-width: 1280px;
+  max-width: 100%;
   margin: 0 auto;
-  padding: 2rem;
+  padding: 1rem;
   text-align: center;
+  min-height: 100vh;
+  box-sizing: border-box;
+  overflow-x: hidden;
+  transform: scale(0.8);
+  transform-origin: top center;
+}
+
+/* Responsive adjustments for different screen sizes */
+@media (min-width: 640px) {
+  #root {
+    padding: 1.5rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  #root {
+    padding: 2rem;
+  }
+}
+
+@media (min-width: 1280px) {
+  #root {
+    max-width: 1280px;
+  }
 }
 
 .logo {

frontend/src/App.tsx

@@ -1,10 +1,10 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import RootLayout from './layouts/RootLayout';
 import UploadPage from './pages/UploadPage';
-import ReviewPage from './pages/ReviewPage';
 import AnalyticsPage from './pages/AnalyticsPage';
 import ExplorePage from './pages/ExplorePage';
 import HelpPage from './pages/HelpPage';
+import MapDetailPage from './pages/MapDetailPage';
 
 const router = createBrowserRouter([
   {
@@ -12,10 +12,10 @@ const router = createBrowserRouter([
     children: [
       { path: '/',          element: <UploadPage /> },
       { path: '/upload',    element: <UploadPage /> },
-      { path: '/review/:id',   element: <ReviewPage /> },
       { path: '/analytics', element: <AnalyticsPage /> },
       { path: '/explore',   element: <ExplorePage /> },
       { path: '/help',      element: <HelpPage /> },
+      { path: '/map/:mapId', element: <MapDetailPage /> },
     ],
   },
 ]);

frontend/src/components/HeaderNav.tsx

@@ -4,13 +4,13 @@ import {
   AnalysisIcon,
   SearchLineIcon,
   QuestionLineIcon,
+  GoMainIcon,
 } from "@ifrc-go/icons";
 
 /* Style helper for active vs. inactive nav links */
 const navLink = ({ isActive }: { isActive: boolean }) =>
-  `flex items-center gap-1 px-3 py-2 text-sm transition-colors ${
-    isActive ? "text-ifrcRed font-semibold" : "text-gray-600 hover:text-ifrcRed"
-  }`;
+  `flex items-center gap-1 px-4 sm:px-6 py-2 text-xs sm:text-sm transition-colors whitespace-nowrap mx-4 sm:mx-6
+  ${isActive ? "text-ifrcRed font-semibold" : "text-gray-600 hover:text-ifrcRed"}`;
 
 /* Put page info in one list so it’s easy to extend */
 const navItems = [
@@ -36,19 +36,19 @@ export default function HeaderNav() {
 
   return (
     <header className="bg-white border-b border-ifrcRed/40">
-      <div className="flex items-center justify-between px-6 py-3">
+      <div className="flex items-center justify-between px-2 sm:px-4 py-3 max-w-full overflow-hidden">
 
         {/* ── Logo + title ─────────────────────────── */}
-        <NavLink to="/" className="flex items-center gap-2" onClick={(e) => handleNavigation(e, "/")}>
-          <img src="/ifrc-logo.svg" alt="IFRC logo" className="h-6" />
-          <span className="font-semibold">PromptAid Vision</span>
+        <NavLink to="/" className="flex items-center gap-2 min-w-0" onClick={(e) => handleNavigation(e, "/")}>
+          <GoMainIcon className="h-6 w-6 flex-shrink-0 text-ifrcRed" />
+          <span className="font-semibold text-sm sm:text-base truncate">PromptAid Vision</span>
         </NavLink>
 
         {/* ── Centre nav links ─────────────────────── */}
-        <nav className="flex gap-6">
+        <nav className="flex flex-wrap justify-center gap-6">
           {navItems.map(({ to, label, Icon }) => (
             <NavLink key={to} to={to} className={navLink} onClick={(e) => handleNavigation(e, to)}>
-              <Icon className="w-4 h-4" /> {label}
+              <Icon className="w-4 h-4" /> <span className="inline">{label}</span>
             </NavLink>
           ))}
         </nav>

frontend/src/pages/ExplorePage.tsx

@@ -1,9 +1,126 @@
-import { PageContainer, Heading } from '@ifrc-go/ui';
+import { PageContainer, Heading, TextInput, SearchSelectInput, SearchMultiSelectInput } from '@ifrc-go/ui';
+import { useState, useEffect, useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+interface MapOut {
+  image_id: string;
+  file_key: string;
+  image_url: string;
+  source: string;
+  type: string;
+  epsg: string;
+  image_type: string;
+  caption?: {
+    generated: string;
+  };
+}
 
 export default function ExplorePage() {
+  const navigate = useNavigate();
+  const [maps, setMaps] = useState<MapOut[]>([]);
+  const [search, setSearch] = useState('');
+  const [srcFilter, setSrcFilter] = useState('');
+  const [catFilter, setCatFilter] = useState('');
+  const [sources, setSources] = useState<{s_code: string, label: string}[]>([]);
+  const [types, setTypes] = useState<{t_code: string, label: string}[]>([]);
+
+  useEffect(() => {
+    // Fetch maps
+    fetch('/api/images/').then(r => r.json()).then(setMaps);
+    
+    // Fetch lookup data
+    fetch('/api/sources').then(r => r.json()).then(setSources);
+    fetch('/api/types').then(r => r.json()).then(setTypes);
+  }, []);
+
+  const filtered = useMemo(() => {
+    return maps.filter(m => {
+      return (
+        m.file_key.toLowerCase().includes(search.toLowerCase()) &&
+        (!srcFilter || m.source === srcFilter) &&
+        (!catFilter || m.type === catFilter)
+      );
+    });
+  }, [maps, search, srcFilter, catFilter]);
+
+  const sourceOptions   = sources.map(s => ({ value: s.s_code, label: s.label }));
+  const typeOptions = types.map(t => ({ value: t.t_code, label: t.label }));
+
   return (
-    <PageContainer className="py-10 text-center">
-      <Heading level={2}>Explore Dataset</Heading>
+    <PageContainer>
+      <Heading level={2}>Explore Examples</Heading>
+
+      {/* ── Filters Bar ──────────────────────────────── */}
+      <div className="mt-4 flex flex-wrap gap-4 items-center">
+        <TextInput
+          name="search"
+          placeholder="Search by filename…"
+          value={search}
+          onChange={(e) => setSearch(e || '')}
+          className="flex-1 min-w-[12rem]"
+        />
+
+        <SearchSelectInput
+          name="source"
+          placeholder="All Sources"
+          options={sourceOptions}
+          value={srcFilter || null}
+          onChange={(v) => setSrcFilter(v as string || '')}
+          keySelector={(o) => o.value}
+          labelSelector={(o) => o.label}
+          selectedOnTop={false}
+        />
+
+        <SearchMultiSelectInput
+          name="type"
+          placeholder="All Types"
+          options={typeOptions}
+          value={catFilter ? [catFilter] : []}
+          onChange={(v) => setCatFilter((v as string[])[0] || '')}
+          keySelector={(o) => o.value}
+          labelSelector={(o) => o.label}
+          selectedOnTop={false}
+        />
+      </div>
+
+      {/* ── List ─────────────────────────────────────── */}
+      <div className="mt-6 space-y-4">
+        {filtered.map(m => (
+          <div key={m.image_id} className="border rounded-lg p-4 flex gap-4 cursor-pointer" onClick={() => navigate(`/map/${m.image_id}`)}>
+            <div className="bg-gray-100 flex items-center justify-center text-gray-400 text-xs overflow-hidden rounded" style={{ width: '120px', height: '80px' }}>
+              {m.image_url ? (
+                <img 
+                  src={m.image_url} 
+                  alt={m.file_key}
+                  className="w-full h-full object-cover"
+                  style={{ imageRendering: 'pixelated' }}
+                  onError={(e) => {
+                    // Fallback to placeholder if image fails to load
+                    const target = e.target as HTMLImageElement;
+                    target.style.display = 'none';
+                    target.parentElement!.innerHTML = 'Img';
+                  }}
+                />
+              ) : (
+                'Img'
+              )}
+            </div>
+            <div className="flex-1 min-w-0">
+              <div className="flex flex-wrap gap-2">
+                <span className="px-2 py-1 bg-ifrcRed/10 text-ifrcRed text-xs rounded">{m.source}</span>
+                <span className="px-2 py-1 bg-ifrcRed/10 text-ifrcRed text-xs rounded">{m.type}</span>
+              </div>
+              <p className="mt-2 text-sm text-gray-700 line-clamp-2">
+                {m.caption?.generated || '— no caption yet —'}
+              </p>
+            </div>
+          </div>
+        ))}
+
+        {!filtered.length && (
+          <p className="text-center text-gray-500">No examples found.</p>
+        )}
+      </div>
     </PageContainer>
   );
 }

frontend/src/pages/MapDetailPage.tsx

@@ -0,0 +1,198 @@
+import { PageContainer, Heading, Button } from '@ifrc-go/ui';
+import { useState, useEffect } from 'react';
+import { useParams, useNavigate } from 'react-router-dom';
+
+interface MapOut {
+  image_id: string;
+  file_key: string;
+  image_url: string;
+  source: string;
+  type: string;
+  epsg: string;
+  image_type: string;
+  caption?: {
+    generated: string;
+  };
+}
+
+export default function MapDetailPage() {
+  const { mapId } = useParams<{ mapId: string }>();
+  const navigate = useNavigate();
+  const [map, setMap] = useState<MapOut | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [contributing, setContributing] = useState(false);
+
+  useEffect(() => {
+    if (!mapId) {
+      setError('Map ID is required');
+      setLoading(false);
+      return;
+    }
+
+    // Fetch the specific map
+    fetch(`/api/images/${mapId}`)
+      .then(response => {
+        if (!response.ok) {
+          throw new Error('Map not found');
+        }
+        return response.json();
+      })
+      .then(data => {
+        setMap(data);
+        setLoading(false);
+      })
+      .catch(err => {
+        setError(err.message);
+        setLoading(false);
+      });
+  }, [mapId]);
+
+  const handleContribute = async () => {
+    if (!map) return;
+    
+    setContributing(true);
+    try {
+      // Simulate uploading the current image by creating a new map entry
+      const formData = new FormData();
+      formData.append('source', map.source);
+      formData.append('type', map.type);
+      formData.append('epsg', map.epsg);
+      formData.append('image_type', map.image_type);
+      
+      // We'll need to fetch the image and create a file from it
+      const imageResponse = await fetch(map.image_url);
+      const imageBlob = await imageResponse.blob();
+      const file = new File([imageBlob], map.file_key, { type: 'image/jpeg' });
+      formData.append('file', file);
+
+      const response = await fetch('/api/images/', {
+        method: 'POST',
+        body: formData,
+      });
+
+      if (!response.ok) {
+        throw new Error('Failed to contribute image');
+      }
+
+      const result = await response.json();
+      
+      // Navigate to the upload page with the new map ID and step 2
+      navigate(`/upload?mapId=${result.image_id}&step=2`);
+    } catch (err) {
+      console.error('Contribution failed:', err);
+      alert('Failed to contribute image. Please try again.');
+    } finally {
+      setContributing(false);
+    }
+  };
+
+  if (loading) {
+    return (
+      <PageContainer>
+        <div className="flex items-center justify-center min-h-[400px]">
+          <div className="text-gray-500">Loading...</div>
+        </div>
+      </PageContainer>
+    );
+  }
+
+  if (error || !map) {
+    return (
+      <PageContainer>
+        <div className="flex items-center justify-center min-h-[400px]">
+          <div className="text-red-500">{error || 'Map not found'}</div>
+        </div>
+      </PageContainer>
+    );
+  }
+
+  return (
+    <PageContainer>
+      <div className="mb-4">
+        <button
+          onClick={() => navigate('/explore')}
+          className="text-ifrcRed hover:text-ifrcRed/80 mb-4 flex items-center gap-2"
+        >
+          ← Back to Explore
+        </button>
+        <Heading level={2}>Map Details</Heading>
+      </div>
+
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
+        {/* Image Section */}
+        <div className="space-y-4">
+          <div className="bg-gray-100 rounded-lg overflow-hidden">
+            {map.image_url ? (
+              <img
+                src={map.image_url}
+                alt={map.file_key}
+                className="w-full h-auto object-contain"
+                style={{ imageRendering: 'pixelated' }}
+              />
+            ) : (
+              <div className="w-full h-64 bg-gray-200 flex items-center justify-center text-gray-400">
+                No image available
+              </div>
+            )}
+          </div>
+        </div>
+
+        {/* Details Section */}
+        <div className="space-y-6">
+          <div>
+            <h3 className="text-lg font-semibold mb-2">File Information</h3>
+            <div className="space-y-2 text-sm">
+              <div><span className="font-medium">File:</span> {map.file_key}</div>
+              <div><span className="font-medium">ID:</span> {map.image_id}</div>
+            </div>
+          </div>
+
+          <div>
+            <h3 className="text-lg font-semibold mb-2">Metadata</h3>
+            <div className="flex flex-wrap gap-2">
+              <span className="px-3 py-1 bg-ifrcRed/10 text-ifrcRed text-sm rounded">
+                {map.source}
+              </span>
+              <span className="px-3 py-1 bg-ifrcRed/10 text-ifrcRed text-sm rounded">
+                {map.type}
+              </span>
+              <span className="px-3 py-1 bg-ifrcRed/10 text-ifrcRed text-sm rounded">
+                {map.epsg}
+              </span>
+              <span className="px-3 py-1 bg-ifrcRed/10 text-ifrcRed text-sm rounded">
+                {map.image_type}
+              </span>
+            </div>
+          </div>
+
+          <div>
+            <h3 className="text-lg font-semibold mb-2">Generated Caption</h3>
+            <div className="bg-gray-50 p-4 rounded-lg">
+              <p className="text-gray-700">
+                {map.caption?.generated || '— no caption yet —'}
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Contribute Section */}
+      <div className="mt-8 pt-6 border-t border-gray-200">
+        <div className="text-center">
+          <p className="text-gray-600 mb-4">
+            Want to contribute to this map? Use this image as a starting point for your own analysis.
+          </p>
+          <Button
+            name="contribute"
+            onClick={handleContribute}
+            disabled={contributing}
+            className="bg-ifrcRed hover:bg-ifrcRed/90 text-white px-6 py-2 rounded-lg"
+          >
+            {contributing ? 'Contributing...' : 'Contribute'}
+          </Button>
+        </div>
+      </div>
+    </PageContainer>
+  );
+} 

frontend/src/pages/ReviewPage.tsx

@@ -1,33 +0,0 @@
-// src/pages/ReviewPage.tsx
-import { useParams } from "react-router-dom";
-import { useEffect, useState } from "react";
-
-export default function ReviewPage() {
-  const { id } = useParams();          // captionId
-  const [data, setData] = useState<any>(null);
-  const [draft, setDraft] = useState("");
-
-  useEffect(() => {
-    (async () => {
-      const res = await fetch(`/api/captions/${id}`);
-      const json = await res.json();
-      setData(json);
-      setDraft(json.generated || "");
-    })();
-  }, [id]);
-
-  if (!data) return <p className="p-6">Loading…</p>;
-
-  return (
-    <main className="p-6 space-y-6">
-      <img src={data.imageUrl} className="max-w-full rounded-xl shadow" />
-      <textarea
-        value={draft}
-        onChange={e => setDraft(e.target.value)}
-        className="w-full border rounded p-3 font-mono" rows={5}
-      />
-      {/* sliders for accuracy/context/usability */}
-      {/* Save button calls PUT /api/captions/{id} */}
-    </main>
-  );
-}

frontend/src/pages/UploadPage.tsx

@@ -9,39 +9,97 @@ import {
   UploadCloudLineIcon,
   ArrowRightLineIcon,
 } from '@ifrc-go/icons';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 
 export default function UploadPage() {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const [step, setStep] = useState<1 | 2 | 3>(1);
   const [preview, setPreview] = useState<string | null>(null);
   /* ---------------- local state ----------------- */
 
-  const PH_SOURCE   = "_TBD_SOURCE";
-  const PH_REGION   = "_TBD_REGION";
-  const PH_CATEGORY = "_TBD_CATEGORY";
+  const PH_SOURCE   = "OTHER";
+  const PH_TYPE = "OTHER";
+  const PH_EPSG     = "OTHER";
+  const PH_IMAGE_TYPE = "crisis_map";
 
   const [file, setFile] = useState<File | null>(null);
   //const [source,    setSource]    = useState('');
-  //const [region,    setRegion]    = useState('');
-  //const [category,  setCategory]  = useState('');
+  //const [type,  setType]  = useState('');
   const [source,   setSource]   = useState(PH_SOURCE);
-  const [region,   setRegion]   = useState(PH_REGION);
-  const [category, setCategory] = useState(PH_CATEGORY);
+  const [type, setType] = useState(PH_TYPE);
+  const [epsg, setEpsg] = useState(PH_EPSG);
+  const [imageType, setImageType] = useState(PH_IMAGE_TYPE);
   const [countries, setCountries] = useState<string[]>([]);
 
+  // Metadata options from database
+  const [sources, setSources] = useState<{s_code: string, label: string}[]>([]);
+  const [types, setTypes] = useState<{t_code: string, label: string}[]>([]);
+  const [spatialReferences, setSpatialReferences] = useState<{epsg: string, srid: string, proj4: string, wkt: string}[]>([]);
+  const [imageTypes, setImageTypes] = useState<{image_type: string, label: string}[]>([]);
+
   // Wrapper functions to handle OptionKey to string conversion
   const handleSourceChange = (value: any) => setSource(String(value));
-  const handleRegionChange = (value: any) => setRegion(String(value));
-  const handleCategoryChange = (value: any) => setCategory(String(value));
+  const handleTypeChange = (value: any) => setType(String(value));
+  const handleEpsgChange = (value: any) => setEpsg(String(value));
+  const handleImageTypeChange = (value: any) => setImageType(String(value));
   const handleCountriesChange = (value: any) => setCountries(Array.isArray(value) ? value.map(String) : []);
 
+  // Fetch metadata options on component mount
+  useEffect(() => {
+    fetch('/api/sources').then(r => r.json()).then(setSources);
+    fetch('/api/types').then(r => r.json()).then(setTypes);
+    fetch('/api/spatial-references').then(r => r.json()).then(setSpatialReferences);
+    fetch('/api/image-types').then(r => r.json()).then(setImageTypes);
+  }, []);
+
   const [captionId, setCaptionId] = useState<string | null>(null);
 
   const [imageUrl, setImageUrl] = useState<string|null>(null);
 
   const [draft, setDraft] = useState('');
 
+  // Handle URL parameters for direct step 2 navigation
+  useEffect(() => {
+    const mapId = searchParams.get('mapId');
+    const stepParam = searchParams.get('step');
+    
+    if (mapId && stepParam === '2') {
+      // Load the map data and start at step 2
+      fetch(`/api/images/${mapId}`)
+        .then(response => response.json())
+        .then(mapData => {
+          setImageUrl(mapData.image_url);
+          setSource(mapData.source);
+          setType(mapData.type);
+          setEpsg(mapData.epsg);
+          setImageType(mapData.image_type);
+          
+          // Generate caption for the existing map
+          return fetch(`/api/images/${mapId}/caption`, { 
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            body: new URLSearchParams({
+              title: 'Generated Caption',
+              prompt: 'Describe this crisis map in detail'
+            })
+          });
+        })
+        .then(capResponse => capResponse.json())
+        .then(capData => {
+          setCaptionId(capData.cap_id);
+          setDraft(capData.generated);
+          setStep(2);
+        })
+        .catch(err => {
+          console.error('Failed to load map data:', err);
+          alert('Failed to load map data. Please try again.');
+        });
+    }
+  }, [searchParams]);
+
   // Handle navigation with confirmation
   const handleNavigation = () => {
     if (step === 2) {
@@ -111,25 +169,35 @@ export default function UploadPage() {
     const fd = new FormData();
     fd.append('file', file);
     fd.append('source', source);
-    fd.append('region', region);
-    fd.append('category', category);
+    fd.append('type', type);
+    fd.append('epsg', epsg);
+    fd.append('image_type', imageType);
     countries.forEach((c) => fd.append('countries', c));
 
     try {
       /* 1) upload */
-      const mapRes = await fetch('/api/maps/', { method: 'POST', body: fd });
+      const mapRes = await fetch('/api/images/', { method: 'POST', body: fd });
       const mapJson = await readJsonSafely(mapRes);
       if (!mapRes.ok) throw new Error(mapJson.error || 'Upload failed');
       setImageUrl(mapJson.image_url);
 
-      const mapIdVal = mapJson.map_id;
-      if (!mapIdVal) throw new Error('Upload failed: map_id not found');
+      const mapIdVal = mapJson.image_id;
+      if (!mapIdVal) throw new Error('Upload failed: image_id not found');
       // setMapId(mapIdVal);
     
       /* 2) caption */
       const capRes = await fetch(
-        `/api/maps/${mapIdVal}/caption`, 
-        { method: 'POST' },
+        `/api/images/${mapIdVal}/caption`, 
+        { 
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+          body: new URLSearchParams({
+            title: 'Generated Caption',
+            prompt: 'Describe this crisis map in detail'
+          })
+        },
       );
       const capJson = await readJsonSafely(capRes);
       if (!capRes.ok) throw new Error(capJson.error || 'Caption failed');
@@ -147,7 +215,10 @@ export default function UploadPage() {
   /* ------------------------------------------------------------------- */
   return (
     <PageContainer>
-      <div className="mx-auto max-w-3xl text-center px-4 py-10" data-step={step}>
+      <div
+        className="mx-auto max-w-screen-lg text-center px-2 sm:px-4 py-6 sm:py-10 overflow-x-hidden"
+        data-step={step}
+      >
         {/* Title & intro copy */}
         {step === 1 && <>
           <Heading level={2}>Upload Your Crisis Map</Heading>
@@ -157,7 +228,7 @@ export default function UploadPage() {
             description, then review and rate the result based on your expertise.
           </p>
           {/* “More »” link  */}
-          <div className="mt-2">
+          <div className="mt-2 flex justify-center">
             <Link
               to="/help"
               className="text-ifrcRed text-xs hover:underline flex items-center gap-1"
@@ -172,7 +243,7 @@ export default function UploadPage() {
         {/* Drop-zone */}
         {step === 1 && (
           <div
-            className="mt-10 border-2 border-dashed border-gray-300 bg-gray-50 rounded-xl p-10 flex flex-col items-center gap-4 hover:bg-gray-100 transition-colors"
+            className="mt-6 sm:mt-10 border-2 border-dashed border-gray-300 bg-gray-50 rounded-xl py-12 px-8 flex flex-col items-center gap-6 hover:bg-gray-100 transition-colors max-w-md mx-auto min-h-[300px] justify-center"
             onDragOver={(e) => e.preventDefault()}
             onDrop={onDrop}
           >
@@ -183,36 +254,44 @@ export default function UploadPage() {
                 Selected file: {file.name}
               </p>
             ) : (
-              <>
-                <p className="text-sm text-gray-600">Drag &amp; Drop a file here</p>
-                <p className="text-xs text-gray-500">or</p>
-
-                {/* File-picker button */}
-                <RawFileInput name="file" accept="image/*" onChange={onFileChange}>
-                  <Button name="upload" size={1}>
-                    Upload
-                  </Button>
-                </RawFileInput>
-              </>
+              <p className="text-sm text-gray-600">Drag &amp; Drop a file here</p>
             )}
+            
+            {/* File-picker button - always visible */}
+            <label className="inline-block cursor-pointer">
+              <input
+                type="file"
+                accept="image/*"
+                className="sr-only"
+                onChange={e => onFileChange(e.target.files?.[0], "file")}
+              />
+              <Button 
+                name="upload" 
+                size={1}
+                onClick={() => (document.querySelector('input[type="file"]') as HTMLInputElement)?.click()}
+              >
+                {file ? 'Change File' : 'Upload'}
+              </Button>
+            </label>
           </div>
         )}
 
         {/* Generate button */}
         {step === 1 && (
-          <Button
-            name="generate"
-            className="mt-8"
-            disabled={!file}
-            onClick={handleGenerate}
-          >
-            Generate
-          </Button>
+          <div className="flex justify-center mt-12">
+            <Button
+              name="generate"
+              disabled={!file}
+              onClick={handleGenerate}
+            >
+              Generate
+            </Button>
+          </div>
         )}
 
 {step === 2 && imageUrl && (
   <div className="mt-6 flex justify-center">
-    <div className="w-full max-w-3xl max-h-80 overflow-hidden bg-red-50">
+    <div className="w-full max-w-screen-lg max-h-80 overflow-hidden bg-red-50">
              <img
          src={preview || undefined}
          alt="Uploaded map preview"
@@ -225,47 +304,44 @@ export default function UploadPage() {
 {step === 2 && (
   <div className="space-y-10">
     {/* ────── METADATA FORM ────── */}
-    <div className="grid gap-4 text-left sm:grid-cols-2">
+    <div className="grid gap-4 text-left grid-cols-1 lg:grid-cols-2">
       <SelectInput
         label="Source"
         name="source"
         value={source}
         onChange={handleSourceChange}
-        options={[
-          { value: 'UNOSAT', label: 'UNOSAT' },
-          { value: 'FIELD',  label: 'Field HQ' },
-        ]}
-        keySelector={(o) => o.value}
+        options={sources}
+        keySelector={(o) => o.s_code}
         labelSelector={(o) => o.label}
         required
       />
       <SelectInput
-        label="Region"
-        name="region"
-        value={region}
-        onChange={handleRegionChange}
-        options={[
-          { value: 'AFR',  label: 'Africa' },
-          { value: 'AMR',  label: 'Americas' },
-          { value: 'APA',  label: 'Asia‑Pacific' },
-          { value: 'EUR',  label: 'Europe' },
-          { value: 'MENA', label: 'Middle East & N Africa' },
-        ]}
-        keySelector={(o) => o.value}
+        label="Type"
+        name="type"
+        value={type}
+        onChange={handleTypeChange}
+        options={types}
+        keySelector={(o) => o.t_code}
         labelSelector={(o) => o.label}
         required
       />
       <SelectInput
-        label="Category"
-        name="category"
-        value={category}
-        onChange={handleCategoryChange}
-        options={[
-          { value: 'FLOOD',      label: 'Flood' },
-          { value: 'WILDFIRE',   label: 'Wildfire' },
-          { value: 'EARTHQUAKE', label: 'Earthquake' },
-        ]}
-        keySelector={(o) => o.value}
+        label="EPSG"
+        name="epsg"
+        value={epsg}
+        onChange={handleEpsgChange}
+        options={spatialReferences}
+        keySelector={(o) => o.epsg}
+        labelSelector={(o) => `${o.srid} (EPSG:${o.epsg})`}
+        required
+      />
+      <SelectInput
+        label="Image Type"
+        name="image_type"
+        value={imageType}
+        onChange={handleImageTypeChange}
+        options={imageTypes}
+        keySelector={(o) => o.image_type}
         labelSelector={(o) => o.label}
         required
       />
@@ -289,8 +365,8 @@ export default function UploadPage() {
     <div className="text-left">
       <Heading level={3}>How well did the AI perform on the task?</Heading>
       {(['accuracy', 'context', 'usability'] as const).map((k) => (
-        <div key={k} className="mt-6 flex items-center gap-4">
-          <label className="block text-sm font-medium capitalize w-28">{k}</label>
+        <div key={k} className="mt-6 flex items-center gap-2 sm:gap-4">
+          <label className="block text-sm font-medium capitalize w-20 sm:w-28 flex-shrink-0">{k}</label>
           <input
             type="range"
             min={0}
@@ -301,7 +377,7 @@ export default function UploadPage() {
             }
             className="w-full accent-ifrcRed"
           />
-          <span className="ml-2 w-10 text-right tabular-nums">{scores[k]}</span>
+          <span className="ml-2 w-8 sm:w-10 text-right tabular-nums flex-shrink-0">{scores[k]}</span>
         </div>
       ))}
     </div>
@@ -310,7 +386,7 @@ export default function UploadPage() {
     <div className="text-left">
       <Heading level={3}>AI‑Generated Caption</Heading>
       <textarea
-        className="w-full border rounded p-3 font-mono mt-2"
+        className="w-full border rounded p-2 sm:p-3 font-mono mt-2"
         rows={5}
         value={draft}
         onChange={(e) => setDraft(e.target.value)}
@@ -318,29 +394,30 @@ export default function UploadPage() {
     </div>
 
     {/* ────── SUBMIT BUTTON ────── */}
-    <Button
-      name="submit"
-      className="mt-10"
-      onClick={async () => {
-        if (!captionId) return alert("No caption to submit");
-        const body = {
-          edited: draft,
-          accuracy: scores.accuracy,
-          context:  scores.context,
-          usability: scores.usability,
-        };
-        const res = await fetch(`/api/captions/${captionId}`, {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(body),
-        });
-        const json = await readJsonSafely(res);
-        if (!res.ok) return alert(json.error || "Save failed");
-        setStep(3);
-      }}
-    >
-      Submit
-    </Button>
+    <div className="flex justify-center mt-10">
+      <Button
+        name="submit"
+        onClick={async () => {
+          if (!captionId) return alert("No caption to submit");
+          const body = {
+            edited: draft,
+            accuracy: scores.accuracy,
+            context:  scores.context,
+            usability: scores.usability,
+          };
+          const res = await fetch(`/api/captions/${captionId}`, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(body),
+          });
+          const json = await readJsonSafely(res);
+          if (!res.ok) return alert(json.error || "Save failed");
+          setStep(3);
+        }}
+      >
+        Submit
+      </Button>
+    </div>
           </div>
       )}
 
@@ -349,13 +426,14 @@ export default function UploadPage() {
         <div className="text-center space-y-6">
           <Heading level={2}>Saved!</Heading>
           <p className="text-gray-700">Your caption has been successfully saved.</p>
-          <Button
-            name="upload-another"
-            onClick={resetToStep1}
-            className="mt-6"
-          >
-            Upload Another
-          </Button>
+          <div className="flex justify-center mt-6">
+            <Button
+              name="upload-another"
+              onClick={resetToStep1}
+            >
+              Upload Another
+            </Button>
+          </div>
         </div>
       )}
       

frontend/src/types.ts

@@ -0,0 +1,17 @@
+export interface MapOut {
+  map_id: string; // UUID as string
+  file_key: string;
+  sha256: string;
+  source: string;
+  region: string;
+  category: string;
+  caption?: {
+    cap_id: string; // UUID as string
+    map_id: string; // UUID as string
+    generated: string;
+    edited?: string;
+    accuracy?: number;
+    context?: number;
+    usability?: number;
+  };
+} 

package-lock.json

@@ -1,108 +0,0 @@
-{
-  "name": "PromptAid-Vision",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "devDependencies": {
-        "prisma": "^6.12.0"
-      }
-    },
-    "node_modules/@prisma/config": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@prisma/config/-/config-6.12.0.tgz",
-      "integrity": "sha512-HovZWzhWEMedHxmjefQBRZa40P81N7/+74khKFz9e1AFjakcIQdXgMWKgt20HaACzY+d1LRBC+L4tiz71t9fkg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jiti": "2.4.2"
-      }
-    },
-    "node_modules/@prisma/debug": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.12.0.tgz",
-      "integrity": "sha512-plbz6z72orcqr0eeio7zgUrZj5EudZUpAeWkFTA/DDdXEj28YHDXuiakvR6S7sD6tZi+jiwQEJAPeV6J6m/tEQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@prisma/engines": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.12.0.tgz",
-      "integrity": "sha512-4BRZZUaAuB4p0XhTauxelvFs7IllhPmNLvmla0bO1nkECs8n/o1pUvAVbQ/VOrZR5DnF4HED0PrGai+rIOVePA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@prisma/debug": "6.12.0",
-        "@prisma/engines-version": "6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc",
-        "@prisma/fetch-engine": "6.12.0",
-        "@prisma/get-platform": "6.12.0"
-      }
-    },
-    "node_modules/@prisma/engines-version": {
-      "version": "6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc.tgz",
-      "integrity": "sha512-70vhecxBJlRr06VfahDzk9ow4k1HIaSfVUT3X0/kZoHCMl9zbabut4gEXAyzJZxaCGi5igAA7SyyfBI//mmkbQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@prisma/fetch-engine": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.12.0.tgz",
-      "integrity": "sha512-EamoiwrK46rpWaEbLX9aqKDPOd8IyLnZAkiYXFNuq0YsU0Z8K09/rH8S7feOWAVJ3xzeSgcEJtBlVDrajM9Sag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@prisma/debug": "6.12.0",
-        "@prisma/engines-version": "6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc",
-        "@prisma/get-platform": "6.12.0"
-      }
-    },
-    "node_modules/@prisma/get-platform": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.12.0.tgz",
-      "integrity": "sha512-nRerTGhTlgyvcBlyWgt8OLNIV7QgJS2XYXMJD1hysorMCuLAjuDDuoxmVt7C2nLxbuxbWPp7OuFRHC23HqD9dA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@prisma/debug": "6.12.0"
-      }
-    },
-    "node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
-    "node_modules/prisma": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.12.0.tgz",
-      "integrity": "sha512-pmV7NEqQej9WjizN6RSNIwf7Y+jeh9mY1JEX2WjGxJi4YZWexClhde1yz/FuvAM+cTwzchcMytu2m4I6wPkIzg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@prisma/config": "6.12.0",
-        "@prisma/engines": "6.12.0"
-      },
-      "bin": {
-        "prisma": "build/index.js"
-      },
-      "engines": {
-        "node": ">=18.18"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    }
-  }
-}

package.json

@@ -1,5 +0,0 @@
-{
-  "devDependencies": {
-    "prisma": "^6.12.0"
-  }
-}

prisma/schema.prisma

@@ -1,87 +0,0 @@
-generator client {
-  provider = "prisma-client-js"
-  output   = "../generated/prisma"
-}
-
-datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
-}
-
-/// This table contains check constraints and requires additional setup for migrations. Visit https://pris.ly/d/check-constraints for more info.
-model captions {
-  cap_id                      String    @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  map_id                      String?   @unique @db.Uuid
-  model                       String
-  raw_json                    Json
-  generated                   String
-  edited                      String?
-  accuracy                    Int?      @db.SmallInt
-  context                     Int?      @db.SmallInt
-  usability                   Int?      @db.SmallInt
-  created_at                  DateTime  @default(now()) @db.Timestamptz(6)
-  updated_at                  DateTime? @db.Timestamptz(6)
-  maps                        maps?     @relation(fields: [map_id], references: [map_id], onDelete: Cascade, onUpdate: NoAction)
-  model_captions_modelTomodel model     @relation("captions_modelTomodel", fields: [model], references: [m_code], onDelete: NoAction, onUpdate: NoAction)
-}
-
-model category {
-  cat_code                     String @id
-  label                        String
-  maps_maps_categoryTocategory maps[] @relation("maps_categoryTocategory")
-}
-
-model country {
-  c_code        String          @id @db.Char(2)
-  label         String
-  map_countries map_countries[]
-}
-
-model goose_db_version {
-  id         Int      @id @default(autoincrement())
-  version_id BigInt
-  is_applied Boolean
-  tstamp     DateTime @default(now()) @db.Timestamp(6)
-}
-
-model map_countries {
-  map_id  String  @db.Uuid
-  c_code  String  @db.Char(2)
-  country country @relation(fields: [c_code], references: [c_code], onDelete: NoAction, onUpdate: NoAction)
-  maps    maps    @relation(fields: [map_id], references: [map_id], onDelete: Cascade, onUpdate: NoAction)
-
-  @@id([map_id, c_code])
-}
-
-model maps {
-  map_id                           String          @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  file_key                         String
-  sha256                           String
-  created_at                       DateTime        @default(now()) @db.Timestamptz(6)
-  source                           String
-  region                           String
-  category                         String
-  captions                         captions?
-  map_countries                    map_countries[]
-  category_maps_categoryTocategory category        @relation("maps_categoryTocategory", fields: [category], references: [cat_code], onDelete: NoAction, onUpdate: NoAction)
-  region_maps_regionToregion       region          @relation("maps_regionToregion", fields: [region], references: [r_code], onDelete: NoAction, onUpdate: NoAction)
-  sources                          sources         @relation(fields: [source], references: [s_code], onDelete: NoAction, onUpdate: NoAction)
-}
-
-model model {
-  m_code                         String     @id
-  label                          String
-  captions_captions_modelTomodel captions[] @relation("captions_modelTomodel")
-}
-
-model region {
-  r_code                   String @id
-  label                    String
-  maps_maps_regionToregion maps[] @relation("maps_regionToregion")
-}
-
-model sources {
-  s_code String @id
-  label  String
-  maps   maps[]
-}

py_backend/alembic/versions/0002_seed.py

@@ -1,87 +0,0 @@
-# py_backend/alembic/versions/0002_seed_lookups.py
-
-"""seed lookup tables
-
-Revision ID: 0002seed
-Revises: ad38fd571716
-Create Date: 2025-07-25 14:00:00.000000
-"""
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = '0002seed'
-down_revision = 'ad38fd571716'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # 1) sources
-    op.execute("""
-      INSERT INTO sources (s_code, label) VALUES
-        ('WFP_ADAM',    'WFP ADAM – Automated Disaster Analysis & Mapping'),
-        ('PDC',         'Pacific Disaster Center (PDC)'),
-        ('GDACS',       'GDACS – Global Disaster Alert & Coordination System'),
-        ('GFL_HUB',     'Google Flood Hub'),
-        ('GFL_GENCAST', 'Google GenCast'),
-        ('USGS',        'USGS – United States Geological Survey'),
-        ('_TBD_SOURCE','TBD placeholder')
-      ON CONFLICT (s_code) DO NOTHING;
-    """)
-
-    # 2) region
-    op.execute("""
-      INSERT INTO region (r_code, label) VALUES
-        ('AFR','Africa'),
-        ('AMR','Americas'),
-        ('APA','Asia‑Pacific'),
-        ('EUR','Europe'),
-        ('MENA','Middle East & North Africa'),
-        ('_TBD_REGION','TBD placeholder')
-      ON CONFLICT (r_code) DO NOTHING;
-    """)
-
-    # 3) category
-    op.execute("""
-      INSERT INTO category (cat_code, label) VALUES
-        ('FLOOD','Flood'),
-        ('WILDFIRE','Wildfire'),
-        ('EARTHQUAKE','Earthquake'),
-        ('CYCLONE','Cyclone'),
-        ('DROUGHT','Drought'),
-        ('LANDSLIDE','Landslide'),
-        ('TORNADO','Tornado'),
-        ('VOLCANO','Volcano'),
-        ('OTHER','Other'),
-        ('_TBD_CATEGORY','TBD placeholder')
-      ON CONFLICT (cat_code) DO NOTHING;
-    """)
-
-    # 4) model
-    op.execute("""
-      INSERT INTO model (m_code, label) VALUES
-        ('GPT-4O',   'GPT‑4o Vision'),
-        ('GEMINI15', 'Gemini 1.5 Pro'),
-        ('CLAUDE3',  'Claude 3 Sonnet'),
-        ('STUB_MODEL','Stub Captioner')
-      ON CONFLICT (m_code) DO NOTHING;
-    """)
-
-    # 5) country (example set; add more ISO‑2 codes as needed)
-    op.execute("""
-      INSERT INTO country (c_code, label) VALUES
-        ('PH','Philippines'),
-        ('ID','Indonesia'),
-        ('VN','Vietnam')
-      ON CONFLICT (c_code) DO NOTHING;
-    """)
-
-
-def downgrade():
-    # reverse in roughly the opposite order
-    op.execute("DELETE FROM country WHERE c_code IN ('PH','ID','VN');")
-    op.execute("DELETE FROM model WHERE m_code IN ('GPT-4O','GEMINI15','CLAUDE3','STUB_MODEL');")
-    op.execute("DELETE FROM category WHERE cat_code IN ('FLOOD','WILDFIRE','EARTHQUAKE','CYCLONE','DROUGHT','LANDSLIDE','TORNADO','VOLCANO','OTHER','_TBD_CATEGORY');")
-    op.execute("DELETE FROM region   WHERE r_code    IN ('AFR','AMR','APA','EUR','MENA','_TBD_REGION');")
-    op.execute("DELETE FROM sources  WHERE s_code   IN ('WFP_ADAM','PDC','GDACS','GFL_HUB','GFL_GENCAST','USGS','_TBD_SOURCE');")

py_backend/alembic/versions/ad38fd571716_init_schema.py

@@ -1,113 +0,0 @@
-"""init schema
-
-Revision ID: ad38fd571716
-Revises: 
-Create Date: 2025-07-24 15:30:00.000000
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-# revision identifiers, used by Alembic.
-revision = 'ad38fd571716'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # 1) Enable pgcrypto extension for gen_random_uuid()
-    op.execute('CREATE EXTENSION IF NOT EXISTS "pgcrypto";')
-
-    # 2) Lookup tables
-    op.create_table(
-        'sources',
-        sa.Column('s_code',   sa.Text(), primary_key=True),
-        sa.Column('label',    sa.Text(), nullable=False),
-    )
-    op.create_table(
-        'region',
-        sa.Column('r_code',   sa.Text(), primary_key=True),
-        sa.Column('label',    sa.Text(), nullable=False),
-    )
-    op.create_table(
-        'category',
-        sa.Column('cat_code', sa.Text(), primary_key=True),
-        sa.Column('label',    sa.Text(), nullable=False),
-    )
-    op.create_table(
-        'country',
-        sa.Column('c_code',   sa.CHAR(length=2), primary_key=True),
-        sa.Column('label',    sa.Text(),    nullable=False),
-    )
-    op.create_table(
-        'model',
-        sa.Column('m_code',   sa.Text(), primary_key=True),
-        sa.Column('label',    sa.Text(), nullable=False),
-    )
-
-    # 3) maps table
-    op.create_table(
-        'maps',
-        sa.Column('map_id',    sa.UUID(), 
-                  server_default=sa.text('gen_random_uuid()'),
-                  primary_key=True),
-        sa.Column('file_key',  sa.Text(), nullable=False),
-        sa.Column('sha256',    sa.Text(), nullable=False),
-        sa.Column('source',    sa.Text(), nullable=False),
-        sa.Column('region',    sa.Text(), nullable=False),
-        sa.Column('category',  sa.Text(), nullable=False),
-        sa.Column('created_at',sa.TIMESTAMP(timezone=True), 
-                  server_default=sa.text('NOW()'),
-                  nullable=False),
-        sa.ForeignKeyConstraint(['source'],   ['sources.s_code']),
-        sa.ForeignKeyConstraint(['region'],   ['region.r_code']),
-        sa.ForeignKeyConstraint(['category'], ['category.cat_code']),
-    )
-
-    # 4) map_countries join table
-    op.create_table(
-        'map_countries',
-        sa.Column('map_id', sa.UUID(),   nullable=False),
-        sa.Column('c_code', sa.CHAR(length=2), nullable=False),
-        sa.PrimaryKeyConstraint('map_id', 'c_code'),
-        sa.ForeignKeyConstraint(['map_id'], ['maps.map_id'], ondelete='CASCADE'),
-        sa.ForeignKeyConstraint(['c_code'], ['country.c_code']),
-    )
-
-    # 5) captions table
-    op.create_table(
-        'captions',
-        sa.Column('cap_id',    sa.UUID(),
-                  server_default=sa.text('gen_random_uuid()'),
-                  primary_key=True),
-        sa.Column('map_id',    sa.UUID(),   nullable=False, unique=True),
-        sa.Column('model',     sa.Text(),    nullable=False),
-        sa.Column('raw_json',  sa.JSON(),    nullable=False),
-        sa.Column('generated', sa.Text(),    nullable=False),
-        sa.Column('edited',    sa.Text(),    nullable=True),
-        sa.Column('accuracy',  sa.SmallInteger(), 
-                  sa.CheckConstraint('accuracy BETWEEN 0 AND 100')),
-        sa.Column('context',   sa.SmallInteger(), 
-                  sa.CheckConstraint('context BETWEEN 0 AND 100')),
-        sa.Column('usability', sa.SmallInteger(), 
-                  sa.CheckConstraint('usability BETWEEN 0 AND 100')),
-        sa.Column('created_at',sa.TIMESTAMP(timezone=True), 
-                  server_default=sa.text('NOW()'),
-                  nullable=False),
-        sa.Column('updated_at',sa.TIMESTAMP(timezone=True), nullable=True),
-        sa.ForeignKeyConstraint(['map_id'], ['maps.map_id'], ondelete='CASCADE'),
-        sa.ForeignKeyConstraint(['model'],  ['model.m_code']),
-    )
-
-
-def downgrade():
-    # drop in reverse order to respect FKs
-    op.drop_table('captions')
-    op.drop_table('map_countries')
-    op.drop_table('maps')
-    op.drop_table('model')
-    op.drop_table('country')
-    op.drop_table('category')
-    op.drop_table('region')
-    op.drop_table('sources')

py_backend/alembic/versions/b8fc40bfe3c7_initial_schema_seed.py

@@ -0,0 +1,248 @@
+"""initial schema + full dynamic country seed
+
+Revision ID: 0001_initial_schema_and_seed
+Revises: 
+Create Date: 2025-08-01 20:00:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+import pycountry
+
+# revision identifiers, used by Alembic.
+revision = '0001_initial_schema_and_seed'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+def _guess_region(alpha2: str) -> str:
+    # Rough continent→region buckets; tweak as needed
+    AFR = {'DZ','AO','BJ','BW','BF','BI','CM','CV','CF','TD','KM','CG','CD','CI','DJ','EG',
+           'GQ','ER','SZ','ET','GA','GM','GH','GN','GW','KE','LS','LR','LY','MG','MW','ML',
+           'MR','MU','YT','MA','MZ','NA','NE','NG','RE','RW','SH','ST','SN','SC','SL','SO',
+           'ZA','SS','SD','TZ','TG','TN','UG','EH','ZM','ZW'}
+    AMR = {'US','CA','MX','BR','AR','CO','PE','VE','CL','EC','GT','CU','BO','DO','HT','HN',
+           'PY','NI','SV','CR','PA','UY','JM','TT','GY','SR','BZ','KY','AG','BS','BB','BM',
+           'DM','GD','GP','HT','MQ','MS','PR','KN','LC','VC','SX','TC','VI'}
+    EUR = {'AL','AD','AT','BY','BE','BA','BG','HR','CY','CZ','DK','EE','FI','FR','DE','GI',
+           'GR','HU','IS','IE','IT','XK','LV','LI','LT','LU','MT','MD','MC','ME','NL','MK',
+           'NO','PL','PT','RO','RU','SM','RS','SK','SI','ES','SE','CH','TR','UA','GB','VA'}
+    MENA = {'DZ','BH','EG','IR','IQ','IL','JO','KW','LB','LY','MA','OM','QA','SA','SY','TN',
+            'AE','YE','PS','SD','EH'}
+    # If it’s in MENA, call it MENA; else AFR-only if in AFR set; else AMR, EUR, else APA
+    if alpha2 in MENA:
+        return 'MENA'
+    if alpha2 in (AFR - MENA):
+        return 'AFR'
+    if alpha2 in AMR:
+        return 'AMR'
+    if alpha2 in EUR:
+        return 'EUR'
+    return 'APA'
+
+
+def upgrade():
+    # allow uuid generation
+    op.execute('CREATE EXTENSION IF NOT EXISTS pgcrypto;')
+
+    #
+    # 1) lookup tables
+    #
+    op.create_table(
+        'sources',
+        sa.Column('s_code', sa.String(), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+    )
+    op.create_table(
+        'regions',
+        sa.Column('r_code', sa.String(), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+    )
+    op.create_table(
+        'types',
+        sa.Column('t_code', sa.String(), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+    )
+    op.create_table(
+        'countries',
+        sa.Column('c_code', sa.CHAR(length=2), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+        sa.Column('r_code', sa.String(), sa.ForeignKey('regions.r_code'), nullable=False),
+    )
+    op.create_table(
+        'spatial_references',
+        sa.Column('epsg', sa.String(), primary_key=True),
+        sa.Column('srid', sa.String(), nullable=False),
+        sa.Column('proj4', sa.String(), nullable=False),
+        sa.Column('wkt', sa.String(), nullable=False),
+    )
+    op.create_table(
+        'image_types',
+        sa.Column('image_type', sa.String(), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+    )
+    op.create_table(
+        'models',
+        sa.Column('m_code', sa.String(), primary_key=True),
+        sa.Column('label', sa.String(), nullable=False),
+    )
+
+    #
+    # 2) seed lookup tables
+    #
+    # — sources —
+    op.execute("""
+      INSERT INTO sources (s_code,label) VALUES
+        ('PDC','PDC'),
+        ('GDACS','GDACS'),
+        ('WFP','WFP ADAM'),
+        ('GFH','Google Flood Hub'),
+        ('GGC','Google GenCast'),
+        ('USGS','USGS'),
+        ('OTHER','Other')
+    """)
+    # — region —
+    op.execute("""
+      INSERT INTO regions (r_code,label) VALUES
+        ('AFR','Africa'),
+        ('AMR','Americas'),
+        ('APA','Asia-Pacific'),
+        ('EUR','Europe'),
+        ('MENA','Middle East & N Africa')
+    """)
+    # — Type —
+    op.execute("""
+      INSERT INTO types (t_code,label) VALUES
+        ('FLOOD','Flood'),
+        ('FIRE','Fire'),
+        ('EARTHQUAKE','Earthquake'),
+        ('CYCLONE','Cyclone'),
+        ('TSUNAMI','Tsunami'),
+        ('POPULATION_MOVEMENT','Population Movement'),
+        ('EPIDEMIC','Epidemic'),
+        ('PLUVIAL','Pluvial'),
+        ('STORM','Storm'),
+        ('LANDSLIDE','Landslide'),
+        ('COLD_WAVE','Cold Wave'),
+        ('BIOLOGICAL_EMERGENCY','Biological Emergency'),
+        ('CHEMICAL_EMERGENCY','Chemical Emergency'),
+        ('CIVIL_UNREST','Civil Unrest'),
+        ('COMPLEX_EMERGENCY','Complex Emergency'),
+        ('DROUGHT','Drought'),
+        ('FLOOD_INSECURITY','Flood Insecurity'),
+        ('HEAT_WAVE','Heat Wave'),
+        ('INSECT_INFESTATION','Insect Infestation'),
+        ('RADIOLOGICAL_EMERGENCY','Radiological Emergency'),
+        ('TRANSPORTATION_EMERGENCY','Transportation Emergency'),
+        ('VOLCANIC_ERUPTION','Volcanic Eruption'),
+        ('OTHER','Other')
+    """)
+
+    # seed only the most common CRSs + an ���Other” placeholder
+    op.execute("""
+      INSERT INTO spatial_references (epsg, srid, proj4, wkt) VALUES
+        ('4326','4326',
+          '+proj=longlat +datum=WGS84 +no_defs',
+          'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]'
+        ),
+        ('3857','3857',
+          '+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs',
+          'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]]'
+        ),
+        ('32633','32633',
+          '+proj=utm +zone=33 +datum=WGS84 +units=m +no_defs',
+          'PROJCS["WGS 84 / UTM zone 33N",GEOGCS["WGS 84",…]]'
+        ),
+        ('32634','32634',
+          '+proj=utm +zone=34 +datum=WGS84 +units=m +no_defs',
+          'PROJCS["WGS 84 / UTM zone 34N",GEOGCS["WGS 84",…]]'
+        ),
+        ('OTHER','OTHER',
+          '',
+          'Other'
+        );
+    """)
+    # — image_type —
+    op.execute("""
+      INSERT INTO image_types (image_type,label) VALUES
+        ('crisis_map','Crisis Map'),
+        ('drone_image','Drone Image')
+    """)
+    # — model —
+    op.execute("""
+      INSERT INTO models (m_code,label) VALUES
+        ('GPT-4O','GPT-4O'),
+        ('GEMINI15','Gemini 1.5'),
+        ('CLAUDE3','Claude 3'),
+        ('STUB_MODEL','<stub>')
+    """)
+
+    # — country: full ISO-3166 seed via pycountry + auto region guess —
+    for c in pycountry.countries:
+        code = c.alpha_2
+        name = c.name.replace("'", "''")
+        region = _guess_region(code)
+        op.execute(
+            f"INSERT INTO countries (c_code,label,r_code) "
+            f"VALUES ('{code}','{name}','{region}')"
+        )
+
+    #
+    # 3) core tables
+    #
+    op.create_table(
+        'images',
+        sa.Column('image_id', postgresql.UUID(as_uuid=True),
+                  server_default=sa.text('gen_random_uuid()'),
+                  primary_key=True),
+        sa.Column('file_key', sa.String(), nullable=False),
+        sa.Column('sha256', sa.String(), nullable=False),
+        sa.Column('source', sa.String(), sa.ForeignKey('sources.s_code'), nullable=False),
+        sa.Column('type', sa.String(), sa.ForeignKey('types.t_code'), nullable=False),
+        sa.Column('epsg', sa.String(), sa.ForeignKey('spatial_references.epsg'), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('NOW()'), nullable=False),
+        sa.Column('image_type', sa.String(), sa.ForeignKey('image_types.image_type'), nullable=False),
+    )
+    op.create_table(
+        'image_countries',
+        sa.Column('image_id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('c_code', sa.CHAR(length=2), nullable=False),
+        sa.PrimaryKeyConstraint('image_id','c_code'),
+        sa.ForeignKeyConstraint(['image_id'], ['images.image_id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['c_code'], ['countries.c_code']),
+    )
+    op.create_table(
+        'captions',
+        sa.Column('cap_id', postgresql.UUID(as_uuid=True),
+                  server_default=sa.text('gen_random_uuid()'),
+                  primary_key=True),
+        sa.Column('image_id', postgresql.UUID(as_uuid=True),
+                  sa.ForeignKey('images.image_id', ondelete='CASCADE'),
+                  unique=True, nullable=False),
+        sa.Column('title', sa.String(), nullable=False),
+        sa.Column('prompt', sa.String(), nullable=False),
+        sa.Column('model', sa.String(), sa.ForeignKey('models.m_code'), nullable=False),
+        sa.Column('raw_json', sa.JSON(), nullable=False),
+        sa.Column('generated', sa.String(), nullable=False),
+        sa.Column('edited', sa.String(), nullable=True),
+        sa.Column('accuracy', sa.SmallInteger()),
+        sa.Column('context', sa.SmallInteger()),
+        sa.Column('usability', sa.SmallInteger()),
+        sa.Column('starred', sa.Boolean(), server_default=sa.text('false')),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('NOW()'), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=True),
+    )
+
+
+def downgrade():
+    op.drop_table('captions')
+    op.drop_table('image_countries')
+    op.drop_table('images')
+    op.drop_table('models')
+    op.drop_table('image_types')
+    op.drop_table('spatial_references')
+    op.drop_table('countries')
+    op.drop_table('types')
+    op.drop_table('regions')
+    op.drop_table('sources')

py_backend/app/config.py

@@ -1,4 +1,4 @@
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings
 
 class Settings(BaseSettings):
     DATABASE_URL: str

py_backend/app/crud.py

@@ -1,36 +1,47 @@
 import io, hashlib
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, joinedload
 from . import models
 
 def hash_bytes(data: bytes) -> str:
     """Compute SHA‑256 hex digest of the data."""
     return hashlib.sha256(data).hexdigest()
 
-def create_map(db: Session, src, reg, cat, key, sha, countries: list[str]):
-    """Insert into maps and map_countries."""
-    m = models.Map(
-        source=src, region=reg, category=cat,
-        file_key=key, sha256=sha
+def create_image(db: Session, src, type_code, key, sha, countries: list[str], epsg: str, image_type: str):
+    """Insert into images and image_countries."""
+    img = models.Images(
+        source=src, type=type_code,
+        file_key=key, sha256=sha, epsg=epsg, image_type=image_type
     )
-    db.add(m)
-    db.flush()  # assign m.map_id
+    db.add(img)
+    db.flush()  # assign img.image_id
 
     # link countries
     for c in countries:
         country = db.get(models.Country, c)
         if country:
-            m.countries.append(country)
+            img.countries.append(country)
 
     db.commit()
-    db.refresh(m)
-    return m
+    db.refresh(img)
+    return img
 
-def get_map(db: Session, map_id):
-    return db.get(models.Map, map_id)
+def get_images(db: Session):
+    """Get all images with their captions"""
+    return db.query(models.Images).options(
+        joinedload(models.Images.caption)
+    ).all()
 
-def create_caption(db: Session, map_id, model_code, raw_json, text):
-    c = models.Caption(
-        map_id=map_id,
+def get_image(db: Session, image_id: str):
+    """Get a single image by ID with its caption"""
+    return db.query(models.Images).options(
+        joinedload(models.Images.caption)
+    ).filter(models.Images.image_id == image_id).first()
+
+def create_caption(db: Session, image_id, title, prompt, model_code, raw_json, text):
+    c = models.Captions(
+        image_id=image_id,
+        title=title,
+        prompt=prompt,
         model=model_code,
         raw_json=raw_json,
         generated=text
@@ -41,16 +52,44 @@ def create_caption(db: Session, map_id, model_code, raw_json, text):
     return c
 
 def get_caption(db: Session, cap_id):
-    return db.get(models.Caption, cap_id)
+    return db.get(models.Captions, cap_id)
 
-def update_caption(db: Session, cap_id, edited, accuracy, context, usability):
+def update_caption(db: Session, cap_id, edited=None, accuracy=None, context=None, usability=None, starred=None):
     c = get_caption(db, cap_id)
     if not c:
         return None
-    c.edited = edited
-    c.accuracy = accuracy
-    c.context = context
-    c.usability = usability
+    
+    if edited is not None:
+        c.edited = edited
+    if accuracy is not None:
+        c.accuracy = accuracy
+    if context is not None:
+        c.context = context
+    if usability is not None:
+        c.usability = usability
+    if starred is not None:
+        c.starred = starred
+    
     db.commit()
     db.refresh(c)
     return c
+
+def get_sources(db: Session):
+    """Get all sources for lookup"""
+    return db.query(models.Source).all()
+
+def get_regions(db: Session):
+    """Get all regions for lookup"""
+    return db.query(models.Region).all()
+
+def get_types(db: Session):
+    """Get all types for lookup"""
+    return db.query(models.Type).all()
+
+def get_spatial_references(db: Session):
+    """Get all spatial references for lookup"""
+    return db.query(models.SpatialReference).all()
+
+def get_image_types(db: Session):
+    """Get all image types for lookup"""
+    return db.query(models.ImageTypes).all()

py_backend/app/main.py

@@ -21,7 +21,7 @@ app.add_middleware(
 )
 
 # Mount routers
-app.include_router(upload.router,   prefix="/api/maps", tags=["maps"])
+app.include_router(upload.router,   prefix="/api/images", tags=["images"])
 app.include_router(caption.router,  prefix="/api",      tags=["captions"])
 app.include_router(metadata.router, prefix="/api",      tags=["metadata"])
 

py_backend/app/models.py

@@ -1,16 +1,25 @@
 from sqlalchemy import (
-    Column, String, DateTime, JSON, SmallInteger, Table, ForeignKey
+    Column, String, DateTime, JSON, SmallInteger, Table, ForeignKey, Boolean
 )
 from sqlalchemy.dialects.postgresql import UUID, TIMESTAMP, CHAR
 from sqlalchemy.orm import relationship
 import datetime, uuid
 from .database import Base
 
-# association table maps ↔ countries
-map_countries = Table(
-    "map_countries", Base.metadata,
-    Column("map_id", UUID(as_uuid=True), ForeignKey("maps.map_id", ondelete="CASCADE")),
-    Column("c_code", CHAR(2), ForeignKey("country.c_code")),
+image_countries = Table(
+    "image_countries", Base.metadata,
+    Column(
+      "image_id",
+      UUID(as_uuid=True),
+      ForeignKey("images.image_id", ondelete="CASCADE"),
+      primary_key=True,
+    ),
+    Column(
+      "c_code",
+      CHAR(2),
+      ForeignKey("countries.c_code"),
+      primary_key=True,
+    ),
 )
 
 class Source(Base):
@@ -19,50 +28,67 @@ class Source(Base):
     label  = Column(String, nullable=False)
 
 class Region(Base):
-    __tablename__ = "region"
+    __tablename__ = "regions"
     r_code = Column(String, primary_key=True)
     label  = Column(String, nullable=False)
 
-class Category(Base):
-    __tablename__ = "category"
-    cat_code = Column(String, primary_key=True)
+class Type(Base):
+    __tablename__ = "types"
+    t_code = Column(String, primary_key=True)
     label    = Column(String, nullable=False)
 
 class Country(Base):
-    __tablename__ = "country"
+    __tablename__ = "countries"
     c_code = Column(CHAR(2), primary_key=True)
     label  = Column(String, nullable=False)
+    r_code = Column(String, ForeignKey("regions.r_code"), nullable=False)
 
-class ModelLookup(Base):
-    __tablename__ = "model"
+class SpatialReference(Base):
+    __tablename__ = "spatial_references"
+    epsg = Column(String, primary_key=True)
+    srid = Column(String, nullable=False)
+    proj4 = Column(String, nullable=False)
+    wkt = Column(String, nullable=False)
+
+class ImageTypes(Base):
+    __tablename__ = "image_types"
+    image_type = Column(String, primary_key=True)
+    label = Column(String, nullable=False)
+
+class Models(Base):
+    __tablename__ = "models"
     m_code = Column(String, primary_key=True)
     label  = Column(String, nullable=False)
 
-class Map(Base):
-    __tablename__ = "maps"
-    map_id     = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+class Images(Base):
+    __tablename__ = "images"
+    image_id     = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     file_key   = Column(String, nullable=False)
     sha256     = Column(String, nullable=False)
     source     = Column(String, ForeignKey("sources.s_code"), nullable=False)
-    region     = Column(String, ForeignKey("region.r_code"), nullable=False)
-    category   = Column(String, ForeignKey("category.cat_code"), nullable=False)
+    type   = Column(String, ForeignKey("types.t_code"), nullable=False)
+    epsg = Column(String, ForeignKey("spatial_references.epsg"), nullable=False)
     created_at = Column(TIMESTAMP(timezone=True), default=datetime.datetime.utcnow)
+    image_type = Column(String, ForeignKey("image_types.image_type"), nullable=False)
 
-    countries = relationship("Country", secondary=map_countries)
-    caption   = relationship("Caption", uselist=False, back_populates="map")
+    countries = relationship("Country", secondary=image_countries, backref="images")
+    caption   = relationship("Captions", uselist=False, back_populates="image")
 
-class Caption(Base):
+class Captions(Base):
     __tablename__ = "captions"
     cap_id     = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    map_id     = Column(UUID(as_uuid=True), ForeignKey("maps.map_id", ondelete="CASCADE"), unique=True)
-    model      = Column(String, ForeignKey("model.m_code"), nullable=False)
+    image_id     = Column(UUID(as_uuid=True), ForeignKey("images.image_id", ondelete="CASCADE"), unique=True)
+    title      = Column(String, nullable=False)
+    prompt     = Column(String, nullable=False)
+    model      = Column(String, ForeignKey("models.m_code"), nullable=False)
     raw_json   = Column(JSON, nullable=False)
     generated  = Column(String, nullable=False)
     edited     = Column(String)
     accuracy   = Column(SmallInteger)
     context    = Column(SmallInteger)
     usability  = Column(SmallInteger)
+    starred    = Column(Boolean, default=False)
     created_at = Column(TIMESTAMP(timezone=True), default=datetime.datetime.utcnow)
     updated_at = Column(TIMESTAMP(timezone=True), onupdate=datetime.datetime.utcnow)
 
-    map = relationship("Map", back_populates="caption")
+    image = relationship("Images", back_populates="caption")

py_backend/app/routers/caption.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, HTTPException, Depends
+from fastapi import APIRouter, HTTPException, Depends, Form
 from sqlalchemy.orm import Session
 from .. import crud, database, schemas, storage
 import io
@@ -22,25 +22,44 @@ class CaptionerStub:
 
 cap = CaptionerStub()
 
-@router.post("/maps/{map_id}/caption", response_model=schemas.CaptionOut)
-def create_caption(map_id: str, db: Session = Depends(get_db)):
-    m = crud.get_map(db, map_id)
-    if not m:
-        raise HTTPException(404, "map not found")
+@router.post("/images/{image_id}/caption", response_model=schemas.CaptionOut)
+def create_caption(
+    image_id: str, 
+    title: str = Form(...), 
+    prompt: str = Form(...), 
+    db: Session = Depends(get_db)
+):
+    img = crud.get_image(db, image_id)
+    if not img:
+        raise HTTPException(404, "image not found")
 
-    # fetch image bytes from S3
-    url = storage.generate_presigned_url(m.file_key)
-    # (in real code, you might stream from S3 directly)
-    import requests
-    resp = requests.get(url)
-    img_bytes = resp.content
+    try:
+        # fetch image bytes from S3
+        url = storage.generate_presigned_url(img.file_key)
+        
+        # Try requests first, fallback to httpx
+        try:
+            import requests
+            resp = requests.get(url)
+            resp.raise_for_status()
+            img_bytes = resp.content
+        except ImportError:
+            # Fallback to httpx if requests is not available
+            import httpx
+            with httpx.Client() as client:
+                resp = client.get(url)
+                resp.raise_for_status()
+                img_bytes = resp.content
 
-    # generate caption
-    text, model, raw = cap.generate(img_bytes)
+        # generate caption
+        text, model, raw = cap.generate(img_bytes)
 
-    # insert into DB
-    c = crud.create_caption(db, map_id, model, raw, text)
-    return c
+        # insert into DB
+        c = crud.create_caption(db, image_id, title, prompt, model, raw, text)
+        return c
+        
+    except Exception as e:
+        raise HTTPException(500, f"Failed to generate caption: {str(e)}")
 
 @router.get("/captions/{cap_id}", response_model=schemas.CaptionOut)
 def get_caption(cap_id: str, db: Session = Depends(get_db)):

py_backend/app/routers/metadata.py

@@ -1,5 +1,6 @@
 from fastapi import APIRouter, HTTPException, Depends
 from sqlalchemy.orm import Session
+from typing import List
 from .. import crud, database, schemas
 
 router = APIRouter()
@@ -22,3 +23,28 @@ def update_metadata(
     if not c:
         raise HTTPException(404, "caption not found")
     return c
+
+@router.get("/sources", response_model=List[schemas.SourceOut])
+def get_sources(db: Session = Depends(get_db)):
+    """Get all sources for lookup"""
+    return crud.get_sources(db)
+
+@router.get("/regions", response_model=List[schemas.RegionOut])
+def get_regions(db: Session = Depends(get_db)):
+    """Get all regions for lookup"""
+    return crud.get_regions(db)
+
+@router.get("/types", response_model=List[schemas.TypeOut])
+def get_types(db: Session = Depends(get_db)):
+    """Get all types for lookup"""
+    return crud.get_types(db)
+
+@router.get("/spatial-references", response_model=List[schemas.SpatialReferenceOut])
+def get_spatial_references(db: Session = Depends(get_db)):
+    """Get all spatial references for lookup"""
+    return crud.get_spatial_references(db)
+
+@router.get("/image-types", response_model=List[schemas.ImageTypeOut])
+def get_image_types(db: Session = Depends(get_db)):
+    """Get all image types for lookup"""
+    return crud.get_image_types(db)

py_backend/app/routers/upload.py

@@ -12,12 +12,50 @@ def get_db():
     finally:
         db.close()
 
-@router.post("/", response_model=schemas.MapOut)
-async def upload_map(
+
+@router.get("/", response_model=list[schemas.ImageOut])
+def list_images(db: Session = Depends(get_db)):
+    images = crud.get_images(db)
+    return [
+        schemas.ImageOut(
+            image_id=img.image_id,
+            file_key=img.file_key,
+            sha256=img.sha256,
+            source=img.source,
+            type=img.type,
+            epsg=img.epsg,
+            image_type=img.image_type,
+            caption=img.caption,
+            image_url=storage.generate_presigned_url(img.file_key, expires_in=3600)
+        ) for img in images
+    ]
+
+@router.get("/{image_id}", response_model=schemas.ImageOut)
+def get_image(image_id: str, db: Session = Depends(get_db)):
+    img = crud.get_image(db, image_id)
+    if not img:
+        raise HTTPException(404, "image not found")
+    
+    return schemas.ImageOut(
+        image_id=img.image_id,
+        file_key=img.file_key,
+        sha256=img.sha256,
+        source=img.source,
+        type=img.type,
+        epsg=img.epsg,
+        image_type=img.image_type,
+        caption=img.caption,
+        image_url=storage.generate_presigned_url(img.file_key, expires_in=3600)
+    )
+
+
+@router.post("/", response_model=schemas.ImageOut)
+async def upload_image(
     source: str        = Form(...),
-    region: str        = Form(...),
-    category: str      = Form(...),
+    type: str          = Form(...),
     countries: list[str] = Form([]),
+    epsg: str          = Form(...),
+    image_type: str    = Form(...),
     file: UploadFile   = Form(...),
     db: Session        = Depends(get_db)
 ):
@@ -29,26 +67,25 @@ async def upload_map(
     key = storage.upload_fileobj(io.BytesIO(content), file.filename)
 
     # 3) persist the DB record
-    m = crud.create_map(db, source, region, category, key, sha, countries)
+    img = crud.create_image(db, source, type, key, sha, countries, epsg, image_type)
 
     # 4) generate a URL for your front‑end
     #
     # If you have an S3/MinIO client in storage:
     try:
-        url = storage.get_presigned_url(key, expires_in=3600)
+        url = storage.generate_presigned_url(key, expires_in=3600)
     except AttributeError:
-        # fallback: if you’re serving via StaticFiles("/uploads")
+        # fallback: if you're serving via StaticFiles("/uploads")
         url = f"/uploads/{key}"
 
-    # 5) return the Map plus that URL
-    return schemas.MapOut(
-        map_id    = m.map_id,
-        file_key  = m.file_key,
-        sha256    = m.sha256,
-        source    = m.source,
-        region    = m.region,
-        category  = m.category,
-        countries = [c.c_code for c in m.countries],  # or however you model it
-        created_at = m.created_at,
+    # 5) return the Image plus that URL
+    return schemas.ImageOut(
+        image_id    = img.image_id,
+        file_key  = img.file_key,
+        sha256    = img.sha256,
+        source    = img.source,
+        type      = img.type,
+        epsg      = img.epsg,
+        image_type = img.image_type,
         image_url = url,
     )

py_backend/app/schemas.py

@@ -1,22 +1,24 @@
-from pydantic import BaseModel, Field, conint
+from pydantic import BaseModel
 from typing import List, Optional
 from uuid import UUID
 
-#–– For the UploadPage ––
-class MapCreate(BaseModel):
+class ImageCreate(BaseModel):
     source: str
-    region: str
-    category: str
+    type: str
     countries: List[str] = []
+    epsg: str
+    image_type: str
 
-class MapOut(BaseModel):
-    map_id: UUID
+class ImageOut(BaseModel):
+    image_id: UUID
     file_key: str
     sha256: str
     source: str
-    region: str
-    category: str
-    image_url:  str
+    type: str
+    epsg: str
+    image_type: str
+    image_url: str
+    caption: Optional["CaptionOut"] = None
 
     class Config:
         orm_mode = True
@@ -24,20 +26,65 @@ class MapOut(BaseModel):
 #–– For the caption endpoints ––
 class CaptionOut(BaseModel):
     cap_id: UUID
-    map_id: UUID
+    image_id: UUID
+    title: str
+    prompt: str
     model: str
     raw_json: dict
     generated: str
-    edited: Optional[str]
-    accuracy: Optional[int]
-    context: Optional[int]
-    usability: Optional[int]
+    edited: Optional[str] = None
+    accuracy: Optional[int] = None
+    context: Optional[int] = None
+    usability: Optional[int] = None
+    starred: bool = False
 
     class Config:
         orm_mode = True
 
 class CaptionUpdate(BaseModel):
-    edited: str
-    accuracy: conint(ge=0, le=100) = None
-    context:  conint(ge=0, le=100) = None
-    usability: conint(ge=0, le=100) = None
+    edited: Optional[str] = None
+    accuracy: Optional[int] = None
+    context: Optional[int] = None
+    usability: Optional[int] = None
+    starred: Optional[bool] = None
+
+#–– For lookup data ––
+class SourceOut(BaseModel):
+    s_code: str
+    label: str
+
+    class Config:
+        orm_mode = True
+
+class RegionOut(BaseModel):
+    r_code: str
+    label: str
+
+    class Config:
+        orm_mode = True
+
+class TypeOut(BaseModel):
+    t_code: str
+    label: str
+
+    class Config:
+        orm_mode = True
+
+class SpatialReferenceOut(BaseModel):
+    epsg: str
+    srid: str
+    proj4: str
+    wkt: str
+
+    class Config:
+        orm_mode = True
+
+class ImageTypeOut(BaseModel):
+    image_type: str
+    label: str
+
+    class Config:
+        orm_mode = True
+
+# Update forward references
+ImageOut.update_forward_refs()

py_backend/requirements.txt

@@ -5,7 +5,11 @@ alembic
 psycopg2-binary
 boto3
 python-dotenv
-pydantic<2.0.0
+pydantic>=2.7.0
+pydantic-settings>=0.2
 openai  # or other VLM client
 pytest
-httpx
+httpx
+requests
+pycountry>=22.3.5
+pycountry-convert>=0.7.2