Update app.py

app.py

@@ -4,12 +4,11 @@ from huggingface_hub import hf_hub_download
 import time
 
 # --- Configuration ---
-MODEL_REPO = "Kezovic/iris-q4gguf-baseline-10k"
-MODEL_FILE = "llama-3.2-1b-instruct.Q4_K_M.gguf"
+MODEL_REPO = "Kezovic/iris-q4gguf-nitrallora"
+MODEL_FILE = "Llama-3.2-1B-Instruct.Q4_K_M.gguf"
 CONTEXT_WINDOW = 2048
 MAX_NEW_TOKENS = 400
-TEMPERATURE = 0.7 
-# Note: min_p = 0.1 is kept as requested in the configuration from the previous prompt
+TEMPERATURE = 0.7 # Note: min_p = 0.1 is kept as requested in the configuration from the previous prompt
 
 # --- Model Loading ---
 llm = None
@@ -50,14 +49,12 @@ format_map = {
 # --- Prompt Construction Helper Function (Simplified) ---
 def build_poem_prompt(voice_instruction, constraint_instruction, format_type, topic):
     """Constructs a simple, direct prompt for initial poem generation."""
-    
     # Combined, prioritized instruction block for maximum clarity
     full_instruction = (
         f"You are a highly disciplined creative writer. {voice_instruction} "
         f"You must write a {format_type} about '{topic}'.\n"
         f"STRICT FORMAT RULE: {constraint_instruction}\n"
-        f"Your output must contain ONLY the poem, nothing else. Do NOT include a title.\n\n"
-        f"BEGIN POEM: " # Simple, clear marker for generation start
+        f"Your output must contain ONLY the poem, nothing else. Do NOT include a title.\n"
     )
     return full_instruction
 
@@ -70,26 +67,27 @@ def generate_poem(format_type, persona, topic, progress=gr.Progress()):
         return "Error: Model not loaded."
     if not topic:
         return "Please enter a topic!"
-
+    
     # --- POEM GENERATION ---
     progress(0.2, desc=f"Summoning {persona} and drafting poem...")
     selected_voice = persona_map.get(persona, "You are a helpful assistant.")
     selected_constraint = format_map.get(format_type, "Write a poem.")
     
     full_poem_prompt = build_poem_prompt(selected_voice, selected_constraint, format_type, topic)
-
     output = llm(
         prompt=full_poem_prompt,
         max_tokens=MAX_NEW_TOKENS,
         temperature=TEMPERATURE,
-        stop=["STRICT FORMAT RULE:", "BEGIN POEM:"],
+        # Minimal stop sequences to prevent cutting off the poem prematurely
+        stop=["STRICT FORMAT RULE:", "\n\n\n"], 
         echo=False
     )
     
     # Clean up output
     poem_text = output['choices'][0]['text'].strip()
-    if poem_text.startswith("BEGIN POEM:"):
-        poem_text = poem_text[len("BEGIN POEM:"):].strip()
+    
+    # Simple post-processing to clean up any residual instruction text if the model echoes it
+    # We are trusting the instruction "Your output must contain ONLY the poem, nothing else."
     
     progress(1.0, desc="Poem draft complete!")
     # NOTE: Only returns the poem output
@@ -101,52 +99,44 @@ def analyze_poem(poem_text, progress=gr.Progress()):
         return "Error: Model not loaded."
     if not poem_text or poem_text.startswith("Error:") or poem_text.startswith("Please enter"):
         return "Please generate a valid poem first!"
-
+    
     progress(0, desc="Analyzing style for literary match...")
     time.sleep(0.2)
-
+    
     # Secondary prompt for the analysis task - MINIMALIST QUESTION
+    # The prompt is simplified to remove conversational fluff and simply present the poem for analysis.
     poet_prompt = (
         f"You are a literary analyst. Your task is to analyze the POEM below and identify the single most appropriate "
         f"REAL, historical poet whose style and themes match the poem. Do NOT suggest fictional characters.\n"
-        f"Format your answer ONLY as: Poet Name: [Name] - Justification: [Reason].\n\n"
-        f"POEM:\n{poem_text}\n\n"
-        f"ANALYSIS: " # Simple marker for generation start
+        f"STRICT OUTPUT FORMAT: Format your answer ONLY as: Poet Name: [Name] - Justification: [Reason].\n\n"
+        f"POEM:\n{poem_text}\n"
     )
     
     output_poet = llm(
         prompt=poet_prompt,
         max_tokens=80, # Keep this response short
         temperature=0.4, 
-        stop=["POEM:", "ANALYSIS:", "\n\n", "\n"], 
+        # Minimal stop sequences for clean output
+        stop=["POEM:", "STRICT OUTPUT FORMAT:", "\n\n", "\n"], 
         echo=False
     )
     
     # Clean up the output using simple string manipulation
     poet_suggestion = output_poet['choices'][0]['text'].strip()
     
-    # Clean up the prefix and formatting
-    if "ANALYSIS:" in poet_suggestion:
-        poet_suggestion = poet_suggestion[poet_suggestion.find("ANALYSIS:") + len("ANALYSIS:"):].strip()
+    # Clean up any potential instruction echo or partial output
+    if poet_suggestion.startswith("STRICT OUTPUT FORMAT:"):
+        poet_suggestion = poet_suggestion[len("STRICT OUTPUT FORMAT:"):].strip()
     
-    if "Poet Name:" in poet_suggestion:
-        poet_suggestion = poet_suggestion.replace("Poet Name:", "").replace(" - Justification:", ":").strip()
-    elif ":" in poet_suggestion:
-        pass # Accept simple Poet: Justification format
-    else:
-        # Fallback for unexpected format
-        poet_suggestion = f"Analysis failed: {poet_suggestion[:50]}..."
-
     progress(1.0, desc="Analysis complete!")
+    
     return poet_suggestion
 
 # --- UI Layout ---
 with gr.Blocks(title="The Poetry Workshop", theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🖋️ The Poetry Workshop - Collaborative Analyst")
     gr.Markdown("Generate a poem based on a topic and persona, then use the separate button to analyze the output.")
-
-    # Removed state variables as they are no longer needed
-
+    
     with gr.Group():
         with gr.Row(equal_height=True):
             gr.Markdown("### I want to write a ")
@@ -176,12 +166,12 @@ with gr.Blocks(title="The Poetry Workshop", theme=gr.themes.Soft()) as demo:
                 scale=5
             )
             generate_btn = gr.Button("✨ Create Poem Draft", variant="primary", scale=1)
-    
-    gr.Markdown("---")
-    
+        
+        gr.Markdown("---")
+        
     # Added Analyze Button
     analyze_btn = gr.Button("🔍 Analyze This Poem", variant="secondary")
-
+    
     with gr.Row():
         output_display = gr.Textbox(
             label="Your Poem",
@@ -189,7 +179,7 @@ with gr.Blocks(title="The Poetry Workshop", theme=gr.themes.Soft()) as demo:
             interactive=False,
             placeholder="Your masterpiece will appear here..."
         )
-        
+                
         # New Textbox for the Poet Suggestion
         poet_suggestion_display = gr.Textbox(
             label="Literary Analysis: Suggested Poet",
@@ -197,16 +187,16 @@ with gr.Blocks(title="The Poetry Workshop", theme=gr.themes.Soft()) as demo:
             interactive=False,
             placeholder="Click 'Analyze This Poem' to run the LLM analysis."
         )
-
+        
     # --- Event Handling ---
-    
+        
     # 1. Initial Generation: Outputs only the poem text
     generate_btn.click(
         fn=generate_poem,
         inputs=[format_dropdown, persona_dropdown, topic_input],
         outputs=[output_display] 
     )
-
+    
     # 2. Analysis (New Step): Inputs only the poem text
     analyze_btn.click(
         fn=analyze_poem,