From 17e999e95dead6e86af53c8fa5dcb7cc8ead2d1d Mon Sep 17 00:00:00 2001 From: Melanie Buehler Date: Wed, 13 Nov 2024 16:38:39 -0800 Subject: [PATCH 1/2] MultimodalQnA bugfix for follow-up query with a .png image Signed-off-by: Melanie Buehler --- .../dataprep/multimodal/redis/langchain/multimodal_utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py b/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py index 09abad5641..919b6a0085 100644 --- a/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py +++ b/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py @@ -250,6 +250,7 @@ def extract_frames_and_generate_captions( # Set up location to store frames and annotations os.makedirs(output_dir, exist_ok=True) os.makedirs(os.path.join(output_dir, "frames"), exist_ok=True) + is_video = os.path.splitext(video_path)[-1] == '.mp4' # Load video and get fps vidcap = cv2.VideoCapture(video_path) @@ -294,8 +295,8 @@ def extract_frames_and_generate_captions( "video_name": os.path.basename(video_path), "b64_img_str": b64_img_str, "caption": text, - "time": mid_time_ms, - "frame_no": frame_no, + "time": mid_time_ms if is_video else 0.0, + "frame_no": frame_no if is_video else 0, "sub_video_id": idx, } ) From a8b7db7630e58b81bc5907fc06aec3d1f8ac7736 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:25:36 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- comps/dataprep/multimodal/redis/langchain/multimodal_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py b/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py index 919b6a0085..e8bf46c6b0 100644 --- a/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py +++ b/comps/dataprep/multimodal/redis/langchain/multimodal_utils.py @@ -250,7 +250,7 @@ def extract_frames_and_generate_captions( # Set up location to store frames and annotations os.makedirs(output_dir, exist_ok=True) os.makedirs(os.path.join(output_dir, "frames"), exist_ok=True) - is_video = os.path.splitext(video_path)[-1] == '.mp4' + is_video = os.path.splitext(video_path)[-1] == ".mp4" # Load video and get fps vidcap = cv2.VideoCapture(video_path)