Update app.py

app.py

@@ -206,77 +206,86 @@ def build_prompts(snippets: List[str], prompt_instruction: str, custom_prompt: O
 def send_to_model(prompt, model_selection, hf_model_choice, hf_custom_model, hf_api_key,
                  groq_model_choice, groq_api_key, openai_api_key, openai_model_choice):
     """Wrapper function for send_to_model_impl with proper error handling."""
-    if not prompt:
+    if not prompt or not prompt.strip():
         return "Error: No prompt provided", None
         
     try:
         with gr.Progress() as progress:
             progress(0, "Preparing to send to model...")
             
-            # Call implementation with proper error handling
-            summary, download_file = send_to_model_impl(
-                prompt=prompt,
-                model_selection=model_selection,
-                hf_model_choice=hf_model_choice,
-                hf_custom_model=hf_custom_model,
-                hf_api_key=hf_api_key,
-                groq_model_choice=groq_model_choice,
-                groq_api_key=groq_api_key,
-                openai_api_key=openai_api_key,
-                openai_model_choice=openai_model_choice
-            )
+            # Basic input validation
+            if model_selection not in ["Clipboard only", "HuggingFace Inference", "Groq API", "OpenAI ChatGPT"]:
+                return "Error: Invalid model selection", None
+                
+            # Model-specific validation
+            if model_selection == "HuggingFace Inference" and not hf_api_key:
+                return "Error: HuggingFace API key required", None
+            elif model_selection == "Groq API" and not groq_api_key:
+                return "Error: Groq API key required", None
+            elif model_selection == "OpenAI ChatGPT" and not openai_api_key:
+                return "Error: OpenAI API key required", None
             
-            progress(1, "Complete!")
-            return summary, download_file
+            # Call implementation with error handling
+            progress(0.5, "Processing with model...")
+            try:
+                summary, download_file = send_to_model_impl(
+                    prompt=prompt.strip(),
+                    model_selection=model_selection,
+                    hf_model_choice=hf_model_choice,
+                    hf_custom_model=hf_custom_model,
+                    hf_api_key=hf_api_key,
+                    groq_model_choice=groq_model_choice,
+                    groq_api_key=groq_api_key,
+                    openai_api_key=openai_api_key,
+                    openai_model_choice=openai_model_choice
+                )
+                
+                if summary is None or not isinstance(summary, str):
+                    return "Error: No response from model", None
+                    
+                progress(1, "Complete!")
+                return summary, download_file
+                
+            except Exception as e:
+                error_msg = str(e)
+                if not error_msg:  # Handle empty error messages
+                    error_msg = "Unknown error occurred"
+                return f"Error: {error_msg}", None
             
     except Exception as e:
-        error_msg = f"Error processing request: {str(e)}"
-        logging.error(error_msg)
-        return error_msg, None
+        error_msg = str(e)
+        if not error_msg:  # Handle empty error messages
+            error_msg = "Unknown error occurred"
+        logging.error(f"Error in send_to_model: {error_msg}")
+        return f"Error: {error_msg}", None
 
 def send_to_model_impl(prompt, model_selection, hf_model_choice, hf_custom_model, hf_api_key,
                       groq_model_choice, groq_api_key, openai_api_key, openai_model_choice):
     """Implementation of model sending with improved error handling."""
-    try:
-        if model_selection == "Clipboard only":
-            return "Text copied to clipboard. Use paste for processing.", None
+    
+    if model_selection == "Clipboard only":
+        return "Text copied to clipboard. Use paste for processing.", None
 
-        elif model_selection == "HuggingFace Inference":
-            if not hf_api_key:
-                return "Error: HuggingFace API key required", None
-            if not hf_model_choice:
-                return "Error: Please select a HuggingFace model", None
-                
+    try:
+        if model_selection == "HuggingFace Inference":
             model_id = hf_custom_model if hf_model_choice == "Custom Model" else model_registry.hf_models[hf_model_choice]
             summary = send_to_hf_inference(prompt, model_id, hf_api_key)
-            if summary.startswith("Error"):
-                return summary, None
-
+            
         elif model_selection == "Groq API":
-            if not groq_api_key:
-                return "Error: Groq API key required", None
-            if not groq_model_choice:
-                return "Error: Please select a Groq model", None
-                
             summary = send_to_groq(prompt, groq_model_choice, groq_api_key)
-            if summary.startswith("Error"):
-                return summary, None
-
+            
         elif model_selection == "OpenAI ChatGPT":
-            if not openai_api_key:
-                return "Error: OpenAI API key required", None
-            if not openai_model_choice:
-                return "Error: Please select an OpenAI model", None
-                
             summary = send_to_openai(prompt, openai_api_key, model=openai_model_choice)
-            if summary.startswith("Error"):
-                return summary, None
-
+            
         else:
             return "Error: Invalid model selection", None
 
-        # If we get here, we have a valid summary. Create download file.
-        if summary and not summary.startswith("Error"):
+        # Validate response
+        if not summary or not isinstance(summary, str):
+            return "Error: Invalid response from model", None
+            
+        # Create download file for valid responses
+        if not summary.startswith("Error"):
             with tempfile.NamedTemporaryFile(delete=False, mode='w', suffix='.txt') as f:
                 f.write(summary)
                 return summary, f.name
@@ -284,9 +293,11 @@ def send_to_model_impl(prompt, model_selection, hf_model_choice, hf_custom_model
         return summary, None
 
     except Exception as e:
-        error_msg = f"Error in model processing: {str(e)}"
-        logging.error(error_msg)
-        return error_msg, None
+        error_msg = str(e)
+        if not error_msg:  # Handle empty error messages
+            error_msg = "Unknown error occurred"
+        logging.error(f"Error in send_to_model_impl: {error_msg}")
+        return f"Error: {error_msg}", None
 
 def send_to_hf_inference(prompt: str, model_name: str, api_key: str) -> str:
     """Send prompt to HuggingFace Inference API with better error handling."""