mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-01-12 02:58:34 +08:00
chore: remove dead code and consolidate duplicate types (#555)
- Delete unused files: lib/ai-config.ts, components/ui/card.tsx, lib/token-counter.ts - Remove js-tiktoken dependency (only used by deleted token-counter.ts) - Consolidate ProviderName type: add "ollama" to model-config.ts, import in ai-providers.ts - Consolidate DiagramOperation type: keep in chat/types.ts, import in utils.ts and hook
This commit is contained in:
@@ -1,92 +0,0 @@
|
|||||||
import * as React from "react"
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
|
||||||
|
|
||||||
function Card({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card"
|
|
||||||
className={cn(
|
|
||||||
"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-header"
|
|
||||||
className={cn(
|
|
||||||
"@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-[data-slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-title"
|
|
||||||
className={cn("leading-none font-semibold", className)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-description"
|
|
||||||
className={cn("text-muted-foreground text-sm", className)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardAction({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-action"
|
|
||||||
className={cn(
|
|
||||||
"col-start-2 row-span-2 row-start-1 self-start justify-self-end",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardContent({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-content"
|
|
||||||
className={cn("px-6", className)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="card-footer"
|
|
||||||
className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export {
|
|
||||||
Card,
|
|
||||||
CardHeader,
|
|
||||||
CardFooter,
|
|
||||||
CardTitle,
|
|
||||||
CardAction,
|
|
||||||
CardDescription,
|
|
||||||
CardContent,
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { MutableRefObject } from "react"
|
import type { MutableRefObject } from "react"
|
||||||
|
import type { DiagramOperation } from "@/components/chat/types"
|
||||||
import { isMxCellXmlComplete, wrapWithMxFile } from "@/lib/utils"
|
import { isMxCellXmlComplete, wrapWithMxFile } from "@/lib/utils"
|
||||||
|
|
||||||
const DEBUG = process.env.NODE_ENV === "development"
|
const DEBUG = process.env.NODE_ENV === "development"
|
||||||
@@ -29,12 +30,6 @@ type AddToolOutputParams = AddToolOutputSuccess | AddToolOutputError
|
|||||||
|
|
||||||
type AddToolOutputFn = (params: AddToolOutputParams) => void
|
type AddToolOutputFn = (params: AddToolOutputParams) => void
|
||||||
|
|
||||||
interface DiagramOperation {
|
|
||||||
operation: "update" | "add" | "delete"
|
|
||||||
cell_id: string
|
|
||||||
new_xml?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
interface UseDiagramToolHandlersParams {
|
interface UseDiagramToolHandlersParams {
|
||||||
partialXmlRef: MutableRefObject<string>
|
partialXmlRef: MutableRefObject<string>
|
||||||
editDiagramOriginalXmlRef: MutableRefObject<Map<string, string>>
|
editDiagramOriginalXmlRef: MutableRefObject<Map<string, string>>
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
import { STORAGE_KEYS } from "./storage"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get AI configuration from localStorage.
|
|
||||||
* Returns API keys and settings for custom AI providers.
|
|
||||||
* Used to override server defaults when user provides their own API key.
|
|
||||||
*/
|
|
||||||
export function getAIConfig() {
|
|
||||||
if (typeof window === "undefined") {
|
|
||||||
return {
|
|
||||||
accessCode: "",
|
|
||||||
aiProvider: "",
|
|
||||||
aiBaseUrl: "",
|
|
||||||
aiApiKey: "",
|
|
||||||
aiModel: "",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
accessCode: localStorage.getItem(STORAGE_KEYS.accessCode) || "",
|
|
||||||
aiProvider: localStorage.getItem(STORAGE_KEYS.aiProvider) || "",
|
|
||||||
aiBaseUrl: localStorage.getItem(STORAGE_KEYS.aiBaseUrl) || "",
|
|
||||||
aiApiKey: localStorage.getItem(STORAGE_KEYS.aiApiKey) || "",
|
|
||||||
aiModel: localStorage.getItem(STORAGE_KEYS.aiModel) || "",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,22 +8,9 @@ import { createOpenAI, openai } from "@ai-sdk/openai"
|
|||||||
import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
|
import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
|
||||||
import { createOpenRouter } from "@openrouter/ai-sdk-provider"
|
import { createOpenRouter } from "@openrouter/ai-sdk-provider"
|
||||||
import { createOllama, ollama } from "ollama-ai-provider-v2"
|
import { createOllama, ollama } from "ollama-ai-provider-v2"
|
||||||
|
import type { ProviderName } from "@/lib/types/model-config"
|
||||||
|
|
||||||
export type ProviderName =
|
export type { ProviderName }
|
||||||
| "bedrock"
|
|
||||||
| "openai"
|
|
||||||
| "anthropic"
|
|
||||||
| "google"
|
|
||||||
| "azure"
|
|
||||||
| "ollama"
|
|
||||||
| "openrouter"
|
|
||||||
| "deepseek"
|
|
||||||
| "siliconflow"
|
|
||||||
| "sglang"
|
|
||||||
| "gateway"
|
|
||||||
| "edgeone"
|
|
||||||
| "doubao"
|
|
||||||
| "modelscope"
|
|
||||||
|
|
||||||
interface ModelConfig {
|
interface ModelConfig {
|
||||||
model: any
|
model: any
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
/**
|
|
||||||
* Token counting utilities using js-tiktoken
|
|
||||||
*
|
|
||||||
* Uses cl100k_base encoding (GPT-4) which is close to Claude's tokenization.
|
|
||||||
* This is a pure JavaScript implementation, no WASM required.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { encodingForModel } from "js-tiktoken"
|
|
||||||
import { DEFAULT_SYSTEM_PROMPT, EXTENDED_SYSTEM_PROMPT } from "./system-prompts"
|
|
||||||
|
|
||||||
const encoder = encodingForModel("gpt-4o")
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Count the number of tokens in a text string
|
|
||||||
* @param text - The text to count tokens for
|
|
||||||
* @returns The number of tokens
|
|
||||||
*/
|
|
||||||
export function countTextTokens(text: string): number {
|
|
||||||
return encoder.encode(text).length
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get token counts for the system prompts
|
|
||||||
* Useful for debugging and optimizing prompt sizes
|
|
||||||
* @returns Object with token counts for default and extended prompts
|
|
||||||
*/
|
|
||||||
export function getSystemPromptTokenCounts(): {
|
|
||||||
default: number
|
|
||||||
extended: number
|
|
||||||
additions: number
|
|
||||||
} {
|
|
||||||
const defaultTokens = countTextTokens(DEFAULT_SYSTEM_PROMPT)
|
|
||||||
const extendedTokens = countTextTokens(EXTENDED_SYSTEM_PROMPT)
|
|
||||||
return {
|
|
||||||
default: defaultTokens,
|
|
||||||
extended: extendedTokens,
|
|
||||||
additions: extendedTokens - defaultTokens,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,6 +6,7 @@ export type ProviderName =
|
|||||||
| "google"
|
| "google"
|
||||||
| "azure"
|
| "azure"
|
||||||
| "bedrock"
|
| "bedrock"
|
||||||
|
| "ollama"
|
||||||
| "openrouter"
|
| "openrouter"
|
||||||
| "deepseek"
|
| "deepseek"
|
||||||
| "siliconflow"
|
| "siliconflow"
|
||||||
@@ -76,6 +77,10 @@ export const PROVIDER_INFO: Record<
|
|||||||
google: { label: "Google" },
|
google: { label: "Google" },
|
||||||
azure: { label: "Azure OpenAI" },
|
azure: { label: "Azure OpenAI" },
|
||||||
bedrock: { label: "Amazon Bedrock" },
|
bedrock: { label: "Amazon Bedrock" },
|
||||||
|
ollama: {
|
||||||
|
label: "Ollama",
|
||||||
|
defaultBaseUrl: "http://localhost:11434",
|
||||||
|
},
|
||||||
openrouter: { label: "OpenRouter" },
|
openrouter: { label: "OpenRouter" },
|
||||||
deepseek: { label: "DeepSeek" },
|
deepseek: { label: "DeepSeek" },
|
||||||
siliconflow: {
|
siliconflow: {
|
||||||
@@ -99,7 +104,7 @@ export const PROVIDER_INFO: Record<
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Suggested models per provider for quick add
|
// Suggested models per provider for quick add
|
||||||
export const SUGGESTED_MODELS: Record<ProviderName, string[]> = {
|
export const SUGGESTED_MODELS: Partial<Record<ProviderName, string[]>> = {
|
||||||
openai: [
|
openai: [
|
||||||
"gpt-5.2-pro",
|
"gpt-5.2-pro",
|
||||||
"gpt-5.2-chat-latest",
|
"gpt-5.2-chat-latest",
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import { type ClassValue, clsx } from "clsx"
|
import { type ClassValue, clsx } from "clsx"
|
||||||
import * as pako from "pako"
|
import * as pako from "pako"
|
||||||
import { twMerge } from "tailwind-merge"
|
import { twMerge } from "tailwind-merge"
|
||||||
|
import type { DiagramOperation } from "@/components/chat/types"
|
||||||
|
|
||||||
|
export type { DiagramOperation }
|
||||||
|
|
||||||
export function cn(...inputs: ClassValue[]) {
|
export function cn(...inputs: ClassValue[]) {
|
||||||
return twMerge(clsx(inputs))
|
return twMerge(clsx(inputs))
|
||||||
@@ -473,12 +476,6 @@ export function replaceNodes(currentXML: string, nodes: string): string {
|
|||||||
// ID-based Diagram Operations
|
// ID-based Diagram Operations
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
export interface DiagramOperation {
|
|
||||||
operation: "update" | "add" | "delete"
|
|
||||||
cell_id: string
|
|
||||||
new_xml?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface OperationError {
|
export interface OperationError {
|
||||||
type: "update" | "add" | "delete"
|
type: "update" | "add" | "delete"
|
||||||
cellId: string
|
cellId: string
|
||||||
|
|||||||
@@ -69,7 +69,6 @@
|
|||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"cmdk": "^1.1.1",
|
"cmdk": "^1.1.1",
|
||||||
"idb": "^8.0.3",
|
"idb": "^8.0.3",
|
||||||
"js-tiktoken": "^1.0.21",
|
|
||||||
"jsonrepair": "^3.13.1",
|
"jsonrepair": "^3.13.1",
|
||||||
"lucide-react": "^0.562.0",
|
"lucide-react": "^0.562.0",
|
||||||
"motion": "^12.23.25",
|
"motion": "^12.23.25",
|
||||||
|
|||||||
Reference in New Issue
Block a user