Revert "feat: add flow blockers"

This reverts commit 29098903dfdf5988a4f7083a15a9fd9f799d5b88.

src/agent/state.py

@@ -1,29 +1,24 @@
 """Simple in-memory user state storage."""
 
 from typing import Dict
-from threading import Lock
 
 from agent.models import UserState
 
 _USER_STATE: Dict[str, UserState] = {}
-_STATE_LOCK = Lock()
 
 
 def get_user_state(user_hash: str) -> UserState:
     """Return user state for the given id, creating it if necessary."""
-    with _STATE_LOCK:
-        if user_hash not in _USER_STATE:
-            _USER_STATE[user_hash] = UserState()
-        return _USER_STATE[user_hash]
+    if user_hash not in _USER_STATE:
+        _USER_STATE[user_hash] = UserState()
+    return _USER_STATE[user_hash]
 
 
 def set_user_state(user_hash: str, state: UserState) -> None:
     """Persist updated user state."""
-    with _STATE_LOCK:
-        _USER_STATE[user_hash] = state
+    _USER_STATE[user_hash] = state
 
 
 def reset_user_state(user_hash: str) -> None:
     """Reset stored state for a user."""
-    with _STATE_LOCK:
-        _USER_STATE[user_hash] = UserState()
+    _USER_STATE[user_hash] = UserState()

src/audio/audio_generator.py

@@ -7,16 +7,14 @@ import queue
 import logging
 import io
 import time
-from threading import Lock
 
 logger = logging.getLogger(__name__)
 
 client = genai.Client(api_key=settings.gemini_api_key.get_secret_value(), http_options={'api_version': 'v1alpha'})
 
 async def generate_music(user_hash: str, music_tone: str, receive_audio):
-    with _SESSIONS_LOCK:
-        if user_hash in sessions:
-            return
+    if user_hash in sessions:
+        return
     async with (
         client.aio.live.music.connect(model='models/lyria-realtime-exp') as session,
         asyncio.TaskGroup() as tg,
@@ -34,19 +32,15 @@ async def generate_music(user_hash: str, music_tone: str, receive_audio):
           config=types.LiveMusicGenerationConfig(bpm=90, temperature=1.0)
         )
         await session.play()
-        logger.info(
-            f"Started music generation for user hash {user_hash}, music tone: {music_tone}"
-        )
-        with _SESSIONS_LOCK:
-            sessions[user_hash] = {
-                'session': session,
-                'queue': queue.Queue()
-            }
+        logger.info(f"Started music generation for user hash {user_hash}, music tone: {music_tone}")
+        sessions[user_hash] = {
+            'session': session,
+            'queue': queue.Queue()
+        }
         
 async def change_music_tone(user_hash: str, new_tone):
     logger.info(f"Changing music tone to {new_tone}")
-    with _SESSIONS_LOCK:
-        session = sessions.get(user_hash, {}).get('session')
+    session = sessions.get(user_hash, {}).get('session')
     if not session:
         logger.error(f"No session found for user hash {user_hash}")
         return
@@ -75,36 +69,27 @@ async def receive_audio(session, user_hash):
             break
 
 sessions = {}
-_SESSIONS_LOCK = Lock()
 
 async def start_music_generation(user_hash: str, music_tone: str):
     """Start the music generation in a separate thread."""
     await generate_music(user_hash, music_tone, receive_audio)
-
+    
 async def cleanup_music_session(user_hash: str):
-    with _SESSIONS_LOCK:
-        session_info = sessions.get(user_hash)
-        if not session_info:
-            return
+    if user_hash in sessions:
         logger.info(f"Cleaning up music session for user hash {user_hash}")
-        session = session_info['session']
-        try:
-            await session.stop()
-            await session.close()
-        except Exception as exc:  # noqa: BLE001
-            logger.error(f"Error closing music session: {exc}")
+        session = sessions[user_hash]['session']
+        await session.stop()
+        await session.close()
         del sessions[user_hash]
     
 
 def update_audio(user_hash):
     """Continuously stream audio from the queue as WAV bytes."""
     while True:
-        with _SESSIONS_LOCK:
-            session_info = sessions.get(user_hash)
-        if not session_info:
+        if user_hash not in sessions:
             time.sleep(0.5)
             continue
-        queue = session_info['queue']
+        queue = sessions[user_hash]['queue']
         pcm_data = queue.get() # This is raw PCM audio bytes
         
         if not isinstance(pcm_data, bytes):
@@ -132,4 +117,4 @@ def update_audio(user_hash):
             wf.setframerate(SAMPLE_RATE)
             wf.writeframes(pcm_data)
         wav_bytes = wav_buffer.getvalue()
-        yield wav_bytes
+        yield wav_bytes

src/images/image_generator.py

@@ -4,7 +4,6 @@ import os
 from PIL import Image
 from io import BytesIO
 from datetime import datetime
-import uuid
 from config import settings
 import logging
 import asyncio
@@ -64,9 +63,9 @@ async def generate_image(prompt: str) -> tuple[str, str] | None:
         image_saved = False
         for part in response.candidates[0].content.parts:
             if part.inline_data is not None:
-                # Create a filename with timestamp and uuid to avoid collisions
+                # Create a filename with timestamp
                 timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-                filename = f"gemini_{timestamp}_{uuid.uuid4().hex}.png"
+                filename = f"gemini_{timestamp}.png"
                 filepath = os.path.join(output_dir, filename)
 
                 # Save the image
@@ -131,9 +130,9 @@ async def modify_image(image_path: str, modification_prompt: str) -> str | None:
         image_saved = False
         for part in response.candidates[0].content.parts:
             if part.inline_data is not None:
-                # Create a filename with timestamp and uuid to avoid collisions
+                # Create a filename with timestamp
                 timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-                filename = f"gemini_modified_{timestamp}_{uuid.uuid4().hex}.png"
+                filename = f"gemini_modified_{timestamp}.png"
                 filepath = os.path.join(output_dir, filename)
 
                 # Save the modified image

src/main.py

@@ -61,8 +61,7 @@ async def update_scene(user_hash: str, choice):
         return (
             gr.update(value=ending_text),
             gr.update(value=ending_image),
-            gr.Dropdown(choices=[], label="", value=None, visible=False,
-                        allow_custom_value=True),
+            gr.Radio(choices=[], label="", value=None, visible=False),
             gr.update(value="", visible=False),
         )
 
@@ -70,11 +69,10 @@ async def update_scene(user_hash: str, choice):
     return (
         scene["description"],
         scene.get("image", ""),
-        gr.Dropdown(
+        gr.Radio(
             choices=[ch["text"] for ch in scene.get("choices", [])],
             label="What do you choose? (select an option or write your own)",
             value=None,
-            allow_custom_value=True,
             elem_classes=["choice-buttons"],
         ),
         gr.update(value=""),
@@ -263,11 +261,10 @@ with gr.Blocks(
                 lines=3,
             )
             with gr.Column(elem_classes=["choice-area"]):
-                game_choices = gr.Dropdown(
+                game_choices = gr.Radio(
                     choices=[],
                     label="What do you choose? (select an option or write your own)",
                     value=None,
-                    allow_custom_value=True,
                     elem_classes=["choice-buttons"],
                 )
                 custom_choice = gr.Textbox(