✨ Added search
This commit is contained in:
@@ -9,13 +9,12 @@ from fastapi.responses import JSONResponse
|
||||
from pydantic import ValidationError
|
||||
|
||||
from classquiz.auth import get_current_user, get_current_user_optional
|
||||
from classquiz.config import redis, settings, storage
|
||||
from classquiz.config import redis, settings, storage, meilisearch
|
||||
from classquiz.db.models import Quiz, QuizInput, User, PlayGame
|
||||
from classquiz.kahoot_importer.import_quiz import import_quiz
|
||||
|
||||
settings = settings()
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@@ -31,6 +30,12 @@ async def create_quiz_lol(quiz_input: QuizInput, user: User = Depends(get_curren
|
||||
raise HTTPException(status_code=400, detail="image url is not valid")
|
||||
quiz = Quiz(**quiz_input.dict(), user_id=user.id, id=uuid.uuid4())
|
||||
await redis.delete("global_quiz_count")
|
||||
meilisearch.index(settings.meilisearch_index).add_documents([{
|
||||
"id": str(quiz.id),
|
||||
"title": quiz.title,
|
||||
"description": quiz.description,
|
||||
"user": (await User.objects.filter(id=quiz.user_id).first()).username,
|
||||
}])
|
||||
return await quiz.save()
|
||||
|
||||
|
||||
@@ -117,6 +122,12 @@ async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends(
|
||||
quiz.description = quiz_input.description
|
||||
quiz.updated_at = datetime.now()
|
||||
quiz.questions = quiz_input.dict()["questions"]
|
||||
meilisearch.index(settings.meilisearch_index).update_documents([{
|
||||
"id": str(quiz.id),
|
||||
"title": quiz.title,
|
||||
"description": quiz.description,
|
||||
"user": (await User.objects.filter(id=quiz.user_id).first()).username,
|
||||
}])
|
||||
return await quiz.update()
|
||||
|
||||
|
||||
@@ -149,4 +160,5 @@ async def delete_quiz(quiz_id: str, user: User = Depends(get_current_user)):
|
||||
pass
|
||||
if len(pics_to_delete) != 0:
|
||||
await storage.delete(pics_to_delete)
|
||||
meilisearch.index(settings.meilisearch_index).delete_document(str(quiz.id))
|
||||
return await quiz.delete()
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
import json
|
||||
import re
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from random import randint
|
||||
|
||||
import pydantic
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from fastapi.responses import JSONResponse
|
||||
from pydantic import ValidationError
|
||||
|
||||
from classquiz.auth import get_current_user, get_current_user_optional
|
||||
from classquiz.config import redis, settings, storage, meilisearch
|
||||
from uuid import UUID
|
||||
from typing import Optional, List
|
||||
from classquiz.db.models import Quiz, QuizInput, User, PlayGame
|
||||
from classquiz.kahoot_importer.import_quiz import import_quiz
|
||||
|
||||
settings = settings()
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
class Hit(pydantic.BaseModel):
|
||||
id: UUID
|
||||
title: str
|
||||
description: str
|
||||
user: str
|
||||
formatted: Optional['Hit'] = pydantic.Field(None, alias='_formatted')
|
||||
|
||||
|
||||
class SearchResponse(pydantic.BaseModel):
|
||||
hits: List[Hit] | list[None]
|
||||
nbHits: int
|
||||
exhaustiveNbHits: bool
|
||||
query: str
|
||||
limit: int
|
||||
offset: int
|
||||
processingTimeMs: int
|
||||
|
||||
|
||||
class SearchData(pydantic.BaseModel):
|
||||
q: str
|
||||
offset: Optional[int] = 0
|
||||
limit: Optional[int] = 20
|
||||
filter: Optional[str] = None
|
||||
facetsDistribution: Optional[list[str]] = None
|
||||
attributesToRetrieve: Optional[list[str]] = ["*"]
|
||||
attributesToCrop: Optional[list[str]]= None
|
||||
cropLength: Optional[int] = 200
|
||||
attributesToHighlight: Optional[list[str]] = None
|
||||
matches: Optional[bool] = False
|
||||
sort: Optional[list[str]] = None
|
||||
|
||||
|
||||
@router.post("/search", response_model=SearchResponse)
|
||||
async def search(data: SearchData):
|
||||
index = meilisearch.get_index(settings.meilisearch_index)
|
||||
query = index.search(data.q, {
|
||||
"offset": data.offset,
|
||||
"limit": data.limit,
|
||||
"filter": data.filter,
|
||||
"cropLength": data.cropLength,
|
||||
"matches": data.matches,
|
||||
"facetsDistribution": data.facetsDistribution,
|
||||
"attributesToRetrieve": data.attributesToRetrieve,
|
||||
"attributesToCrop": data.attributesToCrop,
|
||||
"sort": data.sort,
|
||||
"attributesToHighlight": data.attributesToHighlight
|
||||
})
|
||||
return query.serialize()
|
||||
|
||||
|
||||
@router.get("/search", response_model=SearchResponse)
|
||||
async def search_get(q: str, offset: int = 0, limit: int = 20, filter: str | None = None,
|
||||
cropLength: int = 200, matches: bool = False, attributesToHighlight: Optional[str] = "*"):
|
||||
index = meilisearch.get_index(settings.meilisearch_index)
|
||||
query = index.search(q, {
|
||||
"offset": offset,
|
||||
"limit": limit,
|
||||
"filter": filter,
|
||||
"cropLength": cropLength,
|
||||
"matches": matches,
|
||||
"attributesToHighlight": [attributesToHighlight]
|
||||
})
|
||||
return SearchResponse(**query)
|
||||
Reference in New Issue
Block a user