From 4f0aaa89f8c9642d7416fb1ab103bd5d6976b1b2 Mon Sep 17 00:00:00 2001 From: Arun Date: Thu, 20 Mar 2025 11:41:37 -0400 Subject: [PATCH 1/3] chore: Add docker-compose.override.yml and fix dependencies script; pin langchain and lanarky versions --- docker-compose.override.yml | 11 +++++++++++ docker-compose.yml | 4 ++++ fix-dependencies.sh | 31 +++++++++++++++++++++++++++++++ next/prisma/schema.prisma | 5 ++--- platform/pyproject.toml | 4 ++-- 5 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 docker-compose.override.yml create mode 100644 fix-dependencies.sh diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 0000000000..093eb22efd --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,11 @@ +version: "3.9" +services: + platform: + build: + context: ./platform + dockerfile: Dockerfile + environment: + - LANGCHAIN_VERSION=0.0.267 + command: > + sh -c "pip install langchain==0.0.267 lanarky==0.7.8 && + python -m reworkd_platform" diff --git a/docker-compose.yml b/docker-compose.yml index 27976d40f3..cdc90eb05a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,10 @@ services: - ./next/:/next/ - /next/node_modules - /next/.next + environment: + DATABASE_URL: mysql://reworkd_platform:reworkd_platform@agentgpt_db:3307/reworkd_platform + depends_on: + - agentgpt_db platform: container_name: platform diff --git a/fix-dependencies.sh b/fix-dependencies.sh new file mode 100644 index 0000000000..5ce8aea1df --- /dev/null +++ b/fix-dependencies.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +echo "Fixing AgentGPT dependencies..." + +# Stop containers if running +docker-compose down + +# Create a temporary Dockerfile to fix the platform container +cat > platform/Dockerfile.temp << EOL +FROM reworkd/platform-base:latest + +WORKDIR /app/src + +COPY pyproject.toml poetry.lock /app/src/ + +RUN pip install --no-cache-dir langchain==0.0.267 lanarky==0.7.8 + +COPY . /app/src/ + +# Install current package dependencies +RUN poetry config virtualenvs.create false \ + && poetry install --no-interaction --no-ansi --no-root + +CMD ["uvicorn", "reworkd_platform.main:app", "--host", "0.0.0.0", "--port", "8000"] +EOL + +# Use the temporary Dockerfile +cp platform/Dockerfile platform/Dockerfile.bak +cp platform/Dockerfile.temp platform/Dockerfile + +echo "Dependencies fixed. Now run 'docker-compose up --build' to restart with correct dependencies." diff --git a/next/prisma/schema.prisma b/next/prisma/schema.prisma index 98f57a5442..0d6fc48e37 100644 --- a/next/prisma/schema.prisma +++ b/next/prisma/schema.prisma @@ -3,9 +3,8 @@ generator client { } datasource db { - provider = "mysql" - url = env("DATABASE_URL") - relationMode = "prisma" + provider = "mysql" + url = env("DATABASE_URL") } // Necessary for Next auth diff --git a/platform/pyproject.toml b/platform/pyproject.toml index e48072e813..ea8f0531bf 100644 --- a/platform/pyproject.toml +++ b/platform/pyproject.toml @@ -27,11 +27,11 @@ sentry-sdk = "^1.31.0" loguru = "^0.7.2" aiokafka = "^0.8.1" requests = "^2.31.0" -langchain = "^0.0.295" +langchain = "0.0.267" # Pin to a version that has langchain.globals openai = "^0.28.0" wikipedia = "^1.4.0" replicate = "^0.8.4" -lanarky = "^0.7.15" +lanarky = "0.7.8" # Use a compatible version with this langchain tiktoken = "^0.5.1" grpcio = "^1.58.0" pinecone-client = "^2.2.4" From ab3e0c47299266e74b0a022799c95324e1bf8fe5 Mon Sep 17 00:00:00 2001 From: Arun Date: Thu, 20 Mar 2025 11:44:27 -0400 Subject: [PATCH 2/3] style: Format datasource properties in schema.prisma for consistency --- next/prisma/schema.prisma | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/next/prisma/schema.prisma b/next/prisma/schema.prisma index 0d6fc48e37..98f57a5442 100644 --- a/next/prisma/schema.prisma +++ b/next/prisma/schema.prisma @@ -3,8 +3,9 @@ generator client { } datasource db { - provider = "mysql" - url = env("DATABASE_URL") + provider = "mysql" + url = env("DATABASE_URL") + relationMode = "prisma" } // Necessary for Next auth From e4028272e320713feae585ae92639a996b99b021 Mon Sep 17 00:00:00 2001 From: Arun Date: Thu, 20 Mar 2025 11:45:04 -0400 Subject: [PATCH 3/3] chore: Remove fix-dependencies.sh script as dependencies are managed differently --- fix-dependencies.sh | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 fix-dependencies.sh diff --git a/fix-dependencies.sh b/fix-dependencies.sh deleted file mode 100644 index 5ce8aea1df..0000000000 --- a/fix-dependencies.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -echo "Fixing AgentGPT dependencies..." - -# Stop containers if running -docker-compose down - -# Create a temporary Dockerfile to fix the platform container -cat > platform/Dockerfile.temp << EOL -FROM reworkd/platform-base:latest - -WORKDIR /app/src - -COPY pyproject.toml poetry.lock /app/src/ - -RUN pip install --no-cache-dir langchain==0.0.267 lanarky==0.7.8 - -COPY . /app/src/ - -# Install current package dependencies -RUN poetry config virtualenvs.create false \ - && poetry install --no-interaction --no-ansi --no-root - -CMD ["uvicorn", "reworkd_platform.main:app", "--host", "0.0.0.0", "--port", "8000"] -EOL - -# Use the temporary Dockerfile -cp platform/Dockerfile platform/Dockerfile.bak -cp platform/Dockerfile.temp platform/Dockerfile - -echo "Dependencies fixed. Now run 'docker-compose up --build' to restart with correct dependencies."