Merge branch 'canary' into feat/ntfy

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();

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

@@ -80,7 +80,7 @@ export const redisRouter = createTRPCRouter({
 					type: "volume",
 				});
 
-				return true;
+				return newRedis;
 			} catch (error) {
 				throw error;
 			}

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

@@ -45,7 +45,7 @@ import {
 } from "@dokploy/server";
 import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
 import { TRPCError } from "@trpc/server";
-import { sql } from "drizzle-orm";
+import { eq, sql } from "drizzle-orm";
 import { dump, load } from "js-yaml";
 import { scheduledJobs, scheduleJob } from "node-schedule";
 import { z } from "zod";
@@ -60,6 +60,8 @@ import {
 	apiServerSchema,
 	apiTraefikConfig,
 	apiUpdateDockerCleanup,
+	projects,
+	server,
 } from "@/server/db/schema";
 import { removeJob, schedule } from "@/server/utils/backup";
 import packageInfo from "../../../package.json";
@@ -706,6 +708,18 @@ export const settingsRouter = createTRPCRouter({
 	isCloud: publicProcedure.query(async () => {
 		return IS_CLOUD;
 	}),
+	isUserSubscribed: protectedProcedure.query(async ({ ctx }) => {
+		const haveServers = await db.query.server.findMany({
+			where: eq(server.organizationId, ctx.session?.activeOrganizationId || ""),
+		});
+		const haveProjects = await db.query.projects.findMany({
+			where: eq(
+				projects.organizationId,
+				ctx.session?.activeOrganizationId || "",
+			),
+		});
+		return haveServers.length > 0 || haveProjects.length > 0;
+	}),
 	health: publicProcedure.query(async () => {
 		if (IS_CLOUD) {
 			try {