Spaces:

amaye15
/

AuthenticationApp

Sleeping

App Files Files Community

amaye15 commited on Apr 3

Commit

2f0453b

1 Parent(s): d576ad8

Feat

Browse files

Files changed (4) hide show

Dockerfile +0 -21
app/main.py +16 -16
requirements.txt +3 -1
tests/api.py +4 -157

Dockerfile CHANGED Viewed

@@ -1,24 +1,3 @@
-# # Use an official Python runtime as a parent image
-# FROM python:3.12-slim
-# WORKDIR /code
-# COPY ./requirements.txt /code/requirements.txt
-# RUN pip install --no-cache-dir --upgrade pip && \
-#     pip install --no-cache-dir -r requirements.txt
-# # Copy application code
-# COPY ./app /code/app
-# # Copy static files and templates
-# COPY ./static /code/static
-# COPY ./templates /code/templates
-# EXPOSE 7860
-# # Command to run the FastAPI application
-# CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860"]
 # Use an official Python runtime as a parent image
 FROM python:3.12-slim as builder























1	# Use an official Python runtime as a parent image
2	FROM python:3.12-slim as builder
3

app/main.py CHANGED Viewed

@@ -6,10 +6,8 @@ from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from .database import connect_db, disconnect_db, database, users
-from .api import router as api_router
-from sqlalchemy.schema import CreateTable
-from sqlalchemy.dialects import sqlite
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -22,19 +20,16 @@ async def lifespan(app: FastAPI):
     logger.info("Application startup: DB Connected. Checking/Creating tables...")
     if database.is_connected:
         try:
-            check_query = "SELECT name FROM sqlite_master WHERE type='table' AND name=:table_name;"
-            table_exists = await database.fetch_one(query=check_query, values={"table_name": users.name})
-            if not table_exists:
-                logger.info(f"Table '{users.name}' not found, creating...")
-                dialect = sqlite.dialect()
-                create_table_stmt = str(CreateTable(users).compile(dialect=dialect))
-                await database.execute(query=create_table_stmt)
-                logger.info(f"Table '{users.name}' created.")
-                table_exists_after = await database.fetch_one(query=check_query, values={"table_name": users.name})
-                if table_exists_after: logger.info(f"Table '{users.name}' verified.")
-                else: logger.error(f"Table '{users.name}' verification FAILED!")
-            else:
-                logger.info(f"Table '{users.name}' already exists.")
         except Exception as db_setup_err:
             logger.exception(f"CRITICAL error during async DB table setup: {db_setup_err}")
     else:
@@ -63,6 +58,11 @@ async def read_root(request: Request):
         logger.error("templates/index.html not found!")
         return HTMLResponse(content="<html><body><h1>Error: Frontend not found</h1></body></html>", status_code=500)
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run("app.main:app", host="0.0.0.0", port=7860, reload=True)

 from fastapi.staticfiles import StaticFiles
 from .database import connect_db, disconnect_db, database, users
+from .api import router as api_router
 # Configure logging
 logging.basicConfig(level=logging.INFO)
     logger.info("Application startup: DB Connected. Checking/Creating tables...")
     if database.is_connected:
         try:
+            # Use CREATE TABLE IF NOT EXISTS to avoid race conditions with multiple workers
+            create_table_query = f"""
+            CREATE TABLE IF NOT EXISTS {users.name} (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                email VARCHAR UNIQUE NOT NULL,
+                hashed_password VARCHAR NOT NULL
+            )
+            """
+            await database.execute(query=create_table_query)
+            logger.info(f"Table '{users.name}' exists or was created.")
         except Exception as db_setup_err:
             logger.exception(f"CRITICAL error during async DB table setup: {db_setup_err}")
     else:
         logger.error("templates/index.html not found!")
         return HTMLResponse(content="<html><body><h1>Error: Frontend not found</h1></body></html>", status_code=500)
+@app.get("/health", status_code=200)
+async def health_check():
+    """Health check endpoint for container health monitoring"""
+    return {"status": "ok"}
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run("app.main:app", host="0.0.0.0", port=7860, reload=True)

requirements.txt CHANGED Viewed

@@ -10,4 +10,6 @@ python-multipart==0.0.9
 itsdangerous==2.1.2
 websockets>=11.0.3,<13.0
 aiofiles==23.2.1
-httpx==0.27.0

 itsdangerous==2.1.2
 websockets>=11.0.3,<13.0
 aiofiles==23.2.1
+httpx==0.27.0
+aiohttp==3.9.3
+Faker==22.2.0

tests/api.py CHANGED Viewed

@@ -1,156 +1,3 @@
-# import requests
-# import time
-# from faker import Faker
-# class AuthClient:
-#     """
-#     Python client for interacting with the Authentication API
-#     """
-#     def __init__(self, base_url="http://localhost:7860/api"):
-#         """
-#         Initialize the client with the API base URL
-#         Args:
-#             base_url (str): The base URL of the API
-#         """
-#         self.base_url = base_url
-#         self.token = None
-#     def register(self, email, password):
-#         """
-#         Register a new user
-#         Args:
-#             email (str): User's email
-#             password (str): User's password (should be at least 8 characters)
-#         Returns:
-#             dict: The user data returned by the API
-#         Raises:
-#             Exception: If registration fails
-#         """
-#         url = f"{self.base_url}/register"
-#         data = {
-#             "email": email,
-#             "password": password
-#         }
-#         response = requests.post(url, json=data)
-#         if response.status_code == 201:
-#             return response.json()
-#         else:
-#             error_detail = response.json().get("detail", "Unknown error")
-#             raise Exception(f"Registration failed: {error_detail} (Status: {response.status_code})")
-#     def login(self, email, password):
-#         """
-#         Login to obtain an authentication token
-#         Args:
-#             email (str): User's email
-#             password (str): User's password
-#         Returns:
-#             dict: The token data returned by the API
-#         Raises:
-#             Exception: If login fails
-#         """
-#         url = f"{self.base_url}/login"
-#         data = {
-#             "email": email,
-#             "password": password
-#         }
-#         response = requests.post(url, json=data)
-#         if response.status_code == 200:
-#             token_data = response.json()
-#             self.token = token_data["access_token"]
-#             return token_data
-#         else:
-#             error_detail = response.json().get("detail", "Unknown error")
-#             raise Exception(f"Login failed: {error_detail} (Status: {response.status_code})")
-#     def get_current_user(self):
-#         """
-#         Get information about the current logged-in user
-#         Returns:
-#             dict: The user data returned by the API
-#         Raises:
-#             Exception: If not authenticated or request fails
-#         """
-#         if not self.token:
-#             raise Exception("Not authenticated. Please login first.")
-#         url = f"{self.base_url}/users/me"
-#         headers = {"Authorization": f"Bearer {self.token}"}
-#         response = requests.get(url, headers=headers)
-#         if response.status_code == 200:
-#             return response.json()
-#         else:
-#             error_detail = response.json().get("detail", "Unknown error")
-#             raise Exception(f"Failed to get user info: {error_detail} (Status: {response.status_code})")
-#     def logout(self):
-#         """Clear the authentication token"""
-#         self.token = None
-# # Example usage
-# def main():
-#     # Initialize the client
-#     client = AuthClient("https://amaye15-authenticationapp.hf.space/api")
-#     # Initialize Faker
-#     fake = Faker()
-#     for i in range(10):
-#         try:
-#             # Generate random user data
-#             first_name = fake.first_name()
-#             last_name = fake.last_name()
-#             email = fake.email()
-#             password = fake.password(length=12, special_chars=True, digits=True, upper_case=True, lower_case=True)
-#             # Register a new user
-#             print(f"Registering a new user: {first_name} {last_name}...")
-#             try:
-#                 user = client.register(email, password)
-#                 print(f"Registered user: {user}")
-#             except Exception as e:
-#                 print(f"Registration failed: {e}")
-#             # Login
-#             print("\nLogging in...")
-#             token_data = client.login(email, password)
-#             print(f"Login successful, token: {token_data['access_token'][:10]}...")
-#             # Get current user
-#             print("\nGetting current user info...")
-#             user_info = client.get_current_user()
-#             print(f"Current user: {user_info}")
-#             # Logout
-#             print("\nLogging out...")
-#             client.logout()
-#             print("Logged out successfully")
-#         except Exception as e:
-#             print(f"Error: {e}")
-# if __name__ == "__main__":
-#     main()
 import asyncio
 import aiohttp
 import time
@@ -359,9 +206,9 @@ async def load_test(num_users=10, concurrency=5, base_url="https://amaye15-authe
 # Example usage
-async def main():
     # Initialize the client
-    base_url = "https://amaye15-authenticationapp.hf.space/api"
     # Run a simple example with a single user
     fake = Faker()
@@ -398,8 +245,8 @@ async def main():
     # Run a load test
     print("\nRunning load test...")
-    await load_test(10, 5, base_url)
 if __name__ == "__main__":
-    asyncio.run(main())

 import asyncio
 import aiohttp
 import time
 # Example usage
+async def remote():
     # Initialize the client
+    base_url = "http://localhost:7860/api"
     # Run a simple example with a single user
     fake = Faker()
     # Run a load test
     print("\nRunning load test...")
+    await load_test(100, 10, base_url)
 if __name__ == "__main__":
+    asyncio.run(remote())