Merge branch 'main' into feature/ultralytics-sam3-enhancements

Author: Rajkisan

.gitignore

@@ -17,11 +17,11 @@ apps/sam3.pt
 sam3.pt
 
 # Environment variables
-.env
+# .env
 .secret
-apps/api-inference/.env
+# apps/api-inference/.env
 apps/api-inference/.secret
-apps/web/.env
+# apps/web/.env
 
 # IDEs
 .vscode/
@@ -79,6 +79,8 @@ htmlcov/
 *.tmp
 *.temp
 .claude
+.codex
+.agent
 backend/docs
 # Local scripts
-commit-and-push.sh
+commit-and-push.sh

CLAUDE.md

@@ -1,8 +1,10 @@
 .PHONY: help dev install clean \
         backend-install backend-run backend-test backend-format backend-lint \
+        core-install core-run core-test core-format core-lint \
         frontend-install frontend-dev frontend-build \
-        docker-up docker-down docker-logs docker-build docker-restart docker-shell \
-        docker-up-solo docker-down-solo docker-up-team docker-down-team
+        docker-up docker-down docker-logs docker-build docker-rebuild docker-restart docker-shell \
+        docker-up-solo docker-down-solo docker-up-team docker-down-team \
+        docker-up-prod docker-down-prod docker-rebuild-prod
 
 help:
 	@echo "SAM3 Annotation Platform - Monorepo"
@@ -20,6 +22,13 @@ help:
 	@echo "  backend-format   - Format backend code with ruff"
 	@echo "  backend-lint     - Lint backend code with ruff"
 	@echo ""
+	@echo "API Core Commands:"
+	@echo "  core-install     - Install api-core dependencies with uv"
+	@echo "  core-run         - Run api-core service locally"
+	@echo "  core-test        - Run api-core tests"
+	@echo "  core-format      - Format api-core code with ruff"
+	@echo "  core-lint        - Lint api-core code with ruff"
+	@echo ""
 	@echo "Frontend Commands:"
 	@echo "  frontend-install - Install frontend dependencies with npm"
 	@echo "  frontend-dev     - Run frontend dev server"
@@ -28,20 +37,24 @@ help:
 	@echo "Docker Commands:"
 	@echo "  docker-up        - Start development environment (hot-reload)"
 	@echo "  docker-down      - Stop development services"
+	@echo "  docker-up-prod   - Start production environment (optimized build)"
+	@echo "  docker-down-prod - Stop production services"
 	@echo "  docker-up-solo   - Start SOLO mode (minimal, IndexedDB storage)"
 	@echo "  docker-down-solo - Stop SOLO mode services"
 	@echo "  docker-up-team   - Start TEAM mode (full stack: Postgres, MinIO, Redis, Workers)"
 	@echo "  docker-down-team - Stop TEAM mode services"
-	@echo "  docker-logs      - View logs (usage: make docker-logs service=backend|frontend)"
+	@echo "  docker-logs      - View logs (usage: make docker-logs service=backend|api-core|frontend)"
 	@echo "  docker-build     - Rebuild all Docker images"
-	@echo "  docker-restart   - Restart services (usage: make docker-restart service=backend|frontend)"
-	@echo "  docker-shell     - Open shell in container (usage: make docker-shell service=backend|frontend)"
+	@echo "  docker-rebuild   - Rebuild images, stop, and restart services (build -> down -> up)"
+	@echo "  docker-rebuild-prod - Rebuild production images (build -> down -> up)"
+	@echo "  docker-restart   - Restart services (usage: make docker-restart service=backend|api-core|frontend)"
+	@echo "  docker-shell     - Open shell in container (usage: make docker-shell service=backend|api-core|frontend)"
 
 # Development
 dev:
 	@echo "Starting development environment..."
 	@echo "This will start both backend and frontend services using Docker Compose"
-	docker-compose up
+	docker-compose -f docker/docker-compose.dev.yml up
 
 install:
 	@echo "Installing frontend dependencies..."
@@ -86,6 +99,30 @@ backend-lint:
 	@echo "Linting backend code..."
 	@cd apps/api-inference && uv run ruff check src/
 
+# API Core commands
+core-install:
+	@echo "Installing api-core dependencies..."
+	@cd apps/api-core && uv venv || true
+	@cd apps/api-core && uv sync
+	@echo "✓ API Core dependencies installed"
+
+core-run:
+	@echo "Starting API Core service..."
+	@cd apps/api-core/src && PYTHONPATH=. uv run python app/main.py
+
+core-test:
+	@echo "Running api-core tests..."
+	@cd apps/api-core && uv run pytest src/tests/ -v
+
+core-format:
+	@echo "Formatting api-core code..."
+	@cd apps/api-core && uv run ruff check --fix src/
+	@cd apps/api-core && uv run ruff format src/
+
+core-lint:
+	@echo "Linting api-core code..."
+	@cd apps/api-core && uv run ruff check src/
+
 # Frontend commands
 frontend-install:
 	@echo "Installing frontend dependencies..."
@@ -101,18 +138,38 @@ frontend-build:
 	@cd apps/web && npm run build
 
 # Docker commands
+
 docker-up:
 	@echo "Starting Docker services (development mode)..."
-	docker-compose -f docker/docker-compose.dev.yml up -d
+	docker-compose -f docker/docker-compose.dev.yml --profile dev up -d
 	@echo ""
 	@echo "✓ Services started:"
-	@echo "  Backend API: http://localhost:8000"
-	@echo "  API Docs: http://localhost:8000/docs"
+	@echo "  Backend API (SAM3): http://localhost:8000"
+	@echo "  Backend Docs: http://localhost:8000/docs"
+	@echo "  API Core (BYOM): http://localhost:8001"
+	@echo "  API Core Docs: http://localhost:8001/docs"
 	@echo "  Frontend: http://localhost:5173"
+	@echo "  Redis: localhost:6379 (internal)"
 
 docker-down:
 	@echo "Stopping Docker services..."
-	docker-compose -f docker/docker-compose.dev.yml down
+	docker-compose -f docker/docker-compose.dev.yml --profile dev down
+
+docker-up-prod:
+	@echo "Starting Docker services (production mode)..."
+	docker-compose -f docker/docker-compose.dev.yml --profile prod up -d
+	@echo ""
+	@echo "✓ Production services started:"
+	@echo "  Backend API (SAM3): http://localhost:8000"
+	@echo "  Backend Docs: http://localhost:8000/docs"
+	@echo "  API Core (BYOM): http://localhost:8001"
+	@echo "  API Core Docs: http://localhost:8001/docs"
+	@echo "  Frontend (Production): http://localhost:3000"
+	@echo "  Redis: localhost:6379 (internal)"
+
+docker-down-prod:
+	@echo "Stopping production services..."
+	docker-compose -f docker/docker-compose.dev.yml --profile prod down
 
 docker-up-solo:
 	@echo "Starting Docker services (SOLO mode - minimal)..."
@@ -146,29 +203,72 @@ docker-down-team:
 docker-logs:
 ifdef service
 	@echo "Viewing logs for $(service)..."
-	docker-compose logs -f $(service)
+	docker-compose -f docker/docker-compose.dev.yml logs -f $(service)
 else
 	@echo "Viewing all logs..."
-	docker-compose logs -f
+	docker-compose -f docker/docker-compose.dev.yml logs -f
 endif
 
 docker-build:
 	@echo "Building Docker images..."
-	docker-compose build
+	docker-compose -f docker/docker-compose.dev.yml build
+
+docker-rebuild:
+	@echo "Rebuilding Docker services (build -> down -> up)..."
+	@echo "Step 1/3: Building images..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile dev build
+	@echo ""
+	@echo "Step 2/3: Stopping services..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile dev down
+	@echo ""
+	@echo "Step 3/3: Starting services..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile dev up -d
+	@echo ""
+	@echo "✓ Services rebuilt and restarted:"
+	@echo "  Backend API (SAM3): http://localhost:8000"
+	@echo "  Backend Docs: http://localhost:8000/docs"
+	@echo "  API Core (BYOM): http://localhost:8001"
+	@echo "  API Core Docs: http://localhost:8001/docs"
+	@echo "  Frontend: http://localhost:5173"
+	@echo "  Redis: localhost:6379 (internal)"
+
+docker-rebuild-prod:
+	@echo "Rebuilding production Docker services (build -> down -> up)..."
+	@echo "Step 1/3: Building production images..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile prod build
+	@echo ""
+	@echo "Step 2/3: Stopping services..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile prod down
+	@echo ""
+	@echo "Step 3/3: Starting services..."
+	@docker-compose -f docker/docker-compose.dev.yml --profile prod up -d
+	@echo ""
+	@echo "✓ Production services rebuilt and restarted:"
+	@echo "  Backend API (SAM3): http://localhost:8000"
+	@echo "  Backend Docs: http://localhost:8000/docs"
+	@echo "  API Core (BYOM): http://localhost:8001"
+	@echo "  API Core Docs: http://localhost:8001/docs"
+	@echo "  Frontend (Production): http://localhost:3000"
+	@echo "  Redis: localhost:6379 (internal)"
 
 docker-restart:
 ifdef service
 	@echo "Restarting $(service) service..."
-	docker-compose restart $(service)
+	docker-compose -f docker/docker-compose.dev.yml restart $(service)
 else
 	@echo "Restarting all services..."
-	docker-compose restart
+	docker-compose -f docker/docker-compose.dev.yml restart
 endif
 
 docker-shell:
 ifdef service
 	@echo "Opening shell in $(service) container..."
-	docker-compose exec $(service) sh
+	docker-compose -f docker/docker-compose.dev.yml exec $(service) sh
 else
 	@echo "Error: Please specify service (e.g., make docker-shell service=backend)"
 endif
+
+
+frontend-clear-cache:
+	rm -rf apps/web/node_modules/.vite
+	docker-compose -f docker/docker-compose.dev.yml restart frontend