Many updates to the thing

app.py

@@ -1,12 +1,12 @@
+import gradio
 import gradio as gr
-from download import check_download, download, download_generator
-import argparse
+
+from download import download_generator
 import anvil.media
 import os
-import pathlib
-from pathlib import Path
-from shutil import rmtree
 import dotenv
+
+from utils.apis import render_api_elements
 from utils.utils import get_args
 
 dotenv.load_dotenv()
@@ -20,40 +20,19 @@ model_size: str = args.get("model")
 preload_model: str = args.get("preload")
 
 url_input = gr.Textbox(label="Youtube/Twitter/etc video URL (supports many services)", value='https://twitter.com/starsonxh/status/1552945347194142720', lines=1, elem_id="url_input")
-download_status = gr.Textbox(label="Status:", value='', lines=1, elem_id="download_status")
+# download_status = gr.Textbox(label="Status:", value='', lines=1, elem_id="download_status")
+download_status = gr.Checkbox(label="Status:", elem_id="download_status", interactive=False)
 init_video = gr.Video(label="Downloaded video", visible=False)
 init_audio = gr.Audio(label="Downloaded audio", visible=False)
 output_text = gr.Textbox(label="Output text", lines=5, visible=False, max_lines=10, interactive=True)
-sub_video = gr.Video(label="Subbed video", visible=False)
-
-
-@anvil.server.callable
-def cleanup_output_dir():
-  #make sure we're in the main directory
-  os.chdir(pathlib.Path(__file__).parent.absolute())
-  #delete the output directory contents
-  for path in Path("output").glob("**/*"):
-    if path.is_file():
-      path.unlink()
-    elif path.is_dir():
-      rmtree(path)
-
-@anvil.server.callable
-def download_api(url):
-  print(f'Request from Anvil with URL {url}')
-  final_response = ''
-  #TODO: figure out how to push an incoming event to the queue
-  #THIS DOESN'T WORK queue_placeholder.push_event('download', url)
-  #TODO: handle errors
-  for response in download_generator(url):
-    final_response = response['message']
-    print(final_response)
-  return final_response
+sub_video = gr.Video(label="Subbed video", visible=False, mirror_webcam=False)
+
+
 
 def predownload(url):
   for response in download_generator(url):
     updates_object = {}
-    updates_object[download_status] = response.get('message', '')
+    updates_object[download_status] = gr.update(label=f"STATUS: {response.get('message')}")
     meta = response.get('meta')
     if 'video' in response:
       updates_object[init_video] = gr.update(visible=True, value=response["video"],
@@ -104,11 +83,11 @@ with gr.Blocks(css=css+"") as demo:
     with gr.Group() as group:
       url_input.render()
       greet_btn = gr.Button("Translate", elem_id='submit', variant='primary')
-      pause_for_editing = gr.Checkbox(label="Pause for editing")
-      drowpdown = gr.PlayableVideo
+
+      download_status.render()
   with gr.Row():
     with gr.Column():
-      download_status.render()
+
       init_video.render()
       init_audio.render()
     with gr.Column():
@@ -123,9 +102,12 @@ with gr.Blocks(css=css+"") as demo:
   url_input.submit(fn=predownload, inputs=[url_input], outputs=[download_status, init_video, init_audio, output_text, sub_video])
   rebake.click(fn=rebake, inputs=[output_text, sub_video], outputs=[download_status, output_text, sub_video])
 
-  api_button = gr.Button("API", variant='primary', visible=False).click(fn=cleanup_output_dir, inputs=[], outputs=[], api_name='cleanup_output_dir')
+
+  # Render imported buttons for API bindings
+  render_api_elements(url_input)
 
 queue_placeholder = demo.queue()
 
 if __name__ == "__main__":
-  demo.launch(show_error=True, debug=True, share=gradio_share)
+  gradio.close_all()
+  demo.launch(show_error=True, debug=True, share=gradio_share, server_port=8111, favicon_path='fonts/icon.png')

download.py

@@ -83,6 +83,8 @@ def download_generator(url):
     print('stderr:', e.stderr.decode('utf8'))
     raise e
   except Exception as e:
+    print('stdout:', e.stdout.decode('utf8'))
+    print('stderr:', e.stderr.decode('utf8'))
     os.chdir(original_dir)
     print('error', file=sys.stderr)
     raise e

requirements.txt

@@ -1,5 +1,7 @@
-youtube-dl
-whisper @ git+https://github.com/openai/whisper.git@main#egg=whisper
-anvil-uplink
-gradio
-python-dotenv
+youtube-dl==2021.12.17
+whisper @ git+https://github.com/openai/whisper.git@main#egg=whisper==1.1.5
+anvil-uplink==0.4.0
+gradio==3.4.0
+python-dotenv==0.21.0
+aiohttp==3.8.3
+aiohttp-requests==0.1.3

utils/apis.py

@@ -0,0 +1,75 @@
+import json
+import os
+import pathlib
+import threading
+import time
+from pathlib import Path
+from shutil import rmtree
+
+import anvil.server
+import anvil.media
+import gradio as gr
+import requests
+import asyncio
+import httpx
+
+from download import download_generator
+
+
+@anvil.server.callable()
+def call_gradio_self_api(api_name='test_api', data=[]):
+  gradio_url = f"http://127.0.0.1:8111/api/{api_name}"
+  payload = json.dumps({"data": data})
+  headers = {
+    'accept': 'application/json',
+    'Content-Type': 'application/json'
+  }
+  print(f"Calling {gradio_url} with {payload}")
+  resp = requests.request("POST", gradio_url, headers=headers, data=payload)
+  print(resp.text)
+  return resp.text
+
+def remote_download(url):
+  print(f"remote_download: Downloading {url}")
+  final_response = ''
+  subbed_video_media = None
+  for response in download_generator(url):
+    final_response = response['message']
+    print(final_response)
+    if 'sub_video' in response:
+      subbed_video_media = anvil.media.from_file(response['sub_video'])
+  return final_response, subbed_video_media
+
+def test_api(url=''):
+  print(f'Request from Anvil with URL {url}, faking a long ass request that takes 15 seconds')
+  time.sleep(15)
+  # fake a long ass request that takes 15 seconds
+  # TODO: add a video output here to test how events are done
+  # TODO: add an anvil server pingback to show we completed the queue operation
+  return f"I've slept for 15 seconds and now I'm done. "
+
+def render_api_elements(url_input):
+  with gr.Group() as api_buttons:
+    # This is a hack to get APIs registered with the blocks interface
+    gr.Button("API", visible=False)\
+      .click(api_name='cleanup_output_dir',
+             fn=cleanup_output_dir, queue=True, inputs=[], outputs=[])
+    gr.Button("API", visible=False)\
+      .click(api_name='test_api', queue=True, fn=test_api, inputs=[url_input], outputs=[])
+
+    gr.Button("remote_download", visible=False)\
+      .click(api_name='remote_download', queue=True, fn=remote_download, inputs=[url_input], outputs=[])
+  return api_buttons
+
+
+@anvil.server.callable
+def cleanup_output_dir():
+  #make sure we're in the main directory
+  os.chdir(pathlib.Path(__file__).parent.parent.absolute())
+  #delete the output directory contents
+  for path in Path("output").glob("**/*"):
+    if path.is_file():
+      path.unlink()
+    elif path.is_dir():
+      rmtree(path)
+

utils/subs.py

@@ -10,17 +10,18 @@ from typing import Iterator, TextIO
 def bake_subs(input_file, output_file, subs_file, fontsdir):
   print(f"Baking {subs_file} into video... {input_file} -> {output_file}")
 
-
   fontfile = fontsdir / 'arial.ttf'
+  watermarkfile = fontsdir / 'watermarksmol.png'
   fontstyle = 'Fontsize=18,OutlineColour=&H40000000,BorderStyle=3,FontName=Arial'
   video = ffmpeg.input(input_file)
+  watermark = ffmpeg.input(watermarkfile)
   audio = video.audio
   (
-    ffmpeg
-      .concat(
-      video.filter('subtitles', subs_file, fontsdir=fontfile, force_style=fontstyle),
-      audio, v=1, a=1
-    )
+    ffmpeg.concat(
+        video.filter('subtitles', subs_file, fontsdir=fontfile, force_style=fontstyle),
+        audio, v=1, a=1
+      )
+      .overlay(watermark, x='10', y='10')
       .output(filename=output_file)
       .run(quiet=True, overwrite_output=True)
   )