Dev -> Main v0.0.9

.dockerignore

@@ -1,2 +1,18 @@
-venv/
-gui/
+# Ignore everything
+**
+
+# Allow files and directories
+!/migrations
+!/nginx
+!/superagi
+!/tgwui
+!/tools
+!/workspace
+!/main.py
+!/requirements.txt
+!/entrypoint.sh
+!/entrypoint_celery.sh
+!/wait-for-it.sh
+!/tools.json
+!/install_tool_dependencies.sh
+!/alembic.ini

.gitignore

@@ -17,3 +17,7 @@ workspace/output
 workspace/input
 celerybeat-schedule
 ../bfg-report*
+superagi/tools/marketplace_tools/
+superagi/tools/external_tools/
+tests/unit_tests/resource_manager/test_path
+tools.json

Dockerfile

@@ -1,15 +1,33 @@
-FROM python:3.9
+# Stage 1: Compile image
+FROM python:3.10-slim-bullseye AS compile-image
 WORKDIR /app
-COPY requirements.txt .
 
-#RUN apt-get update && apt-get install --no-install-recommends -y git wget libpq-dev gcc python3-dev && pip install psycopg2
-RUN pip install --upgrade pip
-RUN pip install --no-cache-dir -r requirements.txt
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y wget libpq-dev gcc g++ python3-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+COPY requirements.txt .
+RUN pip install --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
 
 COPY . .
-COPY config.yaml ./config.yaml
-COPY entrypoint.sh ./entrypoint.sh
-COPY wait-for-it.sh ./wait-for-it.sh
-RUN chmod +x ./entrypoint.sh ./wait-for-it.sh
 
-CMD ["./wait-for-it.sh", "super__postgres:5432","-t","60","--","./entrypoint.sh"]
+RUN chmod +x ./entrypoint.sh ./wait-for-it.sh ./install_tool_dependencies.sh ./entrypoint_celery.sh
+
+# Stage 2: Build image
+FROM python:3.10-slim-bullseye AS build-image
+WORKDIR /app
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y libpq-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=compile-image /opt/venv /opt/venv
+COPY --from=compile-image /app /app
+
+ENV PATH="/opt/venv/bin:$PATH"

DockerfileCelery

@@ -8,9 +8,16 @@ RUN pip install --upgrade pip
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-WORKDIR /app
 COPY . .
-COPY config.yaml .
+
+# Downloads the tools
+RUN python superagi/tool_manager.py
+
+# Set executable permissions for install_tool_dependencies.sh
+RUN chmod +x install_tool_dependencies.sh
+
+# Install dependencies
+RUN ./install_tool_dependencies.sh
 
 # Downloads the tools
 RUN python superagi/tool_manager.py

config_template.yaml

@@ -38,6 +38,7 @@ RESOURCES_OUTPUT_ROOT_DIR: workspace/output/{agent_id}/{agent_execution_id} # Fo
 
 #S3 RELATED DETAILS ONLY WHEN STORAGE_TYPE IS "S3"
 BUCKET_NAME:
+INSTAGRAM_TOOL_BUCKET_NAME:                                   #Public read bucket, Images generated by stable diffusion are put in this bucket and the public url of the same is generated.
 AWS_ACCESS_KEY_ID:
 AWS_SECRET_ACCESS_KEY:
 

docker-compose.image.example.yaml

@@ -0,0 +1,75 @@
+version: '3.8'
+services:
+  backend:
+    image: "superagidev/backend:dev"
+    depends_on:
+      - super__redis
+      - super__postgres
+    networks:
+      - super_network
+    env_file:
+      - config.yaml
+    command: ["/app/wait-for-it.sh", "super__postgres:5432","-t","60","--","/app/entrypoint.sh"]
+
+  celery:
+    image: "superagidev/backend:dev"
+    depends_on:
+      - super__redis
+      - super__postgres
+    networks:
+      - super_network
+    env_file:
+      - config.yaml
+    command: ["/app/entrypoint_celery.sh"]
+    volumes:
+      - "./workspace:/app/workspace"
+
+  gui:
+    image: "superagidev/gui:dev"
+    environment:
+      - NEXT_PUBLIC_API_BASE_URL=/api
+    networks:
+      - super_network
+
+  super__redis:
+    image: "redis/redis-stack-server:latest"
+    networks:
+      - super_network
+#    uncomment to expose redis port to host
+#    ports:
+#      - "6379:6379"
+    volumes:
+      - redis_data:/data
+
+  super__postgres:
+    image: "docker.io/library/postgres:latest"
+    environment:
+      - POSTGRES_USER=superagi
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=super_agi_main
+    volumes:
+      - superagi_postgres_data:/var/lib/postgresql/data/
+    networks:
+      - super_network
+#    uncomment to expose postgres port to host
+#    ports:
+#      - "5432:5432"
+
+  proxy:
+    image: nginx:stable-alpine
+    ports:
+      - "3000:80"
+    networks:
+      - super_network
+    depends_on:
+      - backend
+      - gui
+    volumes:
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+
+networks:
+  super_network:
+    driver: bridge
+volumes:
+  superagi_postgres_data:
+  redis_data:

docker-compose.yaml

@@ -9,22 +9,23 @@ services:
       - super__postgres
     networks:
       - super_network
+    command: ["/app/wait-for-it.sh", "super__postgres:5432","-t","60","--","/app/entrypoint.sh"]
   celery:
     volumes:
       - "./:/app"
       - "${EXTERNAL_RESOURCE_DIR:-./workspace}:/app/ext"
-    build:
-      context: .
-      dockerfile: DockerfileCelery
+    build: .
     depends_on:
       - super__redis
       - super__postgres
     networks:
       - super_network
+    command: ["/app/entrypoint_celery.sh"]
   gui:
-    build: ./gui
-    environment:
-      - NEXT_PUBLIC_API_BASE_URL=/api
+    build:
+      context: ./gui
+      args:
+        NEXT_PUBLIC_API_BASE_URL: "/api"
     networks:
       - super_network
 #    volumes:

entrypoint.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# Downloads the tools
+# Downloads the tools from marketplace and external tool repositories
 python superagi/tool_manager.py
 
-# Set executable permissions for install_tool_dependencies.sh
-chmod +x install_tool_dependencies.sh
-
 # Install dependencies
 ./install_tool_dependencies.sh
 

entrypoint_celery.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
-Xvfb :0 -screen 0 1280x1024x24 &
-x11vnc -display :0 -N -forever -shared &
 
-exec "$@"
+# Downloads the tools
+python superagi/tool_manager.py
+
+# Install dependencies
+./install_tool_dependencies.sh
+
+exec celery -A superagi.worker worker --beat --loglevel=info

gui/.dockerignore

@@ -1,2 +1,13 @@
-node_modules/
-.next/
+# Ignore everything
+**
+
+# Allow files and directories
+!app
+!pages
+!public
+!utils
+!package.json
+!next.config.js
+!package-lock.json
+!.eslintrc.json
+!jsconfig.json

gui/Dockerfile

@@ -1,13 +1,19 @@
-FROM node:lts AS deps
-
+FROM node:18-alpine AS deps
+RUN apk add --no-cache libc6-compat
 WORKDIR /app
-
-COPY package*.json ./
+COPY package.json package-lock.json ./
 RUN npm ci
 
-FROM node:lts AS builder
+# Rebuild the source code only when needed
+FROM node:18-alpine AS builder
+
 WORKDIR /app
-COPY . .
+
 COPY --from=deps /app/node_modules ./node_modules
 
+COPY . .
+ARG NEXT_PUBLIC_API_BASE_URL=/api
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+EXPOSE 3000
+
 CMD ["npm", "run", "dev"]

gui/DockerfileProd

@@ -1,11 +1,43 @@
-FROM node:lts
+FROM node:18-alpine AS deps
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci --only=production
+
+# Rebuild the source code only when needed
+FROM node:18-alpine AS builder
 
 WORKDIR /app
 
-COPY package.json .
-RUN npm install
+COPY --from=deps /app/node_modules ./node_modules
 
 COPY . .
+ARG NEXT_PUBLIC_API_BASE_URL=/api
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
 
 RUN npm run build
-CMD ["npm", "run", "start"]
+
+# Production image, copy all the files and run next
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+ENV NODE_ENV production
+
+RUN addgroup --system --gid 1001 supergroup
+RUN adduser --system --uid 1001 superuser
+
+COPY --from=builder /app/public ./public
+COPY --from=builder /app/package.json ./package.json
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=builder --chown=superuser:supergroup /app/.next/standalone ./
+COPY --from=builder --chown=superuser:supergroup /app/.next/static ./.next/static
+
+USER superuser
+
+EXPOSE 3000
+
+ENV PORT 3000
+
+CMD ["node", "server.js"]

gui/next.config.js

@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   assetPrefix: process.env.NODE_ENV === "production" ? "/" : "./",
+  output: 'standalone'
 };
 
 module.exports = nextConfig;

gui/package.json

@@ -29,6 +29,7 @@
     "react-draggable": "^4.4.5",
     "react-grid-layout": "^1.3.4",
     "react-markdown": "^8.0.7",
+    "react-spinners": "^0.13.8",
     "react-toastify": "^9.1.3"
   }
 }