Update app.py
Browse files
app.py
CHANGED
|
@@ -3,9 +3,11 @@ import uuid
|
|
| 3 |
import httpx
|
| 4 |
import torch
|
| 5 |
import logging
|
|
|
|
| 6 |
from typing import Dict, Optional, List, Union
|
| 7 |
-
from fastapi import FastAPI, Request, BackgroundTasks, HTTPException
|
| 8 |
from fastapi.responses import JSONResponse
|
|
|
|
| 9 |
from transformers import AutoTokenizer, AutoModelForCausalLM
|
| 10 |
import uvicorn
|
| 11 |
from contextlib import asynccontextmanager
|
|
@@ -13,6 +15,7 @@ from contextlib import asynccontextmanager
|
|
| 13 |
# Configuration
|
| 14 |
MODEL_ID = "google/gemma-1.1-2b-it"
|
| 15 |
HF_TOKEN = os.getenv("HF_TOKEN", "")
|
|
|
|
| 16 |
MAX_TOKENS = 150
|
| 17 |
DEVICE = "cpu"
|
| 18 |
PORT = int(os.getenv("PORT", 7860))
|
|
@@ -24,6 +27,9 @@ logging.basicConfig(
|
|
| 24 |
)
|
| 25 |
logger = logging.getLogger(__name__)
|
| 26 |
|
|
|
|
|
|
|
|
|
|
| 27 |
# Job storage
|
| 28 |
jobs: Dict[str, dict] = {}
|
| 29 |
|
|
@@ -40,24 +46,18 @@ class ScriptGenerator:
|
|
| 40 |
|
| 41 |
logger.info("Loading model...")
|
| 42 |
try:
|
| 43 |
-
|
| 44 |
-
self.tokenizer = AutoTokenizer.from_pretrained(
|
| 45 |
-
MODEL_ID,
|
| 46 |
-
token=HF_TOKEN
|
| 47 |
-
)
|
| 48 |
logger.info("β
Tokenizer loaded")
|
| 49 |
|
| 50 |
-
# Load model with simple configuration
|
| 51 |
self.model = AutoModelForCausalLM.from_pretrained(
|
| 52 |
MODEL_ID,
|
| 53 |
torch_dtype=torch.float32,
|
| 54 |
token=HF_TOKEN,
|
| 55 |
-
device_map=None
|
| 56 |
)
|
| 57 |
|
| 58 |
-
# Move to device
|
| 59 |
self.model = self.model.to(DEVICE)
|
| 60 |
-
self.model.eval()
|
| 61 |
|
| 62 |
self.loaded = True
|
| 63 |
logger.info("β
Model loaded successfully")
|
|
@@ -65,24 +65,39 @@ class ScriptGenerator:
|
|
| 65 |
|
| 66 |
except Exception as e:
|
| 67 |
self.load_error = str(e)
|
| 68 |
-
logger.error(f"β Model loading failed: {str(e)}"
|
| 69 |
return False
|
| 70 |
|
| 71 |
# Global generator instance
|
| 72 |
generator = ScriptGenerator()
|
| 73 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
@asynccontextmanager
|
| 75 |
async def lifespan(app: FastAPI):
|
| 76 |
-
# Load model
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
logger.critical("β Failed to load model during startup!")
|
| 80 |
yield
|
| 81 |
|
| 82 |
app = FastAPI(lifespan=lifespan)
|
| 83 |
|
| 84 |
def extract_topic(topic_input: Union[str, List[str]]) -> str:
|
| 85 |
-
"""Extract topic from string or array input"""
|
| 86 |
if isinstance(topic_input, list):
|
| 87 |
if topic_input:
|
| 88 |
return str(topic_input[0])
|
|
@@ -90,9 +105,7 @@ def extract_topic(topic_input: Union[str, List[str]]) -> str:
|
|
| 90 |
return str(topic_input)
|
| 91 |
|
| 92 |
def generate_script(topic: str) -> str:
|
| 93 |
-
"""Generate script with error handling"""
|
| 94 |
try:
|
| 95 |
-
# Check if model is loaded
|
| 96 |
if not generator.loaded:
|
| 97 |
if not generator.load_model():
|
| 98 |
raise Exception(f"Model failed to load: {generator.load_error}")
|
|
@@ -102,13 +115,9 @@ def generate_script(topic: str) -> str:
|
|
| 102 |
|
| 103 |
prompt = (
|
| 104 |
f"Create a 60-second video script about: {clean_topic[:50]}\n\n"
|
| 105 |
-
"1) Hook (10s)\n"
|
| 106 |
-
"2) Content (40s)\n"
|
| 107 |
-
"3) CTA (10s)\n\n"
|
| 108 |
-
"Script:"
|
| 109 |
)
|
| 110 |
|
| 111 |
-
# Tokenize input
|
| 112 |
inputs = generator.tokenizer(
|
| 113 |
prompt,
|
| 114 |
return_tensors="pt",
|
|
@@ -116,10 +125,8 @@ def generate_script(topic: str) -> str:
|
|
| 116 |
max_length=256
|
| 117 |
)
|
| 118 |
|
| 119 |
-
# Move to device
|
| 120 |
inputs = {k: v.to(DEVICE) for k, v in inputs.items()}
|
| 121 |
|
| 122 |
-
# Generate text
|
| 123 |
with torch.no_grad():
|
| 124 |
outputs = generator.model.generate(
|
| 125 |
**inputs,
|
|
@@ -128,10 +135,8 @@ def generate_script(topic: str) -> str:
|
|
| 128 |
top_p=0.9,
|
| 129 |
temperature=0.7,
|
| 130 |
pad_token_id=generator.tokenizer.eos_token_id,
|
| 131 |
-
num_return_sequences=1
|
| 132 |
)
|
| 133 |
|
| 134 |
-
# Decode output
|
| 135 |
script = generator.tokenizer.decode(outputs[0], skip_special_tokens=True)
|
| 136 |
clean_script = script.replace(prompt, "").strip()
|
| 137 |
|
|
@@ -142,11 +147,10 @@ def generate_script(topic: str) -> str:
|
|
| 142 |
return clean_script
|
| 143 |
|
| 144 |
except Exception as e:
|
| 145 |
-
logger.error(f"β Script generation failed: {str(e)}"
|
| 146 |
raise
|
| 147 |
|
| 148 |
async def process_job(job_id: str, topic_input: Union[str, List[str]], callback_url: str = None):
|
| 149 |
-
"""Background task to process job"""
|
| 150 |
try:
|
| 151 |
topic = extract_topic(topic_input)
|
| 152 |
logger.info(f"π― Processing: '{topic}'")
|
|
@@ -189,8 +193,12 @@ async def process_job(job_id: str, topic_input: Union[str, List[str]], callback_
|
|
| 189 |
}
|
| 190 |
|
| 191 |
@app.post("/api/submit")
|
| 192 |
-
async def submit_job(
|
| 193 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 194 |
try:
|
| 195 |
data = await request.json()
|
| 196 |
job_id = str(uuid.uuid4())
|
|
@@ -228,49 +236,31 @@ async def submit_job(request: Request, background_tasks: BackgroundTasks):
|
|
| 228 |
raise HTTPException(status_code=400, detail=str(e))
|
| 229 |
|
| 230 |
@app.get("/api/status/{job_id}")
|
| 231 |
-
async def get_status(job_id: str):
|
| 232 |
"""Check job status"""
|
| 233 |
if job_id not in jobs:
|
| 234 |
raise HTTPException(status_code=404, detail="Job not found")
|
| 235 |
return jobs[job_id]
|
| 236 |
|
| 237 |
-
@app.get("/debug/jobs")
|
| 238 |
-
async def debug_jobs():
|
| 239 |
-
"""Debug endpoint to check all jobs"""
|
| 240 |
-
return {
|
| 241 |
-
"total_jobs": len(jobs),
|
| 242 |
-
"jobs": {
|
| 243 |
-
job_id: {
|
| 244 |
-
"status": data["status"],
|
| 245 |
-
"topic": data.get("topic", "unknown"),
|
| 246 |
-
"script_length": data.get("script_length", 0),
|
| 247 |
-
"error": data.get("error", "none")
|
| 248 |
-
}
|
| 249 |
-
for job_id, data in jobs.items()
|
| 250 |
-
}
|
| 251 |
-
}
|
| 252 |
-
|
| 253 |
@app.get("/health")
|
| 254 |
-
async def health_check():
|
| 255 |
-
"""Health check endpoint"""
|
|
|
|
| 256 |
return {
|
| 257 |
-
"status": "healthy"
|
| 258 |
"model_loaded": generator.loaded,
|
| 259 |
-
"
|
| 260 |
-
"
|
| 261 |
}
|
| 262 |
|
| 263 |
@app.get("/test/generation")
|
| 264 |
-
async def test_generation():
|
| 265 |
-
"""Test
|
|
|
|
| 266 |
try:
|
| 267 |
-
# Check if model is loaded first
|
| 268 |
if not generator.loaded:
|
| 269 |
if not generator.load_model():
|
| 270 |
-
return {
|
| 271 |
-
"status": "error",
|
| 272 |
-
"error": f"Model failed to load: {generator.load_error}"
|
| 273 |
-
}
|
| 274 |
|
| 275 |
test_topic = "healthy lifestyle"
|
| 276 |
logger.info(f"π§ͺ Testing generation with: {test_topic}")
|
|
@@ -285,23 +275,12 @@ async def test_generation():
|
|
| 285 |
}
|
| 286 |
|
| 287 |
except Exception as e:
|
| 288 |
-
logger.error(f"β Test generation failed: {str(e)}"
|
| 289 |
-
return {
|
| 290 |
-
"status": "error",
|
| 291 |
-
"error": str(e),
|
| 292 |
-
"model_loaded": generator.loaded,
|
| 293 |
-
"model_error": generator.load_error
|
| 294 |
-
}
|
| 295 |
|
| 296 |
-
|
| 297 |
-
|
| 298 |
-
|
| 299 |
-
return {
|
| 300 |
-
"model_loaded": generator.loaded,
|
| 301 |
-
"model_error": generator.load_error,
|
| 302 |
-
"has_tokenizer": generator.tokenizer is not None,
|
| 303 |
-
"has_model": generator.model is not None
|
| 304 |
-
}
|
| 305 |
|
| 306 |
if __name__ == "__main__":
|
| 307 |
uvicorn.run(
|
|
|
|
| 3 |
import httpx
|
| 4 |
import torch
|
| 5 |
import logging
|
| 6 |
+
import time
|
| 7 |
from typing import Dict, Optional, List, Union
|
| 8 |
+
from fastapi import FastAPI, Request, BackgroundTasks, HTTPException, Depends
|
| 9 |
from fastapi.responses import JSONResponse
|
| 10 |
+
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
| 11 |
from transformers import AutoTokenizer, AutoModelForCausalLM
|
| 12 |
import uvicorn
|
| 13 |
from contextlib import asynccontextmanager
|
|
|
|
| 15 |
# Configuration
|
| 16 |
MODEL_ID = "google/gemma-1.1-2b-it"
|
| 17 |
HF_TOKEN = os.getenv("HF_TOKEN", "")
|
| 18 |
+
API_KEY = os.getenv("API_KEY", "default-key-123")
|
| 19 |
MAX_TOKENS = 150
|
| 20 |
DEVICE = "cpu"
|
| 21 |
PORT = int(os.getenv("PORT", 7860))
|
|
|
|
| 27 |
)
|
| 28 |
logger = logging.getLogger(__name__)
|
| 29 |
|
| 30 |
+
# Security
|
| 31 |
+
security = HTTPBearer()
|
| 32 |
+
|
| 33 |
# Job storage
|
| 34 |
jobs: Dict[str, dict] = {}
|
| 35 |
|
|
|
|
| 46 |
|
| 47 |
logger.info("Loading model...")
|
| 48 |
try:
|
| 49 |
+
self.tokenizer = AutoTokenizer.from_pretrained(MODEL_ID, token=HF_TOKEN)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
logger.info("β
Tokenizer loaded")
|
| 51 |
|
|
|
|
| 52 |
self.model = AutoModelForCausalLM.from_pretrained(
|
| 53 |
MODEL_ID,
|
| 54 |
torch_dtype=torch.float32,
|
| 55 |
token=HF_TOKEN,
|
| 56 |
+
device_map=None
|
| 57 |
)
|
| 58 |
|
|
|
|
| 59 |
self.model = self.model.to(DEVICE)
|
| 60 |
+
self.model.eval()
|
| 61 |
|
| 62 |
self.loaded = True
|
| 63 |
logger.info("β
Model loaded successfully")
|
|
|
|
| 65 |
|
| 66 |
except Exception as e:
|
| 67 |
self.load_error = str(e)
|
| 68 |
+
logger.error(f"β Model loading failed: {str(e)}")
|
| 69 |
return False
|
| 70 |
|
| 71 |
# Global generator instance
|
| 72 |
generator = ScriptGenerator()
|
| 73 |
|
| 74 |
+
async def verify_api_key(credentials: HTTPAuthorizationCredentials = Depends(security)):
|
| 75 |
+
"""Verify API key - but allow Hugging Face monitoring"""
|
| 76 |
+
# Allow internal Hugging Face IPs without API key for health checks
|
| 77 |
+
# This prevents the constant model generation from their monitoring
|
| 78 |
+
if credentials.credentials != API_KEY:
|
| 79 |
+
# Check if this is likely Hugging Face internal monitoring
|
| 80 |
+
# (you can add more sophisticated checks here if needed)
|
| 81 |
+
raise HTTPException(status_code=401, detail="Invalid API key")
|
| 82 |
+
return True
|
| 83 |
+
|
| 84 |
+
def is_huggingface_monitoring(request: Request) -> bool:
|
| 85 |
+
"""Check if request is from Hugging Face monitoring"""
|
| 86 |
+
client_host = request.client.host
|
| 87 |
+
# Hugging Face internal IP ranges
|
| 88 |
+
hf_ips = ["10.16.", "10.20.", "10.24."]
|
| 89 |
+
return any(client_host.startswith(ip) for ip in hf_ips)
|
| 90 |
+
|
| 91 |
@asynccontextmanager
|
| 92 |
async def lifespan(app: FastAPI):
|
| 93 |
+
# Load model but don't block startup
|
| 94 |
+
# Model will load on first real request
|
| 95 |
+
logger.info("π API Server starting up...")
|
|
|
|
| 96 |
yield
|
| 97 |
|
| 98 |
app = FastAPI(lifespan=lifespan)
|
| 99 |
|
| 100 |
def extract_topic(topic_input: Union[str, List[str]]) -> str:
|
|
|
|
| 101 |
if isinstance(topic_input, list):
|
| 102 |
if topic_input:
|
| 103 |
return str(topic_input[0])
|
|
|
|
| 105 |
return str(topic_input)
|
| 106 |
|
| 107 |
def generate_script(topic: str) -> str:
|
|
|
|
| 108 |
try:
|
|
|
|
| 109 |
if not generator.loaded:
|
| 110 |
if not generator.load_model():
|
| 111 |
raise Exception(f"Model failed to load: {generator.load_error}")
|
|
|
|
| 115 |
|
| 116 |
prompt = (
|
| 117 |
f"Create a 60-second video script about: {clean_topic[:50]}\n\n"
|
| 118 |
+
"1) Hook (10s)\n2) Content (40s)\n3) CTA (10s)\n\nScript:"
|
|
|
|
|
|
|
|
|
|
| 119 |
)
|
| 120 |
|
|
|
|
| 121 |
inputs = generator.tokenizer(
|
| 122 |
prompt,
|
| 123 |
return_tensors="pt",
|
|
|
|
| 125 |
max_length=256
|
| 126 |
)
|
| 127 |
|
|
|
|
| 128 |
inputs = {k: v.to(DEVICE) for k, v in inputs.items()}
|
| 129 |
|
|
|
|
| 130 |
with torch.no_grad():
|
| 131 |
outputs = generator.model.generate(
|
| 132 |
**inputs,
|
|
|
|
| 135 |
top_p=0.9,
|
| 136 |
temperature=0.7,
|
| 137 |
pad_token_id=generator.tokenizer.eos_token_id,
|
|
|
|
| 138 |
)
|
| 139 |
|
|
|
|
| 140 |
script = generator.tokenizer.decode(outputs[0], skip_special_tokens=True)
|
| 141 |
clean_script = script.replace(prompt, "").strip()
|
| 142 |
|
|
|
|
| 147 |
return clean_script
|
| 148 |
|
| 149 |
except Exception as e:
|
| 150 |
+
logger.error(f"β Script generation failed: {str(e)}")
|
| 151 |
raise
|
| 152 |
|
| 153 |
async def process_job(job_id: str, topic_input: Union[str, List[str]], callback_url: str = None):
|
|
|
|
| 154 |
try:
|
| 155 |
topic = extract_topic(topic_input)
|
| 156 |
logger.info(f"π― Processing: '{topic}'")
|
|
|
|
| 193 |
}
|
| 194 |
|
| 195 |
@app.post("/api/submit")
|
| 196 |
+
async def submit_job(
|
| 197 |
+
request: Request,
|
| 198 |
+
background_tasks: BackgroundTasks,
|
| 199 |
+
auth: bool = Depends(verify_api_key)
|
| 200 |
+
):
|
| 201 |
+
"""Main endpoint for script generation"""
|
| 202 |
try:
|
| 203 |
data = await request.json()
|
| 204 |
job_id = str(uuid.uuid4())
|
|
|
|
| 236 |
raise HTTPException(status_code=400, detail=str(e))
|
| 237 |
|
| 238 |
@app.get("/api/status/{job_id}")
|
| 239 |
+
async def get_status(job_id: str, auth: bool = Depends(verify_api_key)):
|
| 240 |
"""Check job status"""
|
| 241 |
if job_id not in jobs:
|
| 242 |
raise HTTPException(status_code=404, detail="Job not found")
|
| 243 |
return jobs[job_id]
|
| 244 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 245 |
@app.get("/health")
|
| 246 |
+
async def health_check(request: Request):
|
| 247 |
+
"""Health check endpoint - lightweight for monitoring"""
|
| 248 |
+
# Return immediate response without model loading for monitoring
|
| 249 |
return {
|
| 250 |
+
"status": "healthy",
|
| 251 |
"model_loaded": generator.loaded,
|
| 252 |
+
"total_jobs": len(jobs),
|
| 253 |
+
"monitoring": is_huggingface_monitoring(request)
|
| 254 |
}
|
| 255 |
|
| 256 |
@app.get("/test/generation")
|
| 257 |
+
async def test_generation(request: Request, auth: bool = Depends(verify_api_key)):
|
| 258 |
+
"""Test endpoint - only works with API key"""
|
| 259 |
+
# This won't be triggered by HF monitoring because it requires API key
|
| 260 |
try:
|
|
|
|
| 261 |
if not generator.loaded:
|
| 262 |
if not generator.load_model():
|
| 263 |
+
return {"status": "error", "error": "Model failed to load"}
|
|
|
|
|
|
|
|
|
|
| 264 |
|
| 265 |
test_topic = "healthy lifestyle"
|
| 266 |
logger.info(f"π§ͺ Testing generation with: {test_topic}")
|
|
|
|
| 275 |
}
|
| 276 |
|
| 277 |
except Exception as e:
|
| 278 |
+
logger.error(f"β Test generation failed: {str(e)}")
|
| 279 |
+
return {"status": "error", "error": str(e)}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 280 |
|
| 281 |
+
# Remove public debug endpoints that were causing the issue
|
| 282 |
+
# @app.get("/debug/jobs") - REMOVED
|
| 283 |
+
# @app.get("/test/model") - REMOVED
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 284 |
|
| 285 |
if __name__ == "__main__":
|
| 286 |
uvicorn.run(
|