Update app.py

app.py

@@ -1,13 +1,9 @@
 import gradio as gr
 import os
-import json
 import base64
-import copy
-import time
 from PIL import Image
 from io import BytesIO
 from specklepy.api.client import SpeckleClient
-from specklepy.api.credentials import get_default_account
 from specklepy.transports.server import ServerTransport
 from specklepy.api import operations
 from specklepy.objects import Base
@@ -15,16 +11,36 @@ from specklepy.objects import Base
 # Initialize Speckle client with your token
 speckle_token = os.getenv('SPECKLE_TOKEN')
 speckle_branch = os.getenv('SPECKLE_BRANCH')
-speckle_streamID = os.getenv('SPECKLE_STREAM_ID')
+speckle_stream_id = os.getenv('SPECKLE_STREAM_ID')
 
 CLIENT = SpeckleClient(host="https://speckle.xyz/")
 CLIENT.authenticate_with_token(token=speckle_token)
 
+def send_to_speckle(stream_id, branch_name, client, data_object):
+    try:
+        # Get transport
+        transport = ServerTransport(client=client, stream_id=stream_id)
+        
+        # Send the data object to the speckle stream
+        object_id = operations.send(data_object, [transport])
+
+        # Create a new commit with the new object
+        commit_id = client.commit.create(
+            stream_id=stream_id,
+            object_id=object_id,
+            branch_name=branch_name,
+            message="Updated the data object from Gradio app",
+        )
+        
+        return f"Success! Data sent to Speckle stream. Commit ID: {commit_id}"
+    except Exception as e:
+        return f"An error occurred: {e}"
+
 def process_data(image, text):
     # Process image: Resize and convert to base64
     img_str = ""
     if image is not None:
-        image = Image.open(image)
+        image = Image.open(BytesIO(image))
         # Resize image, maintaining aspect ratio, and max width 1024 pixels
         base_width = 1024
         w_percent = (base_width / float(image.size[0]))
@@ -36,49 +52,22 @@ def process_data(image, text):
         image.save(buffered, format="JPEG")
         img_str = base64.b64encode(buffered.getvalue()).decode('utf-8')
 
-    # Prepare JSON data
+    # Prepare data object
     obj = Base()
     obj["image"] = img_str
     obj["text"] = text
 
     # Send data to Speckle
-    commit_id = updateSpeckleStream(speckle_streamID, speckle_branch, client, obj)
-    send_to_speckle(data)
-
-    # For now, we'll just return the JSON to display it
-    return json.dumps(data)
+    return send_to_speckle(speckle_stream_id, speckle_branch, CLIENT, obj)
     
-def updateSpeckleStream(stream_id,
-                        branch_name,
-                        client,
-                        data_object,
-                        commit_message="Updated the data object",
-                        ):
-    # set stream and branch
-    branch = client.branch.get(stream_id, branch_name)
-    # Get transport
-    transport = ServerTransport(client=client, stream_id=stream_id)
-    # Send the data object to the speckle stream
-    object_id = operations.send(data_object, [transport])
-
-    # Create a new commit with the new object
-    commit_id = client.commit.create(
-        stream_id,
-        object_id= object_id,
-        message=commit_message,
-        branch_name=branch_name,
-    )
-
-    return commit_id
-                            
 with gr.Blocks() as demo:
-    gr.Markdown("### Upload Image and Record Voice Message")
+    gr.Markdown("### Upload Image and Enter Text")
     with gr.Row():
-        image = gr.Image(type="file", label="Upload Image")
-        audio = gr.Audio(source="microphone", type="file", label="Record Voice")
+        image = gr.Image(type="pil", label="Add Image")
+        text = gr.TextArea(label="Enter Text or Speak")
     submit_btn = gr.Button("Submit")
-    output = gr.Textbox(label="JSON Output")
+    output = gr.Textbox(label="Status", visible=False)  # Set visible to False to hide output
 
-    submit_btn.click(fn=process_data, inputs=[image, audio], outputs=output)
+    submit_btn.click(fn=process_data, inputs=[image, text], outputs=output)
 
 demo.launch()