Merge pull request #1 from sinasezza/sinasezza

feat(config/database): connection of app to mongodb database added to…
sinasezza · Jul 24, 2024 · 6c85339 · 6c85339
2 parents 250f1b3 + b64f623
commit 6c85339
Show file tree

Hide file tree

Showing 28 changed files with 237 additions and 60 deletions.
diff --git a/app/config.py b/app/config.py
diff --git a/app/main.py b/app/main.py
diff --git a/app/__init__.py → chatApp/__init__.py b/app/__init__.py → chatApp/__init__.py
diff --git a/app/auth.py → chatApp/auth.py b/app/auth.py → chatApp/auth.py
diff --git a/app/models/__init__.py → chatApp/config/__init__.py b/app/models/__init__.py → chatApp/config/__init__.py
diff --git a/chatApp/config/config.py b/chatApp/config/config.py
@@ -0,0 +1,34 @@
+from functools import lru_cache
+from pathlib import Path
+
+from dotenv import load_dotenv
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+BASE_DIR = Path(__file__).resolve().parent.parent
+load_dotenv(BASE_DIR / ".env")
+
+
+class Settings(BaseSettings):
+    debug: bool = Field(default=False)
+    database_url: str = "mongodb://localhost:27017"
+    database_name: str = "chat_app"
+    jwt_secret_key: str = "your-secret-key"
+    jwt_algorithm: str = Field(default="HS256")
+
+    # CORS settings
+    cors_allow_origins: list[str] = Field(default=["*"])
+    cors_allow_credentials: bool = Field(default=True)
+    cors_allow_methods: list[str] = Field(default=["*"])
+    cors_allow_headers: list[str] = Field(default=["*"])
+
+    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
+
+
+@lru_cache
+def get_settings() -> Settings:
+    return Settings()
+
+
+UPLOAD_DIR = BASE_DIR / "uploads"
+MAX_FILE_SIZE = 5 * 1024 * 1024  # 5 MB
diff --git a/chatApp/config/database.py b/chatApp/config/database.py
@@ -0,0 +1,23 @@
+from motor.motor_asyncio import AsyncIOMotorClient
+
+from .config import get_settings
+
+settings = get_settings()
+
+# Global variable to hold the database client
+db_client = None
+db = None
+
+
+async def connect_to_mongodb():
+    global db_client, db
+    db_client = AsyncIOMotorClient(settings.database_url, maxPoolSize=10, minPoolSize=1)
+    db = db_client[settings.database_name]
+    print("Connected to MongoDB")
+
+
+async def close_mongodb_connection():
+    global db_client
+    if db_client:
+        db_client.close()
+        print("Closed MongoDB connection")
diff --git a/app/exceptions.py → chatApp/exceptions.py b/app/exceptions.py → chatApp/exceptions.py
diff --git a/app/database.py → chatApp/logs.py b/app/database.py → chatApp/logs.py
diff --git a/chatApp/main.py b/chatApp/main.py
@@ -0,0 +1,63 @@
+import socketio
+import uvicorn
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+from chatApp.config.config import get_settings
+from chatApp.config.database import close_mongodb_connection, connect_to_mongodb
+from chatApp.routes import auth, chat, user
+
+# Fetch settings
+settings = get_settings()
+
+app = FastAPI()
+
+# Configure CORS using settings
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=settings.cors_allow_origins,
+    allow_credentials=settings.cors_allow_credentials,
+    allow_methods=settings.cors_allow_methods,
+    allow_headers=settings.cors_allow_headers,
+)
+
+# Create a Socket.IO server
+sio = socketio.AsyncServer(async_mode="asgi", cors_allowed_origins="*")
+
+# Wrap with ASGI application
+socket_app = socketio.ASGIApp(sio, app)
+
+
+@app.get("/")
+async def root():
+    return {"message": "Welcome to the FastAPI Chat App"}
+
+
+# Define lifespan event handlers
+async def lifespan(app: FastAPI):
+    # On startup
+    await connect_to_mongodb()
+
+    yield
+
+    # On shutdown
+    await close_mongodb_connection()
+
+
+app.include_router(auth.router)
+app.include_router(chat.router)
+app.include_router(user.router)
+
+
+@sio.event
+async def connect(sid, environ):
+    print(f"Client connected: {sid}")
+
+
+@sio.event
+async def disconnect(sid):
+    print(f"Client disconnected: {sid}")
+
+
+if __name__ == "__main__":
+    uvicorn.run("main:socket_app", host="0.0.0.0", port=8000, reload=True)
diff --git a/app/routes/__init__.py → chatApp/models/__init__.py b/app/routes/__init__.py → chatApp/models/__init__.py
diff --git a/app/logging.py → chatApp/models/message.py b/app/logging.py → chatApp/models/message.py
diff --git a/app/schemas/__init__.py → chatApp/models/user.py b/app/schemas/__init__.py → chatApp/models/user.py
diff --git a/app/services/__init__.py → chatApp/routes/__init__.py b/app/services/__init__.py → chatApp/routes/__init__.py
diff --git a/chatApp/routes/auth.py b/chatApp/routes/auth.py
@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()
diff --git a/chatApp/routes/chat.py b/chatApp/routes/chat.py
@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()
diff --git a/chatApp/routes/user.py b/chatApp/routes/user.py
@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()
diff --git a/app/utils/__init__.py → chatApp/schemas/__init__.py b/app/utils/__init__.py → chatApp/schemas/__init__.py
diff --git a/chatApp/schemas/message.py b/chatApp/schemas/message.py
diff --git a/chatApp/schemas/user.py b/chatApp/schemas/user.py
diff --git a/chatApp/services/__init__.py b/chatApp/services/__init__.py
diff --git a/chatApp/services/auth_service.py b/chatApp/services/auth_service.py
diff --git a/chatApp/services/chat_service.py b/chatApp/services/chat_service.py
diff --git a/chatApp/utils/__init__.py b/chatApp/utils/__init__.py
diff --git a/mypy.ini b/mypy.ini
@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,11 +7,16 @@ license = "MIT"
 readme = "README.md"
 package-mode = false
 
+[tool.isort]
+line_length = 88
+profile = "black"
+remove_redundant_aliases = true
+
 [tool.poetry.dependencies]
 python = "^3.10"
 fastapi = {extras = ["all"], version = "^0.111.1"}
 uvicorn = "^0.30.3"
-python-socketio = "^5.11.3"
+python-socketio = {extras = ["asyncio"], version = "^5.11.3"}
 pymongo = "^4.8.0"
 python-jose = {extras = ["cryptography"], version = "^3.3.0"}
 passlib = {extras = ["bcrypt"], version = "^1.7.4"}
@@ -21,6 +26,8 @@ isort = "^5.13.2"
 pydantic-settings = "^2.3.4"
 pyjwt = "^2.8.0"
 python-dotenv = "^1.0.1"
+motor = "^3.5.1"
+mypy = "^1.11.0"
 
 
 [build-system]

diff --git a/requirements.txt b/requirements.txt
@@ -28,6 +28,9 @@ jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
 markdown-it-py==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
 markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "4.0"
 mdurl==0.1.2 ; python_version >= "3.10" and python_version < "4.0"
+motor==3.5.1 ; python_version >= "3.10" and python_version < "4.0"
+mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
+mypy==1.11.0 ; python_version >= "3.10" and python_version < "4.0"
 nodeenv==1.9.1 ; python_version >= "3.10" and python_version < "4.0"
 orjson==3.10.6 ; python_version >= "3.10" and python_version < "4.0"
 passlib[bcrypt]==1.7.4 ; python_version >= "3.10" and python_version < "4.0"
@@ -56,6 +59,7 @@ simple-websocket==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
 sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
 starlette==0.37.2 ; python_version >= "3.10" and python_version < "4.0"
+tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
 typer==0.12.3 ; python_version >= "3.10" and python_version < "4.0"
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
 ujson==5.10.0 ; python_version >= "3.10" and python_version < "4.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from fastapi import APIRouter

		router = APIRouter()