Fix merge conflicts in app.py

app.py

@@ -28,13 +28,12 @@ def load_model():
     device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
     model = GPTModel(GPT_CONFIG_124M)
     
-<<<<<<< HEAD
     try:
         # Download model from HuggingFace Model Hub
         print("📥 Downloading model from HuggingFace...")
         model_path = hf_hub_download(
             repo_id="ShubhamBaghel307/miniGPT-124M",
-            filename="model.pth",  # or "model_and_optimizer.pth"
+            filename="model_and_optimizer.pth",
             repo_type="model"
         )
         
@@ -52,15 +51,6 @@ def load_model():
     except Exception as e:
         print(f"⚠️ Error loading model: {e}")
         print("Using randomly initialized weights")
-=======
-    # Try to load trained weights if available
-    model_path = Path("model.pth")
-    if model_path.exists():
-        model.load_state_dict(torch.load(model_path, map_location=device))
-        print("✅ Loaded trained model weights")
-    else:
-        print("⚠️ No trained weights found, using random initialization")
->>>>>>> 9d99f6e730bfb0a7922a4a03324fc61f27387778
     
     model.to(device)
     model.eval()
@@ -114,14 +104,14 @@ def generate_text(prompt, max_new_tokens=50, temperature=1.0, top_k=50):
         return f"Error: {str(e)}"
 
 # Create Gradio interface
-with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
+with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT") as demo:
     gr.Markdown(
         """
-        # 🤖 MiniGPT Chat Interface
+        # 🤖 MiniGPT - Text Generator
         
-        A simple chat interface for your trained GPT model. Enter a prompt and adjust parameters to generate text.
+        A GPT-2 style language model trained from scratch. Enter a prompt and watch it generate text!
         
-        **Note:** This model is trained from scratch on limited data, so outputs may not be as coherent as ChatGPT!
+        **Model:** 124M parameters | **Context:** 256 tokens
         """
     )
     
@@ -129,12 +119,12 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
         with gr.Column(scale=2):
             prompt_input = gr.Textbox(
                 label="Enter your prompt",
-                placeholder="When forty winters shall...",
+                placeholder="Once upon a time...",
                 lines=3
             )
             
             with gr.Row():
-                generate_btn = gr.Button("Generate Text", variant="primary", size="lg")
+                generate_btn = gr.Button("🚀 Generate", variant="primary", size="lg")
                 clear_btn = gr.Button("Clear", size="lg")
             
             output_text = gr.Textbox(
@@ -144,15 +134,14 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
             )
         
         with gr.Column(scale=1):
-            gr.Markdown("### ⚙️ Generation Parameters")
+            gr.Markdown("### ⚙️ Parameters")
             
             max_tokens = gr.Slider(
                 minimum=10,
                 maximum=200,
                 value=50,
                 step=10,
-                label="Max New Tokens",
-                info="Maximum number of tokens to generate"
+                label="Max Tokens"
             )
             
             temperature = gr.Slider(
@@ -160,8 +149,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
                 maximum=2.0,
                 value=0.7,
                 step=0.1,
-                label="Temperature",
-                info="Higher = more random, Lower = more focused"
+                label="Temperature"
             )
             
             top_k = gr.Slider(
@@ -169,24 +157,18 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
                 maximum=100,
                 value=50,
                 step=5,
-                label="Top-K",
-                info="Sample from top K tokens (0 = disabled)"
+                label="Top-K"
             )
     
-    # Example prompts
-    gr.Markdown("### 💡 Example Prompts")
     gr.Examples(
         examples=[
-            ["Every effort moves you"],
-            ["When forty winters shall"],
-            ["The quick brown fox"],
             ["Once upon a time"],
+            ["The future of AI is"],
             ["In a world where"],
         ],
         inputs=prompt_input,
     )
     
-    # Event handlers
     generate_btn.click(
         fn=generate_text,
         inputs=[prompt_input, max_tokens, temperature, top_k],
@@ -195,22 +177,8 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MiniGPT Chat") as demo:
     
     clear_btn.click(
         fn=lambda: ("", ""),
-        inputs=None,
         outputs=[prompt_input, output_text]
     )
-    
-    # Footer
-    gr.Markdown(
-        """
-        ---
-        Built with ❤️ using [Gradio](https://gradio.app) | Model trained from scratch following "Build a Large Language Model (From Scratch)"
-        """
-    )
 
-# Launch the app
 if __name__ == "__main__":
-    demo.launch(
-        share=False,
-        server_name="0.0.0.0",
-        server_port=7860
-    )
+    demo.launch(server_name="0.0.0.0", server_port=7860)