Merge pull request #13 from manavgup/feature/auth-ui-updates

Resolve Conflicts on feature/auth-ui-updates

Author: luizerico

.gitignore

@@ -63,4 +63,8 @@ poetry.lock
 # Temporary files
 *.tmp
 *.bak
-*.swp
+*.swp
+
+# local dev files
+dev-env/
+webui/default.conf-dev

Makefile

@@ -16,24 +16,26 @@ PYTHON_VERSION ?= 3.11
 PROJECT_VERSION ?= v$(shell poetry version -s)
 
 # Tools
-DOCKER_COMPOSE := docker-compose
+DOCKER_COMPOSE := podman-compose
 
 # Set a default value for VECTOR_DB if not already set
 VECTOR_DB ?= milvus
 
 .DEFAULT_GOAL := help
 
-.PHONY: init-env init check-toml format lint audit test run-services build-app run-app clean all info help
+.PHONY: init-env init check-toml format lint audit test run-services build-app run-app clean all info help api-test install-deps newman-test run-backend run-frontend
 
 init-env:
 	@touch .env
 	@echo "PROJECT_NAME=${PROJECT_NAME}" >> .env
 	@echo "PYTHON_VERSION=${PYTHON_VERSION}" >> .env
 	@echo "VECTOR_DB=${VECTOR_DB}" >> .env
 
-init: init-env
+install-deps:
 	pip install -r requirements.txt
 
+init: init-env install-deps
+
 check-toml:
 	# No equivalent for pip, so this can be left empty or removed
 
@@ -53,6 +55,18 @@ test: run-services
 	echo "Waiting for Docker containers to stop..."
 	@while docker ps | grep -q "milvus-standalone"; do sleep 1; done
 
+api-test: run-services
+	pytest $(TEST_DIR)/api -v -m api || { echo "API Tests failed"; exit 1; }
+	@trap '$(DOCKER_COMPOSE) down' EXIT; \
+	echo "Waiting for Docker containers to stop..."
+	@while docker ps | grep -q "milvus-standalone"; do sleep 1; done
+
+newman-test: run-services
+	newman run postman/rag_modulo_api_collection.json
+	@trap '$(DOCKER_COMPOSE) down' EXIT; \
+	echo "Waiting for Docker containers to stop..."
+	@while docker ps | grep -q "milvus-standalone"; do sleep 1; done
+
 create-volumes:
 	@echo "Creating volume directories with correct permissions..."
 	@mkdir -p ./volumes/postgres ./volumes/etcd ./volumes/minio ./volumes/milvus
@@ -68,7 +82,7 @@ run-services: create-volumes
 	$(DOCKER_COMPOSE) up -d postgres
 	@echo "Waiting for PostgreSQL to be ready..."
 	@for i in $$(seq 1 30); do \
-		if docker-compose exec postgres pg_isready -U ${COLLECTIONDB_USER} -d ${COLLECTIONDB_NAME}; then \
+		if $(DOCKER_COMPOSE) exec postgres pg_isready -U ${COLLECTIONDB_USER} -d ${COLLECTIONDB_NAME}; then \
 			echo "PostgreSQL is ready"; \
 			break; \
 		fi; \
@@ -85,7 +99,7 @@ run-services: create-volumes
 		$(DOCKER_COMPOSE) up -d etcd minio milvus-standalone || { echo "Failed to start Milvus and its dependencies"; $(DOCKER_COMPOSE) logs; exit 1; }; \
 		echo "Waiting for Milvus to be ready..."; \
 		for i in $$(seq 1 30); do \
-			if docker-compose exec milvus-standalone curl -s http://localhost:9091/healthz | grep -q "OK"; then \
+			if $(DOCKER_COMPOSE) exec milvus-standalone curl -s http://localhost:9091/healthz | grep -q "OK"; then \
 				echo "Milvus is ready"; \
 				break; \
 			fi; \
@@ -109,8 +123,6 @@ run-services: create-volumes
 		echo "Unknown VECTOR_DB value: $(VECTOR_DB)"; \
 		exit 1; \
 	fi
-	@echo "Starting backend and frontend..."
-	$(DOCKER_COMPOSE) up -d backend frontend
 	@echo "Docker containers status:"
 	@docker ps
 	@echo "Milvus logs saved to milvus.log:"
@@ -120,27 +132,38 @@ run-tests:
 	$(DOCKER_COMPOSE) run --rm test pytest $(ARGS)
 
 build-frontend:
-	docker build -t $(PROJECT_NAME)-frontend \
-		-f webui/Dockerfile.frontend ./webui
+	docker build -t $(PROJECT_NAME)-frontend -f webui/Dockerfile.frontend ./webui
 
 build-backend:
-	docker build -t $(PROJECT_NAME)-backend \
-		-f Dockerfile.backend .
+	docker build --build-arg CACHEBUST=$(date +%s) -t $(PROJECT_NAME)-backend --no-cache -f Dockerfile.backend .
 
 build-app:
 	@echo "Building application containers..."
 	$(DOCKER_COMPOSE) build
 
-run-app: build-app run-services
-	@echo "Starting remaining application containers..."
-	$(DOCKER_COMPOSE) up -d
+run-backend: run-services
+	@echo "Starting backend..."
+	$(DOCKER_COMPOSE) up -d backend
+	@echo "Backend is now running."
+
+run-frontend: run-services
+	@echo "Starting frontend..."
+	$(DOCKER_COMPOSE) up -d frontend
+	@echo "Frontend is now running."
+
+run-app: build-app run-backend run-frontend
 	@echo "All application containers are now running."
 
 logs:
 	$(DOCKER_COMPOSE) logs -f
 
 clean:
+	@echo "Cleaning up Docker Compose resources..."
 	$(DOCKER_COMPOSE) down -v
+	@echo "Cleaning up existing pods and containers..."
+	-@podman pod rm -f $(podman pod ps -q) || true
+	-@podman rm -f $(podman ps -a -q) || true
+	-@podman volume prune -f || true
 	rm -rf .pytest_cache .mypy_cache data volumes my_chroma_data tests
 
 all: format lint audit test
@@ -156,15 +179,20 @@ help:
 	@echo ""
 	@echo "Targets:"
 	@echo "  init-env      Initialize .env file with default values"
-	@echo "  init          Install dependencies"
+	@echo "  init          Initialize environment and install dependencies"
+	@echo "  install-deps  Install project dependencies"
 	@echo "  check-toml    Check TOML files for syntax errors"
 	@echo "  format        Format code using ruff, black, and isort"
 	@echo "  lint          Lint code using ruff and mypy"
 	@echo "  audit         Audit code using bandit"
-	@echo "  test          Run tests using pytest"
+	@echo "  test          Run all tests using pytest"
+	@echo "  api-test      Run API tests using pytest"
+	@echo "  newman-test   Run API tests using Newman"
 	@echo "  run-services  Start services using Docker Compose"
 	@echo "  build-app     Build app using Docker Compose"
-	@echo "  run-app       Run app using Docker Compose"
+	@echo "  run-backend   Run backend using Docker Compose"
+	@echo "  run-frontend  Run frontend using Docker Compose"
+	@echo "  run-app       Run both backend and frontend using Docker Compose"
 	@echo "  logs          View logs of running containers"
 	@echo "  clean         Clean up Docker Compose volumes and cache"
 	@echo "  all           Format, lint, audit, and test"

api_tests.py

@@ -0,0 +1,54 @@
+import requests
+import json
+import uuid
+
+BASE_URL = "http://localhost:8000"
+
+def test_health_check():
+    response = requests.get(f"{BASE_URL}/api/health")
+    assert response.status_code == 200, f"Health check failed with status code {response.status_code}"
+    print("Health check passed")
+
+def test_create_user():
+    user_data = {
+        "ibm_id": f"test_user_{uuid.uuid4()}",
+        "email": f"test_{uuid.uuid4()}@example.com",
+        "name": f"Test User {uuid.uuid4()}"
+    }
+    response = requests.post(f"{BASE_URL}/api/users/", json=user_data)
+    assert response.status_code == 200, f"User creation failed with status code {response.status_code}"
+    user = response.json()
+    print(f"User created: {user['id']}")
+    return user['id']
+
+def test_create_collection(user_id):
+    collection_data = {
+        "name": f"Test Collection {uuid.uuid4()}",
+        "is_private": True,
+        "users": [user_id]
+    }
+    response = requests.post(f"{BASE_URL}/api/collections/create", json=collection_data)
+    assert response.status_code == 200, f"Collection creation failed with status code {response.status_code}"
+    collection = response.json()
+    print(f"Collection created: {collection['id']}")
+    return collection['id']
+
+def test_upload_file(user_id, collection_id):
+    # Create a dummy text file
+    file_content = f"This is a test file content {uuid.uuid4()}"
+    files = {'file': ('test_file.txt', file_content)}
+    response = requests.post(f"{BASE_URL}/api/files/{user_id}/{collection_id}", files=files)
+    assert response.status_code == 200, f"File upload failed with status code {response.status_code}"
+    file_info = response.json()
+    print(f"File uploaded: {file_info['id']}")
+    return file_info['id']
+
+def run_tests():
+    test_health_check()
+    user_id = test_create_user()
+    collection_id = test_create_collection(user_id)
+    file_id = test_upload_file(user_id, collection_id)
+    print("All tests passed successfully")
+
+if __name__ == "__main__":
+    run_tests()

backend/.dockerignore

@@ -1,6 +1,6 @@
 # Ignore Python bytecode and cache
-__pycache__/
-*.pyc
+**__pycache__/
+**/*.pyc
 *.pyo
 *.pyd
 

backend/Dockerfile.backend

@@ -41,6 +41,10 @@ RUN apt-get update && apt-get install -y \
 COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
 COPY --from=builder /usr/local/bin /usr/local/bin
 
+# Add a build argument for cache busting
+ARG CACHEBUST=1
+
+# COPY backend /app/backend
 COPY . /app
 
 # Add a delay and check permissions

backend/auth/oidc.py

@@ -1,8 +1,10 @@
 from fastapi import HTTPException, status, Request
-from authlib.integrations.starlette_client import OAuth
-from core.config import settings
+import jwt
 import logging
 
+from authlib.integrations.starlette_client import OAuth, OAuthError
+from core.config import settings
+
 logging.basicConfig(level=logging.ERROR)
 logger = logging.getLogger(__name__)
 
@@ -18,19 +20,42 @@
     }
 )
 
-# oauth2_scheme = OAuth2AuthorizationCodeBearer(
-#     authorizationUrl=settings.oidc_auth_url,
-#     tokenUrl=settings.oidc_token_url,
-# )
+def verify_jwt_token(token: str):
+    try:
+        payload = jwt.decode(token, options={"verify_signature": False})
+        return payload
+    except jwt.PyJWTError:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Invalid authentication credentials",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
 
 async def get_current_user(request: Request):
-    user = request.session.get('user')
-
-    if not user:
+    auth_header = request.headers.get('Authorization')
+    if not auth_header or not auth_header.startswith('Bearer '):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Not authenticated",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    logger.info(f"Got User: {user}")
-    return user
+    
+    token = auth_header.split(' ')[1]
+    payload = verify_jwt_token(token)
+    
+    logger.info(f"Got User: {payload}")
+    return payload
+
+async def authorize_redirect(request: Request, redirect_uri: str):
+    try:
+        return await oauth.ibm.authorize_redirect(request, redirect_uri)
+    except OAuthError as error:
+        logger.error(f"OAuth error during authorize_redirect: {str(error)}")
+        raise HTTPException(status_code=500, detail="OAuth authorization error")
+
+async def authorize_access_token(request: Request):
+    try:
+        return await oauth.ibm.authorize_access_token(request)
+    except OAuthError as error:
+        logger.error(f"OAuth error during authorize_access_token: {str(error)}")
+        raise HTTPException(status_code=500, detail="OAuth token authorization error")