From 1833a85637976f91a8831f49835cc546206dd021 Mon Sep 17 00:00:00 2001 From: AjaySi <ajay.calsoft@gmail.com> Date: Sun, 31 Mar 2024 19:36:33 +0530 Subject: [PATCH] WIP - Code refactoring --- lib/ai_web_researcher/google_serp_search.py | 7 ++----- lib/ai_writers/keywords_to_blog.py | 9 ++++++--- lib/gpt_providers/openai_text_gen.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ai_web_researcher/google_serp_search.py b/lib/ai_web_researcher/google_serp_search.py index d36d357..ba539d3 100644 --- a/lib/ai_web_researcher/google_serp_search.py +++ b/lib/ai_web_researcher/google_serp_search.py @@ -50,11 +50,8 @@ ) -#from tenacity import retry, stop_after_attempt, wait_random_exponential -#@retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6)) - - -#FIXME: Accept language, country and time frame to search for. +from tenacity import retry, stop_after_attempt, wait_random_exponential +@retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6)) def google_search(query): """ Perform a Google search for the given query. diff --git a/lib/ai_writers/keywords_to_blog.py b/lib/ai_writers/keywords_to_blog.py index 3e24a1d..7777200 100644 --- a/lib/ai_writers/keywords_to_blog.py +++ b/lib/ai_writers/keywords_to_blog.py @@ -39,9 +39,12 @@ def write_blog_from_keywords(search_keywords, url=None): logger.info(f"Researching and Writing Blog on keywords: {search_keywords}") # Call on the got-researcher, tavily apis for this. Do google search for organic competition. - google_search_result, g_titles = do_google_serp_search(search_keywords) - example_blog_titles.append(g_titles) - blog_markdown_str = write_blog_google_serp(search_keywords, google_search_result) + try: + google_search_result, g_titles = do_google_serp_search(search_keywords) + example_blog_titles.append(g_titles) + blog_markdown_str = write_blog_google_serp(search_keywords, google_search_result) + except Exception as err: + logger.error(f"Failed in Google web research: {err}") # logger.info/check the final blog content. logger.info(f"######### Blog content Google SERP research: ###########\n\n{blog_markdown_str}\n\n") diff --git a/lib/gpt_providers/openai_text_gen.py b/lib/gpt_providers/openai_text_gen.py index 29fdc48..7cdb182 100644 --- a/lib/gpt_providers/openai_text_gen.py +++ b/lib/gpt_providers/openai_text_gen.py @@ -15,7 +15,7 @@ @retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6)) -def openai_chatgpt(prompt, model="gpt-3.5-turbo-0125", temperature=0.2, max_tokens=4096, top_p=0.9, n=1): +def openai_chatgpt(prompt, model="gpt-3.5-turbo-0125", temperature=0.7, max_tokens=4096, top_p=0.5, n=1): """ Wrapper function for OpenAI's ChatGPT completion.