add banana

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

.gitignore

@@ -0,0 +1 @@
+.python-version

app.py

@@ -1,17 +1,26 @@
+import base64
 import json
-import mimetypes
+
+# import mimetypes
 import os
+import sys
+from io import BytesIO
 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
+
+# import requests
 from dotenv import load_dotenv
 
-from gantry_callback.gantry_util import GantryImageToTextLogger
-from gantry_callback.s3_util import make_unique_bucket_name
+sys.path.append("..")
+
+from gantry_callback.gantry_util import GantryImageToTextLogger  # noqa: E402
+from gantry_callback.s3_util import make_unique_bucket_name  # noqa: E402
 
 load_dotenv()
 
@@ -19,15 +28,68 @@ URL = os.getenv("ENDPOINT")
 GANTRY_APP_NAME = os.getenv("GANTRY_APP_NAME")
 GANTRY_KEY = os.getenv("GANTRY_API_KEY")
 MAPBOX_TOKEN = os.getenv("MAPBOX_TOKEN")
+BANANA_API_KEY = os.getenv("BANANA_API_KEY")
+BANANA_MODEL_KEY = os.getenv("BANANA_MODEL_KEY")
 
 examples = json.load(open("examples.json"))
 
 
+def compute_distance(map_data: Dict[str, Dict[str, Union[str, float, None]]]):
+    hierarchy_lat, hierarchy_long = (
+        map_data["hierarchy"]["latitude"],
+        map_data["hierarchy"]["longitude"],
+    )
+
+    coarse_lat, coarse_long = (
+        map_data["coarse"]["latitude"],
+        map_data["coarse"]["longitude"],
+    )
+
+    fine_lat, fine_long = (
+        map_data["fine"]["latitude"],
+        map_data["fine"]["longitude"],
+    )
+
+    hierarchy_to_coarse = geopy.distance.geodesic(
+        (hierarchy_lat, hierarchy_long), (coarse_lat, coarse_long)
+    ).miles
+
+    hierarchy_to_fine = geopy.distance.geodesic(
+        (hierarchy_lat, hierarchy_long), (fine_lat, fine_long)
+    ).miles
+
+    return hierarchy_to_coarse, hierarchy_to_fine
+
+
 def get_plotly_graph(
-    latitude: float, longitude: float, location: str
+    map_data: Dict[str, Dict[str, Union[str, float, None]]]
 ) -> plotly.graph_objects.Figure:
-    lat_long_data = [[latitude, longitude, location]]
-    map_df = pd.DataFrame(lat_long_data, columns=["latitude", "longitude", "location"])
+
+    hierarchy_to_coarse, hierarchy_to_fine = compute_distance(map_data)
+    what_to_consider = {"hierarchy"}
+    if hierarchy_to_coarse > 30:
+        what_to_consider.add("coarse")
+    if hierarchy_to_fine > 30:
+        what_to_consider.add("fine")
+
+    size_map = {"hierarchy": 3, "fine": 1, "coarse": 1}
+    lat_long_data = []
+    for subdivision, location_data in map_data.items():
+        if subdivision in what_to_consider:
+            lat_long_data.append(
+                [
+                    subdivision,
+                    float(location_data["latitude"]),
+                    float(location_data["longitude"]),
+                    location_data["location"],
+                    size_map[subdivision],
+                ]
+            )
+
+    map_df = pd.DataFrame(
+        lat_long_data,
+        columns=["subdivision", "latitude", "longitude", "location", "size"],
+    )
 
     px.set_mapbox_access_token(MAPBOX_TOKEN)
     fig = px.scatter_mapbox(
@@ -35,10 +97,18 @@ def get_plotly_graph(
         lat="latitude",
         lon="longitude",
         hover_name="location",
-        color_discrete_sequence=["fuchsia"],
-        zoom=5,
-        height=300,
+        hover_data=["latitude", "longitude", "subdivision"],
+        color="subdivision",
+        color_discrete_map={
+            "hierarchy": "fuchsia",
+            "coarse": "blue",
+            "fine": "blue",
+        },
+        zoom=3,
+        height=500,
+        size="size",
     )
+
     fig.update_layout(mapbox_style="dark")
     fig.update_layout(margin={"r": 0, "t": 0, "l": 0, "b": 0})
     return fig
@@ -49,64 +119,96 @@ def gradio_error():
 
 
 def get_outputs(
-    data: Dict[str, Union[str, float, None]]
+    data: Dict[str, Dict[str, Union[str, float, None]]]
 ) -> Tuple[str, str, plotly.graph_objects.Figure]:
+    if data is None:
+        gradio_error()
+
     location, latitude, longitude = (
-        data["location"],
-        data["latitude"],
-        data["longitude"],
+        data["hierarchy"]["location"],
+        data["hierarchy"]["latitude"],
+        data["hierarchy"]["longitude"],
     )
     if location is None:
         gradio_error()
 
     return (
-        data["location"],
+        location,
         f"{latitude},{longitude}",
-        get_plotly_graph(latitude=latitude, longitude=longitude, location=location),
+        get_plotly_graph(map_data=data),
     )
 
 
 def image_gradio(img_file: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
+    # data = json.loads(
+    #     requests.post(
+    #         f"{URL}predict-image",
+    #         files={
+    #             "image": (
+    #                 img_file,
+    #                 open(img_file, "rb"),
+    #                 mimetypes.guess_type(img_file)[0],
+    #             )
+    #         },
+    #     ).text
+    # )
+    with open(img_file, "rb") as image_file:
+        image_bytes = BytesIO(image_file.read())
+
     data = json.loads(
-        requests.post(
-            f"{URL}predict-image",
-            files={
-                "image": (
-                    img_file,
-                    open(img_file, "rb"),
-                    mimetypes.guess_type(img_file)[0],
-                )
+        banana.run(
+            BANANA_API_KEY,
+            BANANA_MODEL_KEY,
+            {
+                "image": base64.b64encode(image_bytes.getvalue()).decode("utf-8"),
+                "filename": os.path.basename(img_file),
             },
-        ).text
+        )["modelOutputs"][0]
     )
 
     return get_outputs(data=data)
 
 
 def video_gradio(video_file: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
+    # data = json.loads(
+    #     requests.post(
+    #         f"{URL}predict-video",
+    #         files={
+    #             "video": (
+    #                 video_file,
+    #                 open(video_file, "rb"),
+    #                 "application/octet-stream",
+    #             )
+    #         },
+    #     ).text
+    # )
+
     data = json.loads(
-        requests.post(
-            f"{URL}predict-video",
-            files={
-                "video": (
-                    video_file,
-                    open(video_file, "rb"),
-                    "application/octet-stream",
-                )
+        banana.run(
+            BANANA_API_KEY,
+            BANANA_MODEL_KEY,
+            {
+                "video": video_file,
+                "filename": os.path.basename(video_file),
             },
-        ).text
+        )["modelOutputs"][0]
     )
 
     return get_outputs(data=data)
 
 
 def url_gradio(url: str) -> Tuple[str, str, plotly.graph_objects.Figure]:
+    # data = json.loads(
+    #     requests.post(
+    #         f"{URL}predict-url",
+    #         headers={"content-type": "text/plain"},
+    #         data=url,
+    #     ).text
+    # )
     data = json.loads(
-        requests.post(
-            f"{URL}predict-url",
-            headers={"content-type": "text/plain"},
-            data=url,
-        ).text
+        banana.run(BANANA_API_KEY, BANANA_MODEL_KEY, {"url": url},)[
+            "modelOutputs"
+        ][0]
     )
 
     return get_outputs(data=data)

examples.json

@@ -17,6 +17,7 @@
   ],
   "video_urls": [
     "https://www.youtube.com/watch?v=wxeQkJTZrsw",
-    "https://www.youtube.com/watch?v=_AznzZAlwVA"
+    "https://www.youtube.com/watch?v=_AznzZAlwVA",
+    "https://www.youtube.com/watch?v=Lk8r0Ig62zU"
   ]
 }

requirements.in

@@ -7,3 +7,5 @@ boto3
 botocore
 gantry
 smart-open
+banana-dev
+geopy

requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile --output-file=gradio_requirements.txt gradio_requirements.in
+#    pip-compile requirements.in
 #
 aiohttp==3.8.3
     # via gradio
@@ -18,24 +18,27 @@ attrs==22.1.0
     # via aiohttp
 backoff==1.11.1
     # via gantry
+banana-dev==4.0.0
+    # via -r requirements.in
 bcrypt==4.0.1
     # via paramiko
 boto3==1.24.89
     # via
-    #   -r gradio_requirements.in
+    #   -r requirements.in
     #   boto3-extensions
 boto3-extensions==0.19.0
     # via gantry
 botocore==1.27.89
     # via
-    #   -r gradio_requirements.in
+    #   -r requirements.in
     #   boto3
     #   boto3-extensions
     #   s3transfer
 cachetools==4.2.4
     # via gantry
-certifi==2022.9.24
+certifi==2021.10.8
     # via
+    #   banana-dev
     #   httpcore
     #   httpx
     #   requests
@@ -43,9 +46,10 @@ cffi==1.15.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==2.1.1
+charset-normalizer==2.0.7
     # via
     #   aiohttp
+    #   banana-dev
     #   requests
 click==8.1.3
     # via
@@ -79,9 +83,13 @@ frozenlist==1.3.1
 fsspec==2022.8.2
     # via gradio
 gantry==0.4.13
-    # via -r gradio_requirements.in
+    # via -r requirements.in
+geographiclib==1.52
+    # via geopy
+geopy==2.2.0
+    # via -r requirements.in
 gradio==3.4.1
-    # via -r gradio_requirements.in
+    # via -r requirements.in
 h11==0.12.0
     # via
     #   gradio
@@ -93,9 +101,10 @@ httpcore==0.15.0
     # via httpx
 httpx==0.23.0
     # via gradio
-idna==3.4
+idna==3.3
     # via
     #   anyio
+    #   banana-dev
     #   requests
     #   rfc3986
     #   yarl
@@ -152,7 +161,7 @@ packaging==21.3
     #   matplotlib
 pandas==1.5.0
     # via
-    #   -r gradio_requirements.in
+    #   -r requirements.in
     #   gantry
     #   gradio
 paramiko==2.11.0
@@ -162,7 +171,7 @@ pillow==9.2.0
     #   gradio
     #   matplotlib
 plotly==5.10.0
-    # via -r gradio_requirements.in
+    # via -r requirements.in
 pycparser==2.21
     # via cffi
 pycryptodome==3.15.0
@@ -187,7 +196,7 @@ python-dateutil==2.8.2
     #   matplotlib
     #   pandas
 python-dotenv==0.21.0
-    # via -r gradio_requirements.in
+    # via -r requirements.in
 python-multipart==0.0.5
     # via gradio
 pytz==2022.4
@@ -202,9 +211,10 @@ pyyaml==6.0
     #   gradio
 regex==2022.3.2
     # via dateparser
-requests==2.28.1
+requests==2.26.0
     # via
-    #   -r gradio_requirements.in
+    #   -r requirements.in
+    #   banana-dev
     #   gantry
     #   gradio
 rfc3986[idna2008]==1.5.0
@@ -219,7 +229,7 @@ six==1.16.0
     #   python-dateutil
     #   python-multipart
 smart-open==6.2.0
-    # via -r gradio_requirements.in
+    # via -r requirements.in
 sniffio==1.3.0
     # via
     #   anyio
@@ -250,8 +260,9 @@ tzlocal==4.2
     # via dateparser
 uc-micro-py==1.0.1
     # via linkify-it-py
-urllib3==1.26.12
+urllib3==1.26.7
     # via
+    #   banana-dev
     #   botocore
     #   requests
 uvicorn==0.18.3