Merge pull request #409 from mawoka-myblock/testing

classquiz/__init__.py

@@ -36,7 +36,7 @@ from classquiz.routers import (
     moderation,
 )
 from classquiz.socket_server import sio
-from classquiz.helpers import meilisearch_init, telemetry_ping
+from classquiz.helpers import meilisearch_init
 
 settings = settings()
 if settings.sentry_dsn:
@@ -63,7 +63,6 @@ async def startup() -> None:
     if not database_.is_connected:
         await database_.connect()
     await meilisearch_init()
-    await telemetry_ping()
 
 
 @app.on_event("shutdown")

classquiz/config.py

@@ -7,9 +7,9 @@ from functools import lru_cache
 
 from redis import asyncio as redis_lib
 import redis as redis_base_lib
-from pydantic import BaseSettings, RedisDsn, PostgresDsn, BaseModel
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic import RedisDsn, PostgresDsn, BaseModel
 import meilisearch as MeiliSearch
-from typing import Optional
 from arq import create_pool
 from arq.connections import RedisSettings, ArqRedis
 
@@ -28,10 +28,13 @@ class Settings(BaseSettings):
     Settings class for the shop app.
     """
 
+    model_config = SettingsConfigDict(
+        env_file=".env", extra="ignore", env_nested_delimiter="__", env_file_encoding="utf-8"
+    )
     root_address: str = "http://127.0.0.1:8000"
     redis: RedisDsn = "redis://localhost:6379/0?decode_responses=True"
     skip_email_verification: bool = False
-    db_url: str | PostgresDsn = "postgresql://postgres:mysecretpassword@localhost:5432/classquiz"
+    db_url: PostgresDsn | str = "postgresql://postgres:mysecretpassword@localhost:5432/classquiz"
     hcaptcha_key: str | None = None
     recaptcha_key: str | None = None
     mail_address: str
@@ -42,13 +45,13 @@ class Settings(BaseSettings):
     secret_key: str
     access_token_expire_minutes: int = 30
     cache_expiry: int = 86400
-    sentry_dsn: str | None
+    sentry_dsn: str | None = None
     meilisearch_url: str = "http://127.0.0.1:7700"
     meilisearch_index: str = "classquiz"
-    google_client_id: Optional[str]
-    google_client_secret: Optional[str]
-    github_client_id: Optional[str]
-    github_client_secret: Optional[str]
+    google_client_id: str | None = None
+    google_client_secret: str | None = None
+    github_client_id: str | None = None
+    github_client_secret: str | None = None
     custom_openid_provider: CustomOpenIDProvider | None = None
     telemetry_enabled: bool = True
     free_storage_limit: int = 1074000000
@@ -57,21 +60,16 @@ class Settings(BaseSettings):
     registration_disabled: bool = False
 
     # storage_backend
-    storage_backend: str | None = "local"
+    storage_backend: str  # either "local" or "s3"
 
     # if storage_backend == "local":
-    storage_path: str | None
+    storage_path: str | None = None
 
     # if storage_backend == "s3":
-    s3_access_key: str | None
-    s3_secret_key: str | None
+    s3_access_key: str | None = None
+    s3_secret_key: str | None = None
     s3_bucket_name: str = "classquiz"
-    s3_base_url: str | None
-
-    class Config:
-        env_file = ".env"
-        env_file_encoding = "utf-8"
-        env_nested_delimiter = "__"
+    s3_base_url: str | None = None
 
 
 async def initialize_arq():
@@ -85,7 +83,7 @@ def settings() -> Settings:
     return Settings()
 
 
-pool = redis_lib.ConnectionPool().from_url(settings().redis)
+pool = redis_lib.ConnectionPool().from_url(str(settings().redis))
 
 redis: redis_base_lib.client.Redis = redis_lib.Redis(connection_pool=pool)
 arq: ArqRedis = ArqRedis(pool_or_conn=pool)

classquiz/db/models.py

@@ -10,7 +10,7 @@ from typing import Optional
 
 import ormar
 from ormar import ReferentialAction
-from pydantic import BaseModel, Json, validator
+from pydantic import BaseModel, Json, validator, RootModel
 from enum import Enum
 from . import metadata, database
 from .quiztivity import QuizTivityPage
@@ -45,13 +45,7 @@ class User(ormar.Model):
     totp_secret: str = ormar.String(max_length=32, min_length=32, nullable=True, default=None)
     storage_used: int = ormar.BigInteger(nullable=False, default=0, minimum=0)
 
-    class Meta:
-        tablename = "users"
-        metadata = metadata
-        database = database
-
-    class Config:
-        use_enum_values = True
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="users")
 
 
 class FidoCredentials(ormar.Model):
@@ -61,20 +55,14 @@ class FidoCredentials(ormar.Model):
     sign_count: int = ormar.Integer()
     user: Optional[User] = ormar.ForeignKey(User, ondelete=ReferentialAction.CASCADE)
 
-    class Meta:
-        tablename = "fido_credentials"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="fido_credentials")
 
 
 class ApiKey(ormar.Model):
     key: str = ormar.String(max_length=48, min_length=48, primary_key=True)
     user: Optional[User] = ormar.ForeignKey(User, ondelete=ReferentialAction.CASCADE)
 
-    class Meta:
-        tablename = "api_keys"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="api_keys")
 
 
 class UserSession(ormar.Model):
@@ -90,16 +78,13 @@ class UserSession(ormar.Model):
     user_agent: str = ormar.String(max_length=255, nullable=True)
     last_seen: datetime = ormar.DateTime(default=datetime.now())
 
-    class Meta:
-        tablename = "user_sessions"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="user_sessions")
 
 
 class ABCDQuizAnswer(BaseModel):
     right: bool
     answer: str
-    color: str | None
+    color: str | None = None
 
 
 class RangeQuizAnswer(BaseModel):
@@ -112,7 +97,7 @@ class RangeQuizAnswer(BaseModel):
 class VotingQuizAnswer(BaseModel):
     answer: str
     image: str | None = None
-    color: str | None
+    color: str | None = None
 
 
 class QuizQuestionType(str, Enum):
@@ -136,6 +121,7 @@ class QuizQuestion(BaseModel):
     type: None | QuizQuestionType = QuizQuestionType.ABCD
     answers: list[ABCDQuizAnswer] | RangeQuizAnswer | list[TextQuizAnswer] | list[VotingQuizAnswer] | str
     image: str | None = None
+    hide_results: bool | None = False
 
     @validator("answers")
     def answers_not_none_if_abcd_type(cls, v, values):
@@ -160,10 +146,10 @@ class QuizInput(BaseModel):
     public: bool = False
     title: str
     description: str
-    cover_image: str | None
-    background_color: str | None
+    cover_image: str | None = None
+    background_color: str | None = None
     questions: list[QuizQuestion]
-    background_image: str | None
+    background_image: str | None = None
 
 
 class Quiz(ormar.Model):
@@ -186,19 +172,13 @@ class Quiz(ormar.Model):
     views: int = ormar.Integer(nullable=False, default=0, server_default="0")
     mod_rating: int | None = ormar.SmallInteger(nullable=True)
 
-    class Meta:
-        tablename = "quiz"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(tablename="quiz", metadata=metadata, database=database)
 
 
 class InstanceData(ormar.Model):
     instance_id: uuid.UUID = ormar.UUID(primary_key=True, default=uuid.uuid4(), nullable=False, unique=True)
 
-    class Meta:
-        tablename = "instance_data"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(tablename="instance_data", metadata=metadata, database=database)
 
 
 class Token(BaseModel):
@@ -228,18 +208,18 @@ class PlayGame(BaseModel):
     game_pin: str
     started: bool = False
     captcha_enabled: bool = False
-    cover_image: str | None
-    game_mode: str | None
+    cover_image: str | None = None
+    game_mode: str | None = None
     current_question: int = -1
-    background_color: str | None
-    background_image: str | None
-    custom_field: str | None
+    background_color: str | None = None
+    background_image: str | None = None
+    custom_field: str | None = None
     question_show: bool = False
 
 
 class GamePlayer(BaseModel):
     username: str
-    sid: str | None
+    sid: str | None = None
 
 
 class GameAnswer2(BaseModel):
@@ -273,9 +253,9 @@ class AnswerData(BaseModel):
     score: int
 
 
-class AnswerDataList(BaseModel):
+class AnswerDataList(RootModel):
     # Just a method to make a top-level list
-    __root__: list[AnswerData]
+    root: list[AnswerData]
 
 
 class GameInLobby(BaseModel):
@@ -307,10 +287,7 @@ class GameResults(ormar.Model):
     description: str = ormar.Text(nullable=False)
     questions: Json[list[QuizQuestion]] = ormar.JSON(nullable=False)
 
-    class Meta:
-        tablename = "game_results"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="game_results")
 
 
 class QuizTivityInput(BaseModel):
@@ -325,10 +302,7 @@ class QuizTivity(ormar.Model):
     user: User | None = ormar.ForeignKey(User, ondelete=ReferentialAction.CASCADE)
     pages: list[QuizTivityPage] = ormar.JSON(nullable=False)
 
-    class Meta:
-        tablename = "quiztivitys"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(tablename="quiztivitys", metadata=metadata, database=database)
 
 
 class QuizTivityShare(ormar.Model):
@@ -338,10 +312,7 @@ class QuizTivityShare(ormar.Model):
     quiztivity: QuizTivity | None = ormar.ForeignKey(QuizTivity, ondelete=ReferentialAction.CASCADE)
     user: User | None = ormar.ForeignKey(User, ondelete=ReferentialAction.CASCADE)
 
-    class Meta:
-        tablename = "quiztivityshares"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="quiztivityshares")
 
 
 class OnlyId(BaseModel):
@@ -350,8 +321,8 @@ class OnlyId(BaseModel):
 
 class PublicQuizTivityShare(BaseModel):
     id: uuid.UUID
-    name: str | None
-    expire_in: int | None
+    name: str | None = None
+    expire_in: int | None = None
     quiztivity: OnlyId
     user: OnlyId
 
@@ -386,23 +357,20 @@ class StorageItem(ormar.Model):
     server: str | None = ormar.Text(default=None, nullable=True)
     imported: bool = ormar.Boolean(default=False, nullable=True)
 
-    class Meta:
-        tablename = "storage_items"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="storage_items")
 
 
 class PublicStorageItem(BaseModel):
     id: uuid.UUID
     uploaded_at: datetime
     mime_type: str
-    hash: str | None
+    hash: str | None = None
     size: int
-    deleted_at: datetime | None
-    alt_text: str | None
-    filename: str | None
-    thumbhash: str | None
-    server: str | None
+    deleted_at: datetime | None = None
+    alt_text: str | None = None
+    filename: str | None = None
+    thumbhash: str | None = None
+    server: str | None = None
     imported: bool
 
     @classmethod
@@ -458,8 +426,8 @@ class PrivateStorageItem(PublicStorageItem):
 
 
 class UpdateStorageItem(BaseModel):
-    filename: str | None
-    alt_text: str | None
+    filename: str | None = None
+    alt_text: str | None = None
 
 
 class Controller(ormar.Model):
@@ -473,10 +441,7 @@ class Controller(ormar.Model):
     os_version: str | None = ormar.Text(nullable=True)
     wanted_os_version: str = ormar.Text(nullable=True, default=None)
 
-    class Meta:
-        tablename = "controller"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(tablename="controller", metadata=metadata, database=database)
 
 
 class Rating(ormar.Model):
@@ -486,7 +451,4 @@ class Rating(ormar.Model):
     created_at: datetime = ormar.DateTime(nullable=False, server_default=func.now())
     quiz: uuid.UUID | Quiz = ormar.ForeignKey(Quiz)
 
-    class Meta:
-        tablename = "rating"
-        metadata = metadata
-        database = database
+    ormar_config = ormar.OrmarConfig(database=database, metadata=metadata, tablename="rating")

classquiz/db/quiztivity.py

@@ -12,8 +12,8 @@ class Pdf(BaseModel):
 
 
 class _MemoryCard(BaseModel):
-    image: str | None
-    text: str | None
+    image: str | None = None
+    text: str | None = None
     id: str
 
 
@@ -53,6 +53,6 @@ TYPE_CLASS_LIST = {
 
 
 class QuizTivityPage(BaseModel):
-    title: str | None
+    title: str | None = None
     type: QuizTivityTypes
     data: Pdf | Memory | Markdown | Abcd

classquiz/kahoot_importer/__init__.py

@@ -10,19 +10,19 @@ from pydantic import BaseModel
 
 
 class _CoverMetadata(BaseModel):
-    id: UUID | None
-    resources: str | None
+    id: UUID | None = None
+    resources: str | None = None
 
 
 class _CreatorAvatar(BaseModel):
-    url: str | None
-    id: UUID | None
-    type: str | None
-    bitmojiAvatarId: str | None
-    altText: str | None
-    contentType: str | None
-    width: int | None
-    height: int | None
+    url: str | None = None
+    id: UUID | None = None
+    type: str | None = None
+    bitmojiAvatarId: str | None = None
+    altText: str | None = None
+    contentType: str | None = None
+    width: int | None = None
+    height: int | None = None
 
 
 class _LastEdit(BaseModel):
@@ -32,19 +32,19 @@ class _LastEdit(BaseModel):
 
 
 class _ImageMetadata(BaseModel):
-    id: UUID | None
-    content_type: Optional[str]
-    width: Optional[int]
-    height: Optional[int]
-    resources: Optional[str]
+    id: UUID | None = None
+    content_type: Optional[str] = None
+    width: Optional[int] = None
+    height: Optional[int] = None
+    resources: Optional[str] = None
 
 
 class _SampleQuestion(BaseModel):
-    image: str | None
-    imageMetadata: _ImageMetadata | None
+    image: str | None = None
+    imageMetadata: _ImageMetadata | None = None
     title: str
     type: str
-    time: int | None
+    time: int | None = None
 
 
 class _Access(BaseModel):
@@ -57,19 +57,19 @@ class _Card(BaseModel):
     title: str
     description: str
     slug: str
-    cover: str | None
-    coverMetadata: _CoverMetadata | dict[None, None] | None
+    cover: str | None = None
+    coverMetadata: _CoverMetadata | dict[None, None] | None = None
     draftExists: bool
-    inventoryItemIds: List[Any]
+    inventoryItemIds: List[Any] = None
     number_of_questions: int
     creator: UUID
     creator_username: str
-    creator_avatar: _CreatorAvatar | dict[None, None] | None
+    creator_avatar: _CreatorAvatar | dict[None, None] | None = None
     badges: List[str]
     visibility: int
     locked: bool
     writeProtection: bool
-    lastEdit: _LastEdit | None
+    lastEdit: _LastEdit | None = None
     featured: bool
     young_featured: bool
     sponsored: bool
@@ -111,8 +111,8 @@ class _LanguageInfo(BaseModel):
 
 class _Metadata(BaseModel):
     access: _Access
-    duplicationProtection: bool | None
-    lastEdit: _LastEdit | None
+    duplicationProtection: bool | None = None
+    lastEdit: _LastEdit | None = None
 
 
 class _Parent(BaseModel):
@@ -123,15 +123,15 @@ class _Parent(BaseModel):
 class _Choice(BaseModel):
     answer: str
     correct: bool
-    languageInfo: _LanguageInfo | None
+    languageInfo: _LanguageInfo | None = None
 
 
 class _Video(BaseModel):
     startTime: float
     endTime: float
     service: str
-    full_url: Optional[str]
-    id: Optional[str]
+    full_url: Optional[str] = None
+    id: Optional[str] = None
 
 
 class _Question(BaseModel):
@@ -141,12 +141,12 @@ class _Question(BaseModel):
     points: bool
     pointsMultiplier: int
     choices: List[_Choice]
-    image: str | None
-    imageMetadata: _ImageMetadata | None
-    resources: Optional[str]
+    image: str | None = None
+    imageMetadata: _ImageMetadata | None = None
+    resources: Optional[str] = None
     video: _Video
     questionFormat: int
-    languageInfo: _LanguageInfo | None
+    languageInfo: _LanguageInfo | None = None
     media: List[Any]
 
 
@@ -157,23 +157,23 @@ class _Kahoot(BaseModel):
     creator_username: str
     compatibilityLevel: int
     creator_primary_usage: str
-    folderId: UUID | None
+    folderId: UUID | None = None
     visibility: int
-    difficulty: int | None
+    difficulty: int | None = None
     audience: str
     audience: str
     title: str
     description: str
     quizType: str
-    tags: str | None | List[str]
-    cover: str | None
-    coverMetadata: _CoverMetadata | dict[None, None] | None
+    tags: str | None | List[str] = None
+    cover: str | None = None
+    coverMetadata: _CoverMetadata | dict[None, None] | None = None
     questions: List[_Question]
     metadata: _Metadata
-    parent: _Parent | None
-    resources: str | None
+    parent: _Parent | None = None
+    resources: str | None = None
     slug: str
-    languageInfo: _LanguageInfo | None
+    languageInfo: _LanguageInfo | None = None
     inventoryItemIds: List[Any]
     type: str
     created: int

classquiz/kahoot_importer/search.py

@@ -15,12 +15,12 @@ from classquiz.kahoot_importer import _Entity
 class _Response(BaseModel):
     entities: List[_Entity]
     totalHits: int
-    cursor: int | None
+    cursor: int | None = None
     pageTimestamp: int
 
 
 async def search(
-    query: str | None,
+    query: str | None = None,
     limit: int | None = 9,
     cursor: int | None = 1,
     search_cluster: int | None = 1,

classquiz/routers/box_controller/web.py

@@ -18,7 +18,7 @@ router = APIRouter()
 
 
 class SetControllerUpInput(BaseModel):
-    player_name: str | None
+    player_name: str | None = None
     name: str
 
 

classquiz/routers/login.py

@@ -50,7 +50,7 @@ class LoginSession(BaseModel):
     user_id: str
     step_1: set[StartLoginResponseTypes]
     step_2: set[StartLoginResponseTypes]
-    webauthn_challenge: str | None
+    webauthn_challenge: str | None = None
     step1_success: bool = False
 
 
@@ -58,7 +58,7 @@ class StartLoginResponse(BaseModel):
     step_1: set[StartLoginResponseTypes]
     step_2: set[StartLoginResponseTypes]
     session_id: str
-    webauthn_data: None | str
+    webauthn_data: None | str = None
 
 
 def verify_webauthn(data, fidocredentialss: list[FidoCredentials], login_session: LoginSession):

classquiz/routers/moderation.py

@@ -47,7 +47,7 @@ async def get_newest_quizzes(
 
 
 class SetModRatingForQuizInput(BaseModel):
-    rating: int | None
+    rating: int | None = None
 
 
 @router.post("/rating/set/{quiz_id}")

classquiz/routers/quiz.py

@@ -22,6 +22,7 @@ from classquiz.config import redis, settings, storage, meilisearch
 from classquiz.db.models import Quiz, User, PlayGame, GameInLobby, QuizQuestion, QuizQuestionType
 from classquiz.helpers.box_controller import generate_code
 from classquiz.kahoot_importer.import_quiz import import_quiz
+from uuid import UUID
 import urllib.parse
 
 settings = settings()
@@ -54,7 +55,7 @@ class PublicQuizResponseUser(BaseModel):
     id: uuid.UUID
 
 
-class PublicQuizResponse(Quiz.get_pydantic()):
+class PublicQuizResponse(Quiz.get_pydantic(exclude={"questions"})):
     user_id: PublicQuizResponseUser
     questions: list[QuizQuestion]
     likes: int
@@ -143,8 +144,8 @@ async def start_quiz(
 
 class CheckIfCaptchaEnabledResponse(BaseModel):
     enabled: bool
-    game_mode: str | None
-    custom_field: str | None
+    game_mode: str | None = None
+    custom_field: str | None = None
 
 
 @router.get("/play/check_captcha/{game_pin}", response_model=CheckIfCaptchaEnabledResponse)
@@ -229,7 +230,8 @@ async def export_quiz_answers(export_token: str, game_pin: str):
     data = json.loads(data)
     data2 = await redis.get(f"game:{game_pin}")
     game_data = PlayGame.parse_raw(data2)
-    quiz = await Quiz.objects.get_or_none(id=game_data.quiz_id)
+    print(type(game_data.quiz_id))
+    quiz = await Quiz.objects.get_or_none(id=UUID(game_data.quiz_id))
     if quiz is None:
         raise HTTPException(status_code=404, detail="quiz not found")
 

classquiz/routers/quiztivity/shares.py

@@ -25,9 +25,9 @@ async def get_shares(user: User = Depends(get_current_user)) -> list[PublicQuizT
 
 
 class CreateShareInput(BaseModel):
-    name: str | None
+    name: str | None = None
     quiztivity: UUID
-    expire_in: int | None
+    expire_in: int | None = None
 
 
 @router.post("/")
@@ -55,8 +55,8 @@ async def delete_share(uuid: UUID, user: User = Depends(get_current_user)):
 
 
 class UpdateShareInput(BaseModel):
-    name: str | None
-    expire_in: int | None
+    name: str | None = None
+    expire_in: int | None = None
 
 
 @router.put("/{uuid}")

classquiz/routers/sitemap.py

@@ -45,7 +45,7 @@ class SitemapQuiz(BaseModel):
     updated_at: datetime.datetime
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
 
 @router.get("/get")

classquiz/routers/users/__init__.py

@@ -297,7 +297,7 @@ async def get_other_avatar(respo: Response, user_id: uuid.UUID):
 
 class InternalAuthData(BaseModel):
     rememberme: str
-    jwt: str | None
+    jwt: str | None = None
 
 
 @router.post("/auth/internal")

classquiz/socket_server/__init__.py

@@ -28,6 +28,7 @@ from pydantic import BaseModel, ValidationError, validator
 from datetime import datetime
 
 from classquiz.socket_server.export_helpers import save_quiz_to_storage
+from classquiz.socket_server.session import get_session, save_session
 
 sio = socketio.AsyncServer(async_mode="asgi", cors_allowed_origins=[])
 settings = settings()
@@ -61,10 +62,10 @@ def calculate_score(z: float, t: int) -> int:
 
 async def set_answer(answers, game_pin: str, q_index: int, data: AnswerData) -> AnswerDataList:
     if answers is None:
-        answers = AnswerDataList(__root__=[data])
+        answers = AnswerDataList([data])
     else:
         answers = AnswerDataList.parse_raw(answers)
-        answers.__root__.append(data)
+        answers.root.append(data)
     await redis.set(
         f"game_session:{game_pin}:{q_index}",
         answers.json(),
@@ -76,8 +77,8 @@ async def set_answer(answers, game_pin: str, q_index: int, data: AnswerData) ->
 class _JoinGameData(BaseModel):
     username: str
     game_pin: str
-    captcha: str | None
-    custom_field: str | None
+    captcha: str | None = None
+    custom_field: str | None = None
 
 
 class _RejoinGameData(BaseModel):
@@ -105,9 +106,13 @@ async def rejoin_game(sid: str, data: dict):
     await sio.emit("time_sync", encrypted_datetime, room=sid)
     await redis.set(redis_sid_key, sid)
     await redis.srem(
-        f"game_session:{data.game_pin}:players", GamePlayer(username=data.username, sid=data.old_sid).json()
+        f"game_session:{data.game_pin}:players",
+        GamePlayer(username=data.username, sid=data.old_sid).json(),
+    )
+    await redis.sadd(
+        f"game_session:{data.game_pin}:players",
+        GamePlayer(username=data.username, sid=sid).json(),
     )
-    await redis.sadd(f"game_session:{data.game_pin}:players", GamePlayer(username=data.username, sid=sid).json())
     game_data = PlayGame.parse_raw(redis_res)
     session = {
         "game_pin": data.game_pin,
@@ -115,7 +120,7 @@ async def rejoin_game(sid: str, data: dict):
         "sid_custom": sid,
         "admin": False,
     }
-    await sio.save_session(sid, session)
+    await save_session(sid, sio, session)
     await sio.enter_room(sid, data.game_pin)
     await sio.emit(
         "rejoined_game",
@@ -151,7 +156,10 @@ async def join_game(sid: str, data: dict):
                     try:
                         async with session.post(
                             "https://hcaptcha.com/siteverify",
-                            data={"response": data.captcha, "secret": settings.hcaptcha_key},
+                            data={
+                                "response": data.captcha,
+                                "secret": settings.hcaptcha_key,
+                            },
                         ) as resp:
                             resp_data = await resp.json()
                             if not resp_data["success"]:
@@ -163,7 +171,10 @@ async def join_game(sid: str, data: dict):
                 elif settings.recaptcha_key is not None:
                     async with session.post(
                         "https://www.google.com/recaptcha/api/siteverify",
-                        data={"secret": settings.recaptcha_key, "response": data.captcha},
+                        data={
+                            "secret": settings.recaptcha_key,
+                            "response": data.captcha,
+                        },
                     ) as resp:
                         try:
                             resp_data = await resp.json()
@@ -186,7 +197,7 @@ async def join_game(sid: str, data: dict):
         "sid_custom": sid,
         "admin": False,
     }
-    await sio.save_session(sid, session)
+    await save_session(sid, sio, session)
     await sio.emit(
         "joined_game",
         {
@@ -198,11 +209,18 @@ async def join_game(sid: str, data: dict):
     redis_res = await redis.get(f"game_session:{data.game_pin}")
     redis_res = GameSession.parse_raw(redis_res)
     await redis.set(f"game_session:{data.game_pin}:players:{data.username}", sid, ex=7200)
-    await redis.sadd(f"game_session:{data.game_pin}:players", GamePlayer(username=data.username, sid=sid).json())
+    await redis.sadd(
+        f"game_session:{data.game_pin}:players",
+        GamePlayer(username=data.username, sid=sid).json(),
+    )
     if data.custom_field == "":
         data.custom_field = None
     if data.custom_field is not None:
-        await redis.hset(f"game:{data.game_pin}:players:custom_fields", data.username, data.custom_field)
+        await redis.hset(
+            f"game:{data.game_pin}:players:custom_fields",
+            data.username,
+            data.custom_field,
+        )
 
     # await redis.set(
     #     f"game_session:{data.game_pin}",
@@ -223,7 +241,7 @@ async def join_game(sid: str, data: dict):
 
 @sio.event
 async def start_game(sid: str, _data: dict):
-    session = await sio.get_session(sid)
+    session = await get_session(sid, sio)
     if not session["admin"]:
         return
     game_data = PlayGame.parse_raw(await redis.get(f"game:{session['game_pin']}"))
@@ -260,10 +278,11 @@ async def register_as_admin(sid: str, data: dict):
             {"game_id": game_id, "game": await redis.get(f"game:{game_pin}")},
             room=sid,
         )
-        async with sio.session(sid) as session:
-            session["game_pin"] = game_pin
-            session["admin"] = True
-            session["remote"] = False
+        session = {}
+        session["game_pin"] = game_pin
+        session["admin"] = True
+        session["remote"] = False
+        await save_session(sid, sio, session)
         await sio.enter_room(sid, game_pin)
         await sio.enter_room(sid, f"admin:{data.game_pin}")
     else:
@@ -272,7 +291,7 @@ async def register_as_admin(sid: str, data: dict):
 
 @sio.event
 async def get_question_results(sid: str, data: dict):
-    session = await sio.get_session(sid)
+    session = await get_session(sid, sio)
     if not session["admin"]:
         return
 
@@ -280,7 +299,7 @@ async def get_question_results(sid: str, data: dict):
     if redis_res is None:
         redis_res = []
     else:
-        redis_res = AnswerDataList.parse_raw(redis_res).dict()["__root__"]
+        redis_res = AnswerDataList.parse_raw(redis_res).model_dump()
     game_data = PlayGame.parse_raw(await redis.get(f"game:{session['game_pin']}"))
     game_data.question_show = False
     await redis.set(f"game:{session['game_pin']}", game_data.json())
@@ -291,7 +310,7 @@ async def get_question_results(sid: str, data: dict):
 
 class ABCDQuizAnswerWithoutSolution(BaseModel):
     answer: str
-    color: str | None
+    color: str | None = None
 
 
 class RangeQuizAnswerWithoutSolution(BaseModel):
@@ -318,7 +337,7 @@ class ReturnQuestion(QuizQuestion):
 @sio.event
 async def set_question_number(sid, data: str):
     # data is just a number (as a str) of the question
-    session = await sio.get_session(sid)
+    session = await get_session(sid, sio)
     if not session["admin"]:
         return
     game_pin = session["game_pin"]
@@ -360,7 +379,7 @@ class _SubmitAnswerDataOrderType(BaseModel):
 class _SubmitAnswerData(BaseModel):
     question_index: int
     answer: str
-    complex_answer: list[_SubmitAnswerDataOrderType] | None
+    complex_answer: list[_SubmitAnswerDataOrderType] | None = None
 
 
 @sio.event
@@ -372,7 +391,7 @@ async def submit_answer(sid: str, data: dict):
         await sio.emit("error", room=sid)
         print(e)
         return
-    session = await sio.get_session(sid)
+    session = await get_session(sid, sio)
     game_data = PlayGame.parse_raw(await redis.get(f"game:{session['game_pin']}"))
     answer_right = False
     if game_data.questions[int(float(data.question_index))].type == QuizQuestionType.ABCD:
@@ -423,14 +442,15 @@ async def submit_answer(sid: str, data: dict):
         answer_right = bool(correct_string == data.answer)
     else:
         raise NotImplementedError
-    latency = int(float((await sio.get_session(sid))["ping"]))
+    latency = int(float((await get_session(sid, sio))["ping"]))
     time_q_started = datetime.fromisoformat(await redis.get(f"game:{session['game_pin']}:current_time"))
 
     diff = (time_q_started - now).total_seconds() * 1000  # - timedelta(milliseconds=latency)
     score = 0
     if answer_right:
         score = calculate_score(
-            abs(diff) - latency, int(float(game_data.questions[int(float(data.question_index))].time))
+            abs(diff) - latency,
+            int(float(game_data.questions[int(float(data.question_index))].time)),
         )
         if score > 1000:
             score = 1000
@@ -444,11 +464,14 @@ async def submit_answer(sid: str, data: dict):
     )
     answers = await redis.get(f"game_session:{session['game_pin']}:{data.question_index}")
     answers = await set_answer(
-        answers, game_pin=session["game_pin"], data=answer_data, q_index=int(float(data.question_index))
+        answers,
+        game_pin=session["game_pin"],
+        data=answer_data,
+        q_index=int(float(data.question_index)),
     )
     player_count = await redis.scard(f"game_session:{session['game_pin']}:players")
     await sio.emit("player_answer", {})
-    if len(answers.__root__) == player_count:
+    if len(answers.root) == player_count:
         # await sio.emit(
         #     "question_results",
         #     await redis.get(f"game_session:{session['game_pin']}:{data.question_index}"),
@@ -465,7 +488,7 @@ async def submit_answer(sid: str, data: dict):
 
 @sio.event
 async def get_final_results(sid: str, _data: dict):
-    session: dict = await sio.get_session(sid)
+    session: dict = await get_session(sid, sio)
     game_data = PlayGame(**json.loads(await redis.get(f"game:{session['game_pin']}")))
     if not session["admin"]:
         return
@@ -475,7 +498,7 @@ async def get_final_results(sid: str, _data: dict):
 
 @sio.event
 async def get_export_token(sid: str):
-    session = await sio.get_session(sid)
+    session = await get_session(sid, sio)
     if not session["admin"]:
         return
     game_data = PlayGame(**json.loads(await redis.get(f"game:{session['game_pin']}")))
@@ -487,11 +510,15 @@ async def get_export_token(sid: str):
 
 @sio.event
 async def show_solutions(sid: str, _data: dict):
-    session: dict = await sio.get_session(sid)
+    session: dict = await get_session(sid, sio)
     game_data = PlayGame(**json.loads(await redis.get(f"game:{session['game_pin']}")))
     if not session["admin"]:
         return
-    await sio.emit("solutions", game_data.questions[game_data.current_question].dict(), room=session["game_pin"])
+    await sio.emit(
+        "solutions",
+        game_data.questions[game_data.current_question].dict(),
+        room=session["game_pin"],
+    )
 
 
 @sio.event
@@ -500,8 +527,9 @@ async def echo_time_sync(sid: str, data: str):
     then = datetime.fromisoformat(then_dec)
     now = datetime.now()
     delta = now - then
-    async with sio.session(sid) as session:
-        session["ping"] = delta.microseconds / 1000
+    session = await get_session(sid, sio)
+    session["ping"] = delta.microseconds / 1000
+    await save_session(sid, sio, session)
 
 
 class _KickPlayerInput(BaseModel):
@@ -517,13 +545,14 @@ async def kick_player(sid: str, data: dict):
         print(e)
         return
 
-    session: dict = await sio.get_session(sid)
+    session: dict = await get_session(sid, sio)
     if not session["admin"]:
         return
 
     player_sid = await redis.get(f"game_session:{session['game_pin']}:players:{data.username}")
     await redis.srem(
-        f"game_session:{session['game_pin']}:players", GamePlayer(username=data.username, sid=player_sid).json()
+        f"game_session:{session['game_pin']}:players",
+        GamePlayer(username=data.username, sid=player_sid).json(),
     )
     await sio.leave_room(player_sid, session["game_pin"])
     await sio.emit("kick", room=player_sid)
@@ -548,10 +577,11 @@ async def register_as_remote(sid: str, data: dict):
         room=sid,
     )
     await sio.emit("control_visibility", {"visible": False}, room=f"admin:{data.game_pin}")
-    async with sio.session(sid) as session:
-        session["game_pin"] = data.game_pin
-        session["admin"] = True
-        session["remote"] = True
+    session = await get_session(sid, sio)
+    session["game_pin"] = data.game_pin
+    session["admin"] = True
+    session["remote"] = True
+    await save_session(sid, sio, session)
     await sio.enter_room(sid, data.game_pin)
     await sio.enter_room(sid, f"admin:{data.game_pin}")
 
@@ -568,14 +598,31 @@ async def set_control_visibility(sid: str, data: dict):
         await sio.emit("error", room=sid)
         print(e)
         return
-    session: dict = await sio.get_session(sid)
-    await sio.emit("control_visibility", {"visible": data.visible}, room=f"admin:{session['game_pin']}")
+    session: dict = await get_session(sid, sio)
+    await sio.emit(
+        "control_visibility",
+        {"visible": data.visible},
+        room=f"admin:{session['game_pin']}",
+    )
 
 
 @sio.event
 async def save_quiz(sid: str):
-    session: dict = await sio.get_session(sid)
+    session: dict = await get_session(sid, sio)
     if not session["admin"]:
         return
     await save_quiz_to_storage(session["game_pin"])
     await sio.emit("results_saved_successfully")
+
+
+class ConnectSessionIdEvent(BaseModel):
+    session_id: str
+
+
+@sio.event
+async def connect(sid: str, _environ, _auth):
+    session_id = os.urandom(16).hex()
+    print("Connection opened with handler")
+    sio_session = {"session_id": session_id}
+    await sio.save_session(sid, sio_session)
+    await sio.emit("session_id", ConnectSessionIdEvent(session_id=session_id).dict())

classquiz/socket_server/session.py

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
+#
+# SPDX-License-Identifier: MPL-2.0
+
+from classquiz.config import redis
+import json
+from typing import Any
+from socketio import AsyncServer
+from socketio.exceptions import ConnectionRefusedError
+
+
+async def get_session(sid: str, sio: AsyncServer, disconnect_on_error: bool = True) -> dict:
+    session_id = (await sio.get_session(sid)).get("session_id")
+    if session_id is None:
+        raise ConnectionRefusedError("Session not configured")
+    val = await redis.get(f"socket_io_session:{session_id}")
+    if disconnect_on_error and val is None:
+        raise ConnectionRefusedError("session not available")
+    return json.loads(val)
+
+
+async def save_session(sid: str, sio: AsyncServer, data: Any, disconnect_on_error: bool = True) -> None:
+    session_id = (await sio.get_session(sid)).get("session_id")
+    if session_id is None:
+        raise ConnectionRefusedError("Session not configured")
+    await redis.set(f"socket_io_session:{session_id}", json.dumps(data), ex=3600)

classquiz/worker/__init__.py

@@ -27,4 +27,4 @@ class WorkerSettings:
     cron_jobs = [cron(clean_editor_images_up, hour={0, 6, 12, 18}, minute=0)]
     on_startup = startup
     on_shutdown = shutdown
-    redis_settings = RedisSettings.from_dsn(settings.redis)
+    redis_settings = RedisSettings.from_dsn(str(settings.redis))