Refactor Dockerfile and clean up unused schemas; update Redis client initialization and environment configuration

.env.example

@@ -1,18 +1,33 @@
 # Environment file configuration
 CORS_ALLOW_ORIGINS="http://localhost, http://127.0.0.1"
 
+# Logging configuration
 LOG_FILE=app.log
 LOG_RETENTION="90 days"
 
-OPENAI_API_KEY=your-openai-api-key
-PINECONE_API_KEY=your-pinecone-api-key
+# OPENAI Configuration
+OPENAI_API_KEY=
+OPENAI_BASE_URL=
+OPENAI_WS_BASE_URL=
+OPENAI_REALTIME_MODEL=
+OPENAI_CHAT_COMPLETION_MODEL=
 
-PINECONE_INDEX_NAME=your-pinecone-index-name
+# PINECONE Configuration
+PINECONE_API_KEY=
+PINECONE_INDEX_NAME=
 
-MONGO_DB_URI=your-mongo-db-uri
-MONGO_DB_NAME=your-mongo-db-name
+# MONGO Configuration
+MONGO_DB_URI=
+MONGO_DB_NAME=
 
+# JWT Configuration
 JWT_SECRET_KEY=your-jwt-secret-key
 
-HUBSPOT_API_KEY=your-hubspot-api-key
-REDIS_URI=your-redis-uri
+# HUBSPOT Configuration
+HUBSPOT_API_KEY=
+HUBSPOT_BASE_URL=
+
+# REDIS Configuration
+REDIS_URI=
+REDIS_SESSION_EXPIRY=
+

Dockerfile

@@ -16,10 +16,6 @@ RUN chown -R user /app
 
 USER user
 
-COPY --chown=user alembic.ini /app/
-
-COPY --chown=user migrations /app/migrations
-
 COPY --chown=user src /app/src
 
 EXPOSE 8000

src/__init__.py

@@ -15,15 +15,55 @@ if not os.getenv("CORS_ALLOW_ORIGINS"):
         "CORS_ALLOW_ORIGINS environment not set. Allowing localhost by default."
     )
 
+if not os.getenv("LOG_FILE"):
+    raise ValueError("LOG_FILE environment not set.")
+
+if not os.getenv("LOG_RETENTION"):
+    logger.warning("LOG_RETENTION environment not set. Defaulting to 90 days.")
+
 if not os.getenv("OPENAI_API_KEY"):
     raise ValueError("OPENAI_API_KEY environment not set.")
 
+if not os.getenv("OPENAI_BASE_URL"):
+    raise ValueError("OPENAI_BASE_URL environment not set.")
+
+if not os.getenv("OPENAI_WS_BASE_URL"):
+    raise ValueError("OPENAI_WS_BASE_URL environment not set.")
+
+if not os.getenv("OPENAI_REALTIME_MODEL"):
+    raise ValueError("OPENAI_REALTIME_MODEL environment not set.")
+
+if not os.getenv("OPENAI_CHAT_COMPLETION_MODEL"):
+    raise ValueError("OPENAI_CHAT_COMPLETION_MODEL environment not set.")
+
+if not os.getenv("PINECONE_API_KEY"):
+    raise ValueError("PINECONE_API_KEY environment not set.")
+
+if not os.getenv("PINECONE_INDEX_NAME"):
+    raise ValueError("PINECONE_INDEX_NAME environment not set.")
+
 if not os.getenv("MONGO_DB_URI"):
     raise ValueError("MONGO_DB_URI environment not set.")
 
 if not os.getenv("MONGO_DB_NAME"):
     raise ValueError("MONGO_DB_NAME environment not set.")
 
+if not os.getenv("JWT_SECRET_KEY"):
+    raise ValueError("JWT_SECRET_KEY environment not set.")
+
+if not os.getenv("HUBSPOT_API_KEY"):
+    raise ValueError("HUBSPOT_API_KEY environment not set.")
+
+if not os.getenv("HUBSPOT_BASE_URL"):
+    raise ValueError("HUBSPOT_BASE_URL environment not set.")
+
+if not os.getenv("REDIS_URI"):
+    raise ValueError("REDIS_URI environment not set.")
+
+if not os.getenv("REDIS_SESSION_EXPIRY"):
+    raise ValueError("REDIS_SESSION_EXPIRY environment not set.")
+
+
 __all__ = ["app"]
 __version__ = "0.1.0"
 __author__ = "Ramanjit Singh"

src/config/__init__.py

@@ -1,13 +1,6 @@
 from ._logger import logger
 from ._database import DatabaseConfig
-from ._redis import RedisConfig, redis_client, REDIS_SESSION_EXPIRY
 
-__all__ = [
-    "logger",
-    "DatabaseConfig",
-    "RedisConfig",
-    "redis_client",
-    "REDIS_SESSION_EXPIRY",
-]
+__all__ = ["logger", "DatabaseConfig"]
 __version__ = "0.1.0"
 __author__ = "Ramanjit Singh"

src/controllers/__init__.py

@@ -4,14 +4,12 @@ from fastapi.security import APIKeyHeader
 from ._auth_controller import AuthController
 from ._file_controller import FileController
 from ._conversation_controller import ConversationController
-from ._meeting_controller import MeetingController
 
 api_router = APIRouter()
 
 auth_router = AuthController().api_router
 conversation_router = ConversationController().api_router
 file_router = FileController().api_router
-meeting_router = MeetingController().api_router
 
 API_KEY_HEADER = APIKeyHeader(name="Authorization", auto_error=False)
 
@@ -33,12 +31,6 @@ api_router.include_router(
     tags=["Semantic Search"],
     dependencies=[Depends(API_KEY_HEADER)],
 )
-api_router.include_router(
-    meeting_router,
-    prefix="/v1",
-    tags=["Meeting"],
-    dependencies=[Depends(API_KEY_HEADER)],
-)
 
 __all__ = ["api_router"]
 __version__ = "0.1.0"

src/controllers/_conversation_controller.py

@@ -1,4 +1,4 @@
-import re
+import os
 from fastapi import (
     APIRouter,
     HTTPException,
@@ -9,7 +9,6 @@ from fastapi import (
 from typing import List
 
 from src.config import logger
-from src.config import redis_client, REDIS_SESSION_EXPIRY
 from src.services import ConversationService
 from src.schemas import (
     CreateConversationSchema,
@@ -19,7 +18,7 @@ from src.schemas import (
     CreateConversationSummaryResponse,
     CreateWebrtcConnectionResponse,
 )
-from src.utils import JWTUtil
+from src.utils import JWTUtil, RedisClient
 
 
 class ConnectionManager:
@@ -27,9 +26,10 @@ class ConnectionManager:
         self.jwt = JWTUtil()
         self.active_connections: List[WebSocket] = []
 
-    async def connect(self, websocket: WebSocket):
+    async def connect(self, websocket: WebSocket, redis_client):
         await websocket.accept()
         token = websocket.query_params.get("token")
+        conversation_id = websocket.query_params.get("conversation_id")
         user = self.jwt.validate_jwt(token)
 
         if not user:
@@ -37,30 +37,41 @@ class ConnectionManager:
             return None
 
         self.active_connections.append(websocket)
-        await self._update_redis_status(user["user_id"], "active")
+        await self._update_redis_status(
+            unique_id=f"{user["user_id"]}{conversation_id}",
+            redis_client=redis_client,
+            status="active",
+        )
         return user
 
-    async def disconnect(self, websocket: WebSocket, user_id: str):
+    async def disconnect(
+        self, websocket: WebSocket, redis_client, user_id: str, conversation_id: str
+    ):
         if websocket in self.active_connections:
             self.active_connections.remove(websocket)
 
-        await self._update_redis_status(user_id, None)
+        await self._update_redis_status(
+            unique_id=f"{user_id}{conversation_id}",
+            redis_client=redis_client,
+            status=None,
+        )
 
-    async def _update_redis_status(self, user_id: str, status: str):
+    async def _update_redis_status(self, unique_id: str, redis_client, status: str):
         if status:
             await redis_client.set(
-                f"session:{user_id}", status, ex=REDIS_SESSION_EXPIRY
+                f"session:{unique_id}", status, ex=os.getenv("REDIS_SESSION_EXPIRY")
             )
         else:
-            await redis_client.delete(f"session:{user_id}")
+            await redis_client.delete(f"session:{unique_id}")
 
-        redis_status = await redis_client.get(f"session:{user_id}")
-        logger.info(f"Redis status for user {user_id}: {redis_status}")
+        redis_status = await redis_client.get(f"session:{unique_id}")
+        logger.info(f"Redis status for user {unique_id}: {redis_status}")
 
 
 class ConversationController:
     def __init__(self):
         self.websocket_connection_manager = ConnectionManager()
+        self.redis_client = RedisClient().client
         self.service = ConversationService
         self.api_router = APIRouter()
         self.api_router.add_api_route(
@@ -70,7 +81,7 @@ class ConversationController:
             response_model=CreateConversationResponse,
         )
         self.api_router.add_api_route(
-            "/conversations/{conversation_id}/webrtc",
+            "/conversations/{conversation_id}",
             self.create_webrtc_connection,
             methods=["POST"],
             response_model=CreateWebrtcConnectionResponse,
@@ -92,6 +103,9 @@ class ConversationController:
                 return await service.create_conversation(
                     user_id=user_id, modality=data.modality
                 )
+        except HTTPException as e:
+            raise
+
         except Exception as e:
             logger.error(f"Error creating conversation: {str(e)}")
             raise HTTPException(status_code=500, detail="Failed to create conversation")
@@ -109,6 +123,9 @@ class ConversationController:
                     conversation_id=data.conversation_id,
                     offer=data.offer.model_dump(),
                 )
+        except HTTPException as e:
+            raise
+
         except Exception as e:
             logger.error(f"Error creating WebRTC connection: {str(e)}")
             raise HTTPException(
@@ -116,7 +133,9 @@ class ConversationController:
             )
 
     async def conversation(self, websocket: WebSocket):
-        user = await self.websocket_connection_manager.connect(websocket)
+        user = await self.websocket_connection_manager.connect(
+            websocket=websocket, redis_client=self.redis_client
+        )
         if not user:
             return
         user_id = user["user_id"]
@@ -129,15 +148,28 @@ class ConversationController:
                     user_id=user_id,
                     conversation_id=conversation_id,
                     modality=modality,
-                    redis_client=redis_client,
+                    redis_client=self.redis_client,
                 )
         except WebSocketDisconnect:
-            await self.websocket_connection_manager.disconnect(websocket, user_id)
+            await self.websocket_connection_manager.disconnect(
+                websocket=websocket,
+                user_id=user_id,
+                redis_client=self.redis_client,
+                conversation_id=conversation_id,
+            )
             logger.info("WebSocket connection closed")
 
+        except HTTPException as e:
+            raise
+
         except Exception as e:
             logger.error(f"Error in WebSocket conversation: {str(e)}")
-            await self.websocket_connection_manager.disconnect(websocket, user_id)
+            await self.websocket_connection_manager.disconnect(
+                websocket=websocket,
+                user_id=user_id,
+                redis_client=self.redis_client,
+                conversation_id=conversation_id,
+            )
 
     async def create_conversation_summary(
         self, request: Request, data: CreateConversationSummarySchema
@@ -148,6 +180,10 @@ class ConversationController:
                 return await service.create_conversation_summary(
                     user_id=user_id, conversation_id=data.conversation_id
                 )
+
+        except HTTPException as e:
+            raise
+
         except Exception as e:
             logger.error(f"Error creating conversation summary: {str(e)}")
             raise HTTPException(

src/controllers/_file_controller.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, HTTPException, Request
 
 from src.config import logger
 from src.services import FileService
-from src.schemas import InsertFileSchema, SemanticSearchSchema
+from src.schemas import InsertFileSchema
 
 
 class FileController:
@@ -10,9 +10,6 @@ class FileController:
         self.service = FileService
         self.api_router = APIRouter()
         self.api_router.add_api_route("/files", self.insert_file, methods=["POST"])
-        self.api_router.add_api_route(
-            "/files/search", self.semantic_search, methods=["GET"]
-        )
 
     async def insert_file(self, request: Request, data: InsertFileSchema):
         try:
@@ -24,12 +21,3 @@ class FileController:
         except Exception as e:
             logger.error(f"Error while inserting file: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
-
-    async def semantic_search(self, request: Request, data: SemanticSearchSchema):
-        try:
-            query = data.query
-            async with self.service() as service:
-                return await service.semantic_search(query=query)
-        except Exception as e:
-            logger.error(f"Error while searching for similar data: {str(e)}")
-            raise HTTPException(status_code=500, detail=str(e))

src/controllers/_meeting_controller.py

@@ -1,67 +0,0 @@
-from fastapi import APIRouter, HTTPException, Request
-
-from src.config import logger
-from src.schemas import DemoBookingSchema
-from src.services import MeetingService
-
-
-class MeetingController:
-    def __init__(self):
-        self.service = MeetingService
-        self.api_router = APIRouter()
-        self.api_router.add_api_route(
-            "/meetings/slots",
-            self.get_available_slots,
-            methods=["GET"],
-        )
-        self.api_router.add_api_route(
-            "/meetings/book",
-            self.schedule_meeting,
-            methods=["POST"],
-        )
-        self.api_router.add_api_route(
-            "/meetings/confirm",
-            self.send_meeting_confirmation,
-            methods=["POST"],
-        )
-
-    async def get_available_slots(
-        self, request: Request, salesperson_meeting_id: str, timezone: str
-    ):
-        try:
-            async with self.service() as service:
-                return await service.get_available_slots(
-                    salesperson_meeting_id, timezone
-                )
-        except Exception as e:
-            logger.error(f"Error getting available slots: {str(e)}")
-            raise HTTPException(status_code=500, detail="Failed to get available slots")
-
-    async def schedule_meeting(self, request: Request, data: DemoBookingSchema):
-        try:
-            user_id = request.state.user["user_id"]
-            async with self.service() as service:
-                return await service.schedule_meeting(
-                    user_id=user_id,
-                    salesperson_meeting_id=data.salesperson_meeting_id,
-                    duration=data.duration,
-                    preferred_start_time=data.preferred_start_time,
-                    timezone=data.timezone,
-                    locale=data.locale,
-                )
-        except Exception as e:
-            logger.error(f"Error booking demo: {str(e)}")
-            raise HTTPException(
-                status_code=500, detail=f"Failed to book demo: {str(e)}"
-            )
-
-    async def send_meeting_confirmation(self, request: Request):
-        try:
-            user_id = request.state.user["user_id"]
-            async with self.service() as service:
-                return await service.send_meeting_confirmation(user_id=user_id)
-        except Exception as e:
-            logger.error(f"Error sending meeting confirmation: {str(e)}")
-            raise HTTPException(
-                status_code=500, detail="Failed to send meeting confirmation"
-            )

src/middlewares/_authentication.py

@@ -39,31 +39,29 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
             except HTTPException as e:
                 # Create a response with CORS headers
                 response = JSONResponse(
-                    status_code=e.status_code,
-                    content={"detail": e.detail}
+                    status_code=e.status_code, content={"detail": e.detail}
                 )
-                
+
                 origin = request.headers.get("origin", "*")
                 response.headers["Access-Control-Allow-Origin"] = origin
                 response.headers["Access-Control-Allow-Credentials"] = "true"
                 response.headers["Access-Control-Allow-Methods"] = "*"
                 response.headers["Access-Control-Allow-Headers"] = "*"
-                
+
                 return response
             except Exception as e:
                 response = JSONResponse(
-                    status_code=500,
-                    content={"detail": "Internal server error"}
+                    status_code=500, content={"detail": "Internal server error"}
                 )
-                
+
                 origin = request.headers.get("origin", "*")
                 response.headers["Access-Control-Allow-Origin"] = origin
                 response.headers["Access-Control-Allow-Credentials"] = "true"
                 response.headers["Access-Control-Allow-Methods"] = "*"
                 response.headers["Access-Control-Allow-Headers"] = "*"
-                
+
                 return response
-                
+
         return await call_next(request)
 
     def _require_auth(self, path: str):

src/models/_sessions.py

@@ -8,8 +8,8 @@ class Session(Document):
     user_id: Link[User]
     token: str
     device_ipv4_address: str
-    created_at: datetime = Field(default_factory=datetime.now)  
-    expired_at: datetime = Field(default_factory=datetime.now) 
+    created_at: datetime = Field(default_factory=datetime.now)
+    expired_at: datetime = Field(default_factory=datetime.now)
 
     class Settings:
         name = "sessions"

src/models/_users.py

@@ -9,9 +9,9 @@ class User(Document):
     first_name: str
     last_name: str
     hashed_password: str
-    email: Annotated[ str, Indexed(unique=True)]
+    email: Annotated[str, Indexed(unique=True)]
     created_at: datetime = Field(default_factory=datetime.now)
     updated_at: datetime = Field(default_factory=datetime.now)
 
     class Settings:
-        name = "users"
+        name = "users"

src/prompts/system_prompt.md

@@ -1,4 +1,4 @@
-# System Prompt: Olivia - Your Friendly and Knowledgeable Assistant
+# Olivia - Your Friendly and Knowledgeable Assistant
 
 You are Olivia, a dynamic and supportive virtual assistant, here to deliver personalized, context-aware interactions. Below are key attributes to guide your behavior and tone:
 
@@ -52,7 +52,7 @@ Always use **get_relevant_information** if the user query relates to **Keepme Sa
 
 - **Description:** Get relevant information (Context) to better respond to user queries.
 - **Parameters:**
-    - `query` (string): The user query to get relevant information for.
+  - `query` (string): The user query to get relevant information for.
 
 #### **get_available_salesperson_meetings**
 
@@ -62,16 +62,16 @@ Always use **get_relevant_information** if the user query relates to **Keepme Sa
 
 - **Description:** Get available slots for a salesperson meeting.
 - **Parameters:**
-    - `salesperson_meeting_id` (string): The ID of the salesperson meeting.
-    - `timezone` (string): The timezone for the available slots.
+  - `salesperson_meeting_id` (string): The ID of the salesperson meeting.
+  - `timezone` (string): The timezone for the available slots.
 
 #### **schedule_meeting**
 
 - **Description:** Schedule a meeting.
 - **Parameters:**
-    - `user_id` (string): The ID of the user.
-    - `salesperson_meeting_id` (string): The ID of the salesperson meeting.
-    - `preferred_start_time` (string, format: date-time): The preferred start time for the meeting.
-    - `duration` (integer): The duration of the meeting in minutes.
-    - `timezone` (string): The timezone for the meeting.
-    - `locale` (string, default: "en-us"): The locale for the meeting.
+  - `user_id` (string): The ID of the user.
+  - `salesperson_meeting_id` (string): The ID of the salesperson meeting.
+  - `preferred_start_time` (string, format: date-time): The preferred start time for the meeting.
+  - `duration` (integer): The duration of the meeting in minutes.
+  - `timezone` (string): The timezone for the meeting.
+  - `locale` (string, default: "en-us"): The locale for the meeting.

src/repositories/_base_repository.py

@@ -1,5 +1,5 @@
 from beanie import Document, WriteRules, DeleteRules
-from typing import Type, TypeVar, List, Dict
+from typing import Type, TypeVar, Dict
 
 T = TypeVar("T", bound=Document)
 

src/schemas/__init__.py

@@ -15,7 +15,7 @@ from ._conversations import (
     CreateWebrtcConnectionResponse,
 )
 from ._meetings import DemoBookingSchema
-from ._files import InsertFileSchema, SemanticSearchSchema
+from ._files import InsertFileSchema
 
 
 __all__ = [
@@ -32,7 +32,6 @@ __all__ = [
     "CreateConversationSummaryResponse",
     "CreateWebrtcConnectionResponse",
     "InsertFileSchema",
-    "SemanticSearchSchema",
     "DemoBookingSchema",
 ]
 

src/schemas/_files.py

@@ -4,7 +4,3 @@ from fastapi import UploadFile, File
 
 class InsertFileSchema(BaseModel):
     file: UploadFile = File(...)
-
-
-class SemanticSearchSchema(BaseModel):
-    query: str

src/schemas/_sessions.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from pydantic import BaseModel
 from src.models import User
 
+
 class SessionCreateSchema(BaseModel):
     user_id: User
     token: str

src/schemas/_users.py

@@ -35,5 +35,6 @@ class UserSignInSchema(BaseModel):
 class UserSignInResponse(BaseModel):
     token: str
 
+
 class UserSignUpResponse(BaseModel):
     user_id: str

src/services/_meeting_service.py

@@ -20,7 +20,9 @@ class MeetingService:
         pass
 
     async def get_available_salesperson_meetings(self):
-        request_url = "https://api.hubapi.com/scheduler/v3/meetings/meeting-links"
+        request_url = (
+            os.getenv("HUBSPOT_BASE_URL") + "/scheduler/v3/meetings/meeting-links"
+        )
         headers = {"authorization": f"Bearer {os.getenv('HUBSPOT_API_KEY')}"}
 
         async with aiohttp.ClientSession() as session:
@@ -44,7 +46,10 @@ class MeetingService:
         return result
 
     async def get_available_slots(self, salesperson_meeting_id: str, timezone: str):
-        request_url = f"https://api.hubapi.com/scheduler/v3/meetings/meeting-links/book/availability-page/{salesperson_meeting_id}?timezone={timezone}"
+        request_url = (
+            os.getenv("HUBSPOT_BASE_URL")
+            + "/scheduler/v3/meetings/meeting-links/book/availability-page/{salesperson_meeting_id}?timezone={timezone}"
+        )
         headers = {"authorization": f"Bearer {os.getenv('HUBSPOT_API_KEY')}"}
 
         async with aiohttp.ClientSession() as session:
@@ -98,7 +103,9 @@ class MeetingService:
 
         duration_ms = duration * 60000
 
-        url = "https://api.hubapi.com/scheduler/v3/meetings/meeting-links/book"
+        url = (
+            os.getenv("HUBSPOT_BASE_URL") + "/scheduler/v3/meetings/meeting-links/book"
+        )
         headers = {
             "authorization": f"Bearer {os.getenv('HUBSPOT_API_KEY')}",
             "content-type": "application/json",

src/services/_session_service.py

@@ -25,7 +25,7 @@ class SessionService:
 
     async def delete_session(self, session_id):
         return await self.session_repository.delete(session_id)
-    
+
     async def get_session_by_token(self, token: str):
         session = await self.session_repository.get_all(filter_by={"token": token})
         return session[0] if session else None

src/services/_web_rtc_service.py

@@ -24,7 +24,7 @@ class WebRTCService:
             data = await websocket.receive_text()
             message = json.loads(data)
 
-            user_status = await redis_client.get(f"session:{user_id}")
+            user_status = await redis_client.get(f"session:{user_id}{conversation_id}")
             if not user_status:
                 raise Exception("A max 25 minute session has ended")
 

src/services/_websocket_service.py

@@ -30,7 +30,11 @@ class WebSocketService:
     ):
         openai_websocket = None
         async with websockets.connect(
-            uri="wss://api.openai.com/v1/realtime?model=gpt-4o-mini-realtime-preview-2024-12-17",
+            uri=(
+                os.getenv("OPENAI_WS_BASE_URL")
+                + "/v1/realtime?model="
+                + os.getenv("OPENAI_REALTIME_MODEL")
+            ),
             additional_headers={
                 "Authorization": f"Bearer {os.getenv('OPENAI_API_KEY')}",
                 "OpenAI-Beta": "realtime=v1",
@@ -122,7 +126,9 @@ class WebSocketService:
                 user_message = await client_websocket.receive_text()
                 user_message = json.loads(user_message)["user_message"]
 
-                user_status = await redis_client.get(f"session:{user_id}")
+                user_status = await redis_client.get(
+                    f"session:{user_id}{conversation_id}"
+                )
                 if not user_status:
                     raise Exception("A max 25 minute session has ended")
 

src/utils/__init__.py

@@ -3,6 +3,7 @@ from ._bcrypt_util import BcryptUtil
 from ._openai_client import OpenAIClient
 from ._pinecone_client import PineconeClient
 from ._meeting_utils import MeetingUtils
+from ._redis_client import RedisClient
 
 __all__ = [
     "JWTUtil",
@@ -10,6 +11,7 @@ __all__ = [
     "OpenAIClient",
     "PineconeClient",
     "MeetingUtils",
+    "RedisClient",
 ]
 
 __version__ = "0.1.0"

src/utils/_bcrypt_util.py

@@ -6,12 +6,12 @@ class BcryptUtil:
     def hash_password(password: str) -> str:
 
         salt = bcrypt.gensalt()
-        hashed_password = bcrypt.hashpw(password.encode('utf-8'), salt)
-        return hashed_password.decode('utf-8')
+        hashed_password = bcrypt.hashpw(password.encode("utf-8"), salt)
+        return hashed_password.decode("utf-8")
 
     @staticmethod
     def compare_password(stored_password: str, provided_password: str) -> bool:
 
-        stored_password = stored_password.encode('utf-8')
-        provided_password = provided_password.encode('utf-8')
+        stored_password = stored_password.encode("utf-8")
+        provided_password = provided_password.encode("utf-8")
         return bcrypt.checkpw(provided_password, stored_password)

src/utils/_jwt_util.py

@@ -2,19 +2,20 @@ import os
 import jwt
 from datetime import datetime, timedelta
 
+
 class JWTUtil:
-  def __init__(self, algorithm='HS256'):
-    self.secret_key = os.getenv('JWT_SECRET_KEY') 
-    self.algorithm = algorithm
+    def __init__(self, algorithm="HS256"):
+        self.secret_key = os.getenv("JWT_SECRET_KEY")
+        self.algorithm = algorithm
 
-  def generate_jwt(self, payload, expiration_minutes=60):
-    payload['exp'] = datetime.now() + timedelta(minutes=expiration_minutes)
-    return jwt.encode(payload, self.secret_key, algorithm=self.algorithm)
+    def generate_jwt(self, payload, expiration_minutes=60):
+        payload["exp"] = datetime.now() + timedelta(minutes=expiration_minutes)
+        return jwt.encode(payload, self.secret_key, algorithm=self.algorithm)
 
-  def validate_jwt(self, token):
-    try:
-      return jwt.decode(token, self.secret_key, algorithms=[self.algorithm])
-    except jwt.ExpiredSignatureError:
-      return None
-    except jwt.InvalidTokenError:
-      return None
+    def validate_jwt(self, token):
+        try:
+            return jwt.decode(token, self.secret_key, algorithms=[self.algorithm])
+        except jwt.ExpiredSignatureError:
+            return None
+        except jwt.InvalidTokenError:
+            return None

src/utils/_openai_client.py

@@ -5,102 +5,17 @@ from aiortc import RTCPeerConnection, RTCSessionDescription
 from openai import AsyncOpenAI
 
 from src.config import logger
-
-
-_OPENAI_TOOLS = [
-    {
-        "type": "function",
-        "name": "get_relevant_information",
-        "description": "Get relevant information(Context) to better respond to user queries",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "query": {
-                    "type": "string",
-                    "description": "The user query to get relevant information for",
-                },
-            },
-            "required": ["query"],
-        },
-    },
-    {
-        "type": "function",
-        "name": "get_available_salesperson_meetings",
-        "description": "Get all the salespersons ids that can be used to check available slots and to schedule meetings",
-    },
-    {
-        "type": "function",
-        "name": "get_available_slots",
-        "description": "Get available slots for a salesperson meeting",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "salesperson_meeting_id": {
-                    "type": "string",
-                    "description": "The ID of the salesperson meeting",
-                },
-                "timezone": {
-                    "type": "string",
-                    "description": "The timezone for the available slots. It must be a tz identifier like America/New_York, Asia/Kolkata, Cuba, etc.Note: We have regional calenders for APAC, EMEA, and North America. Please use the timezone accordingly. The region must be asked explicitly from the user and hence confirmed too.",
-                },
-            },
-            "required": ["salesperson_meeting_id", "timezone"],
-        },
-    },
-    {
-        "type": "function",
-        "name": "schedule_meeting",
-        "description": "Schedule a meeting",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "user_id": {
-                    "type": "string",
-                    "description": "The ID of the user, default: DEFAULT_USER, Do not explicitly ask for this",
-                    "default": "DEFAULT_USER",
-                },
-                "salesperson_meeting_id": {
-                    "type": "string",
-                    "description": "The ID of the salesperson meeting, this can be obtained from get_available_salesperson_meetings",
-                },
-                "preferred_start_time": {
-                    "type": "string",
-                    "format": "date-time",
-                    "description": "The preferred start time for the meeting. format: YYYY-MM-DD HH:MM:SS, this can be obtained from get_available_slots",
-                    "example": "2022-12-17 12:00:00",
-                },
-                "duration": {
-                    "type": "integer",
-                    "description": "The duration of the meeting in minutes",
-                },
-                "timezone": {
-                    "type": "string",
-                    "description": "The timezone for the available slots. It must be a tz identifier like America/New_York, Asia/Kolkata, Cuba, etc.Note: We have regional calenders for APAC, EMEA, and North America. Please use the timezone accordingly. The region must be asked explicitly from the user and hence confirmed too.",
-                },
-                "locale": {
-                    "type": "string",
-                    "description": "The locale for the meeting",
-                    "default": "en-us",
-                },
-            },
-            "required": [
-                "user_id",
-                "salesperson_meeting_id",
-                "preferred_start_time",
-                "duration",
-                "timezone",
-            ],
-        },
-    },
-]
+from ._openai_tools import _OPENAI_TOOLS
 
 
 class OpenAIClient:
     def __init__(self):
         self.client = None
-        self.session_url = "https://api.openai.com/v1/realtime/sessions"
-        self.model = "gpt-4o-mini-realtime-preview-2024-12-17"
-        self.webrtc_url = f"https://api.openai.com/v1/realtime?model={self.model}"
+        self.model = os.getenv("OPENAI_REALTIME_MODEL")
+        self.session_url = os.getenv("OPENAI_BASE_URL") + "/v1/realtime/sessions"
+        self.webrtc_url = (
+            os.getenv("OPENAI_BASE_URL") + "/v1/realtime?model={self.model}"
+        )
         self.modalities = ["text", "audio"]
         self.voice = "alloy"
         self.transcription_model = "whisper-1"
@@ -126,7 +41,7 @@ class OpenAIClient:
 
     async def text_generation(self, query: str):
         completion = await self.client.chat.completions.create(
-            model="gpt-4o-mini-2024-07-18",
+            model=os.getenv("OPENAI_CHAT_COMPLETION_MODEL"),
             messages=[
                 {
                     "role": "user",

src/utils/_openai_tools.py

@@ -0,0 +1,86 @@
+_OPENAI_TOOLS = [
+    {
+        "type": "function",
+        "name": "get_relevant_information",
+        "description": "Get relevant information(Context) to better respond to user queries",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "query": {
+                    "type": "string",
+                    "description": "The user query to get relevant information for",
+                },
+            },
+            "required": ["query"],
+        },
+    },
+    {
+        "type": "function",
+        "name": "get_available_salesperson_meetings",
+        "description": "Get all the salespersons ids that can be used to check available slots and to schedule meetings",
+    },
+    {
+        "type": "function",
+        "name": "get_available_slots",
+        "description": "Get available slots for a salesperson meeting",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "salesperson_meeting_id": {
+                    "type": "string",
+                    "description": "The ID of the salesperson meeting",
+                },
+                "timezone": {
+                    "type": "string",
+                    "description": "The timezone for the available slots. It must be a tz identifier like America/New_York, Asia/Kolkata, Cuba, etc.Note: We have regional calenders for APAC, EMEA, and North America. Please use the timezone accordingly. The region must be asked explicitly from the user and hence confirmed too.",
+                },
+            },
+            "required": ["salesperson_meeting_id", "timezone"],
+        },
+    },
+    {
+        "type": "function",
+        "name": "schedule_meeting",
+        "description": "Schedule a meeting",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "user_id": {
+                    "type": "string",
+                    "description": "The ID of the user, default: DEFAULT_USER, Do not explicitly ask for this",
+                    "default": "DEFAULT_USER",
+                },
+                "salesperson_meeting_id": {
+                    "type": "string",
+                    "description": "The ID of the salesperson meeting, this can be obtained from get_available_salesperson_meetings",
+                },
+                "preferred_start_time": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "The preferred start time for the meeting. format: YYYY-MM-DD HH:MM:SS, this can be obtained from get_available_slots",
+                    "example": "2022-12-17 12:00:00",
+                },
+                "duration": {
+                    "type": "integer",
+                    "description": "The duration of the meeting in minutes",
+                },
+                "timezone": {
+                    "type": "string",
+                    "description": "The timezone for the available slots. It must be a tz identifier like America/New_York, Asia/Kolkata, Cuba, etc.Note: We have regional calenders for APAC, EMEA, and North America. Please use the timezone accordingly. The region must be asked explicitly from the user and hence confirmed too.",
+                },
+                "locale": {
+                    "type": "string",
+                    "description": "The locale for the meeting",
+                    "default": "en-us",
+                },
+            },
+            "required": [
+                "user_id",
+                "salesperson_meeting_id",
+                "preferred_start_time",
+                "duration",
+                "timezone",
+            ],
+        },
+    },
+]

src/{config/_redis.py → utils/_redis_client.py}

@@ -2,20 +2,13 @@ import os
 import redis.asyncio as redis
 
 
-REDIS_SESSION_EXPIRY = 1500
-
-
-class RedisConfig:
+class RedisClient:
     def __init__(self):
         self.redis_url = os.getenv("REDIS_URI")
+        self.client = self.init_redis()
 
     def init_redis(self):
         redis_client = redis.from_url(
-            url=self.redis_url,
-            encoding="utf-8",
-            decode_responses=True,
+            url=self.redis_url, encoding="utf-8", decode_responses=True
         )
         return redis_client
-
-
-redis_client = RedisConfig().init_redis()