Skip to content

B
bit-pm
Unverified 提交 b616598b authored 作者: Will Chen's avatar Will Chen 提交者： GitHub
浏览文件
操作

Add ollama support (#7)

上级 a7b3e664
显示空白字符变更
内嵌 并排
正在显示 包含 364 行增加 和 51 行删除
package-lock.json
浏览文件 @ b616598b
......@@ -52,6 +52,7 @@
"kill-port": "^2.0.1",
"lucide-react": "^0.487.0",
"monaco-editor": "^0.52.2",
"ollama-ai-provider": "^1.2.0",
"openai": "^4.91.1",
"posthog-js": "^1.236.3",
"react": "^19.0.0",
......@@ -16841,6 +16842,28 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/ollama-ai-provider": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ollama-ai-provider/-/ollama-ai-provider-1.2.0.tgz",
"integrity": "sha512-jTNFruwe3O/ruJeppI/quoOUxG7NA6blG3ZyQj3lei4+NnJo7bi3eIRWqlVpRlu/mbzbFXeJSBuYQWF6pzGKww==",
"license": "Apache-2.0",
"dependencies": {
"@ai-sdk/provider": "^1.0.0",
"@ai-sdk/provider-utils": "^2.0.0",
"partial-json": "0.1.7"
},
"engines": {
"node": ">=18"
},
"peerDependencies": {
"zod": "^3.0.0"
},
"peerDependenciesMeta": {
"zod": {
"optional": true
}
}
},
"node_modules/on-finished": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
......@@ -17236,6 +17259,12 @@
"node": ">= 0.8"
}
},
"node_modules/partial-json": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/partial-json/-/partial-json-0.1.7.tgz",
"integrity": "sha512-Njv/59hHaokb/hRUjce3Hdv12wd60MtM9Z5Olmn+nehe0QDAsRtRbJPvJ0Z91TusF0SuZRIvnM+S4l6EIP8leA==",
"license": "MIT"
},
"node_modules/path-browserify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
......
package.json
浏览文件 @ b616598b
......@@ -67,6 +67,7 @@
"@ai-sdk/google": "^1.2.10",
"@ai-sdk/openai": "^1.3.7",
"@biomejs/biome": "^1.9.4",
"@dyad-sh/supabase-management-js": "v1.0.0",
"@monaco-editor/react": "^4.7.0-rc.0",
"@openrouter/ai-sdk-provider": "^0.4.5",
"@radix-ui/react-accordion": "^1.2.4",
......@@ -105,6 +106,7 @@
"kill-port": "^2.0.1",
"lucide-react": "^0.487.0",
"monaco-editor": "^0.52.2",
"ollama-ai-provider": "^1.2.0",
"openai": "^4.91.1",
"posthog-js": "^1.236.3",
"react": "^19.0.0",
......@@ -116,7 +118,6 @@
"shell-env": "^4.0.1",
"shiki": "^3.2.1",
"sonner": "^2.0.3",
"@dyad-sh/supabase-management-js": "v1.0.0",
"tailwind-merge": "^3.1.0",
"tailwindcss": "^4.1.3",
"tree-kill": "^1.2.2",
......
src/atoms/localModelsAtoms.ts 0 → 100644
浏览文件 @ b616598b
import { atom } from "jotai";
import { type LocalModel } from "@/ipc/ipc_types";
export const localModelsAtom = atom<LocalModel[]>([]);
export const localModelsLoadingAtom = atom<boolean>(false);
export const localModelsErrorAtom = atom<Error | null>(null);
src/components/ModelPicker.tsx
浏览文件 @ b616598b
import type { LargeLanguageModel, ModelProvider } from "@/lib/schemas";
import { Button } from "@/components/ui/button";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { useState } from "react";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
DropdownMenuSub,
DropdownMenuSubTrigger,
DropdownMenuSubContent,
} from "@/components/ui/dropdown-menu";
import { useEffect, useState } from "react";
import { MODEL_OPTIONS } from "@/constants/models";
import { useLocalModels } from "@/hooks/useLocalModels";
import { ChevronDown } from "lucide-react";
interface ModelPickerProps {
selectedModel: LargeLanguageModel;
......@@ -23,9 +31,37 @@ export function ModelPicker({
onModelSelect,
}: ModelPickerProps) {
const [open, setOpen] = useState(false);
const modelDisplayName = MODEL_OPTIONS[selectedModel.provider].find(
const {
models: localModels,
loading: localModelsLoading,
error: localModelsError,
loadModels,
} = useLocalModels();
// Load local models when the component mounts or the dropdown opens
useEffect(() => {
if (open) {
loadModels();
}
}, [open, loadModels]);
// Get display name for the selected model
const getModelDisplayName = () => {
if (selectedModel.provider === "ollama") {
return (
localModels.find((model) => model.modelName === selectedModel.name)
?.displayName || selectedModel.name
);
}
return (
MODEL_OPTIONS[selectedModel.provider]?.find(
(model) => model.name === selectedModel.name
)?.displayName;
)?.displayName || selectedModel.name
);
};
const modelDisplayName = getModelDisplayName();
// Flatten the model options into a single array with provider information
const allModels = Object.entries(MODEL_OPTIONS).flatMap(
......@@ -36,9 +72,13 @@ export function ModelPicker({
}))
);
// Determine if we have local models available
const hasLocalModels =
!localModelsLoading && !localModelsError && localModels.length > 0;
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<DropdownMenu open={open} onOpenChange={setOpen}>
<DropdownMenuTrigger asChild>
<Button
variant="outline"
size="sm"
......@@ -48,18 +88,24 @@ export function ModelPicker({
<span className="text-xs text-muted-foreground">Model:</span>{" "}
{modelDisplayName}
</span>
<ChevronDown className="h-4 w-4" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-56 p-1" align="start">
<div className="grid gap-2">
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56" align="start">
<DropdownMenuLabel>Cloud Models</DropdownMenuLabel>
<DropdownMenuSeparator />
{/* Cloud models */}
{allModels.map((model) => (
<Tooltip key={model.name}>
<Tooltip key={`${model.provider}-${model.name}`}>
<TooltipTrigger asChild>
<Button
variant={
selectedModel.name === model.name ? "secondary" : "ghost"
<DropdownMenuItem
className={
selectedModel.provider === model.provider &&
selectedModel.name === model.name
? "bg-secondary"
: ""
}
className="w-full justify-start font-normal"
onClick={() => {
onModelSelect({
name: model.name,
......@@ -81,13 +127,88 @@ export function ModelPicker({
</span>
)}
</div>
</Button>
</DropdownMenuItem>
</TooltipTrigger>
<TooltipContent side="right">{model.description}</TooltipContent>
</Tooltip>
))}
<DropdownMenuSeparator />
{/* Ollama Models Dropdown */}
<DropdownMenuSub>
<DropdownMenuSubTrigger
disabled={localModelsLoading || !hasLocalModels}
className="w-full font-normal"
>
<div className="flex flex-col items-start">
<span>Local models (Ollama)</span>
{localModelsLoading ? (
<span className="text-xs text-muted-foreground">
Loading...
</span>
) : !hasLocalModels ? (
<span className="text-xs text-muted-foreground">
None available
</span>
) : (
<span className="text-xs text-muted-foreground">
{localModels.length} models
</span>
)}
</div>
</DropdownMenuSubTrigger>
<DropdownMenuSubContent className="w-56">
<DropdownMenuLabel>Ollama Models</DropdownMenuLabel>
<DropdownMenuSeparator />
{localModelsLoading ? (
<div className="text-xs text-center py-2 text-muted-foreground">
Loading models...
</div>
) : localModelsError ? (
<div className="text-xs text-center py-2 text-muted-foreground">
Error loading models
</div>
) : localModels.length === 0 ? (
<div className="px-2 py-1.5 text-sm">
<div className="flex flex-col">
<span>No local models available</span>
<span className="text-xs text-muted-foreground">
Start Ollama to use local models
</span>
</div>
</div>
</PopoverContent>
</Popover>
) : (
localModels.map((model) => (
<DropdownMenuItem
key={`local-${model.modelName}`}
className={
selectedModel.provider === "ollama" &&
selectedModel.name === model.modelName
? "bg-secondary"
: ""
}
onClick={() => {
onModelSelect({
name: model.modelName,
provider: "ollama",
});
setOpen(false);
}}
>
<div className="flex flex-col">
<span>{model.displayName}</span>
<span className="text-xs text-muted-foreground truncate">
{model.modelName}
</span>
</div>
</DropdownMenuItem>
))
)}
</DropdownMenuSubContent>
</DropdownMenuSub>
</DropdownMenuContent>
</DropdownMenu>
);
}
src/components/ui/dropdown-menu.tsx
浏览文件 @ b616598b
import * as React from "react"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react"
import * as React from "react";
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
import { cn } from "@/lib/utils"
import { cn } from "@/lib/utils";
function DropdownMenu({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />
return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
}
function DropdownMenuPortal({
......@@ -15,7 +15,7 @@ function DropdownMenuPortal({
}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
return (
<DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
)
);
}
function DropdownMenuTrigger({
......@@ -26,7 +26,7 @@ function DropdownMenuTrigger({
data-slot="dropdown-menu-trigger"
{...props}
/>
)
);
}
function DropdownMenuContent({
......@@ -46,7 +46,7 @@ function DropdownMenuContent({
{...props}
/>
</DropdownMenuPrimitive.Portal>
)
);
}
function DropdownMenuGroup({
......@@ -54,7 +54,7 @@ function DropdownMenuGroup({
}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
return (
<DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
)
);
}
function DropdownMenuItem({
......@@ -63,8 +63,8 @@ function DropdownMenuItem({
variant = "default",
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
inset?: boolean
variant?: "default" | "destructive"
inset?: boolean;
variant?: "default" | "destructive";
}) {
return (
<DropdownMenuPrimitive.Item
......@@ -72,12 +72,12 @@ function DropdownMenuItem({
data-inset={inset}
data-variant={variant}
className={cn(
"focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
"focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-1 rounded-sm px-2 py-1 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className
)}
{...props}
/>
)
);
}
function DropdownMenuCheckboxItem({
......@@ -103,7 +103,7 @@ function DropdownMenuCheckboxItem({
</span>
{children}
</DropdownMenuPrimitive.CheckboxItem>
)
);
}
function DropdownMenuRadioGroup({
......@@ -114,7 +114,7 @@ function DropdownMenuRadioGroup({
data-slot="dropdown-menu-radio-group"
{...props}
/>
)
);
}
function DropdownMenuRadioItem({
......@@ -138,7 +138,7 @@ function DropdownMenuRadioItem({
</span>
{children}
</DropdownMenuPrimitive.RadioItem>
)
);
}
function DropdownMenuLabel({
......@@ -146,7 +146,7 @@ function DropdownMenuLabel({
inset,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
inset?: boolean
inset?: boolean;
}) {
return (
<DropdownMenuPrimitive.Label
......@@ -158,7 +158,7 @@ function DropdownMenuLabel({
)}
{...props}
/>
)
);
}
function DropdownMenuSeparator({
......@@ -171,7 +171,7 @@ function DropdownMenuSeparator({
className={cn("bg-border -mx-1 my-1 h-px", className)}
{...props}
/>
)
);
}
function DropdownMenuShortcut({
......@@ -187,13 +187,13 @@ function DropdownMenuShortcut({
)}
{...props}
/>
)
);
}
function DropdownMenuSub({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
}
function DropdownMenuSubTrigger({
......@@ -202,7 +202,7 @@ function DropdownMenuSubTrigger({
children,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
inset?: boolean
inset?: boolean;
}) {
return (
<DropdownMenuPrimitive.SubTrigger
......@@ -217,7 +217,7 @@ function DropdownMenuSubTrigger({
{children}
<ChevronRightIcon className="ml-auto size-4" />
</DropdownMenuPrimitive.SubTrigger>
)
);
}
function DropdownMenuSubContent({
......@@ -233,7 +233,7 @@ function DropdownMenuSubContent({
)}
{...props}
/>
)
);
}
export {
......@@ -252,4 +252,4 @@ export {
DropdownMenuSub,
DropdownMenuSubTrigger,
DropdownMenuSubContent,
}
};
src/constants/models.ts
浏览文件 @ b616598b
......@@ -6,7 +6,8 @@ export interface ModelOption {
tag?: string;
}
export const MODEL_OPTIONS: Record<ModelProvider, ModelOption[]> = {
type RegularModelProvider = Exclude<ModelProvider, "ollama">;
export const MODEL_OPTIONS: Record<RegularModelProvider, ModelOption[]> = {
openai: [
{
name: "gpt-4.1",
......@@ -52,7 +53,7 @@ export const MODEL_OPTIONS: Record<ModelProvider, ModelOption[]> = {
};
export const PROVIDERS: Record<
ModelProvider,
RegularModelProvider,
{
name: string;
displayName: string;
......
src/hooks/useLocalModels.ts 0 → 100644
浏览文件 @ b616598b
import { useCallback } from "react";
import { useAtom } from "jotai";
import {
localModelsAtom,
localModelsLoadingAtom,
localModelsErrorAtom,
} from "@/atoms/localModelsAtoms";
import { IpcClient } from "@/ipc/ipc_client";
export function useLocalModels() {
const [models, setModels] = useAtom(localModelsAtom);
const [loading, setLoading] = useAtom(localModelsLoadingAtom);
const [error, setError] = useAtom(localModelsErrorAtom);
const ipcClient = IpcClient.getInstance();
/**
* Load local models from Ollama
*/
const loadModels = useCallback(async () => {
setLoading(true);
try {
const modelList = await ipcClient.listLocalModels();
setModels(modelList);
setError(null);
return modelList;
} catch (error) {
console.error("Error loading local models:", error);
setError(error instanceof Error ? error : new Error(String(error)));
return [];
} finally {
setLoading(false);
}
}, [ipcClient, setModels, setError, setLoading]);
return {
models,
loading,
error,
loadModels,
};
}
src/ipc/handlers/local_model_handlers.ts 0 → 100644
浏览文件 @ b616598b
import { ipcMain } from "electron";
import log from "electron-log";
import { LocalModelListResponse, LocalModel } from "../ipc_types";
const logger = log.scope("local_model_handlers");
const OLLAMA_API_URL = "http://localhost:11434";
interface OllamaModel {
name: string;
modified_at: string;
size: number;
digest: string;
details: {
format: string;
family: string;
families: string[];
parameter_size: string;
quantization_level: string;
};
}
export function registerLocalModelHandlers() {
// Get list of models from Ollama
ipcMain.handle(
"local-models:list",
async (): Promise<LocalModelListResponse> => {
try {
const response = await fetch(`${OLLAMA_API_URL}/api/tags`);
if (!response.ok) {
throw new Error(`Failed to fetch models: ${response.statusText}`);
}
const data = await response.json();
const ollamaModels: OllamaModel[] = data.models || [];
// Transform the data to return just what we need
const models: LocalModel[] = ollamaModels.map((model) => {
// Extract display name by cleaning up the model name
// For names like "llama2:latest" we want to show "Llama 2"
let displayName = model.name.split(":")[0]; // Remove tags like ":latest"
// Capitalize and add spaces for readability
displayName = displayName
.replace(/-/g, " ")
.replace(/(\d+)/, " $1 ") // Add spaces around numbers
.split(" ")
.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
.join(" ")
.trim();
return {
modelName: model.name, // The actual model name used for API calls
displayName, // The user-friendly name
};
});
logger.info(
`Successfully fetched ${models.length} local models from Ollama`
);
return { models, error: null };
} catch (error) {
if (
error instanceof TypeError &&
(error as Error).message.includes("fetch failed")
) {
logger.error("Could not connect to Ollama. Is it running?");
return {
models: [],
error:
"Could not connect to Ollama. Make sure it's running at http://localhost:11434",
};
}
logger.error("Error fetching local models:", error);
return { models: [], error: "Failed to fetch models from Ollama" };
}
}
);
}
src/ipc/ipc_client.ts
浏览文件 @ b616598b
......@@ -17,6 +17,8 @@ import type {
Message,
Version,
SystemDebugInfo,
LocalModel,
LocalModelListResponse,
} from "./ipc_types";
import type { CodeProposal, ProposalResult } from "@/lib/schemas";
import { showError } from "@/lib/toast";
......@@ -729,14 +731,24 @@ export class IpcClient {
// Get system debug information
public async getSystemDebugInfo(): Promise<SystemDebugInfo> {
try {
const result = await this.ipcRenderer.invoke("get-system-debug-info");
return result;
const data = await this.ipcRenderer.invoke("get-system-debug-info");
return data;
} catch (error) {
showError(error);
throw error;
}
}
public async listLocalModels(): Promise<LocalModel[]> {
const { models, error } = (await this.ipcRenderer.invoke(
"local-models:list"
)) as LocalModelListResponse;
if (error) {
throw new Error(error);
}
return models;
}
// Listen for deep link events
public onDeepLinkReceived(
callback: (data: DeepLinkData) => void
......
src/ipc/ipc_host.ts
浏览文件 @ b616598b
......@@ -9,6 +9,7 @@ import { registerNodeHandlers } from "./handlers/node_handlers";
import { registerProposalHandlers } from "./handlers/proposal_handlers";
import { registerDebugHandlers } from "./handlers/debug_handlers";
import { registerSupabaseHandlers } from "./handlers/supabase_handlers";
import { registerLocalModelHandlers } from "./handlers/local_model_handlers";
export function registerIpcHandlers() {
// Register all IPC handlers by category
......@@ -23,4 +24,5 @@ export function registerIpcHandlers() {
registerProposalHandlers();
registerDebugHandlers();
registerSupabaseHandlers();
registerLocalModelHandlers();
}
src/ipc/ipc_types.ts
浏览文件 @ b616598b
......@@ -91,3 +91,13 @@ export interface SystemDebugInfo {
architecture: string;
logs: string;
}
export interface LocalModel {
modelName: string; // Name used for API calls (e.g., "llama2:latest")
displayName: string; // User-friendly name (e.g., "Llama 2")
}
export type LocalModelListResponse = {
models: LocalModel[];
error: string | null;
};
src/ipc/utils/get_model_client.ts
浏览文件 @ b616598b
......@@ -2,6 +2,8 @@ import { createOpenAI } from "@ai-sdk/openai";
import { createGoogleGenerativeAI as createGoogle } from "@ai-sdk/google";
import { createAnthropic } from "@ai-sdk/anthropic";
import { createOpenRouter } from "@openrouter/ai-sdk-provider";
import { createOllama } from "ollama-ai-provider";
import type { LargeLanguageModel, UserSettings } from "../../lib/schemas";
import { PROVIDER_TO_ENV_VAR, AUTO_MODELS } from "../../constants/models";
import { getEnvVar } from "./read_env";
......@@ -56,6 +58,10 @@ export function getModelClient(
const provider = createOpenRouter({ apiKey });
return provider(model.name);
}
case "ollama": {
const provider = createOllama();
return provider(model.name);
}
default: {
// Ensure exhaustive check if more providers are added
const _exhaustiveCheck: never = model.provider;
......
src/lib/schemas.ts
浏览文件 @ b616598b
......@@ -35,6 +35,7 @@ export const ModelProviderSchema = z.enum([
"google",
"auto",
"openrouter",
"ollama",
]);
/**
......
src/preload.ts
浏览文件 @ b616598b
......@@ -45,6 +45,7 @@ const validInvokeChannels = [
"supabase:list-projects",
"supabase:set-app-project",
"supabase:unset-app-project",
"local-models:list",
] as const;
// Add valid receive channels
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论