diff --git a/alwrity.py b/alwrity.py index e9c17462..ea45b494 100644 --- a/alwrity.py +++ b/alwrity.py @@ -1,24 +1,19 @@ +print("Welcome, Alwrity at your service..") import os from pathlib import Path import configparser from datetime import datetime import typer -from prompt_toolkit.shortcuts import checkboxlist_dialog, message_dialog, input_dialog -from prompt_toolkit.shortcuts import radiolist_dialog from prompt_toolkit import prompt -from prompt_toolkit.styles import Style from prompt_toolkit.shortcuts import radiolist_dialog -from prompt_toolkit.formatted_text import HTML -from prompt_toolkit.layout.containers import HSplit, Window -from prompt_toolkit.layout.controls import BufferControl from dotenv import load_dotenv import requests from rich import print from rich.text import Text load_dotenv(Path('.env')) - +print("Loading, required libraries..") app = typer.Typer() from lib.utils.alwrity_utils import blog_from_audio, blog_from_keyword, do_web_research, do_web_research, ai_news_writer @@ -254,12 +249,11 @@ def create_env_file(): if __name__ == "__main__": + print("Checking Internet..") check_internet() print("Creating .env file") create_env_file() - print("Clear, all this..") - os.system("clear" if os.name == "posix" else "cls") print("Checking Search APIs..") check_search_apis() print("Checking LLM APIs..") diff --git a/lib/ai_web_researcher/google_serp_search.py b/lib/ai_web_researcher/google_serp_search.py index 5e672a2d..0ff01e5e 100644 --- a/lib/ai_web_researcher/google_serp_search.py +++ b/lib/ai_web_researcher/google_serp_search.py @@ -35,7 +35,7 @@ from clint.textui import progress #from serpapi import GoogleSearch from loguru import logger from tabulate import tabulate -from GoogleNews import GoogleNews +#from GoogleNews import GoogleNews # Configure logger logger.remove() from dotenv import load_dotenv diff --git a/lib/ai_web_researcher/gpt_online_researcher.py b/lib/ai_web_researcher/gpt_online_researcher.py index 68af625c..5b68cad7 100644 --- a/lib/ai_web_researcher/gpt_online_researcher.py +++ b/lib/ai_web_researcher/gpt_online_researcher.py @@ -24,14 +24,12 @@ import os import json from pathlib import Path import sys -from typing import List, NamedTuple from datetime import datetime from .tavily_ai_search import get_tavilyai_results from .metaphor_basic_neural_web_search import metaphor_find_similar, metaphor_search_articles from .google_serp_search import google_search from .google_trends_researcher import do_google_trends_analysis -#from .web_research_report import write_web_research_report from loguru import logger # Configure logger @@ -42,6 +40,7 @@ logger.add(sys.stdout, ) + def gpt_web_researcher(search_keywords): """ Keyword based web researcher, basic, neural and Semantic search.""" diff --git a/lib/ai_web_researcher/tavily_ai_search.py b/lib/ai_web_researcher/tavily_ai_search.py index 088c9d2a..f18d24cd 100644 --- a/lib/ai_web_researcher/tavily_ai_search.py +++ b/lib/ai_web_researcher/tavily_ai_search.py @@ -45,7 +45,6 @@ logger.add(sys.stdout, ) from .common_utils import save_in_file, cfg_search_param - from tenacity import retry, stop_after_attempt, wait_random_exponential diff --git a/lib/ai_writers/ai_agents_crew_writer.py b/lib/ai_writers/ai_agents_crew_writer.py index 5a84802a..51978b93 100644 --- a/lib/ai_writers/ai_agents_crew_writer.py +++ b/lib/ai_writers/ai_agents_crew_writer.py @@ -78,7 +78,7 @@ def create_tasks(agents, search_keywords): task_description, expected_output = read_config("research_task") print(task_description, expected_output) research_task = Task( - description=f"""The main focus keywords are: "{search_keywords}".\n{task_description}""", + description=f"""The main focus keywords are: "{search_keywords}".\n{task_description}""", expected_output = expected_output, agent=agents[0] # Assign to the researcher agent ) diff --git a/lib/utils/alwrity_utils.py b/lib/utils/alwrity_utils.py index c52dcc75..0601a800 100644 --- a/lib/utils/alwrity_utils.py +++ b/lib/utils/alwrity_utils.py @@ -8,9 +8,7 @@ from prompt_toolkit import prompt from prompt_toolkit.completion import WordCompleter from prompt_toolkit.validation import Validator, ValidationError from prompt_toolkit.shortcuts import radiolist_dialog -import typer from rich import print - from lib.ai_web_researcher.gpt_online_researcher import gpt_web_researcher from lib.ai_web_researcher.metaphor_basic_neural_web_search import metaphor_find_similar from lib.ai_writers.keywords_to_blog import write_blog_from_keywords @@ -352,7 +350,7 @@ def image_generator(): if os.getenv(api_key) is None: print(f"\n\n[bold green] πŸ™‹ Get {api_key} Here:https://platform.stability.ai/docs/getting-started πŸ™‹ -- \n") - user_input = typer.prompt(f"πŸ’© -**Please Enter(copy/paste) {api_key} Key** - HereπŸ™‹:") + user_input = prompt(f"πŸ’© -**Please Enter(copy/paste) {api_key} Key** - HereπŸ™‹:") os.environ[api_key] = user_input try: with open(".env", "a") as env_file: