diff --git a/Pipfile.lock b/Pipfile.lock index cb60c85..e11c0a0 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -299,7 +299,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3.5'", + "markers": "python_full_version >= '3.5.0'", "version": "==2.0.12" }, "click": { @@ -331,7 +331,7 @@ "sha256:0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e", "sha256:a851e51367fb93e9e1361732c1d60dab63eff98712e503ea7d92e6eccb109b4f" ], - "markers": "python_version >= '3.6' and python_version < '4.0'", + "markers": "python_version >= '3.6' and python_version < '4'", "version": "==2.2.1" }, "ecdsa": { @@ -544,7 +544,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3.5'", + "markers": "python_full_version >= '3.5.0'", "version": "==3.3" }, "jinja2": { @@ -949,7 +949,7 @@ "sha256:5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17", "sha256:95c5d300c4e879ee69708c428ba566c59478fd653cc3a22243eeb8ed846950bb" ], - "markers": "python_version >= '3.6' and python_version < '4.0'", + "markers": "python_version >= '3.6' and python_version < '4'", "version": "==4.8" }, "sentry-sdk": { @@ -981,7 +981,7 @@ "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663", "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de" ], - "markers": "python_version >= '3.5'", + "markers": "python_full_version >= '3.5.0'", "version": "==1.2.0" }, "sqlalchemy": { @@ -1047,7 +1047,7 @@ "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14", "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.9" }, "uvicorn": { diff --git a/classquiz/routers/quiz.py b/classquiz/routers/quiz.py index c86e3c1..6cd39df 100644 --- a/classquiz/routers/quiz.py +++ b/classquiz/routers/quiz.py @@ -8,7 +8,7 @@ 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.auth import get_current_user 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 diff --git a/classquiz/routers/search.py b/classquiz/routers/search.py index db93a75..8a75238 100644 --- a/classquiz/routers/search.py +++ b/classquiz/routers/search.py @@ -1,20 +1,9 @@ -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 fastapi import APIRouter -from classquiz.auth import get_current_user, get_current_user_optional -from classquiz.config import redis, settings, storage, meilisearch +from classquiz.config import settings, 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() @@ -90,7 +79,7 @@ async def search_get( { "offset": offset, "limit": limit, - "filter": filter, + "filter": filter, # skipcq: PYL-W0622 "cropLength": cropLength, "matches": matches, "attributesToHighlight": [attributesToHighlight],