From 19263884ebf1dd949ae291fca9528d6cf4beb332 Mon Sep 17 00:00:00 2001
From: Javier Martinez <javiermartinezalvarez98@gmail.com>
Date: Mon, 29 Jul 2024 11:12:47 +0200
Subject: [PATCH 1/2] fix: ffmpy dependency

---
 poetry.lock    | 19 ++++++++++++-------
 pyproject.toml |  4 +++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 035f434cd..13dd1ef7d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -1253,13 +1253,18 @@ standard = ["fastapi", "uvicorn[standard] (>=0.15.0)"]
 
 [[package]]
 name = "ffmpy"
-version = "0.3.1"
+version = "0.3.2"
 description = "A simple Python wrapper for ffmpeg"
 optional = true
 python-versions = "*"
-files = [
-    {file = "ffmpy-0.3.1.tar.gz", hash = "sha256:a173b8f42c7c669ff722df7fb31e1e870067713697f745224fa6e621b82f0004"},
-]
+files = []
+develop = false
+
+[package.source]
+type = "git"
+url = "https://github.com/EuDs63/ffmpy.git"
+reference = "HEAD"
+resolved_reference = "333a19ee4d21f32537c0508aa1942ef1aa7afe24"
 
 [[package]]
 name = "filelock"
@@ -6851,7 +6856,7 @@ llms-openai-like = ["llama-index-llms-openai-like"]
 llms-sagemaker = ["boto3"]
 rerank-sentence-transformers = ["sentence-transformers", "torch"]
 storage-nodestore-postgres = ["asyncpg", "llama-index-storage-docstore-postgres", "llama-index-storage-index-store-postgres", "psycopg2-binary"]
-ui = ["gradio"]
+ui = ["ffmpy", "gradio"]
 vector-stores-chroma = ["llama-index-vector-stores-chroma"]
 vector-stores-clickhouse = ["clickhouse-connect", "llama-index-vector-stores-clickhouse"]
 vector-stores-milvus = ["llama-index-vector-stores-milvus"]
@@ -6861,4 +6866,4 @@ vector-stores-qdrant = ["llama-index-vector-stores-qdrant"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.11,<3.12"
-content-hash = "5e916cce1a7805965795dbaee0e2d24612e54305af4b1936d6bc1fa469b8012f"
+content-hash = "85268756d94673be933e42bbb8e6e71e632d71096b0e4b98dd4cec8df9cd0dc4"
diff --git a/pyproject.toml b/pyproject.toml
index f611ad7a7..37d472a26 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,12 +56,14 @@ sentence-transformers = {version ="^3.0.1", optional = true}
 
 # Optional UI
 gradio = {version ="^4.37.2", optional = true}
+# Fix: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/16289#issuecomment-2255106490
+ffmpy = {git = "https://github.com/EuDs63/ffmpy.git", optional = true}
 
 # Optional Google Gemini dependency
 google-generativeai = {version ="^0.5.4", optional = true}
 
 [tool.poetry.extras]
-ui = ["gradio"]
+ui = ["gradio", "ffmpy"]
 llms-llama-cpp = ["llama-index-llms-llama-cpp"]
 llms-openai = ["llama-index-llms-openai"]
 llms-openai-like = ["llama-index-llms-openai-like"]

From dfa03d261e975b8fa4f1e7fea7c1691cf3e384ea Mon Sep 17 00:00:00 2001
From: Javier Martinez <javiermartinezalvarez98@gmail.com>
Date: Mon, 29 Jul 2024 11:42:04 +0200
Subject: [PATCH 2/2] fix: block ffmpy to commit sha

---
 poetry.lock    | 4 ++--
 pyproject.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 13dd1ef7d..2ac5cecc2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -6866,4 +6866,4 @@ vector-stores-qdrant = ["llama-index-vector-stores-qdrant"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.11,<3.12"
-content-hash = "85268756d94673be933e42bbb8e6e71e632d71096b0e4b98dd4cec8df9cd0dc4"
+content-hash = "66edb004ccbe7915d68567ea31a7851c87717185e2b504048cc645d1d511a66e"
diff --git a/pyproject.toml b/pyproject.toml
index 37d472a26..7b34c07ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ sentence-transformers = {version ="^3.0.1", optional = true}
 # Optional UI
 gradio = {version ="^4.37.2", optional = true}
 # Fix: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/16289#issuecomment-2255106490
-ffmpy = {git = "https://github.com/EuDs63/ffmpy.git", optional = true}
+ffmpy = {git = "https://github.com/EuDs63/ffmpy.git", rev = "333a19ee4d21f32537c0508aa1942ef1aa7afe24", optional = true}
 
 # Optional Google Gemini dependency
 google-generativeai = {version ="^0.5.4", optional = true}