Cookie ids

.env.example

@@ -1,6 +1,6 @@
 CLIENT_ORIGINS=https://fake-origin.example.com
 CLIENT_ORIGINS_REGEX="^http://fake-localhost:.*"
-
+ENV=development
 ##### MISTRAL AZURE #####
 AZURE_MISTRAL_SWEDEN_API_BASE=https://fake-mistral-sweden.example.com/models
 AZURE_MISTRAL_SWEDEN_API_KEY=FAKE_MISTRAL_SWEDEN_API_KEY

k8s/welearn-api/values.dev.yaml

@@ -6,6 +6,7 @@ config:
     PG_HOST: dev-lab-projects-backend.postgres.database.azure.com
     TIKA_URL_BASE: https://tika.k8s.lp-i.dev/
     DATA_COLLECTION_ORIGIN_PREFIX: welearn
+    ENV: development
 allowedHostsRegexes:
   mainUrl: |-
     https:\/\/welearn\.k8s\.lp-i\.dev

k8s/welearn-api/values.prod.yaml

@@ -6,6 +6,7 @@ config:
     PG_HOST: prod-prod-projects-backend.postgres.database.azure.com
     TIKA_URL_BASE: https://tika.k8s.lp-i.org/
     DATA_COLLECTION_ORIGIN_PREFIX: workshop
+    ENV: production
 allowedHostsRegexes:
   alphaUrls: |-
     https://[a-zA-Z0-9-]*\.alpha-welearn\.lp-i\.org

k8s/welearn-api/values.staging.yaml

@@ -8,6 +8,7 @@ config:
     PG_DATABASE: welearn_datastack_staging
     TIKA_URL_BASE: https://tika.k8s.lp-i.dev/
     DATA_COLLECTION_ORIGIN_PREFIX: welearn
+    ENV: staging
 allowedHostsRegexes:
   mainUrl: |-
     https:\/\/welearn\.k8s\.lp-i\.xyz

pytest.ini

@@ -21,6 +21,7 @@ env =
     TIKA_URL_BASE=https://tika.example.com
     USE_CACHED_SETTINGS=True
     DATA_COLLECTION_ORIGIN_PREFIX=workshop
+    ENV=test
 
 filterwarnings =
     ignore:.*U.*mode is deprecated:DeprecationWarning

src/app/api/api_v1/api.py

@@ -2,9 +2,10 @@
 
 from fastapi import APIRouter
 
-from src.app.api.api_v1.endpoints import chat, metric, micro_learning, user
+from src.app.api.api_v1.endpoints import chat, metric, micro_learning
 from src.app.search.api import router as search_router
 from src.app.tutor.api import router as tutor_router
+from src.app.user.api import router as user_router
 
 api_router = APIRouter()
 api_router.include_router(chat.router, prefix="/qna", tags=["qna"])
@@ -14,7 +15,7 @@
 api_router.include_router(
     micro_learning.router, prefix="/micro_learning", tags=["micro_learning"]
 )
-api_router.include_router(user.router, prefix="/user", tags=["user"])
+api_router.include_router(user_router.router, prefix="/user", tags=["user"])
 
 
 api_tags_metadata = [

src/app/api/api_v1/endpoints/chat.py

@@ -23,6 +23,7 @@
 )
 from src.app.shared.infra.abst_chat import get_chat_service
 from src.app.shared.utils.dependencies import get_settings
+from src.app.shared.utils.requests import extract_session_cookie
 from src.app.utils.logger import logger as utils_logger
 
 logger = utils_logger(__name__)
@@ -256,7 +257,7 @@ async def q_and_a_ans(
         str: openai chat completion content
     """
 
-    session_id = request.headers.get("X-Session-ID")
+    session_id = extract_session_cookie(request)
 
     try:
         content = await chatfactory.chat_message(
@@ -354,7 +355,7 @@ async def agent_response(
     data_collection=Depends(get_data_collection_service),
 ) -> Optional[Dict]:
     try:
-        session_id = request.headers.get("X-Session-ID")
+        session_id = extract_session_cookie(request)
         docs = []
 
         if body.query is None:

src/app/api/api_v1/endpoints/metric.py

@@ -6,6 +6,7 @@
 from src.app.services.data_collection import get_data_collection_service
 from src.app.services.sql_db.queries import get_document_qty_table_info_sync
 from src.app.shared.utils.dependencies import get_settings
+from src.app.shared.utils.requests import extract_session_cookie
 from src.app.utils.logger import logger as utils_logger
 
 logger = utils_logger(__name__)
@@ -55,6 +56,6 @@ async def update_clicked_doc_from_chat_message(
 async def register_syllabus_download(
     request: Request, data_collection=Depends(get_data_collection_service)
 ) -> str:
-    session_id = request.headers.get("X-Session-ID")
+    session_id = extract_session_cookie(request)
     await data_collection.register_syllabus_download(session_id)
     return "registered"

src/app/core/config.py

@@ -42,6 +42,7 @@ def get_api_version(self) -> dict:
     AZURE_API_VERSION: str
 
     LLM_MODEL_NAME: str
+    ENV: str
 
     # PG
     PG_USER: Optional[str] = None

src/app/middleware/monitor_requests.py

@@ -3,6 +3,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from src.app.services.sql_db.queries import register_endpoint
+from src.app.shared.utils.requests import extract_session_cookie
 from src.app.utils.logger import logger as logger_utils
 
 logger = logger_utils(__name__)
@@ -11,7 +12,7 @@
 class MonitorRequestsMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next):
         if request.url.path.startswith("/api/v1/"):
-            session_id = request.headers.get("X-Session-ID")
+            session_id = extract_session_cookie(request)
             if session_id:
                 try:
                     await run_in_threadpool(
@@ -24,7 +25,7 @@ async def dispatch(self, request: Request, call_next):
                     logger.error(f"Failed to register endpoint {request.url.path}: {e}")
             else:
                 logger.warning(
-                    f"No X-Session-ID header provided for {request.url.path}"
+                    f"No X-Session-ID cookie provided for {request.url.path}"
                 )
 
         response = await call_next(request)

src/app/search/api/router.py

@@ -32,6 +32,7 @@
     ModelNotFoundError,
     bad_request,
 )
+from src.app.shared.utils.requests import extract_session_cookie
 from src.app.utils.logger import logger as logger_utils
 
 router = APIRouter()
@@ -207,7 +208,7 @@ async def search_all(
     data_collection=Depends(get_data_collection_service),
 ):
     try:
-        session_id = request.headers.get("X-Session-ID")
+        session_id = extract_session_cookie(request)
 
         res = await sp.search_handler(
             qp=qp, method=SearchMethods.BY_DOCUMENT, background_tasks=background_tasks

src/app/services/data_collection.py

@@ -65,7 +65,7 @@ def get_campaign_state(
 
     async def register_search_data(
         self,
-        session_id: str | None,
+        session_id: uuid.UUID | None,
         query: str,
         search_results: list[Document | ScoredPoint],
         sdg_filter: list[int] | None = None,
@@ -88,9 +88,7 @@ async def register_search_data(
                 },
             )
 
-        user_id = await run_in_threadpool(
-            get_user_from_session_id, uuid.UUID(session_id)
-        )
+        user_id = await run_in_threadpool(get_user_from_session_id, session_id)
 
         if not user_id:
             raise HTTPException(
@@ -241,7 +239,7 @@ async def register_syllabus_update(
 
     async def register_chat_data(
         self,
-        session_id: str | None,
+        session_id: uuid.UUID | None,
         user_query: str,
         conversation_id: uuid.UUID | None,
         answer_content: str,
@@ -264,9 +262,7 @@ async def register_chat_data(
                 },
             )
 
-        user_id = await run_in_threadpool(
-            get_user_from_session_id, uuid.UUID(session_id)
-        )
+        user_id = await run_in_threadpool(get_user_from_session_id, session_id)
 
         if not user_id:
             raise HTTPException(

src/app/services/sql_db/queries_user.py

@@ -7,6 +7,7 @@
 from welearn_database.data.models import Bookmark, InferredUser, Session
 
 from src.app.services.sql_db.sql_service import session_maker
+from src.app.shared.domain.exceptions import SessionNotFoundError, UserNotFoundError
 from src.app.utils.logger import logger as logger_utils
 
 logger = logger_utils(__name__)
@@ -27,6 +28,8 @@ def get_or_create_user_sync(
             ).first()
             if user:
                 return user.id
+
+        logger.info("Creating new user with referer: %s", referer)
         user = InferredUser(origin_referrer=referer)
         s.add(user)
         s.commit()
@@ -45,7 +48,7 @@ def get_or_create_session_sync(
             select(InferredUser.id).where(InferredUser.id == user_id)
         ).first()
         if not user:
-            raise ValueError(f"User {user_id} does not exist")
+            raise UserNotFoundError(f"User {user_id} does not exist")
 
         if session_id:
             session = s.execute(
@@ -58,6 +61,9 @@ def get_or_create_session_sync(
             if session:
                 return session.id
 
+        logger.info(
+            "Creating new session for user_id=%s with referer: %s", user_id, referer
+        )
         new_session = Session(
             inferred_user_id=user_id,
             origin_referrer=referer,
@@ -70,11 +76,21 @@ def get_or_create_session_sync(
         return new_session.id
 
 
-def get_user_from_session_id(session_id: uuid.UUID) -> uuid.UUID | None:
+def get_user_from_session_id(session_id: uuid.UUID | None) -> uuid.UUID | None:
+    if not session_id:
+        return None
+
     with session_maker() as s:
         session = s.execute(select(Session).where(Session.id == session_id)).first()
         if session:
+            logger.info(
+                "Valid session. user_id=%s session_id=%s",
+                session[0].inferred_user_id,
+                session_id,
+            )
             return session[0].inferred_user_id
+        else:
+            raise SessionNotFoundError(f"Session with id {session_id} not found")
     return None
 
 

src/app/shared/domain/constants.py

@@ -25,3 +25,7 @@
 }
 
 APP_NAME = "welearn-api"
+
+
+SESSION_COOKIE_NAME = "x-session-id"
+SESSION_TTL_SECONDS = 60 * 60 * 24 * 400  # 400 days