Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FROM feature/127-interpreter-as-tool TO development #128

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
docker/mysql/data
docker/redis/data
docker/redis/data
docker/intepreter/data
docker/n8n/
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- bugfix/42-redis-is-default-vector-db (2024-05-26)
- bugfix/33-groq-rag-not-working (2024-05-19)
### Changed
- feature/127-interpreter-as-tool (2024-07-04)
- feature/124-message-out-of-order (2024-07-02)
- feature/120-status-of-split-and-upsert-to-client (2024-06-30)
- feature/87-ability-to-abort-query (2024-06-30)
Expand Down
44 changes: 39 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,15 @@ services:

# Database (MySQL)
mysql:
image: mysql:8.2.0
image: mysql:8.2
container_name: mysql
restart: unless-stopped
ports:
- "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: password
MYSQL_USER: admin
MYSQL_PASSWORD: password
MYSQL_DATABASE: llm_server
volumes:
- ./docker/mysql/data:/var/lib/mysql
- ./docker/mysql/:/docker-entrypoint-initdb.d

# phpMyAdmin
phpmyadmin:
Expand Down Expand Up @@ -54,6 +51,43 @@ services:
BASE_URL: "http://localhost:8080/"
INSTANCE_NAME: "my-instance"

# Code Interpreter (Jupyter Notebook / FastAPI)
interpreter:
container_name: interpreter
image: promptengineers/interpreter:latest
build: .
restart: always
ports:
- "8888:8888"
- "8000:8000"
environment:
- JUPYTER_ENABLE_LAB=yes
- PYTHONPATH=/home/jovyan
entrypoint: ["sh", "-c", "start-notebook.sh --NotebookApp.token='' & uvicorn api:app --host 0.0.0.0 --port 8000"]
volumes:
- ./docker/interpreter/data:/tmp

# n8n (Workflow Automation)
# n8n:
# image: n8nio/n8n
# container_name: n8n
# restart: unless-stopped
# depends_on:
# - mysql
# ports:
# - "5678:5678"
# environment:
# DB_TYPE: mysqldb
# DB_MYSQLDB_DATABASE: n8n
# DB_MYSQLDB_HOST: mysql
# DB_MYSQLDB_PORT: 3306
# DB_MYSQLDB_USER: admin
# DB_MYSQLDB_PASSWORD: password
# N8N_BASIC_AUTH_USER: admin_user
# N8N_BASIC_AUTH_PASSWORD: password
# volumes:
# - ./docker/n8n:/home/node/.n8n

# Minio (File Storage) -- CURRENTLY ALL FILES AND IMAGES ARE BASE64 ENCODED
# minio:
# image: minio/minio
Expand Down
11 changes: 11 additions & 0 deletions docker/mysql/init_db.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-- Create databases
CREATE DATABASE IF NOT EXISTS llm_server;
CREATE DATABASE IF NOT EXISTS n8n;

-- Create users and grant privileges
CREATE USER IF NOT EXISTS 'admin'@'%' IDENTIFIED BY 'password';

GRANT ALL PRIVILEGES ON llm_server.* TO 'admin'@'%';
GRANT ALL PRIVILEGES ON n8n.* TO 'admin'@'%';

FLUSH PRIVILEGES;