From 44c50e9ecd94a05ecaef8e91d42bc4f220c3bbc7 Mon Sep 17 00:00:00 2001 From: AjaySi Date: Fri, 12 Apr 2024 18:56:20 +0530 Subject: [PATCH] Alwrity - Bug fixes --- lib/ai_web_researcher/gpt_online_researcher.py | 3 ++- .../text_generation/main_text_generation.py | 14 ++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/ai_web_researcher/gpt_online_researcher.py b/lib/ai_web_researcher/gpt_online_researcher.py index 0464d7bd..16ec8f2a 100644 --- a/lib/ai_web_researcher/gpt_online_researcher.py +++ b/lib/ai_web_researcher/gpt_online_researcher.py @@ -46,7 +46,8 @@ def gpt_web_researcher(search_keywords): """ Keyword based web researcher, basic, neural and Semantic search.""" # TBD: Keeping the results directory as fixed, for now. - os.environ["SEARCH_SAVE_FILE"] = os.path.join(os.getcwd(), "workspace", "web_research_reports", search_keywords.replace(" ", "_") + "_" + datetime.now().strftime("%Y-%m-%d_%H-%M-%S")) + os.environ["SEARCH_SAVE_FILE"] = os.path.join(os.getcwd(), "workspace", + search_keywords.replace(" ", "_") + "_" + datetime.now().strftime("%Y-%m-%d_%H-%M-%S")) try: google_search_result = do_google_serp_search(search_keywords) diff --git a/lib/gpt_providers/text_generation/main_text_generation.py b/lib/gpt_providers/text_generation/main_text_generation.py index d468234a..8dce9500 100644 --- a/lib/gpt_providers/text_generation/main_text_generation.py +++ b/lib/gpt_providers/text_generation/main_text_generation.py @@ -69,17 +69,11 @@ def check_gpt_provider(gpt_provider): ValueError: If both the specified GPT provider and environment variable GPT_PROVIDER are missing. """ env_gpt_provider = os.getenv('GPT_PROVIDER') - - if gpt_provider: - os.environ['GPT_PROVIDER'] = gpt_provider - elif env_gpt_provider: - gpt_provider = env_gpt_provider - else: - raise ValueError("Both specified GPT provider and environment variable 'GPT_PROVIDER' are missing.") - - if gpt_provider != env_gpt_provider: + if gpt_provider and if gpt_provider != env_gpt_provider: logger.warning(f"Config: '{gpt_provider}' different to environment variable 'GPT_PROVIDER' '{env_gpt_provider}'") - logger.info(f"Using GPT provider: {gpt_provider}") + logger.info(f"Using Environment GPT provider: {env_gpt_provider}") + gpt_provider = env_gpt_provider + return gpt_provider