Update app.py

app.py

@@ -6,7 +6,6 @@ from simple_salesforce import Salesforce
 from datetime import datetime
 import hashlib
 import shutil
-import base64
 
 # Load environment variables
 load_dotenv()
@@ -59,7 +58,7 @@ def mock_ai_model(image):
     return milestone, completion_percent, confidence_score
 
 # Image processing and Salesforce upload
-def process_image(image, project_name, sobject_id):
+def process_image(image, project_name):
     try:
         if image is None:
             return "Error: Please upload an image to proceed.", "Pending", "", "", 0
@@ -71,7 +70,7 @@ def process_image(image, project_name, sobject_id):
         if not str(image).lower().endswith(('.jpg', '.jpeg', '.png')):
             return "Error: Only JPG/PNG images are supported.", "Failure", "", "", 0
 
-        # Save image to a temporary file
+        # Save image to public folder
         upload_dir = "public_uploads"
         os.makedirs(upload_dir, exist_ok=True)
         unique_id = datetime.now().strftime("%Y%m%d%H%M%S")
@@ -79,26 +78,14 @@ def process_image(image, project_name, sobject_id):
         saved_image_path = os.path.join(upload_dir, image_filename)
         shutil.copy(image, saved_image_path)
 
-        # Open the image file and encode it as base64
-        with open(saved_image_path, "rb") as file:
-            encoded_image = base64.b64encode(file.read()).decode('utf-8')
+        # Corrected public URL logic
+        if os.getenv("GRADIO_SERVER_NAME"):
+            public_url_base = f"https://{os.getenv('GRADIO_SERVER_NAME')}/file"
+        else:
+            public_url_base = "http://localhost:7860/file"
 
-        # Upload to Salesforce as a ContentVersion
-        try:
-            content_version_data = {
-                'Title': image_filename,
-                'PathOnClient': image_filename,
-                'VersionData': encoded_image,  # Using the base64-encoded image data
-                'FirstPublishLocationId': sobject_id,  # Use the actual Salesforce object ID here
-            }
-            content_version = sf.ContentVersion.create(content_version_data)
-
-            # Generate download URL for the uploaded image
-            file_url = f"https://{sf.sf_instance}/sfc/servlet.shepherd/version/download/{content_version['id']}"
-        except Exception as e:
-            return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", "", 0
+        image_url = f"{public_url_base}/{upload_dir}/{image_filename}"
 
-        # AI prediction
         milestone, percent_complete, confidence_score = mock_ai_model(img)
 
         record = {
@@ -108,10 +95,9 @@ def process_image(image, project_name, sobject_id):
             "Last_Updated_On__c": datetime.now().isoformat(),
             "Upload_Status__c": "Success",
             "Comments__c": f"AI Prediction: {milestone} with {confidence_score*100}% confidence",
-            "Last_Updated_Image__c": file_url
+            "Last_Updated_Image__c": image_url
         }
 
-        # Insert record into Salesforce
         try:
             sf.Construction__c.create(record)
         except Exception as e:
@@ -134,7 +120,6 @@ with gr.Blocks(css=".gradio-container {background-color: #f0f4f8; font-family: A
     with gr.Row():
         image_input = gr.Image(type="filepath", label="Upload Construction Site Photo (JPG/PNG, ≤ 20MB)")
         project_name_input = gr.Textbox(label="Project Name (Required)", placeholder="e.g. Project_12345")
-        sobject_id_input = gr.Textbox(label="Salesforce Record ID (Required)", placeholder="Enter Salesforce Record ID here")
 
     submit_button = gr.Button("Process Image")
     output_text = gr.Textbox(label="Result")
@@ -145,8 +130,8 @@ with gr.Blocks(css=".gradio-container {background-color: #f0f4f8; font-family: A
 
     submit_button.click(
         fn=process_image,
-        inputs=[image_input, project_name_input, sobject_id_input],
+        inputs=[image_input, project_name_input],
         outputs=[output_text, upload_status, milestone, confidence, progress]
     )
 
-demo.launch(share=True)
+demo.launch(share=True)