Update app.py

app.py

@@ -437,40 +437,58 @@ def Gemma3_AI_Translate(query_txt):
         return query_txt
 
 # --- 검색 ---
-def search_DB_from_multiple_regions(query, selected_regions, region_rag_objects):
-    selected_regions = selected_regions or list(region_rag_objects.keys())
-    logger.info(f"번역된 쿼리: {query}")
+# 검색 함수 수정
+def search_DB_from_multiple_regions(query, selected_regions, region_rag_objects, custom_filters=None):
+    global Filtered_search
+    global filters
+    
+    if not selected_regions:
+        selected_regions = list(region_rag_objects.keys())
+
+    print(f"Translated Query : {query}")
+
+    # 커스텀 필터가 제공된 경우 사용
+    search_filters = custom_filters if custom_filters is not None else filters
+    
+    # 필터가 설정되어 있는지 확인
+    has_filters = any(search_filters.get(key, []) for key in search_filters.keys())
+    
+    print(f"사용된 검색 필터: {search_filters}")
+    print(f"필터 사용 여부: {has_filters}")
 
     combined_results = []
+
     for region in selected_regions:
         rag = region_rag_objects.get(region)
         if not rag:
             continue
 
-        retriever = rag["ensemble_retriever"]
+        ensemble_retriever = rag["ensemble_retriever"]
         vectorstore = rag["vectorstore"]
         sqlite_conn = rag["sqlite_conn"]
 
-        if Filtered_search:
-            results = reg_embedding_system.search_with_metadata_filter(
-                ensemble_retriever=retriever,
-                vectorstore=vectorstore,
-                query=query,
-                k=search_document_number,
-                metadata_filter=filters,
-                sqlite_conn=sqlite_conn
-            )
-        else:
-            results = reg_embedding_system.smart_search_vectorstore(
-                retriever=retriever,
-                query=query,
-                k=search_document_number,
-                vectorstore=vectorstore,
-                sqlite_conn=sqlite_conn,
-                enable_detailed_search=True
-            )
-        logger.info(f"[{region}] 검색: {len(results)}건")
-        combined_results.extend(results)
+        if ensemble_retriever:
+            if has_filters:
+                results = reg_embedding_system.search_with_metadata_filter(
+                    ensemble_retriever=ensemble_retriever,
+                    vectorstore=vectorstore,    
+                    query=query,
+                    k=search_document_number,
+                    metadata_filter=search_filters,
+                    sqlite_conn=sqlite_conn
+                )
+            else:
+                results = reg_embedding_system.smart_search_vectorstore(
+                    retriever=ensemble_retriever,
+                    query=query,
+                    k=search_document_number,
+                    vectorstore=vectorstore,
+                    sqlite_conn=sqlite_conn,
+                    enable_detailed_search=True
+                )
+
+            print(f"[{region}] 검색 완료: {len(results)}건")
+            combined_results.extend(results)
 
     return combined_results