Update middlewares/utils.py

middlewares/utils.py

@@ -7,19 +7,14 @@ from middlewares.search_client import SearchClient
 import os
 from dotenv import load_dotenv
 
-
 load_dotenv()
-API_TOKEN = os.getenv("HF_TOKEN")
-GOOGLE_SEARCH_ENGINE_ID = os.getenv("GOOGLE_SEARCH_ENGINE_ID")
-GOOGLE_SEARCH_API_KEY = os.getenv("GOOGLE_SEARCH_API_KEY")
-#BING_SEARCH_API_KEY = os.getenv("BING_SEARCH_API_KEY")
-BING_SEARCH_API_KEY = os.environ.get('AZURE_SEARCH_KEY', 'b828219acd4f46d0b77d51b4564a8475')
 
-reranker = CrossEncoder("cross-encoder/ms-marco-MiniLM-L-6-v2")
+start_date='1/05/2024'
+end_date='26/05/2024'
 
-googleSearchClient = SearchClient(
-    "google", api_key=GOOGLE_SEARCH_API_KEY, engine_id=GOOGLE_SEARCH_ENGINE_ID
-)
+BING_SEARCH_API_KEY = os.environ.get('AZURE_SEARCH_KEY', 'b828219acd4f46d0b77d51b4564a8475')
+reranker = CrossEncoder("cross-encoder/ms-marco-MiniLM-L-6-v2")
+googleSearchClient = SearchClient("google",api_key=None, engine_id=None)
 bingSearchClient = SearchClient("bing", api_key=BING_SEARCH_API_KEY, engine_id=None)
 
 
@@ -71,20 +66,17 @@ def gen_augmented_prompt_via_websearch(
     chunk_size=512,
 ):
    
-    try:
-        search_results = []
-        reranked_results = []
-        if search_vendor == "Google":
-            search_results = googleSearchClient.search(prompt, n_crawl)
-        elif search_vendor == "Bing":
-            print('[Bing search enabled]')
-            search_results = bingSearchClient.search(prompt, n_crawl)
-            print(search_results)
-            print('[Bing search completed]') 
-        if len(search_results) > 0:
-            reranked_results = rerank(prompt, top_k, search_results, chunk_size)
-    except Exception as e:
-        print(e)
+
+    search_results = []
+    reranked_results = []
+    if search_vendor == "Google":
+        search_results =googleSearchClient.search_google(start_date,end_date,prompt, n_crawl)
+    elif search_vendor == "Bing":
+        search_results = bingSearchClient.search(prompt, n_crawl)
+        print('search_results',search_results)
+
+    if len(search_results) > 0:
+        reranked_results = rerank(prompt, top_k, search_results, chunk_size)
 
     links = []
     context = ""
@@ -118,4 +110,4 @@ def gen_augmented_prompt_via_websearch(
     """
 
     print(augmented_prompt)
-    return augmented_prompt, links
+    return augmented_prompt, links