fix lint

Author: sandragjacinto

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

@@ -1,5 +1,5 @@
 import numpy
-from fastapi import APIRouter, HTTPException, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from welearn_database.data.models import ContextDocument
 
 from src.app.models.documents import JourneySectionType
@@ -9,9 +9,9 @@
     collection_and_model_id_according_lang,
     convert_embedding_bytes,
 )
+from src.app.services.search import SearchService, get_search_service
 from src.app.services.sql_db import get_context_documents, get_subject, get_subjects
 from src.app.utils.logger import logger as logger_utils
-from src.app.services.search import SearchService, get_search_service
 
 router = APIRouter()
 logger = logger_utils(__name__)
@@ -23,7 +23,9 @@
     description="Retrieve all the subjects",
     response_model=list[str],
 )
-async def get_subject_list(lang: str | None = None,sp: SearchService = Depends(get_search_service)) -> list[str]:
+async def get_subject_list(
+    lang: str | None = None, sp: SearchService = Depends(get_search_service)
+) -> list[str]:
     collection_info, model_id = await collection_and_model_id_according_lang(
         sp=sp, lang=lang
     )
@@ -38,7 +40,12 @@ async def get_subject_list(lang: str | None = None,sp: SearchService = Depends(g
     summary="get the full journey",
     description="Get all documents for the micro learning journey of one sdg",
 )
-async def get_full_journey(sdg: int, subject: str, lang: str | None = None):
+async def get_full_journey(
+    sdg: int,
+    subject: str,
+    lang: str | None = None,
+    sp: SearchService = Depends(get_search_service),
+):
     collection_info, model_id = await collection_and_model_id_according_lang(
         sp=sp, lang=lang
     )

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

@@ -30,7 +30,6 @@
 from src.app.services.sql_db import session_maker
 from src.app.utils.logger import logger as logger_utils
 
-
 router = APIRouter()
 logger = logger_utils(__name__)
 
@@ -148,7 +147,7 @@ async def search_doc_by_collection(
 async def search_all_slices_by_lang(
     response: Response,
     qp: EnhancedSearchQuery = Depends(get_params),
-    sp: SearchService = Depends(get_search_service)
+    sp: SearchService = Depends(get_search_service),
 ):
     try:
 
@@ -174,7 +173,7 @@ async def search_all_slices_by_lang(
 async def multi_search_all_slices_by_lang(
     response: Response,
     qp: EnhancedSearchQuery = Depends(get_params),
-    sp: SearchService = Depends(get_search_service)
+    sp: SearchService = Depends(get_search_service),
 ):
     if isinstance(qp.query, str):
         qp.query = [qp.query]

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

@@ -1,14 +1,13 @@
 from typing import Annotated
 
-from fastapi import APIRouter, File, Response, UploadFile, Depends
-from qdrant_client import qdrant_client
+from fastapi import APIRouter, Depends, File, Response, UploadFile
 
 from src.app.api.dependencies import get_settings
 from src.app.models.search import EnhancedSearchQuery
 from src.app.services.abst_chat import AbstractChat
 from src.app.services.exceptions import NoResultsError
 from src.app.services.helpers import extract_json_from_response
-from src.app.services.search import SearchService, get_qdrant
+from src.app.services.search import SearchService, get_search_service
 from src.app.services.search_helpers import search_multi_inputs
 from src.app.services.tutor.agents import TEMPLATES
 from src.app.services.tutor.models import (
@@ -28,8 +27,6 @@
 from src.app.services.tutor.utils import get_files_content
 from src.app.utils.logger import logger as utils_logger
 
-from src.app.services.search import SearchService, get_search_service
-
 logger = utils_logger(__name__)
 
 router = APIRouter()

src/app/core/lifespan.py

@@ -1,6 +1,8 @@
 from contextlib import asynccontextmanager
+
 from fastapi import FastAPI
-from src.app.services.search import init_qdrant, close_qdrant
+
+from src.app.services.search import close_qdrant, init_qdrant
 
 
 @asynccontextmanager

src/app/services/search.py

@@ -2,16 +2,19 @@
 from functools import cache
 from typing import Tuple, cast
 
-from fastapi import Depends
 import numpy as np
+from fastapi import Depends
 from numpy import ndarray
 from psycopg import Error
-from qdrant_client import models as qdrant_models, qdrant_client
+from qdrant_client import AsyncQdrantClient
+from qdrant_client import models as qdrant_models
+from qdrant_client import qdrant_client
 from qdrant_client.http import exceptions as qdrant_exceptions
 from qdrant_client.http import models as http_models
 from sentence_transformers import SentenceTransformer
 from sklearn.metrics.pairwise import cosine_similarity
 
+from src.app.api.dependencies import get_settings
 from src.app.models.collections import Collection
 from src.app.models.search import (
     EnhancedSearchQuery,
@@ -24,8 +27,6 @@
 from src.app.services.sql_db import get_subject
 from src.app.utils.decorators import log_time_and_error, log_time_and_error_sync
 from src.app.utils.logger import logger as logger_utils
-from qdrant_client import AsyncQdrantClient
-from src.app.api.dependencies import get_settings
 
 logger = logger_utils(__name__)
 
@@ -346,11 +347,13 @@ def sort_slices_using_mmr(
     logger.debug("sort_slices_using_mmr=end")
     return [qdrant_results[i] for i in id_s]
 
+
 async def get_search_service(
     qdrant: AsyncQdrantClient = Depends(get_qdrant),
 ) -> SearchService:
     return SearchService(qdrant)
 
+
 @log_time_and_error_sync
 def concatenate_same_doc_id_slices(
     qdrant_results: list[http_models.ScoredPoint],

src/main.py

@@ -23,7 +23,7 @@
     description=settings.DESCRIPTION,
     title=settings.PROJECT_NAME,
     openapi_url=f"{settings.API_V1_STR}/openapi.json",
-    lifespan=lifespan
+    lifespan=lifespan,
 )
 
 # TODO: check this with JM