mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-20 06:02:14 +03:00
feat: improvements from 9router analysis (T01/T08-T13) (#351)
* fix: tool description null sanitization, clipboard HTTP fallback fixes T10 - Sanitize tool.description null in claude-to-openai translator - claude-to-openai.ts: tool.description defaults to empty string when null/undefined - claude-to-openai.ts: filter out tools with empty/missing names - Prevents 400 validation errors on providers like NVIDIA NIM (issue #276) T11 - Fix copy buttons to work on HTTP/non-HTTPS deployments - Add src/shared/utils/clipboard.ts with HTTPS+HTTP (execCommand) dual fallback - Migrate useCopyToClipboard.ts to use shared utility - Migrate ConsoleLogViewer.tsx, RequestLoggerV2.tsx to shared utility - Migrate HomePageClient.tsx, endpoint/page.tsx, GetStarted.tsx - Migrate DefaultToolCard.tsx to shared utility - Fixes copy buttons when OmniRoute runs behind HTTP proxy (issue #296) T02 - Verified SSE [DONE] sentinel handling already correct - sseParser.ts filters [DONE] on line 13 (no change needed) - stream.ts uses doneSent flag to prevent duplicate sentinel - bypassHandler.ts correctly separates streaming/non-streaming responses Issue triage comments posted to #340, #341, #344 * feat: DB read cache + Accept header stream negotiation (T09/T01) T09 - In-memory TTL cache for hot DB read paths - Add src/lib/db/readCache.ts with TTL cache (5s settings/connections, 30s pricing) - Eliminates redundant SQLite reads on concurrent requests - Integrate invalidation in settings.ts updateSettings() and updatePricing() - Integrate invalidation in providers.ts create/update/delete operations - Export getCachedSettings, getCachedPricing, getCachedProviderConnections, invalidateDbCache via localDb.ts for consumer migration - Cache auto-busts on any write, preserving data consistency T01 - Accept header stream negotiation - src/sse/handlers/chat.ts: detect Accept: text/event-stream header - Override body.stream=true when Accept header indicates streaming client - Enables curl, httpx and SDK clients that use HTTP headers instead of JSON body field to trigger streaming responses - Logs Accept override at DEBUG level for observability * fix: auto-advance quota window on expiry to prevent stale blocking (T08) T08 - Quota Window Rolling Auto-Advance - quotaCache.ts: add windowDurationMs field to QuotaCacheEntry interface (optional field that callers can set when they know the window duration) - Add advancedWindowResetAt() helper: if entry.nextResetAt is in the past, eagerly returns { exhausted: false } so requests are unblocked immediately - isAccountQuotaExhausted() now uses advancedWindowResetAt() instead of the previous inline date check, and optimistically clears entry.exhausted flag to avoid re-checking the same stale entry on the next request Before: exhausted accounts with an expired resetAt would wait up to 5 minutes for the background refresh before accepting new requests. After: the first request after resetAt passes will be immediately accepted and will trigger a quota refresh on the next background tick. * feat: manual OAuth token refresh UI (T12) T12 - Manual Token Refresh UI - Add POST /api/providers/[id]/refresh endpoint - Validates connection exists and is OAuth type - Calls getAccessToken() (same helper used in auto-refresh) - Persists new credentials via updateProviderCredentials() - Returns { success, expiresAt, refreshedAt } on success - Update providers/[id]/page.tsx - handleRefreshToken() with loading state (refreshingId) - Pass onRefreshToken + isRefreshing props to ConnectionRow - ConnectionRow: add optional onRefreshToken/isRefreshing props - ConnectionRow: tokenMinsLeft state via lazy init (Date.now() in getter fn, not in render body - satisfies react-hooks/purity) - Token expiry badge: red 'expired' | amber '~Xm' (<30min) | hidden - 'Token' button (amber) next to 'Retest' for OAuth connections - Add en.json i18n: tokenRefreshed, tokenRefreshFailed * Initial plan * feat: integrate wildcardRouter into model alias resolution (T13) T13 - Wildcard Model Routing - Import resolveWildcardAlias from wildcardRouter.ts into model.ts - In getModelInfoCore(), after exact alias check fails, try glob wildcard alias matching (e.g., 'claude-sonnet-*' alias → 'anthropic/claude-sonnet-4') - Returns { provider, model, extendedContext, wildcardPattern } on match - Falls back to MODEL_TO_PROVIDERS lookup and openai default as before * fix: clipboard cleanup and tool validation * feat: media page UX + T04 playground uploads + T03 HuggingFace/Vertex AI Media Page (MediaPageClient.tsx): - Render images inline (img tags from b64_json or url) - Show transcription as plain readable text (not raw JSON) - Amber banner for credential errors with link to /dashboard/providers - Detect empty transcription result and show credentials hint - Provider credential hint below selector for non-local providers - Extended provider/model lists: HuggingFace, Qwen TTS, Inworld, Cartesia, PlayHT, AssemblyAI T04 - Playground File Uploads (playground/page.tsx): - Audio file upload panel for transcription endpoint (multipart/form-data) - Image upload panel for vision models (gpt-4o, claude-3, gemini, pixtral, llava...) - Auto-detect vision models by name heuristic - Inject uploaded images as base64 image_url in chat messages - Inline image rendering for image generation results - Readable text view for transcription results with copy button - Preview thumbnails for attached images with individual remove T03 - HuggingFace + Vertex AI Providers: - HuggingFace: frontend providers.ts + backend providerRegistry.ts Uses HuggingFace Router OpenAI-compatible endpoint - Vertex AI: frontend providers.ts + backend providerRegistry.ts Uses gemini format with generateContent API (urlBuilder fallback) T07 - API Key Round-Robin: VERIFIED already implemented in auth.ts fill-first, round-robin, p2c, random, least-used, cost-optimized strategies * feat: T05 task-aware routing + fix #302 stream override + fix #73 claude provider fallback T05 - Task-Aware Smart Routing: - New open-sse/services/taskAwareRouter.ts: Detects 7 task types: coding, creative, analysis, vision, summarization, background, chat from system/user message content and images Configurable taskModelMap per task type, stats tracking applyTaskAwareRouting() integrates with existing chat pipeline - New src/app/api/settings/task-routing/route.ts: GET/PUT/POST API for task routing config + reset-stats + detect action Persists config via updateSettings('taskRouting') - Integration in src/sse/handlers/chat.ts: applyTaskAwareRouting() called after policy enforcement, before combo resolve Logs task type detection and model overrides Fix #302 - OpenAI SDK stream=False drops tool_calls: - src/sse/handlers/chat.ts T01 Accept header negotiation: Changed condition from 'body.stream !== true' to 'body.stream === undefined' OpenAI Python SDK sends 'Accept: application/json, text/event-stream' in every request, even stream=False — the old code was incorrectly forcing stream=true, causing tool_calls to be dropped from non-streaming responses Fix #73 - Claude Haiku routed to OpenAI provider instead of Antigravity: - open-sse/services/model.ts getModelInfoCore(): Added heuristic prefix detection before the blind 'openai' fallback: claude-* models → antigravity (Anthropic) provider gemini-*/gemma-* models → gemini provider Closes: #73, partially addresses #302 * fix: token counts 0 (#74), model import dup (#180), model route fallback (#73) fix #74 - Token counts always 0 for Antigravity/Claude streaming: - open-sse/utils/usageTracking.ts extractUsage(): Add handler for 'message_start' SSE event which carries INPUT tokens in Antigravity/Claude streaming: { type: 'message_start', message: { usage: { input_tokens: N } } } This event was completely unhandled, causing ALL input token counts to be dropped for every Antigravity/Claude streaming request fix #180 - Model import shows duplicates with no visual feedback: - src/shared/components/ModelSelectModal.tsx: Added addedModelValues prop (string[]) to receive already-added model values Models already in the combo now shown with ✓ indicator + green highlight Makes it visually clear which models are already added vs new - src/app/(dashboard)/dashboard/combos/page.tsx: Pass addedModelValues={models.map(m => m.model)} to ModelSelectModal * Harden clipboard UX and Claude tool normalization (#360) * Initial plan * chore: plan updates for clipboard and translator fixes * fix: clipboard cleanup, copy feedback, and claude tool validation --------- Co-authored-by: openai-code-agent[bot] <242516109+Codex@users.noreply.github.com> Co-authored-by: diegosouzapw <diegosouzapw@users.noreply.github.com> --------- Co-authored-by: diegosouzapw <diegosouzapw@users.noreply.github.com> Co-authored-by: openai-code-agent[bot] <242516109+Codex@users.noreply.github.com>
This commit is contained in:
Diego Rodrigues de Sa e Souza
committed by
GitHub
GitHub
parent
5cff98ea75
commit
eaddb6f0fa
@@ -11,6 +11,7 @@ import { useTranslations } from "next-intl";
|
||||
*/
|
||||
|
||||
import { useState, useEffect, useRef, useCallback } from "react";
|
||||
import { copyToClipboard } from "@/shared/utils/clipboard";
|
||||
|
||||
interface LogEntry {
|
||||
timestamp: string;
|
||||
@@ -89,12 +90,17 @@ export default function ConsoleLogViewer() {
|
||||
}
|
||||
}, [logs, autoScroll]);
|
||||
|
||||
const handleCopy = (entry: LogEntry, idx: number) => {
|
||||
const handleCopy = async (entry: LogEntry, idx: number) => {
|
||||
const text = JSON.stringify(entry, null, 2);
|
||||
navigator.clipboard.writeText(text).then(() => {
|
||||
setCopiedIdx(idx);
|
||||
setTimeout(() => setCopiedIdx(null), 2000);
|
||||
});
|
||||
const success = await copyToClipboard(text);
|
||||
if (!success) {
|
||||
setError("Failed to copy log entry");
|
||||
return;
|
||||
}
|
||||
|
||||
setError(null);
|
||||
setCopiedIdx(idx);
|
||||
setTimeout(() => setCopiedIdx(null), 2000);
|
||||
};
|
||||
|
||||
const formatTime = (ts: string) => {
|
||||
|
||||
@@ -27,6 +27,7 @@ export default function ModelSelectModal({
|
||||
activeProviders = [],
|
||||
title = "Select Model",
|
||||
modelAliases = {},
|
||||
addedModelValues = [],
|
||||
}) {
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
const [combos, setCombos] = useState<any[]>([]);
|
||||
@@ -330,6 +331,7 @@ export default function ModelSelectModal({
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{group.models.map((model) => {
|
||||
const isSelected = selectedModel === model.value;
|
||||
const isAdded = addedModelValues.includes(model.value);
|
||||
return (
|
||||
<button
|
||||
key={model.id}
|
||||
@@ -339,10 +341,13 @@ export default function ModelSelectModal({
|
||||
${
|
||||
isSelected
|
||||
? "bg-primary text-white border-primary"
|
||||
: "bg-surface border-border text-text-main hover:border-primary/50 hover:bg-primary/5"
|
||||
: isAdded
|
||||
? "bg-emerald-500/15 border-emerald-500/30 text-emerald-700 dark:text-emerald-400"
|
||||
: "bg-surface border-border text-text-main hover:border-primary/50 hover:bg-primary/5"
|
||||
}
|
||||
`}
|
||||
>
|
||||
{isAdded && <span className="mr-0.5 opacity-70">✓</span>}
|
||||
{model.name}
|
||||
{model.isCustom ? " ★" : ""}
|
||||
</button>
|
||||
@@ -375,4 +380,5 @@ ModelSelectModal.propTypes = {
|
||||
),
|
||||
title: PropTypes.string,
|
||||
modelAliases: PropTypes.object,
|
||||
addedModelValues: PropTypes.arrayOf(PropTypes.string),
|
||||
};
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { useState, useEffect, useCallback, useMemo, useRef } from "react";
|
||||
import Card from "./Card";
|
||||
import RequestLoggerDetail from "./RequestLoggerDetail";
|
||||
import { copyToClipboard } from "@/shared/utils/clipboard";
|
||||
import {
|
||||
PROTOCOL_COLORS,
|
||||
PROVIDER_COLORS,
|
||||
@@ -230,30 +231,8 @@ export default function RequestLoggerV2() {
|
||||
setDetailData(null);
|
||||
};
|
||||
|
||||
// Copy to clipboard
|
||||
const copyToClipboard = async (text) => {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
return true;
|
||||
} catch {
|
||||
// Fallback for non-HTTPS or older browsers
|
||||
try {
|
||||
const textarea = document.createElement("textarea");
|
||||
textarea.value = text;
|
||||
textarea.style.position = "fixed";
|
||||
textarea.style.left = "-9999px";
|
||||
document.body.appendChild(textarea);
|
||||
textarea.select();
|
||||
document.execCommand("copy");
|
||||
document.body.removeChild(textarea);
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Unique accounts and providers for dropdowns
|
||||
|
||||
const uniqueAccounts = [...new Set(logs.map((l) => l.account).filter((a) => a && a !== "-"))];
|
||||
const uniqueModels = [...new Set(logs.map((l) => l.model).filter(Boolean))].sort();
|
||||
const uniqueProviders = [
|
||||
|
||||
@@ -349,6 +349,27 @@ export const APIKEY_PROVIDERS = {
|
||||
textIcon: "CF",
|
||||
website: "https://github.com/comfyanonymous/ComfyUI",
|
||||
},
|
||||
huggingface: {
|
||||
id: "huggingface",
|
||||
alias: "hf",
|
||||
name: "HuggingFace",
|
||||
icon: "face",
|
||||
color: "#FFD21E",
|
||||
textIcon: "HF",
|
||||
website: "https://huggingface.co",
|
||||
hasFree: true,
|
||||
freeNote: "Free Inference API for thousands of models (Whisper, VITS, SDXL…)",
|
||||
},
|
||||
vertex: {
|
||||
id: "vertex",
|
||||
alias: "vertex",
|
||||
name: "Vertex AI",
|
||||
icon: "cloud",
|
||||
color: "#4285F4",
|
||||
textIcon: "VA",
|
||||
website: "https://cloud.google.com/vertex-ai",
|
||||
authHint: "Provide Service Account JSON or OAuth access_token",
|
||||
},
|
||||
};
|
||||
|
||||
export const OPENAI_COMPATIBLE_PREFIX = "openai-compatible-";
|
||||
|
||||
@@ -1,58 +1,35 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useCallback, useRef } from "react";
|
||||
import { copyToClipboard } from "@/shared/utils/clipboard";
|
||||
|
||||
/**
|
||||
* Fallback copy using legacy execCommand (works on HTTP)
|
||||
*/
|
||||
function fallbackCopy(text) {
|
||||
const textarea = document.createElement("textarea");
|
||||
textarea.value = text;
|
||||
textarea.style.position = "fixed";
|
||||
textarea.style.left = "-9999px";
|
||||
textarea.style.top = "-9999px";
|
||||
textarea.style.opacity = "0";
|
||||
document.body.appendChild(textarea);
|
||||
textarea.focus();
|
||||
textarea.select();
|
||||
try {
|
||||
document.execCommand("copy");
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
document.body.removeChild(textarea);
|
||||
}
|
||||
|
||||
/**
|
||||
* Hook for copy to clipboard with feedback
|
||||
* Hook for copy to clipboard with feedback.
|
||||
* Uses shared copyToClipboard utility that works on both HTTP and HTTPS.
|
||||
* @param {number} resetDelay - Time in ms before resetting copied state (default: 2000)
|
||||
* @returns {{ copied: string|null, copy: (text: string, id?: string) => void }}
|
||||
* @returns {{ copied: string|null, copy: (text: string, id?: string) => Promise<boolean> }}
|
||||
*/
|
||||
export function useCopyToClipboard(resetDelay = 2000) {
|
||||
const [copied, setCopied] = useState(null);
|
||||
const timeoutRef = useRef(null);
|
||||
const [copied, setCopied] = useState<string | null>(null);
|
||||
const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
const copy = useCallback(
|
||||
async (text, id = "default") => {
|
||||
try {
|
||||
if (navigator.clipboard && window.isSecureContext) {
|
||||
await navigator.clipboard.writeText(text);
|
||||
} else {
|
||||
fallbackCopy(text);
|
||||
async (text: string, id = "default"): Promise<boolean> => {
|
||||
const success = await copyToClipboard(text);
|
||||
|
||||
if (success) {
|
||||
setCopied(id);
|
||||
|
||||
if (timeoutRef.current) {
|
||||
clearTimeout(timeoutRef.current);
|
||||
}
|
||||
} catch {
|
||||
fallbackCopy(text);
|
||||
|
||||
timeoutRef.current = setTimeout(() => {
|
||||
setCopied(null);
|
||||
}, resetDelay);
|
||||
}
|
||||
|
||||
setCopied(id);
|
||||
|
||||
if (timeoutRef.current) {
|
||||
clearTimeout(timeoutRef.current);
|
||||
}
|
||||
|
||||
timeoutRef.current = setTimeout(() => {
|
||||
setCopied(null);
|
||||
}, resetDelay);
|
||||
return success;
|
||||
},
|
||||
[resetDelay]
|
||||
);
|
||||
|
||||
52
src/shared/utils/clipboard.ts
Normal file
52
src/shared/utils/clipboard.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
/**
|
||||
* Clipboard utility with HTTP/HTTPS fallback.
|
||||
* navigator.clipboard.writeText() requires HTTPS (secure context).
|
||||
* For HTTP deployments, falls back to execCommand('copy').
|
||||
*/
|
||||
|
||||
/**
|
||||
* Copy text to clipboard with automatic HTTPS/HTTP fallback.
|
||||
* Works in both secure (HTTPS) and non-secure (HTTP) contexts.
|
||||
* @param text - Text to copy to clipboard
|
||||
* @returns true if copy succeeded, false otherwise
|
||||
*/
|
||||
export async function copyToClipboard(text: string): Promise<boolean> {
|
||||
// Method 1: Clipboard API (requires HTTPS / secure context)
|
||||
if (
|
||||
typeof navigator !== "undefined" &&
|
||||
navigator.clipboard &&
|
||||
typeof window !== "undefined" &&
|
||||
window.isSecureContext
|
||||
) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
return true;
|
||||
} catch {
|
||||
// Fall through to execCommand fallback
|
||||
}
|
||||
}
|
||||
|
||||
// Method 2: Legacy execCommand fallback (works on HTTP)
|
||||
if (typeof document !== "undefined" && document.body) {
|
||||
const textArea = document.createElement("textarea");
|
||||
textArea.value = text;
|
||||
textArea.style.cssText = "position:fixed;top:0;left:-9999px;opacity:0;pointer-events:none;";
|
||||
let appended = false;
|
||||
|
||||
try {
|
||||
document.body.appendChild(textArea);
|
||||
appended = true;
|
||||
textArea.focus();
|
||||
textArea.select();
|
||||
return document.execCommand("copy");
|
||||
} catch {
|
||||
return false;
|
||||
} finally {
|
||||
if (appended && document.body.contains(textArea)) {
|
||||
document.body.removeChild(textArea);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
Reference in New Issue
Block a user