From 2a5445216c412667b4ea26083c29d7780acf7d25 Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Wed, 20 Jul 2022 02:56:23 +0400 Subject: [PATCH] Image input directory not required by collate result as image_name already absolute path --- src/main.py | 1 - src/search_type/image_search.py | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 63a3346d..857d9823 100644 --- a/src/main.py +++ b/src/main.py @@ -94,7 +94,6 @@ def search(q: str, n: Optional[int] = 5, t: Optional[SearchType] = None): return image_search.collate_results( hits, image_names=model.image_search.image_names, - image_directory=config.content_type.image.input_directory, output_directory=output_directory, static_files_url='/static', count=results_count) diff --git a/src/search_type/image_search.py b/src/search_type/image_search.py index adb33a10..896b9118 100644 --- a/src/search_type/image_search.py +++ b/src/search_type/image_search.py @@ -169,13 +169,11 @@ def render_results(hits, image_names, image_directory, count): img.show() -def collate_results(hits, image_names, image_directory, output_directory, static_files_url, count=5): +def collate_results(hits, image_names, output_directory, static_files_url, count=5): results = [] - image_directory = resolve_absolute_path(image_directory, strict=True) for index, hit in enumerate(hits[:count]): - source_image_name = image_names[hit['corpus_id']] - source_path = image_directory.joinpath(source_image_name) + source_path = image_names[hit['corpus_id']] target_image_name = f"{index}{source_path.suffix}" target_path = resolve_absolute_path(f"{output_directory}/{target_image_name}")