Merge pull request #2410 from gentslava/fix/ollama-ai-provider

Ollama AI provider

apps/dokploy/components/dashboard/settings/handle-ai.tsx

@@ -38,7 +38,7 @@ import { api } from "@/utils/api";
 const Schema = z.object({
 	name: z.string().min(1, { message: "Name is required" }),
 	apiUrl: z.string().url({ message: "Please enter a valid URL" }),
-	apiKey: z.string().min(1, { message: "API Key is required" }),
+	apiKey: z.string(),
 	model: z.string().min(1, { message: "Model is required" }),
 	isEnabled: z.boolean(),
 });
@@ -71,7 +71,7 @@ export const HandleAi = ({ aiId }: Props) => {
 			name: "",
 			apiUrl: "",
 			apiKey: "",
-			model: "gpt-3.5-turbo",
+			model: "",
 			isEnabled: true,
 		},
 	});
@@ -81,7 +81,7 @@ export const HandleAi = ({ aiId }: Props) => {
 			name: data?.name ?? "",
 			apiUrl: data?.apiUrl ?? "https://api.openai.com/v1",
 			apiKey: data?.apiKey ?? "",
-			model: data?.model ?? "gpt-3.5-turbo",
+			model: data?.model ?? "",
 			isEnabled: data?.isEnabled ?? true,
 		});
 	}, [aiId, form, data]);
@@ -89,6 +89,7 @@ export const HandleAi = ({ aiId }: Props) => {
 	const apiUrl = form.watch("apiUrl");
 	const apiKey = form.watch("apiKey");
 
+	const isOllama = apiUrl.includes(":11434") || apiUrl.includes("ollama");
 	const { data: models, isLoading: isLoadingServerModels } =
 		api.ai.getModels.useQuery(
 			{
@@ -96,7 +97,7 @@ export const HandleAi = ({ aiId }: Props) => {
 				apiKey: apiKey ?? "",
 			},
 			{
-				enabled: !!apiUrl && !!apiKey,
+				enabled: !!apiUrl && (isOllama || !!apiKey),
 				onError: (error) => {
 					setError(`Failed to fetch models: ${error.message}`);
 				},
@@ -191,22 +192,29 @@ export const HandleAi = ({ aiId }: Props) => {
 							)}
 						/>
 
-						<FormField
-							control={form.control}
-							name="apiKey"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>API Key</FormLabel>
-									<FormControl>
-										<Input type="password" placeholder="sk-..." {...field} />
-									</FormControl>
-									<FormDescription>
-										Your API key for authentication
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
+						{!isOllama && (
+							<FormField
+								control={form.control}
+								name="apiKey"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>API Key</FormLabel>
+										<FormControl>
+											<Input
+												type="password"
+												placeholder="sk-..."
+												autoComplete="one-time-code"
+												{...field}
+											/>
+										</FormControl>
+										<FormDescription>
+											Your API key for authentication
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+						)}
 
 						{isLoadingServerModels && (
 							<span className="text-sm text-muted-foreground">
@@ -214,6 +222,12 @@ export const HandleAi = ({ aiId }: Props) => {
 							</span>
 						)}
 
+						{!isLoadingServerModels && !models?.length && (
+							<span className="text-sm text-muted-foreground">
+								No models available
+							</span>
+						)}
+
 						{!isLoadingServerModels && models && models.length > 0 && (
 							<FormField
 								control={form.control}

apps/dokploy/package.json

@@ -37,13 +37,13 @@
 		"test": "vitest --config __test__/vitest.config.ts"
 	},
 	"dependencies": {
-		"@ai-sdk/anthropic": "^1.2.12",
-		"@ai-sdk/azure": "^1.3.23",
-		"@ai-sdk/cohere": "^1.2.10",
-		"@ai-sdk/deepinfra": "^0.0.4",
-		"@ai-sdk/mistral": "^1.2.8",
-		"@ai-sdk/openai": "^1.3.22",
-		"@ai-sdk/openai-compatible": "^0.0.13",
+		"@ai-sdk/anthropic": "^2.0.5",
+		"@ai-sdk/azure": "^2.0.16",
+		"@ai-sdk/cohere": "^2.0.4",
+		"@ai-sdk/deepinfra": "^1.0.10",
+		"@ai-sdk/mistral": "^2.0.7",
+		"@ai-sdk/openai": "^2.0.16",
+		"@ai-sdk/openai-compatible": "^1.0.10",
 		"@codemirror/autocomplete": "^6.18.6",
 		"@codemirror/lang-json": "^6.0.1",
 		"@codemirror/lang-yaml": "^6.1.2",
@@ -91,7 +91,8 @@
 		"@xterm/addon-clipboard": "0.1.0",
 		"@xterm/xterm": "^5.5.0",
 		"adm-zip": "^0.5.16",
-		"ai": "^4.3.16",
+		"ai": "^5.0.17",
+		"ai-sdk-ollama": "^0.5.1",
 		"bcrypt": "5.1.1",
 		"better-auth": "v1.2.8-beta.7",
 		"bl": "6.0.11",
@@ -124,7 +125,6 @@
 		"node-schedule": "2.1.1",
 		"nodemailer": "6.9.14",
 		"octokit": "3.1.2",
-		"ollama-ai-provider": "^1.2.0",
 		"otpauth": "^9.4.0",
 		"pino": "9.4.0",
 		"pino-pretty": "11.2.2",

apps/dokploy/server/api/routers/ai.ts

@@ -20,6 +20,7 @@ import {
 } from "@dokploy/server/services/user";
 import {
 	getProviderHeaders,
+	getProviderName,
 	type Model,
 } from "@dokploy/server/utils/ai/select-ai-provider";
 import { TRPCError } from "@trpc/server";
@@ -47,11 +48,24 @@ export const aiRouter = createTRPCRouter({
 		}),
 
 	getModels: protectedProcedure
-		.input(z.object({ apiUrl: z.string().min(1), apiKey: z.string().min(1) }))
+		.input(z.object({ apiUrl: z.string().min(1), apiKey: z.string() }))
 		.query(async ({ input }) => {
 			try {
+				const providerName = getProviderName(input.apiUrl);
 				const headers = getProviderHeaders(input.apiUrl, input.apiKey);
-				const response = await fetch(`${input.apiUrl}/models`, { headers });
+				let response = null;
+				switch (providerName) {
+					case "ollama":
+						response = await fetch(`${input.apiUrl}/api/tags`, { headers });
+						break;
+					default:
+						if (!input.apiKey)
+							throw new TRPCError({
+								code: "BAD_REQUEST",
+								message: "API key must contain at least 1 character(s)",
+							});
+						response = await fetch(`${input.apiUrl}/models`, { headers });
+				}
 
 				if (!response.ok) {
 					const errorText = await response.text();