fix: custom model compatibility with antigravity/mitm (PR #250)
This commit is contained in:
@@ -22,6 +22,7 @@ export default function MitmToolCard({
|
||||
apiKeys,
|
||||
activeProviders,
|
||||
hasActiveProviders,
|
||||
modelAliases = {},
|
||||
cloudEnabled,
|
||||
onDnsChange,
|
||||
}) {
|
||||
@@ -74,7 +75,7 @@ export default function MitmToolCard({
|
||||
};
|
||||
|
||||
const handleModelSelect = (model) => {
|
||||
if (!currentEditingAlias) return;
|
||||
if (!currentEditingAlias || model.isPlaceholder) return;
|
||||
const updated = { ...modelMappings, [currentEditingAlias]: model.value };
|
||||
setModelMappings(updated);
|
||||
saveMappings(updated);
|
||||
@@ -104,7 +105,7 @@ export default function MitmToolCard({
|
||||
});
|
||||
const data = await res.json();
|
||||
if (!res.ok) throw new Error(data.error || "Failed to toggle DNS");
|
||||
|
||||
|
||||
if (action === "enable") {
|
||||
setMessage({
|
||||
type: "success",
|
||||
@@ -116,7 +117,7 @@ export default function MitmToolCard({
|
||||
text: "DNS disabled — traffic restored",
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
setShowPasswordModal(false);
|
||||
setSudoPassword("");
|
||||
onDnsChange?.(data);
|
||||
@@ -303,6 +304,7 @@ export default function MitmToolCard({
|
||||
onSelect={handleModelSelect}
|
||||
selectedModel={currentEditingAlias ? modelMappings[currentEditingAlias] : null}
|
||||
activeProviders={activeProviders}
|
||||
modelAliases={modelAliases}
|
||||
title={`Select model for ${currentEditingAlias}`}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
import { useState, useEffect } from "react";
|
||||
import { CLI_TOOLS } from "@/shared/constants/cliTools";
|
||||
import { getModelsByProviderId, PROVIDER_ID_TO_ALIAS } from "@/shared/constants/models";
|
||||
import { getModelsByProviderId } from "@/shared/constants/models";
|
||||
import { isOpenAICompatibleProvider, isAnthropicCompatibleProvider } from "@/shared/constants/providers";
|
||||
import { MitmServerCard, MitmToolCard } from "@/app/(dashboard)/dashboard/cli-tools/components";
|
||||
|
||||
const MITM_TOOL_IDS = ["antigravity", "copilot"];
|
||||
@@ -10,6 +11,7 @@ const MITM_TOOL_IDS = ["antigravity", "copilot"];
|
||||
export default function MitmPageClient() {
|
||||
const [connections, setConnections] = useState([]);
|
||||
const [apiKeys, setApiKeys] = useState([]);
|
||||
const [modelAliases, setModelAliases] = useState({});
|
||||
const [cloudEnabled, setCloudEnabled] = useState(false);
|
||||
const [expandedTool, setExpandedTool] = useState(null);
|
||||
const [mitmStatus, setMitmStatus] = useState({ running: false, certExists: false, dnsStatus: {}, hasCachedPassword: false });
|
||||
@@ -17,6 +19,7 @@ export default function MitmPageClient() {
|
||||
useEffect(() => {
|
||||
fetchConnections();
|
||||
fetchApiKeys();
|
||||
fetchAliases();
|
||||
fetchCloudSettings();
|
||||
}, []);
|
||||
|
||||
@@ -40,6 +43,16 @@ export default function MitmPageClient() {
|
||||
} catch { /* ignore */ }
|
||||
};
|
||||
|
||||
const fetchAliases = async () => {
|
||||
try {
|
||||
const res = await fetch("/api/models/alias");
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
setModelAliases(data.aliases || {});
|
||||
}
|
||||
} catch { /* ignore */ }
|
||||
};
|
||||
|
||||
const fetchCloudSettings = async () => {
|
||||
try {
|
||||
const res = await fetch("/api/settings");
|
||||
@@ -54,7 +67,11 @@ export default function MitmPageClient() {
|
||||
|
||||
const hasActiveProviders = () => {
|
||||
const active = getActiveProviders();
|
||||
return active.some(conn => getModelsByProviderId(conn.provider).length > 0);
|
||||
return active.some(conn =>
|
||||
getModelsByProviderId(conn.provider).length > 0 ||
|
||||
isOpenAICompatibleProvider(conn.provider) ||
|
||||
isAnthropicCompatibleProvider(conn.provider)
|
||||
);
|
||||
};
|
||||
|
||||
const mitmTools = Object.entries(CLI_TOOLS).filter(([id]) => MITM_TOOL_IDS.includes(id));
|
||||
@@ -82,6 +99,7 @@ export default function MitmPageClient() {
|
||||
apiKeys={apiKeys}
|
||||
activeProviders={getActiveProviders()}
|
||||
hasActiveProviders={hasActiveProviders()}
|
||||
modelAliases={modelAliases}
|
||||
cloudEnabled={cloudEnabled}
|
||||
onDnsChange={(data) => setMitmStatus(prev => ({ ...prev, dnsStatus: data.dnsStatus ?? prev.dnsStatus }))}
|
||||
/>
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { getCombos, createCombo, getComboByName } from "@/lib/localDb";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
// Validate combo name: only a-z, A-Z, 0-9, -, _
|
||||
const VALID_NAME_REGEX = /^[a-zA-Z0-9_-]+$/;
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ import { NextResponse } from "next/server";
|
||||
import { getApiKeys, createApiKey } from "@/lib/localDb";
|
||||
import { getConsistentMachineId } from "@/shared/utils/machineId";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
// GET /api/keys - List API keys
|
||||
export async function GET() {
|
||||
try {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { getModelAliases, setModelAlias, deleteModelAlias } from "@/models";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
// GET /api/models/alias - Get all aliases
|
||||
export async function GET() {
|
||||
try {
|
||||
|
||||
@@ -3,6 +3,8 @@ import { createProviderNode, getProviderNodes } from "@/models";
|
||||
import { OPENAI_COMPATIBLE_PREFIX, ANTHROPIC_COMPATIBLE_PREFIX } from "@/shared/constants/providers";
|
||||
import { generateId } from "@/shared/utils";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
const OPENAI_COMPATIBLE_DEFAULTS = {
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
};
|
||||
|
||||
@@ -3,6 +3,8 @@ import { getProviderConnections, createProviderConnection, getProviderNodeById,
|
||||
import { APIKEY_PROVIDERS } from "@/shared/constants/config";
|
||||
import { isOpenAICompatibleProvider, isAnthropicCompatibleProvider } from "@/shared/constants/providers";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
// GET /api/providers - List all connections
|
||||
export async function GET() {
|
||||
try {
|
||||
@@ -15,8 +17,8 @@ export async function GET() {
|
||||
for (const node of nodes) {
|
||||
if (node.id && node.name) nodeNameMap[node.id] = node.name;
|
||||
}
|
||||
} catch {}
|
||||
|
||||
} catch { }
|
||||
|
||||
// Hide sensitive fields, enrich name for compatible providers
|
||||
const safeConnections = connections.map(c => {
|
||||
const isCompatible = isOpenAICompatibleProvider(c.provider) || isAnthropicCompatibleProvider(c.provider);
|
||||
@@ -47,9 +49,9 @@ export async function POST(request) {
|
||||
const { provider, apiKey, name, priority, globalPriority, defaultModel, testStatus } = body;
|
||||
|
||||
// Validation
|
||||
const isValidProvider = APIKEY_PROVIDERS[provider] ||
|
||||
isOpenAICompatibleProvider(provider) ||
|
||||
isAnthropicCompatibleProvider(provider);
|
||||
const isValidProvider = APIKEY_PROVIDERS[provider] ||
|
||||
isOpenAICompatibleProvider(provider) ||
|
||||
isAnthropicCompatibleProvider(provider);
|
||||
|
||||
if (!provider || !isValidProvider) {
|
||||
return NextResponse.json({ error: "Invalid provider" }, { status: 400 });
|
||||
|
||||
Reference in New Issue
Block a user