Skip to content

fix: allow silent scan submission #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpdevhub merged 2 commits into from
Jun 12, 2026
+353 −219
Merged

fix: allow silent scan submission #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9260784
fix: allow silent scan submission
krishnendu07-code Jun 12, 2026
c29f48d
fix: respect silent mode for scan sync
krishnendu07-code Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 109 additions & 50 deletions src/lib/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
import toast from 'react-hot-toast';
import toast from "react-hot-toast";
import type {
ScanResult,
HistoryScan,
HistoryStats,
Market,
UserProfile,
} from './types';
} from "./types";

// Base URL — override with VITE_API_URL in .env for production
const API_BASE = (import.meta.env.VITE_API_URL as string | undefined) || 'http://localhost:8000';
const API_BASE =
(import.meta.env.VITE_API_URL as string | undefined) ||
"http://localhost:8000";

// ── Token management ──────────────────────────────────────────────────────────

const TOKEN_KEY = 'fs_access_token';
const TOKEN_KEY = "fs_access_token";

export function getToken(): string | null {
return localStorage.getItem(TOKEN_KEY);
}

export function setToken(token: string): void {
localStorage.setItem(TOKEN_KEY, token);
window.dispatchEvent(new Event('auth-change'));
window.dispatchEvent(new Event("auth-change"));
}

export function clearToken(): void {
localStorage.removeItem(TOKEN_KEY);
window.dispatchEvent(new Event('auth-change'));
window.dispatchEvent(new Event("auth-change"));
}

export function isAuthenticated(): boolean {
Expand All @@ -39,93 +41,140 @@ function authHeaders(): Record<string, string> {

// ── Shared Error Handling Logic ──────────────────────────────────────────────

async function handleResponse(res: Response): Promise<Response> {
async function handleResponse(
res: Response,
options?: ApiRequestOptions,
): Promise<Response> {
if (res.ok) return res;

if (res.status >= 500) {
const msg = "Server error. Please try again later.";
toast.error(msg);

if (!options?.silent) {
toast.error(msg);
}

throw new Error(msg);
}

const err = await res.json().catch(() => ({ detail: res.statusText }));
throw new Error((err as { detail?: string }).detail || `HTTP ${res.status}`);
}

async function safeFetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {
type ApiRequestOptions = {
silent?: boolean;
};
async function safeFetch(
input: RequestInfo | URL,
init?: RequestInit,
options?: ApiRequestOptions,
): Promise<Response> {
try {
const res = await fetch(input, init);
return await handleResponse(res);
return await handleResponse(res, options);
} catch (error) {
if (error instanceof TypeError) {
toast.error("Unable to connect to the server. Please check your internet connection.");
if (error instanceof TypeError && !options?.silent) {
toast.error(
"Unable to connect to the server. Please check your internet connection.",
);
}

console.error("API Error:", error);
throw error;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

async function apiFetch<T>(path: string, options: RequestInit = {}): Promise<T> {
async function apiFetch<T>(
path: string,
options: RequestInit = {},
): Promise<T> {
const validRes = await safeFetch(`${API_BASE}${path}`, {
...options,
headers: {
'Content-Type': 'application/json',
"Content-Type": "application/json",
...authHeaders(),
...(options.headers as Record<string, string> || {}),
...((options.headers as Record<string, string>) || {}),
},
});
return validRes.json() as Promise<T>;
}

// ── Response envelopes ────────────────────────────────────────────────────────

export interface ScanResponse { success: boolean; scan: ScanResult; }
export interface HistoryResponse { success: boolean; count: number; stats: HistoryStats; scans: HistoryScan[]; }
export interface MarketsResponse { success: boolean; markets: Market[]; }
export interface GradcamResponse { gradcam_image: string; predicted_class: string; class_index: number; mode: 'real' | 'demo'; }
export interface ScanResponse {
success: boolean;
scan: ScanResult;
}
export interface HistoryResponse {
success: boolean;
count: number;
stats: HistoryStats;
scans: HistoryScan[];
}
export interface MarketsResponse {
success: boolean;
markets: Market[];
}
export interface GradcamResponse {
gradcam_image: string;
predicted_class: string;
class_index: number;
mode: "real" | "demo";
}

// Metadata sent alongside edge-inference results so the backend can store them
// without re-running the ML pipeline on the server.
export interface EdgeInferenceMeta {
freshness_label?: string;
fused_score?: number;
source?: 'edge_onnx' | 'server';
fused_score?: number;
source?: "edge_onnx" | "server";
}

// ── API surface ───────────────────────────────────────────────────────────────

export const api = {
loginUrl: async (turnstileToken?: string): Promise<string> => {
if (turnstileToken) {
const response = await apiFetch<{ redirect_url: string }>('/api/v1/auth/login/google', {
method: 'POST',
body: JSON.stringify({ turnstile_token: turnstileToken }),
});
const response = await apiFetch<{ redirect_url: string }>(
"/api/v1/auth/login/google",
{
method: "POST",
body: JSON.stringify({ turnstile_token: turnstileToken }),
},
);
return response.redirect_url;
}

return `${API_BASE}/api/v1/auth/login/google`;
},

getMe: (): Promise<UserProfile> => apiFetch<UserProfile>('/api/v1/auth/me'),
getMe: (): Promise<UserProfile> => apiFetch<UserProfile>("/api/v1/auth/me"),

// ── Scans ────────────────────────────────────────────────────────────────
// meta is optional — when provided (edge inference path), the backend skips
// running its own ML pipeline and just stores the result we computed locally.
submitScan: async (blob: Blob, meta?: EdgeInferenceMeta): Promise<ScanResponse> => {
submitScan: async (
blob: Blob,
meta?: EdgeInferenceMeta,
options?: ApiRequestOptions,
): Promise<ScanResponse> => {
const form = new FormData();
form.append('image', blob, 'scan.jpg');
form.append("image", blob, "scan.jpg");

// Attach edge inference metadata if available
if (meta?.freshness_label) form.append('freshness_label', meta.freshness_label);
if (meta?.fused_score !== undefined) form.append('fused_score', String(meta.fused_score));
if (meta?.source) form.append('source', meta.source);

const validRes = await safeFetch(`${API_BASE}/api/v1/scan-auto`, {
method: 'POST',
headers: authHeaders(),
body: form,
});
if (meta?.freshness_label)
form.append("freshness_label", meta.freshness_label);
if (meta?.fused_score !== undefined)
form.append("fused_score", String(meta.fused_score));
if (meta?.source) form.append("source", meta.source);

const validRes = await safeFetch(
`${API_BASE}/api/v1/scan-auto`,
{
method: "POST",
headers: authHeaders(),
body: form,
},
options,
);

return validRes.json() as Promise<ScanResponse>;
},
Expand All @@ -138,16 +187,18 @@ export const api = {
*/
scanOnline: async (blob: Blob): Promise<ScanResponse | null> => {
const form = new FormData();
form.append('image', blob, 'scan.jpg');
form.append("image", blob, "scan.jpg");
try {
const res = await fetch(`${API_BASE}/api/v1/scan-auto`, {
method: 'POST',
method: "POST",
headers: authHeaders(),
body: form,
});
if (!res.ok) {
const err = await res.json().catch(() => ({ detail: res.statusText }));
throw new Error((err as { detail?: string }).detail || `HTTP ${res.status}`);
throw new Error(
(err as { detail?: string }).detail || `HTTP ${res.status}`,
);
}
return res.json() as Promise<ScanResponse>;
} catch (err) {
Expand All @@ -160,21 +211,23 @@ export const api = {
},

getLatestScan: (): Promise<ScanResponse> =>
apiFetch<ScanResponse>('/api/v1/scans/latest'),
apiFetch<ScanResponse>("/api/v1/scans/latest"),

getScan: (id: string): Promise<ScanResponse> =>
apiFetch<ScanResponse>(`/api/v1/scans/${id}`),

getScanHistory: (limit = 20, offset = 0): Promise<HistoryResponse> =>
apiFetch<HistoryResponse>(`/api/v1/scans/history?limit=${limit}&offset=${offset}`),
apiFetch<HistoryResponse>(
`/api/v1/scans/history?limit=${limit}&offset=${offset}`,
),

// ── Grad-CAM ─────────────────────────────────────────────────────────────
getGradcam: async (blob: Blob): Promise<GradcamResponse> => {
const form = new FormData();
form.append('image', blob, 'gradcam_input.jpg');
form.append("image", blob, "gradcam_input.jpg");

const validRes = await safeFetch(`${API_BASE}/api/v1/gradcam`, {
method: 'POST',
method: "POST",
headers: authHeaders(),
body: form,
});
Expand All @@ -183,8 +236,14 @@ export const api = {
},

getMarkets: (): Promise<MarketsResponse> =>
apiFetch<MarketsResponse>('/api/v1/maps/markets'),

getLiveMarkets: (lat: number, lng: number, radius = 15000): Promise<MarketsResponse> =>
apiFetch<MarketsResponse>(`/api/v1/maps/markets/live?lat=${lat}&lng=${lng}&radius=${radius}`),
apiFetch<MarketsResponse>("/api/v1/maps/markets"),

getLiveMarkets: (
lat: number,
lng: number,
radius = 15000,
): Promise<MarketsResponse> =>
apiFetch<MarketsResponse>(
`/api/v1/maps/markets/live?lat=${lat}&lng=${lng}&radius=${radius}`,
),
};
Loading
Loading