diff --git a/lib/ai_web_researcher/gpt_competitor_analysis.py b/lib/ai_web_researcher/gpt_competitor_analysis.py index 668b27eb..eb1d6af4 100644 --- a/lib/ai_web_researcher/gpt_competitor_analysis.py +++ b/lib/ai_web_researcher/gpt_competitor_analysis.py @@ -1,6 +1,6 @@ import sys -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/ai_web_researcher/gpt_online_researcher.py b/lib/ai_web_researcher/gpt_online_researcher.py index 25f0f427..21bd2277 100644 --- a/lib/ai_web_researcher/gpt_online_researcher.py +++ b/lib/ai_web_researcher/gpt_online_researcher.py @@ -56,7 +56,7 @@ def do_google_serp_search(search_keywords): def do_tavily_ai_search(search_keywords, include_domains=None): - """ """ + """ Common function to do Tavily AI web research.""" try: # FIXME: Include the follow-up questions as blog FAQs. logger.info(f"Doing Tavily AI search for: {search_keywords}") diff --git a/lib/ai_web_researcher/gpt_summarize_web_content.py b/lib/ai_web_researcher/gpt_summarize_web_content.py index 339df264..aff9b7ef 100644 --- a/lib/ai_web_researcher/gpt_summarize_web_content.py +++ b/lib/ai_web_researcher/gpt_summarize_web_content.py @@ -1,6 +1,6 @@ import sys -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/ai_web_researcher/tavily_ai_search.py b/lib/ai_web_researcher/tavily_ai_search.py index d40b676c..7753dd6e 100644 --- a/lib/ai_web_researcher/tavily_ai_search.py +++ b/lib/ai_web_researcher/tavily_ai_search.py @@ -81,7 +81,6 @@ def get_tavilyai_results(keywords, include_urls, search_depth="advanced"): tavily_search_result = client.search(keywords, search_depth, include_answer=True) print_result_table(tavily_search_result) return(tavily_search_result) - except Exception as err: logger.error(f"Failed to do Tavily Research: {err}") @@ -147,7 +146,7 @@ def save_in_file(table_content): file_path = os.environ.get('SEARCH_SAVE_FILE') try: # Save the content to the file - with open(file_path, "a+") as file: + with open(file_path, "a") as file: file.write(table_content) file.write("\n" * 3) # Add three newlines at the end logger.info(f"Search content saved to {file_path}") diff --git a/lib/ai_writers/blog_from_google_serp.py b/lib/ai_writers/blog_from_google_serp.py index 0bba303c..cfe92410 100644 --- a/lib/ai_writers/blog_from_google_serp.py +++ b/lib/ai_writers/blog_from_google_serp.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv load_dotenv(Path('../.env')) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/ai_writers/combine_blog_and_keywords.py b/lib/ai_writers/combine_blog_and_keywords.py index db25aa2b..bad01b42 100644 --- a/lib/ai_writers/combine_blog_and_keywords.py +++ b/lib/ai_writers/combine_blog_and_keywords.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv load_dotenv(Path('../.env')) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/ai_writers/combine_research_and_blog.py b/lib/ai_writers/combine_research_and_blog.py index 3c0eefc6..7eaa1a02 100644 --- a/lib/ai_writers/combine_research_and_blog.py +++ b/lib/ai_writers/combine_research_and_blog.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv load_dotenv(Path('../.env')) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/ai_writers/keywords_to_blog.py b/lib/ai_writers/keywords_to_blog.py index 3221e073..3e24a1d1 100644 --- a/lib/ai_writers/keywords_to_blog.py +++ b/lib/ai_writers/keywords_to_blog.py @@ -46,11 +46,13 @@ def write_blog_from_keywords(search_keywords, url=None): logger.info(f"######### Blog content Google SERP research: ###########\n\n{blog_markdown_str}\n\n") # Do Tavily AI research to augument the above blog. - tavily_search_result, t_titles = do_tavily_ai_search(search_keywords) - example_blog_titles.append(t_titles) - if tavily_search_result: + try: + tavily_search_result, t_titles = do_tavily_ai_search(search_keywords) + example_blog_titles.append(t_titles) blog_markdown_str = blog_with_research(blog_markdown_str, tavily_search_result) logger.info(f"######### Blog content after Tavily AI research: ######### \n\n{blog_markdown_str}\n\n") + except Exception as err: + logger.error(f"Failed to do Tavily AI research: {err}") try: # Do Metaphor/Exa AI search. diff --git a/lib/blog_metadata/get_blog_category.py b/lib/blog_metadata/get_blog_category.py index 52a1b50a..38137939 100644 --- a/lib/blog_metadata/get_blog_category.py +++ b/lib/blog_metadata/get_blog_category.py @@ -11,7 +11,7 @@ logger.add(sys.stdout, format="{level}|{file}:{line}:{function}| {message}" ) -from ..gpt_providers.openai_gpt_provider import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response diff --git a/lib/blog_metadata/get_blog_meta_desc.py b/lib/blog_metadata/get_blog_meta_desc.py index ede8a09d..a1eb2787 100644 --- a/lib/blog_metadata/get_blog_meta_desc.py +++ b/lib/blog_metadata/get_blog_meta_desc.py @@ -11,7 +11,7 @@ logger.add(sys.stdout, format="{level}|{file}:{line}:{function}| {message}" ) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response diff --git a/lib/blog_metadata/get_blog_title.py b/lib/blog_metadata/get_blog_title.py index 8c39189c..47fe6e78 100644 --- a/lib/blog_metadata/get_blog_title.py +++ b/lib/blog_metadata/get_blog_title.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv load_dotenv(Path('../../.env')) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response from loguru import logger diff --git a/lib/blog_metadata/get_tags.py b/lib/blog_metadata/get_tags.py index 69e49e4f..dfbf90c3 100644 --- a/lib/blog_metadata/get_tags.py +++ b/lib/blog_metadata/get_tags.py @@ -11,7 +11,7 @@ logger.add(sys.stdout, format="{level}|{file}:{line}:{function}| {message}" ) -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt from ..gpt_providers.gemini_pro_text import gemini_text_response diff --git a/lib/blog_postprocessing/blog_proof_reader.py b/lib/blog_postprocessing/blog_proof_reader.py index b2a0d698..87151294 100644 --- a/lib/blog_postprocessing/blog_proof_reader.py +++ b/lib/blog_postprocessing/blog_proof_reader.py @@ -6,7 +6,7 @@ from dotenv import load_dotenv load_dotenv(Path('../../.env')) from ..gpt_providers.gemini_pro_text import gemini_text_response -from ..gpt_providers.openai_chat_completion import openai_chatgpt +from ..gpt_providers.openai_text_gen import openai_chatgpt def blog_proof_editor(blog_content, blog_keywords): diff --git a/lib/gpt_providers/openai_chat_completion.py b/lib/gpt_providers/openai_text_gen.py similarity index 100% rename from lib/gpt_providers/openai_chat_completion.py rename to lib/gpt_providers/openai_text_gen.py