fix: initialize active order timestamps in api trading flows

.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,59 +1,24 @@
-name: Backend-API Docker Buildx Workflow
+name: Hummingbot-API Docker Buildx Workflow
 
 on:
   pull_request:
     types: [closed]
     branches:
       - main
-      - development
-  release:
-    types: [published, edited]
 
 jobs:
-  build_pr:
-    if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
+  build_and_push:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4.1.1
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.1.0
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Development Image
-        if: github.base_ref == 'development'
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: hummingbot/backend-api:development
-
-      - name: Build and push Latest Image
-        if: github.base_ref == 'main'
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: hummingbot/backend-api:latest
-
-  build_release:
-    if: github.event_name == 'release'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4.1.1
+      - name: Extract version from main.py
+        id: get_version
+        run: |
+          VERSION=$(grep -E '^VERSION *= *' main.py | head -1 | sed -E 's/^VERSION *= *["\x27]?([^"\x27]*)["\x27]?/\1/')
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -67,14 +32,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract tag name
-        id: get_tag
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-
-      - name: Build and push
+      - name: Build and push Docker images (latest and versioned)
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: hummingbot/backend-api:${{ steps.get_tag.outputs.VERSION }}
+          tags: |
+            hummingbot/hummingbot-api:latest
+            hummingbot/hummingbot-api:${{ steps.get_version.outputs.VERSION }}

.gitignore

@@ -68,6 +68,9 @@ instance/
 # Scrapy stuff:
 .scrapy
 
+# Setup sentinel
+.setup-complete
+
 # Sphinx documentation
 docs/_build/
 
@@ -158,3 +161,21 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# Hummingbot Gateway files
+gateway-files/
+
+# Hummingbot wheel files (for local Docker builds)
+*.whl
+
+# Hummingbot credentials and local data
+bots/credentials/
+bots/instances/
+bots/conf/
+
+# Local MCP configuration (project-specific overrides)
+.mcp.json
+
+# IDE files
+.vscode/
+.idea/

.pre-commit-config.yaml

@@ -26,8 +26,7 @@ repos:
         args: [--settings-path=pyproject.toml]
 
 -   repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 7.1.1
     hooks:
       - id: flake8
-        additional_dependencies: ['flake8']
         args: [--max-line-length=130]

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 g++ build-essential && \
     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

@@ -1,49 +1,48 @@
-.ONESHELL:
-.SHELLFLAGS := -c
-
-.PHONY: run
-.PHONY: uninstall
-.PHONY: install
-.PHONY: install-pre-commit
-.PHONY: docker_build
-.PHONY: docker_run
-
-
-detect_conda_bin := $(shell bash -c 'if [ "${CONDA_EXE} " == " " ]; then \
-    CONDA_EXE=$$((find /opt/conda/bin/conda || find ~/anaconda3/bin/conda || \
-    find /usr/local/anaconda3/bin/conda || find ~/miniconda3/bin/conda || \
-    find /root/miniconda/bin/conda || find ~/Anaconda3/Scripts/conda || \
-    find $$CONDA/bin/conda) 2>/dev/null); fi; \
-    if [ "${CONDA_EXE}_" == "_" ]; then \
-    echo "Please install Anaconda w/ Python 3.10+ first"; \
-    echo "See: https://www.anaconda.com/distribution/"; \
-    exit 1; fi; \
-    echo $$(dirname $${CONDA_EXE})')
-
-CONDA_BIN := $(detect_conda_bin)
+.PHONY: setup run deploy stop install uninstall build install-pre-commit
 
+SETUP_SENTINEL := .setup-complete
+
+setup: $(SETUP_SENTINEL)
+
+$(SETUP_SENTINEL):
+	chmod +x setup.sh
+	./setup.sh
+
+# Run locally (dev mode)
 run:
-	uvicorn main:app --reload
+	docker compose up emqx postgres -d
+	conda run --no-capture-output -n hummingbot-api uvicorn main:app --reload
 
-uninstall:
-	conda env remove -n backend-api
+# Deploy with Docker
+deploy: $(SETUP_SENTINEL)
+	docker compose up -d
+
+# Stop all services
+stop:
+	docker compose down
 
+# Install conda environment
 install:
-	if conda env list | grep -q '^backend-api '; then \
-	    echo "Environment already exists."; \
+	@if ! command -v conda >/dev/null 2>&1; then \
+		echo "Error: Conda is not found in PATH. Please install Conda or add it to your PATH."; \
+		exit 1; \
+	fi
+	@if conda env list | grep -q '^hummingbot-api '; then \
+		echo "Environment already exists."; \
 	else \
-	    conda env create -f environment.yml; \
+		conda env create -f environment.yml; \
 	fi
 	$(MAKE) install-pre-commit
+	$(MAKE) setup
 
-install-pre-commit:
-	/bin/bash -c 'source "${CONDA_BIN}/activate" backend-api && \
-	if ! conda list pre-commit | grep pre-commit &> /dev/null; then \
-	    pip install pre-commit; \
-	fi && pre-commit install'
+uninstall:
+	conda env remove -n hummingbot-api -y
+	rm -f $(SETUP_SENTINEL)
 
-docker_build:
-	docker build -t hummingbot/backend-api:latest .
+install-pre-commit:
+	conda run -n hummingbot-api pip install pre-commit
+	conda run -n hummingbot-api pre-commit install
 
-docker_run:
-	docker compose up -d
+# Build Docker image
+build:
+	docker build -t hummingbot/hummingbot-api:latest .