Update app.py

app.py

@@ -1,34 +1,22 @@
+import os
 import gradio as gr
-from fastapi import FastAPI, HTTPException
-from pydantic import BaseModel
 import json
 import time
-from typing import List, Literal
-
-# FastAPI app
-app = FastAPI(title="SoActi AI Quiz API", version="1.0.0")
-
-# Request/Response models
-class QuizRequest(BaseModel):
-    tema: str
-    språk: Literal["no", "en"] = "no"
-    antall_spørsmål: int = 5
-    type: Literal["sted", "rute"] = "sted"
-    vanskelighetsgrad: int = 3
+from fastapi import FastAPI, HTTPException, Depends, Header
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from pydantic import BaseModel
+from typing import Optional
 
-class QuizQuestion(BaseModel):
-    spørsmål: str
-    alternativer: List[str]
-    korrekt_svar: int
-    forklaring: str
+# Hent API-nøkkel fra miljøvariabler
+API_KEY = os.getenv("SOACTI_API_KEY")
+if not API_KEY:
+    raise ValueError("SOACTI_API_KEY miljøvariabel er ikke satt!")
 
-class QuizResponse(BaseModel):
-    success: bool
-    questions: List[QuizQuestion]
-    metadata: dict
-    message: str
+# FastAPI app
+app = FastAPI(title="SoActi AI Quiz API - Secure")
+security = HTTPBearer()
 
-# Hardkodede spørsmål
+# Hardkodede spørsmål (samme som før)
 QUIZ_DATABASE = {
     "oslo": [
         {
@@ -74,66 +62,107 @@ QUIZ_DATABASE = {
     ]
 }
 
-def get_questions_for_topic(tema: str, antall: int = 5):
-    """Hent spørsmål for et tema"""
-    tema_lower = tema.lower().strip()
-    
-    if tema_lower in QUIZ_DATABASE:
-        questions = QUIZ_DATABASE[tema_lower]
-    elif "oslo" in tema_lower:
-        questions = QUIZ_DATABASE["oslo"]
-    elif "bergen" in tema_lower:
-        questions = QUIZ_DATABASE["bergen"]
-    elif "historie" in tema_lower:
-        questions = QUIZ_DATABASE["norsk historie"]
-    else:
-        questions = QUIZ_DATABASE["oslo"]
-    
-    return questions[:antall]
+# API-nøkkel validering
+async def verify_api_key(credentials: HTTPAuthorizationCredentials = Depends(security)):
+    if credentials.credentials != API_KEY:
+        raise HTTPException(
+            status_code=401,
+            detail="Ugyldig API-nøkkel"
+        )
+    return credentials.credentials
 
-# API Endpoints
-@app.get("/")
-async def root():
-    return {"service": "SoActi AI Quiz API", "status": "running"}
+# Pydantic modeller
+class QuizRequest(BaseModel):
+    tema: str
+    språk: str = "no"
+    antall_spørsmål: int = 5
+    type: str = "multiple_choice"
+    vanskelighetsgrad: int = 3
 
+# API endepunkter
 @app.get("/health")
-async def health():
-    return {"status": "healthy"}
+async def health_check():
+    """Offentlig health check"""
+    return {
+        "status": "healthy", 
+        "service": "SoActi AI Quiz API",
+        "auth_required": True
+    }
 
-@app.post("/generate-quiz", response_model=QuizResponse)
-async def generate_quiz_api(request: QuizRequest):
-    """API endpoint - INGEN AUTENTISERING"""
+@app.post("/generate-quiz")
+async def generate_quiz_secure(
+    request: QuizRequest,
+    api_key: str = Depends(verify_api_key)
+):
+    """Sikret quiz-generering - krever API-nøkkel"""
     try:
-        questions = get_questions_for_topic(request.tema, request.antall_spørsmål)
+        tema_lower = request.tema.lower().strip()
         
-        quiz_questions = [
-            QuizQuestion(
-                spørsmål=q["spørsmål"],
-                alternativer=q["alternativer"],
-                korrekt_svar=q["korrekt_svar"],
-                forklaring=q["forklaring"]
-            )
-            for q in questions
-        ]
+        # Finn riktige spørsmål
+        if tema_lower in QUIZ_DATABASE:
+            questions = QUIZ_DATABASE[tema_lower]
+        elif "oslo" in tema_lower:
+            questions = QUIZ_DATABASE["oslo"]
+        elif "bergen" in tema_lower:
+            questions = QUIZ_DATABASE["bergen"]
+        elif "historie" in tema_lower:
+            questions = QUIZ_DATABASE["norsk historie"]
+        else:
+            questions = QUIZ_DATABASE["oslo"]
         
-        return QuizResponse(
-            success=True,
-            questions=quiz_questions,
-            metadata={"generation_time": 0.1, "model_used": "Database"},
-            message=f"Genererte {len(quiz_questions)} spørsmål"
-        )
+        # Begrens antall spørsmål
+        selected_questions = questions[:request.antall_spørsmål]
+        
+        return {
+            "success": True,
+            "questions": selected_questions,
+            "metadata": {
+                "tema": request.tema,
+                "språk": request.språk,
+                "antall_generert": len(selected_questions),
+                "model_used": "Fallback Database",
+                "generation_time": 0.1,
+                "auth_verified": True
+            }
+        }
         
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(
+            status_code=500, 
+            detail=f"Feil ved quiz-generering: {str(e)}"
+        )
 
-# Gradio interface
-def generate_quiz_gradio(tema, språk, antall, type_val, vanskelighet):
+# Gradio interface (kun for testing)
+def generate_quiz_ui(tema, antall, api_key_input):
+    """Gradio wrapper med API-nøkkel input"""
+    if not api_key_input:
+        return "❌ API-nøkkel er påkrevd"
+    
+    if api_key_input != API_KEY:
+        return "❌ Ugyldig API-nøkkel"
+    
     try:
-        questions = get_questions_for_topic(tema, antall)
+        tema_lower = tema.lower().strip()
         
-        output = f"✅ Genererte {len(questions)} spørsmål om '{tema}'\n\n"
+        if tema_lower in QUIZ_DATABASE:
+            questions = QUIZ_DATABASE[tema_lower]
+        elif "oslo" in tema_lower:
+            questions = QUIZ_DATABASE["oslo"]
+        elif "bergen" in tema_lower:
+            questions = QUIZ_DATABASE["bergen"]
+        elif "historie" in tema_lower:
+            questions = QUIZ_DATABASE["norsk historie"]
+        else:
+            questions = QUIZ_DATABASE["oslo"]
         
-        for i, q in enumerate(questions, 1):
+        selected_questions = questions[:antall]
+        
+        output = f"✅ **Genererte {len(selected_questions)} spørsmål om '{tema}'**\n\n"
+        output += f"🔐 **Autentisert:** Ja\n"
+        output += f"🤖 **Modell:** Fallback Database\n"
+        output += f"⏱️ **Tid:** 0.1s\n\n"
+        
+        for i, q in enumerate(selected_questions, 1):
             output += f"📝 **Spørsmål {i}:** {q['spørsmål']}\n"
             for j, alt in enumerate(q['alternativer']):
                 marker = "✅" if j == q['korrekt_svar'] else "❌"
@@ -143,28 +172,55 @@ def generate_quiz_gradio(tema, språk, antall, type_val, vanskelighet):
         return output
         
     except Exception as e:
-        return f"❌ Feil: {str(e)}"
+        return f"❌ **Feil:** {str(e)}"
 
-with gr.Blocks(title="SoActi AI Quiz API") as demo:
-    gr.Markdown("# 🧠 SoActi AI Quiz API")
+# Gradio interface
+with gr.Blocks(title="SoActi AI Quiz API - Secure") as demo:
+    gr.Markdown("# 🔐 SoActi AI Quiz API - Sikker Versjon")
+    gr.Markdown("**API krever nå autentisering med Bearer token**")
     
     with gr.Row():
         with gr.Column():
-            tema_input = gr.Textbox(label="Tema", value="Oslo")
-            antall_input = gr.Slider(1, 5, 3, label="Antall spørsmål")
+            tema_input = gr.Textbox(
+                label="Tema",
+                value="Oslo",
+                placeholder="Oslo, Bergen, Norsk historie"
+            )
+            antall_input = gr.Slider(
+                minimum=1,
+                maximum=5,
+                step=1,
+                label="Antall spørsmål",
+                value=3
+            )
+            api_key_input = gr.Textbox(
+                label="API-nøkkel (for testing)",
+                type="password",
+                placeholder="Skriv inn API-nøkkel..."
+            )
+            
             generate_btn = gr.Button("🚀 Generer Quiz", variant="primary")
         
         with gr.Column():
-            output = gr.Textbox(label="Quiz", lines=15)
+            output = gr.Textbox(
+                label="Generert Quiz",
+                lines=20,
+                placeholder="Skriv inn API-nøkkel og klikk 'Generer Quiz'..."
+            )
     
     generate_btn.click(
-        fn=generate_quiz_gradio,
-        inputs=[tema_input, gr.Dropdown(["no"], value="no"), antall_input, gr.Dropdown(["sted"], value="sted"), gr.Slider(1, 5, 3)],
+        fn=generate_quiz_ui,
+        inputs=[tema_input, antall_input, api_key_input],
         outputs=output
     )
+    
+    gr.Markdown("## 🔗 API Endepunkt")
+    gr.Markdown("`POST https://Soacti-soacti-ai-quiz-api.hf.space/generate-quiz`")
+    gr.Markdown("**Header:** `Authorization: Bearer [din-api-nøkkel]`")
 
+# Mount Gradio til FastAPI
 app = gr.mount_gradio_app(app, demo, path="/")
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app, host="0.0.0.0", port=7860)