Update app.py

app.py

@@ -4,14 +4,13 @@ import time
 import threading
 import asyncio
 from io import BytesIO
-from typing import Union
 import requests
 import boto3
 import torch
 import safetensors
 import soundfile as sf
 import numpy as np
-from fastapi import FastAPI, HTTPException, Response, Request, UploadFile, File
+from fastapi import FastAPI, HTTPException, Request, UploadFile, File
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, ValidationError, field_validator
 from transformers import (
@@ -50,8 +49,6 @@ class GenerateRequest(BaseModel):
     chunk_delay: float = 0.0
     stop_sequences: list[str] = []
 
-    model_config = {"protected_namespaces": ()}
-
     @field_validator("model_name")
     def model_name_cannot_be_empty(cls, v):
         if not v:
@@ -71,13 +68,13 @@ class S3ModelLoader:
         self.s3_client = s3_client
 
     def _get_s3_uri(self, model_name):
-        return f"s3://{self.bucket_name}/{model_name.replace('/', '-')}"
+        return f"s3://{self.bucket_name}/lilmeaty_garca/{model_name.replace('/', '-')}"
     
     def _download_from_s3(self, model_name):
         s3_uri = self._get_s3_uri(model_name)
         try:
             logging.info(f"Attempting to load model {model_name} from S3...")
-            model_files = self.s3_client.list_objects_v2(Bucket=self.bucket_name, Prefix=model_name)
+            model_files = self.s3_client.list_objects_v2(Bucket=self.bucket_name, Prefix=f"lilmeaty_garca/{model_name}")
             if "Contents" not in model_files:
                 raise FileNotFoundError(f"Model files not found in S3 for {model_name}")
 
@@ -99,7 +96,6 @@ class S3ModelLoader:
 
     async def load_model_and_tokenizer(self, model_name):
         try:
-            # Offload the blocking I/O to a separate thread
             model_dir = await asyncio.to_thread(self._download_from_s3, model_name)
             config = AutoConfig.from_pretrained(model_dir)
             tokenizer = AutoTokenizer.from_pretrained(model_dir, config=config)
@@ -115,7 +111,7 @@ class S3ModelLoader:
         try:
             logging.info(f"Downloading model {model_name} from Hugging Face...")
             model_dir = hf_hub_download(model_name, token=HUGGINGFACE_HUB_TOKEN)
-            self.s3_client.upload_file(model_dir, self.bucket_name, model_name)
+            self.s3_client.upload_file(model_dir, self.bucket_name, f"lilmeaty_garca/{model_name}")
             logging.info(f"Model {model_name} saved to S3 successfully.")
         except Exception as e:
             logging.error(f"Error downloading model {model_name} from Hugging Face: {e}")