Feat/backend api v2

.dockerignore

@@ -1 +1,62 @@
-.env
+# Python cache
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+
+# Virtual environments
+venv/
+ENV/
+env/
+.venv
+
+# IDEs
+.idea/
+.vscode/
+*.swp
+*.swo
+*~
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Git
+.git/
+.gitignore
+
+# Documentation
+*.md
+docs/
+
+# Tests
+test/
+tests/
+pytest_cache/
+.coverage
+.pytest_cache/
+
+# Development files
+.env
+.env.local
+*.log
+
+# Build artifacts
+build/
+dist/
+*.egg-info/
+
+# Docker files (don't copy themselves)
+Dockerfile*
+docker-compose*.yml
+.dockerignore
+
+# Bot data that should be mounted as volumes
+bots/instances/*
+bots/data/*
+bots/credentials/*
+!bots/credentials/master_account/
+
+# Archives
+bots/archived/

.github/workflows/docker_buildx_workflow.yml

@@ -1,4 +1,4 @@
-name: Backend-API Docker Buildx Workflow
+name: Hummingbot-API Docker Buildx Workflow
 
 on:
   pull_request:
@@ -36,7 +36,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: hummingbot/backend-api:development
+          tags: hummingbot/hummingbot-api:development
 
       - name: Build and push Latest Image
         if: github.base_ref == 'main'
@@ -46,7 +46,7 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: hummingbot/backend-api:latest
+          tags: hummingbot/hummingbot-api:latest
 
   build_release:
     if: github.event_name == 'release'
@@ -77,4 +77,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: hummingbot/backend-api:${{ steps.get_tag.outputs.VERSION }}
+          tags: hummingbot/hummingbot-api:${{ steps.get_tag.outputs.VERSION }}

Dockerfile

@@ -1,22 +1,56 @@
-# Start from a base image with Miniconda installed
-FROM continuumio/miniconda3
+# Stage 1: Builder stage
+FROM continuumio/miniconda3 AS builder
 
-# Install system dependencies
+# Install build dependencies
 RUN apt-get update && \
-    apt-get install -y sudo libusb-1.0 python3-dev gcc && \
+    apt-get install -y python3-dev gcc && \
     rm -rf /var/lib/apt/lists/*
 
-# Set the working directory in the container
-WORKDIR /backend-api
+# Set working directory
+WORKDIR /build
+
+# Copy only the environment file first (for better layer caching)
+COPY environment.yml .
+
+# Create the conda environment
+RUN conda env create -f environment.yml && \
+    conda clean -afy && \
+    rm -rf /root/.cache/pip/*
+
+# Stage 2: Runtime stage
+FROM continuumio/miniconda3
+
+# Install only runtime dependencies
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    libusb-1.0-0 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy the conda environment from builder
+COPY --from=builder /opt/conda/envs/hummingbot-api /opt/conda/envs/hummingbot-api
+
+# Set the working directory
+WORKDIR /hummingbot-api
+
+# Copy only necessary application files
+COPY main.py config.py deps.py ./
+COPY models ./models
+COPY routers ./routers
+COPY services ./services
+COPY utils ./utils
+COPY database ./database
+COPY bots/controllers ./bots/controllers
+COPY bots/scripts ./bots/scripts
 
-# Copy the current directory contents and the Conda environment file into the container
-COPY . .
+# Create necessary directories
+RUN mkdir -p bots/instances bots/conf bots/credentials bots/data bots/archived
 
-# Create the environment from the environment.yml file
-RUN conda env create -f environment.yml
+# Expose port
+EXPOSE 8000
 
-# Make RUN commands use the new environment
-SHELL ["conda", "run", "-n", "backend-api", "/bin/bash", "-c"]
+# Set environment variables to ensure conda env is used
+ENV PATH="/opt/conda/envs/hummingbot-api/bin:$PATH"
+ENV CONDA_DEFAULT_ENV=hummingbot-api
 
-# The code to run when container is started
-ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "backend-api", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+# Run the application
+ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

Makefile

@@ -5,8 +5,8 @@
 .PHONY: uninstall
 .PHONY: install
 .PHONY: install-pre-commit
-.PHONY: docker_build
-.PHONY: docker_run
+.PHONY: build
+.PHONY: deploy
 
 
 detect_conda_bin := $(shell bash -c 'if [ "${CONDA_EXE} " == " " ]; then \
@@ -26,25 +26,25 @@ run:
 	uvicorn main:app --reload
 
 uninstall:
-	conda env remove -n backend-api -y
+	conda env remove -n hummingbot-api -y
 
 install:
-	if conda env list | grep -q '^backend-api '; then \
+	if conda env list | grep -q '^hummingbot-api '; then \
 	    echo "Environment already exists."; \
 	else \
 	    conda env create -f environment.yml; \
 	fi
-	conda activate backend-api
+	conda activate hummingbot-api
 	$(MAKE) install-pre-commit
 
 install-pre-commit:
-	/bin/bash -c 'source "${CONDA_BIN}/activate" backend-api && \
+	/bin/bash -c 'source "${CONDA_BIN}/activate" hummingbot-api && \
 	if ! conda list pre-commit | grep pre-commit &> /dev/null; then \
 	    pip install pre-commit; \
 	fi && pre-commit install'
 
-docker_build:
-	docker build -t hummingbot/backend-api:latest .
+build:
+	docker build -t hummingbot/hummingbot-api:latest .
 
-docker_run:
+deploy:
 	docker compose up -d