Merge branch 'main' into restructure

app.py

@@ -44,7 +44,7 @@ def move_video_to_tempdir(input_dir, filename):
 
 def download_video_from_url(url):
     """Download video from url or return md5 hash as video name"""
-    filename = os.path.join(video_directory, hashlib.md5(url.encode()).hexdigest())
+    filename = filename_from_url(url)
     if not os.path.exists(filename):
         with (urllib.request.urlopen(url)) as f, open(filename, 'wb') as fileout:
             fileout.write(f.read())
@@ -95,6 +95,8 @@ def index_hashes_for_video(url, is_file = False):
         logging.info(f"Index {filename}.index has in total {binary_index.ntotal} frames")
         return binary_index
 
+    download_video_from_url(url)
+
     hash_vectors = np.array([x['hash'] for x in compute_hashes(VideoFileClip(filename))])
     logging.info(f"Computed hashes for {hash_vectors.shape} frames.")
 

clip_data.ipynb

@@ -395,7 +395,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.9.13 64-bit",
+   "display_name": "Python 3.9.7 ('base')",
    "language": "python",
    "name": "python3"
   },
@@ -409,12 +409,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.13"
+   "version": "3.9.7"
   },
   "orig_nbformat": 4,
   "vscode": {
    "interpreter": {
-    "hash": "397704579725e15f5c7cb49fe5f0341eb7531c82d19f2c29d197e8b64ab5776b"
+    "hash": "35ac539f20c4edc7c4b10c8a5969be22a35cbd7bf12b66c83932160e8a573333"
    }
   }
  },

requirements.txt

@@ -1,6 +1,8 @@
 gradio==3.1.7
 moviepy==1.0.3
 imagehash==4.2.1
-pandas==1.4.3
+pandas==1.3.5
 faiss-cpu==1.7.2
-Pillow==9.2.0
+Pillow==9.2.0
+kats==0.2.0
+seaborn==0.12.0