slop review WIP

server/reflector/db/meetings.py

@@ -47,20 +47,18 @@ meeting_consent = sa.Table(
     metadata,
     sa.Column("id", sa.String, primary_key=True),
     sa.Column("meeting_id", sa.String, sa.ForeignKey("meeting.id")),
-    sa.Column("user_identifier", sa.String, nullable=True),
+    sa.Column("user_id", sa.String, nullable=True),
     sa.Column("consent_given", sa.Boolean),
     sa.Column("consent_timestamp", sa.DateTime),
-    sa.Column("user_agent", sa.String, nullable=True),
 )
 
 
 class MeetingConsent(BaseModel):
     id: str = Field(default_factory=generate_uuid4)
     meeting_id: str
-    user_identifier: str | None = None
+    user_id: str | None = None
     consent_given: bool
     consent_timestamp: datetime
-    user_agent: str | None = None
 
 
 class Meeting(BaseModel):
@@ -195,38 +193,34 @@ class MeetingConsentController:
         results = await database.fetch_all(query)
         return [MeetingConsent(**result) for result in results]
     
-    async def get_by_meeting_and_user(self, meeting_id: str, user_identifier: str) -> MeetingConsent | None:
+    async def get_by_meeting_and_user(self, meeting_id: str, user_id: str) -> MeetingConsent | None:
         """Get existing consent for a specific user and meeting"""
         query = meeting_consent.select().where(
             meeting_consent.c.meeting_id == meeting_id,
-            meeting_consent.c.user_identifier == user_identifier
+            meeting_consent.c.user_id == user_id
         )
         result = await database.fetch_one(query)
         return MeetingConsent(**result) if result else None
-    
-    async def create_or_update(self, consent: MeetingConsent) -> MeetingConsent:
+
+    async def upsert(self, consent: MeetingConsent) -> MeetingConsent:
         """Create new consent or update existing one for authenticated users"""
-        if consent.user_identifier:
+        if consent.user_id:
             # For authenticated users, check if consent already exists
-            existing = await self.get_by_meeting_and_user(consent.meeting_id, consent.user_identifier)
+            # not transactional but we're ok with that; the consents ain't deleted anyways
+            existing = await self.get_by_meeting_and_user(consent.meeting_id, consent.user_id)
             if existing:
-                # Update existing consent
                 query = meeting_consent.update().where(
                     meeting_consent.c.id == existing.id
                 ).values(
                     consent_given=consent.consent_given,
                     consent_timestamp=consent.consent_timestamp,
-                    user_agent=consent.user_agent
                 )
                 await database.execute(query)
                 
-                # Return updated consent object
                 existing.consent_given = consent.consent_given
                 existing.consent_timestamp = consent.consent_timestamp
-                existing.user_agent = consent.user_agent
                 return existing
-        
-        # For anonymous users or first-time authenticated users, create new record
+
         query = meeting_consent.insert().values(**consent.model_dump())
         await database.execute(query)
         return consent

server/reflector/db/recordings.py

@@ -5,6 +5,7 @@ from uuid import uuid4
 import sqlalchemy as sa
 from pydantic import BaseModel, Field
 from reflector.db import database, metadata
+from reflector.utils import generate_uuid4
 
 recordings = sa.Table(
     "recording",
@@ -22,11 +23,6 @@ recordings = sa.Table(
     sa.Column("meeting_id", sa.String),
 )
 
-
-def generate_uuid4() -> str:
-    return str(uuid4())
-
-
 class Recording(BaseModel):
     id: str = Field(default_factory=generate_uuid4)
     bucket_name: str

server/reflector/db/rooms.py

@@ -6,7 +6,7 @@ import sqlalchemy
 from fastapi import HTTPException
 from pydantic import BaseModel, Field
 from reflector.db import database, metadata
-from reflector.db.transcripts import generate_uuid4
+from reflector.utils import generate_uuid4
 from sqlalchemy.sql import false, or_
 
 rooms = sqlalchemy.Table(

server/reflector/db/transcripts.py

@@ -6,7 +6,7 @@ from contextlib import asynccontextmanager
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Literal
-from uuid import uuid4
+from reflector.utils import generate_uuid4
 
 import sqlalchemy
 from fastapi import HTTPException
@@ -14,7 +14,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from reflector.db import database, metadata
 from reflector.processors.types import Word as ProcessorWord
 from reflector.settings import settings
-from reflector.storage import Storage
+from reflector.storage import Storage, get_transcripts_storage
 from sqlalchemy import Enum
 from sqlalchemy.sql import false, or_
 
@@ -72,23 +72,11 @@ transcripts = sqlalchemy.Table(
     ),
 )
 
-
-def generate_uuid4() -> str:
-    return str(uuid4())
-
-
 def generate_transcript_name() -> str:
     now = datetime.utcnow()
     return f"Transcript {now.strftime('%Y-%m-%d %H:%M:%S')}"
 
 
-def get_storage() -> Storage:
-    return Storage.get_instance(
-        name=settings.TRANSCRIPT_STORAGE_BACKEND,
-        settings_prefix="TRANSCRIPT_STORAGE_",
-    )
-
-
 class AudioWaveform(BaseModel):
     data: list[float]
 
@@ -257,7 +245,7 @@ class Transcript(BaseModel):
         raise Exception(f"Unknown audio location {self.audio_location}")
 
     async def _generate_storage_audio_link(self) -> str:
-        return await get_storage().get_file_url(self.storage_audio_path)
+        return await get_transcripts_storage().get_file_url(self.storage_audio_path)
 
     def _generate_local_audio_link(self) -> str:
         # we need to create an url to be used for diarization
@@ -558,7 +546,7 @@ class TranscriptController:
 
         if transcript.audio_location == "local":
             # store the audio on external storage if it's not already there
-            await get_storage().put_file(
+            await get_transcripts_storage().put_file(
                 transcript.storage_audio_path,
                 transcript.audio_mp3_filename.read_bytes(),
             )
@@ -574,7 +562,7 @@ class TranscriptController:
         Download audio from storage
         """
         transcript.audio_mp3_filename.write_bytes(
-            await get_storage().get_file(
+            await get_transcripts_storage().get_file(
                 transcript.storage_audio_path,
             )
         )