Update app.py

app.py

@@ -16,12 +16,15 @@ from aiocache import Cache
 # Google Cloud Imports
 from google.cloud import storage
 from google.oauth2 import service_account
+
 # --- CONFIGURATION ---
 BUCKET_NAME = os.environ.get("GCP_BUCKET_NAME")
+
 # Handle Credentials: If provided as a raw JSON string in env var
 CREDENTIALS_JSON = os.environ.get("GCP_CREDENTIALS")
 # --- STORAGE MAP ---
 # Defines the folder structure inside the bucket
+
 STORAGE_MAP = {
     "song": {"folder": "songs/", "index": "songs/_songs.json"},
     "pattern": {"folder": "patterns/", "index": "patterns/_patterns.json"},
@@ -42,6 +45,7 @@ bucket = None
 io_executor = ThreadPoolExecutor(max_workers=20)
 cache = Cache(Cache.MEMORY)
 INDEX_LOCK = asyncio.Lock() # Prevents race conditions during index writes
+
 # --- HELPERS ---
 def get_gcs_client():
     """Initializes the GCS Client from environment variable string or file"""
@@ -54,10 +58,12 @@ def get_gcs_client():
     else:
         # Fallback to standard environment variable lookups (local dev)
         return storage.Client()
+        
 async def run_io(func, *args, **kwargs):
     """Runs blocking GCS I/O in a thread pool"""
     loop = asyncio.get_running_loop()
     return await loop.run_in_executor(io_executor, lambda: func(*args, **kwargs))
+    
 # --- LIFESPAN ---
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -70,7 +76,9 @@ async def lifespan(app: FastAPI):
         print(f"!!! GCS CONNECTION FAILED: {e}")
     yield
     io_executor.shutdown()
+    
 app = FastAPI(lifespan=lifespan)
+
 # --- CORS ---
 # Replace ["*"] with your actual external site URL to prevent strangers from using your API
 ALLOWED_ORIGINS = [
@@ -79,6 +87,7 @@ ALLOWED_ORIGINS = [
     "https://go.1ink.us", # <--- REPLACE THIS with your actual site
     "https://noahcohn.com", # <--- REPLACE THIS with your actual site
 ]
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=ALLOWED_ORIGINS, # Uses the list above
@@ -86,6 +95,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
+
 # --- DIRECT STORAGE LISTING ---
 @app.get("/api/storage/files")
 async def list_gcs_folder(folder: str = Query(..., description="Folder name, e.g., 'songs' or 'samples'")):
@@ -118,6 +128,7 @@ async def list_gcs_folder(folder: str = Query(..., description="Folder name, e.g
         return {"folder": prefix, "count": len(files), "files": files}
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+        
 # --- MODELS ---
 class ItemPayload(BaseModel):
     name: str
@@ -126,6 +137,7 @@ class ItemPayload(BaseModel):
     type: str = "song"
     data: dict
     rating: Optional[int] = None
+    
 class MetaData(BaseModel):
     id: str
     name: str
@@ -138,12 +150,21 @@ class MetaData(BaseModel):
     genre: Optional[str] = None
     last_played: Optional[str] = None # ISO timestamp
     tags: List[str] = Field(default_factory=list) # ← ADD THIS
+
+class ShaderCategory(str, Enum):
+    generative = "generative"
+    reactive = "reactive"
+    transition = "transition"
+    filter = "filter"
+    distortion = "distortion"
+    
 # --- GCS I/O HELPERS ---
 def _read_json_sync(blob_path):
     blob = bucket.blob(blob_path)
     if blob.exists():
         return json.loads(blob.download_as_text())
     return []
+    
 def _write_json_sync(blob_path, data):
     blob = bucket.blob(blob_path)
     # Upload as JSON string with correct content type
@@ -151,10 +172,12 @@ def _write_json_sync(blob_path, data):
         json.dumps(data),
         content_type='application/json'
     )
+    
 # --- ENDPOINTS ---
 @app.get("/")
 def home():
     return {"status": "online", "provider": "Google Cloud Storage"}
+    
 # --- 0.5 HEALTH CHECK & TEST DATA ---
 @app.post("/api/admin/sync-music")
 async def sync_music_folder():
@@ -225,6 +248,7 @@ async def sync_music_folder():
            
         except Exception as e:
             raise HTTPException(500, f"Failed to sync music: {str(e)}")
+            
 @app.post("/api/admin/seed-test-samples")
 async def seed_test_samples():
     """Creates test sample entries for development."""
@@ -287,6 +311,7 @@ async def seed_test_samples():
             return {"success": True, "added": added, "total": len(index_data)}
         except Exception as e:
             raise HTTPException(500, f"Failed to seed: {str(e)}")
+            
 @app.get("/api/health")
 async def health_check():
     """Returns storage manager status and index counts."""
@@ -301,14 +326,17 @@ async def health_check():
         except Exception as e:
             status[item_type] = {"count": 0, "status": "error", "error": str(e)}
     return {"status": "online", "storage": status}
+    
 # --- 1. LISTING (Cached) ---
 from enum import Enum
+
 class SortBy(str, Enum):
     date = "date"
     rating = "rating"
     name = "name"
     last_played = "last_played"
     genre = "genre"
+    
 @app.get("/api/songs", response_model=List[MetaData])
 async def list_library(
     type: Optional[str] = Query(None),
@@ -321,7 +349,7 @@ async def list_library(
     cached = await cache.get(cache_key)
     if cached:
         return cached
-    search_types = [type] if type else ["song", "pattern", "bank", "sample", "music"]
+    search_types = [type] if type else ["song", "pattern", "bank", "sample", "music", "shader"]
     results = []
     for t in search_types:
         config = STORAGE_MAP.get(t, STORAGE_MAP["default"])
@@ -348,6 +376,7 @@ async def list_library(
     results.sort(key=sort_key, reverse=sort_desc)
     await cache.set(cache_key, results, ttl=30)
     return results
+    
 # --- 2. UPLOAD JSON ---
 @app.post("/api/songs")
 async def upload_item(payload: ItemPayload):
@@ -384,6 +413,7 @@ async def upload_item(payload: ItemPayload):
             return {"success": True, "id": item_id}
         except Exception as e:
             raise HTTPException(500, f"Upload failed: {str(e)}")
+            
 # --- 2.5 UPDATE JSON (PUT) ---
 @app.put("/api/songs/{item_id}")
 async def update_item(item_id: str, payload: ItemPayload):
@@ -445,6 +475,7 @@ async def update_item(item_id: str, payload: ItemPayload):
             return {"success": True, "id": item_id, "action": "updated"}
         except Exception as e:
             raise HTTPException(500, f"Update failed: {str(e)}")
+            
 # --- 3. FETCH METADATA (without full data) ---
 @app.get("/api/songs/{item_id}/meta")
 async def get_item_metadata(item_id: str, type: Optional[str] = Query(None)):
@@ -468,6 +499,7 @@ async def get_item_metadata(item_id: str, type: Optional[str] = Query(None)):
                 return entry
    
     raise HTTPException(404, "Item not found")
+    
 # --- 3.5 FETCH JSON ITEM ---
 @app.get("/api/songs/{item_id}")
 async def get_item(item_id: str, type: Optional[str] = Query(None)):
@@ -483,6 +515,7 @@ async def get_item(item_id: str, type: Optional[str] = Query(None)):
             data = await run_io(blob.download_as_text)
             return json.loads(data)
     raise HTTPException(404, "Item not found")
+    
 # --- 4. STREAMING SAMPLES (Upload & Download) ---
 @app.post("/api/samples")
 async def upload_sample(
@@ -524,6 +557,7 @@ async def upload_sample(
             return {"success": True, "id": sample_id}
         except Exception as e:
             raise HTTPException(500, str(e))
+            
 @app.get("/api/samples/{sample_id}")
 async def get_sample(sample_id: str):
     config = STORAGE_MAP["sample"]
@@ -548,6 +582,7 @@ async def get_sample(sample_id: str):
         headers={
             "Content-Disposition": f"attachment; filename={entry['name']}"}
     )
+    
 # --- 4.4 RECORD PLAY ---
 @app.post("/api/samples/{sample_id}/play")
 async def record_play(sample_id: str):
@@ -574,6 +609,7 @@ async def record_play(sample_id: str):
         except Exception as e:
             logging.error(f"Failed to record play for {sample_id}: {e}")
             raise HTTPException(status_code=500, detail=f"Failed to record play: {str(e)}")
+            
 # --- 4.5 UPDATE SAMPLE METADATA ---
 class SampleMetaUpdatePayload(BaseModel):
     """Payload for updating a sample's metadata."""
@@ -583,6 +619,7 @@ class SampleMetaUpdatePayload(BaseModel):
         None, ge=1, le=10, description="A rating from 1 to 10.")
     genre: Optional[str] = None
     last_played: Optional[str] = None # ISO timestamp
+    
 @app.put("/api/samples/{sample_id}")
 async def update_sample_metadata(sample_id: str, payload: SampleMetaUpdatePayload):
     """
@@ -637,6 +674,7 @@ async def update_sample_metadata(sample_id: str, payload: SampleMetaUpdatePayloa
                 f"Failed to update sample metadata for {sample_id}: {e}")
             raise HTTPException(
                 status_code=500, detail=f"Failed to update sample metadata: {str(e)}")
+            
 # --- 4.6 MUSIC ENDPOINTS ---
 @app.get("/api/music/{music_id}")
 async def get_music_file(music_id: str):
@@ -678,6 +716,7 @@ async def get_music_file(music_id: str):
         media_type=media_type,
         headers={"Content-Disposition": f'inline; filename="{entry["name"]}"'}
     )
+    
 @app.put("/api/music/{music_id}")
 async def update_music_metadata(music_id: str, payload: SampleMetaUpdatePayload):
     """Updates metadata for a music track."""
@@ -725,15 +764,19 @@ async def update_music_metadata(music_id: str, payload: SampleMetaUpdatePayload)
         except Exception as e:
             logging.error(f"Failed to update music metadata: {e}")
             raise HTTPException(status_code=500, detail=f"Failed to update: {str(e)}")
+            
 # --- 5. SMART SYNC (The "Magic" Button) ---
 from pydantic import Field
+
 from typing import Optional, List
+
 class MetaPatch(BaseModel):
     name: Optional[str] = None
     rating: Optional[int] = Field(None, ge=0, le=10)
     genre: Optional[str] = None
     tags: Optional[List[str]] = None # full list (replace)
     last_played: Optional[str] = None # ISO string
+    
 @app.patch("/api/songs/{item_id}")
 async def patch_song(item_id: str, patch: MetaPatch):
     config = STORAGE_MAP["song"] # ← FIXED HERE
@@ -843,6 +886,7 @@ async def sync_gcs_storage():
                 report[item_type] = {"error": str(e)}
         await cache.clear()
         return report
+        
 async def load_metadata(shader_id: str):
     config = STORAGE_MAP["shader"]
     meta_path = f"{config['folder']}{shader_id}/metadata.json"
@@ -859,6 +903,7 @@ async def load_metadata(shader_id: str):
         return meta
     except Exception as e:
         raise HTTPException(404, f"Shader {shader_id} not found: {str(e)}")
+        
 async def save_metadata(shader_id: str, meta: dict):
     config = STORAGE_MAP["shader"]
     meta_path = f"{config['folder']}{shader_id}/metadata.json"
@@ -891,9 +936,11 @@ async def save_metadata(shader_id: str, meta: dict):
     except Exception as e:
         raise HTTPException(500, f"Failed to save metadata: {str(e)}")
 # --- SHADER ENDPOINTS ---
+
 @app.get("/api/shaders/{shader_id}")
 async def get_shader_meta(shader_id: str):
     return await load_metadata(shader_id)
+    
 @app.post("/api/shaders/{shader_id}/rate")
 async def rate_shader(shader_id: str, stars: float = Form(...)):  # 1.0–5.0
     if not 1 <= stars <= 5:
@@ -903,6 +950,7 @@ async def rate_shader(shader_id: str, stars: float = Form(...)):  # 1.0–5.0
     meta["rating_count"] += 1
     await save_metadata(shader_id, meta)
     return meta
+    
 @app.post("/api/shaders/{shader_id}/update")
 async def update_shader_meta(shader_id: str, description: str = Form(None), tags: str = Form(None)):
     meta = await load_metadata(shader_id)
@@ -912,9 +960,10 @@ async def update_shader_meta(shader_id: str, description: str = Form(None), tags
         meta["tags"] = [t.strip() for t in tags.split(",")]
     await save_metadata(shader_id, meta)
     return meta
+    
 @app.get("/api/shaders")
 async def list_shaders(
-    category: Optional[str] = Query(None),
+    category: Optional[ShaderCategory] = Query(None),  # ← Use Enum here
     min_stars: float = Query(0.0, ge=0, le=5),
     sort_by: SortBy = Query(SortBy.rating)
 ):
@@ -929,7 +978,7 @@ async def list_shaders(
             index = []
         # Filters
         if category:
-            index = [s for s in index if category in s.get("tags", []) or category.lower() in s.get("description", "").lower()]
+            index = [s for s in index if category.value in s.get("tags", []) or category.value.lower() in s.get("description", "").lower()]
         if min_stars > 0:
             index = [s for s in index if s.get("stars", 0) >= min_stars]
         # Sort
@@ -944,6 +993,7 @@ async def list_shaders(
         return index
     except Exception as e:
         raise HTTPException(500, f"Failed to list shaders: {str(e)}")
+        
 @app.post("/api/shaders/upload")
 async def upload_shader(
     file: UploadFile = File(...),  # The .wgsl file
@@ -987,6 +1037,20 @@ async def upload_shader(
             return {"success": True, "id": shader_id, "meta": meta}
         except Exception as e:
             raise HTTPException(500, f"Shader upload failed: {str(e)}")
-   
+            
+@app.get("/api/shaders/{shader_id}/code")
+async def get_shader_code(shader_id: str):
+    """Returns the actual .wgsl shader code."""
+    config = STORAGE_MAP["shader"]
+    meta = await load_metadata(shader_id)
+    blob_path = f"{config['folder']}{meta['filename']}"
+    blob = bucket.blob(blob_path)
+    
+    if not await run_io(blob.exists):
+        raise HTTPException(404, "Shader file not found")
+    
+    code = await run_io(blob.download_as_text)
+    return {"id": shader_id, "code": code, "name": meta.get("name")}
+    
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)