remove json loads

Signed-off-by: Samhita Alla <[email protected]>

app.py

@@ -1,5 +1,6 @@
 import base64
 import json
+import mimetypes
 
 # import mimetypes
 import os
@@ -9,18 +10,28 @@ from typing import Dict, Tuple, Union
 
 import banana_dev as banana
 import geopy.distance
-import gradio as gr
 import pandas as pd
 import plotly
 import plotly.express as px
 
 # import requests
 from dotenv import load_dotenv
+from smart_open import open as smartopen
+
+import gradio as gr
 
 sys.path.append("..")
 
 from gantry_callback.gantry_util import GantryImageToTextLogger  # noqa: E402
-from gantry_callback.s3_util import make_unique_bucket_name  # noqa: E402
+from gantry_callback.s3_util import (
+    add_access_policy,  # noqa: E402
+    enable_bucket_versioning,
+    get_or_create_bucket,
+    get_uri_of,
+    make_key,
+    make_unique_bucket_name,
+)
+from gantry_callback.string_img_util import read_b64_string  # noqa: E402
 
 load_dotenv()
 
@@ -155,20 +166,37 @@ def image_gradio(img_file: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
     with open(img_file, "rb") as image_file:
         image_bytes = BytesIO(image_file.read())
 
-    data = json.loads(
-        banana.run(
-            BANANA_API_KEY,
-            BANANA_MODEL_KEY,
-            {
-                "image": base64.b64encode(image_bytes.getvalue()).decode("utf-8"),
-                "filename": os.path.basename(img_file),
-            },
-        )["modelOutputs"][0]
-    )
+    data = banana.run(
+        BANANA_API_KEY,
+        BANANA_MODEL_KEY,
+        {
+            "image": base64.b64encode(image_bytes.getvalue()).decode("utf-8"),
+            "filename": os.path.basename(img_file),
+        },
+    )["modelOutputs"][0]
 
     return get_outputs(data=data)
 
 
+def _upload_video_to_s3(video_b64_string):
+    bucket = get_or_create_bucket(
+        make_unique_bucket_name(prefix="geolocator-app", seed="420")
+    )
+    enable_bucket_versioning(bucket)
+    add_access_policy(bucket)
+
+    data_type, video_buffer = read_b64_string(video_b64_string, return_data_type=True)
+    video_bytes = video_buffer.read()
+    key = make_key(video_bytes, filetype=data_type)
+
+    s3_uri = get_uri_of(bucket, key)
+
+    with smartopen(s3_uri, "wb") as s3_object:
+        s3_object.write(video_bytes)
+
+    return s3_uri
+
+
 def video_gradio(video_file: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
     # data = json.loads(
     #     requests.post(
@@ -183,16 +211,23 @@ def video_gradio(video_file: str) -> Tuple[str, str, plotly.graph_objects.Figure
     #     ).text
     # )
 
-    data = json.loads(
-        banana.run(
-            BANANA_API_KEY,
-            BANANA_MODEL_KEY,
-            {
-                "video": video_file,
-                "filename": os.path.basename(video_file),
-            },
-        )["modelOutputs"][0]
-    )
+    with open(video_file, "rb") as video_file:
+        video_b64_string = base64.b64encode(
+            BytesIO(video_file.read()).getvalue()
+        ).decode("utf8")
+
+    video_mime = mimetypes.guess_type(video_file)[0]
+
+    s3_uri = _upload_video_to_s3(f"data:{video_mime};base64," + video_b64_string)
+
+    data = banana.run(
+        BANANA_API_KEY,
+        BANANA_MODEL_KEY,
+        {
+            "video": s3_uri,
+            "filename": os.path.basename(video_file),
+        },
+    )["modelOutputs"][0]
 
     return get_outputs(data=data)
 
@@ -205,11 +240,9 @@ def url_gradio(url: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
     #         data=url,
     #     ).text
     # )
-    data = json.loads(
-        banana.run(BANANA_API_KEY, BANANA_MODEL_KEY, {"url": url},)[
-            "modelOutputs"
-        ][0]
-    )
+    data = banana.run(BANANA_API_KEY, BANANA_MODEL_KEY, {"url": url},)[
+        "modelOutputs"
+    ][0]
 
     return get_outputs(data=data)