Sorting alphabetical

rnd/autogpt_libs/pyproject.toml

@@ -7,15 +7,14 @@ readme = "README.md"
 packages = [{ include = "autogpt_libs" }]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4.0"
-pydantic = "^2.8.2"
-pyjwt = "^2.8.0"
-python-dotenv = "^1.0.1"
-supabase = "^2.7.2"
 colorama = "^0.4.6"
 google-cloud-logging = "^3.8.0"
+pydantic = "^2.8.2"
 pydantic-settings = "^2.5.2"
-
+pyjwt = "^2.8.0"
+python = ">=3.10,<4.0"
+python-dotenv = "^1.0.1"
+supabase = "^2.7.2"
 
 [build-system]
 requires = ["poetry-core"]

rnd/autogpt_server/Dockerfile

@@ -28,12 +28,18 @@ RUN poetry config virtualenvs.create false \
 
 # Generate Prisma client
 COPY rnd/autogpt_server/schema.prisma ./
-RUN poetry config virtualenvs.create false && poetry run prisma generate
+RUN poetry run prisma generate
 
 FROM python:3.11-slim-buster AS server_dependencies
 
 WORKDIR /app
 
+ENV POETRY_VERSION=1.8.3 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=false \
+    PATH="$POETRY_HOME/bin:$PATH"
+
 # Copy only necessary files from builder
 COPY --from=builder /app /app
 COPY --from=builder /usr/local/lib/python3.11 /usr/local/lib/python3.11
@@ -53,7 +59,7 @@ WORKDIR /app/rnd/autogpt_server
 FROM server_dependencies AS server_prisma
 
 COPY rnd/autogpt_server/schema.prisma ./
-RUN poetry config virtualenvs.create false && poetry run prisma generate
+RUN poetry run prisma generate
 
 FROM server_prisma AS server
 

rnd/docker-compose.yml

@@ -25,7 +25,7 @@ services:
         - path: ./
           target: rnd/autogpt_server/migrate
           action: rebuild
-    command: ["sh", "-c", "sleep 5 && poetry run prisma migrate deploy"]
+    command: ["poetry", "run", "prisma", "migrate", "deploy"]
     depends_on:
       postgres:
         condition: service_healthy
@@ -54,7 +54,7 @@ services:
       context: ../
       dockerfile: rnd/autogpt_server/Dockerfile
       target: server
-    command: ["sh", "-c", "sleep 5 && python -m autogpt_server.rest"]
+    command: ["python", "-m", "autogpt_server.rest"]
     develop:
       watch:
         - path: ./
@@ -86,7 +86,7 @@ services:
       context: ../
       dockerfile: rnd/autogpt_server/Dockerfile
       target: server
-    command: ["sh", "-c", "sleep 5 && python -m autogpt_server.exec"]
+    command: ["python", "-m", "autogpt_server.exec"]
     develop:
       watch:
         - path: ./
@@ -117,7 +117,7 @@ services:
       context: ../
       dockerfile: rnd/autogpt_server/Dockerfile
       target: server
-    command: ["sh", "-c", "sleep 5 && python -m autogpt_server.ws"]
+    command: ["python", "-m", "autogpt_server.ws"]
     develop:
       watch:
         - path: ./