From 0fa728d905bb4c662f7f2c718b13489459e72c25 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 2 Mar 2025 03:22:11 -0600 Subject: [PATCH 1/3] chore(dependencies): add AI SDK providers to project dependencies - Integrate multiple AI SDK providers including Anthropic, Azure, Cohere, DeepInfra, Mistral, and OpenAI Compatible - Update package.json and pnpm-lock.yaml with new AI SDK dependencies --- apps/dokploy/package.json | 6 ++++++ pnpm-lock.yaml | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index fd61d1d5..4193ade3 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -36,7 +36,13 @@ "test": "vitest --config __test__/vitest.config.ts" }, "dependencies": { + "@ai-sdk/anthropic": "^1.0.6", + "@ai-sdk/azure": "^1.0.15", + "@ai-sdk/cohere": "^1.0.6", + "@ai-sdk/deepinfra": "^0.0.4", + "@ai-sdk/mistral": "^1.0.6", "@ai-sdk/openai": "^1.0.12", + "@ai-sdk/openai-compatible": "^0.0.13", "better-auth": "1.2.0", "bl": "6.0.11", "rotating-file-stream": "3.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c076f614..a7b6eeb6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -97,9 +97,27 @@ importers: apps/dokploy: dependencies: + '@ai-sdk/anthropic': + specifier: ^1.0.6 + version: 1.0.8(zod@3.23.8) + '@ai-sdk/azure': + specifier: ^1.0.15 + version: 1.0.18(zod@3.23.8) + '@ai-sdk/cohere': + specifier: ^1.0.6 + version: 1.0.8(zod@3.23.8) + '@ai-sdk/deepinfra': + specifier: ^0.0.4 + version: 0.0.4(zod@3.23.8) + '@ai-sdk/mistral': + specifier: ^1.0.6 + version: 1.0.8(zod@3.23.8) '@ai-sdk/openai': specifier: ^1.0.12 version: 1.0.16(zod@3.23.8) + '@ai-sdk/openai-compatible': + specifier: ^0.0.13 + version: 0.0.13(zod@3.23.8) '@codemirror/lang-json': specifier: ^6.0.1 version: 6.0.1 From f63d58253061a312220087aec21c60344579a6a9 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 2 Mar 2025 03:35:32 -0600 Subject: [PATCH 2/3] chore(dependencies): add Ollama AI provider to project dependencies - Integrate Ollama AI provider in package.json - Update pnpm-lock.yaml with Ollama AI provider dependency --- apps/dokploy/package.json | 3 ++- pnpm-lock.yaml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 4193ade3..8b067cf8 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -36,6 +36,7 @@ "test": "vitest --config __test__/vitest.config.ts" }, "dependencies": { + "ai": "^4.0.23", "@ai-sdk/anthropic": "^1.0.6", "@ai-sdk/azure": "^1.0.15", "@ai-sdk/cohere": "^1.0.6", @@ -43,6 +44,7 @@ "@ai-sdk/mistral": "^1.0.6", "@ai-sdk/openai": "^1.0.12", "@ai-sdk/openai-compatible": "^0.0.13", + "ollama-ai-provider": "^1.1.0", "better-auth": "1.2.0", "bl": "6.0.11", "rotating-file-stream": "3.2.3", @@ -98,7 +100,6 @@ "@xterm/xterm": "^5.4.0", "@xterm/addon-clipboard": "0.1.0", "adm-zip": "^0.5.14", - "ai": "^4.0.23", "bcrypt": "5.1.1", "bullmq": "5.4.2", "class-variance-authority": "^0.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7b6eeb6..cef1fa0d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -361,6 +361,9 @@ importers: octokit: specifier: 3.1.2 version: 3.1.2 + ollama-ai-provider: + specifier: ^1.1.0 + version: 1.1.0(zod@3.23.8) otpauth: specifier: ^9.2.3 version: 9.3.4 From b13b906d756a905a3717184dff21531e1b77873f Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 2 Mar 2025 03:52:29 -0600 Subject: [PATCH 3/3] feat(deployments): improve deployment list display and cleanup logic - Add deployment index numbering in the UI - Adjust deployment cleanup to retain 9 instead of 10 deployments - Update deployment list rendering to show numbered status --- .../application/deployments/show-deployments.tsx | 5 ++--- packages/server/src/services/deployment.ts | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx index d33936f5..76e5bb26 100644 --- a/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx +++ b/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx @@ -73,15 +73,14 @@ export const ShowDeployments = ({ applicationId }: Props) => { ) : (
- {deployments?.map((deployment) => ( + {deployments?.map((deployment, index) => (
- {deployment.status} - + {index + 1}. {deployment.status} 10) { - const deploymentsToDelete = deploymentList.slice(10); + const deploymentsToDelete = deploymentList.slice(9); if (serverId) { let command = ""; for (const oldDeployment of deploymentsToDelete) { @@ -342,7 +342,7 @@ const removeLastTenComposeDeployments = async ( if (deploymentList.length > 10) { if (serverId) { let command = ""; - const deploymentsToDelete = deploymentList.slice(10); + const deploymentsToDelete = deploymentList.slice(9); for (const oldDeployment of deploymentsToDelete) { const logPath = path.join(oldDeployment.logPath); @@ -354,7 +354,7 @@ const removeLastTenComposeDeployments = async ( await execAsyncRemote(serverId, command); } else { - const deploymentsToDelete = deploymentList.slice(10); + const deploymentsToDelete = deploymentList.slice(9); for (const oldDeployment of deploymentsToDelete) { const logPath = path.join(oldDeployment.logPath); if (existsSync(logPath)) { @@ -376,7 +376,7 @@ export const removeLastTenPreviewDeploymenById = async ( }); if (deploymentList.length > 10) { - const deploymentsToDelete = deploymentList.slice(10); + const deploymentsToDelete = deploymentList.slice(9); if (serverId) { let command = ""; for (const oldDeployment of deploymentsToDelete) {