Update app.py

app.py

@@ -202,6 +202,10 @@ def stream_chat(input_image: Image.Image, caption_type: str, caption_tone: str,
     """
     Generate a caption, training prompt, tags, or a style prompt for image generation based on the input image and parameters.
     """
+    # Check if an image has been uploaded
+    if input_image is None:
+        return "Error: Please upload an image before generating a caption."
+
     torch.cuda.empty_cache()
 
     try:
@@ -345,7 +349,7 @@ film_stocks_info = {
     "Ektar": "Modern Kodak film. Color photos with little to no grain. Results look like regular modern photography with artistic angles.",
     "Film Washi": "Mostly black and white photos with fine/low to moderate grain. Occasionally gives colored photos with low saturation. Distinct style with high black contrast and soft camera lens effect.",
     "Fomapan": "Black and white photos with fine/low to moderate grain, highly artistic exposure and angles. Adds very soft lens effect without distortion, dark photo vignette.",
-    "Fujicolor": "Color photos with fine/low to moderate grain. Colors are slightly or notably desaturated, with entire color hue shifted in a very distinct manner.",
+    "Fujicolor": "Color photos with fine/low to moderate grain. Colors are either very oversaturated or slightly desaturated, with entire color hue shifted in a very distinct manner.",
     "Holga": "Color photos with high grain. Colors are either very oversaturated or slightly desaturated. Distinct contrast of black. Often applies photographic vignette.",
     "Instax": "Instant color photos similar to Polaroid but clearer. Near perfect colors, regular saturation, fine/low to medium grain.",
     "Lomography": "Color photos with high grain. Colors are either very oversaturated or slightly desaturated. Distinct contrast of black. Often applies photographic vignette.",
@@ -423,33 +427,38 @@ def get_dropdown_choices(info_dict):
 # Gradio interface
 with gr.Blocks(theme="Hev832/Applio", css=css, fill_width=True, fill_height=True) as demo:
     with gr.Tab("Welcome"):
-        gr.Markdown(
-            """
-            <img src="https://cdn-uploads.huggingface.co/production/uploads/64740cf7485a7c8e1bd51ac9/LVZnwLV43UUvKu3HORqSs.webp" alt="UDG" width="250" style="max-width: 100%; height: auto;">
+        with gr.Row():
+            with gr.Column(scale=2): 
+                gr.Markdown(
+                    """
+                    <img src="https://cdn-uploads.huggingface.co/production/uploads/64740cf7485a7c8e1bd51ac9/LVZnwLV43UUvKu3HORqSs.webp" alt="UDG" width="250" style="max-width: 100%; height: auto;">
 
-            # 🎨 Underground Digital's Caption Captain: AI-Powered Art Inspiration
+                    # 🎨 Underground Digital's Caption Captain: AI-Powered Art Inspiration
 
-            ## Accelerate Your Creative Workflow with Intelligent Image Analysis
+                    ## Accelerate Your Creative Workflow with Intelligent Image Analysis
 
-            This innovative tool empowers Yamamoto's artists to quickly generate descriptive captions,<br>
-            training prompts, and tags from existing artwork, fueling the creative process for GenAI models.
+                    This innovative tool empowers Yamamoto's artists to quickly generate descriptive captions,<br>
+                    training prompts, and tags from existing artwork, fueling the creative process for GenAI models.
 
-            ## 🚀 How It Works:
-            1. **Upload Your Inspiration**: Drop in an image (e.g., a charcoal horse picture) that embodies your desired style.
-            2. **Choose Your Output**: Select from descriptive captions, training prompts, or tags.
-            3. **Customize the Results**: Adjust tone, length, and other parameters to fine-tune the output.
-            4. **Generate and Iterate**: Click 'Caption' to analyze your image and use the results to inspire new creations.
-            """
-        )
+                    ## 🚀 How It Works:
+                    1. **Upload Your Inspiration**: Drop in an image (e.g., a charcoal horse picture) that embodies your desired style.
+                    2. **Choose Your Output**: Select from descriptive captions, training prompts, or tags.
+                    3. **Customize the Results**: Adjust tone, length, and other parameters to fine-tune the output.
+                    4. **Generate and Iterate**: Click 'Caption' to analyze your image and use the results to inspire new creations.
+                    """
+                )
 
-        with gr.Row():
-            username = gr.Textbox(label="Username", placeholder="Enter your username", value="ugd", visible=False)
-        with gr.Row():
-            password = gr.Textbox(label="Password", type="password", placeholder="Enter your password", value="ugd!", visible=False)
-        with gr.Row():
-            login_button = gr.Button("Login", size="sm", visible=False)
-        login_message = gr.Markdown(visible=False)
-    
+            with gr.Column(scale=1):  
+                with gr.Row():  
+                    gr.Markdown(
+                        """
+                        Login below using the Yamamoto internal<br>
+                        username and password to access the full app.<br>
+                        
+                        Once logged in, a new tab will appear named<br>
+                        "QR Code Art Generator" allowing you to access.
+                        """
+                    )    
     with gr.Tab("Caption Captain") as app_container:
         with gr.Accordion("How to Use Caption Captain", open=False):
             gr.Markdown("""
@@ -521,6 +530,7 @@ with gr.Blocks(theme="Hev832/Applio", css=css, fill_width=True, fill_height=True
 
                 
             with gr.Column():
+                error_message = gr.Markdown(visible=False)  # Add this line
                 output_caption = gr.Textbox(label="Generated Caption")
                 run_button = gr.Button("Make My Caption!")
 
@@ -563,7 +573,18 @@ with gr.Blocks(theme="Hev832/Applio", css=css, fill_width=True, fill_height=True
 
     caption_type.change(update_style_options, inputs=[caption_type], outputs=[advanced_options])
     
-    run_button.click(fn=stream_chat, inputs=[input_image, caption_type, caption_tone, caption_length, lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect], outputs=[output_caption])
+    def process_and_handle_errors(input_image, caption_type, caption_tone, caption_length, lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect):
+        try:
+            result = stream_chat(input_image, caption_type, caption_tone, caption_length, lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect)
+            return gr.update(visible=False), result
+        except Exception as e:
+            return gr.update(visible=True, value=f"Error: {str(e)}"), ""
+
+    run_button.click(
+        fn=process_and_handle_errors,
+        inputs=[input_image, caption_type, caption_tone, caption_length, lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect],
+        outputs=[error_message, output_caption]
+    )
 
 
 if __name__ == "__main__":