refactored orchestrator to master

assafelovic · Oct 11, 2024 · a1e8b8a · a1e8b8a
1 parent 0879e16
commit a1e8b8a
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 23 deletions.
diff --git a/backend/report_type/basic_report/basic_report.py b/backend/report_type/basic_report/basic_report.py
@@ -1,6 +1,6 @@
 from fastapi import WebSocket
 
-from gpt_researcher.orchestrator.agent import GPTResearcher
+from gpt_researcher.master.agent import GPTResearcher
 from gpt_researcher.utils.enum import Tone
 
 

diff --git a/backend/report_type/detailed_report/detailed_report.py b/backend/report_type/detailed_report/detailed_report.py
@@ -2,16 +2,16 @@
 from typing import List, Dict, Set, Optional
 from fastapi import WebSocket
 
-from gpt_researcher.orchestrator.actions import (
+from gpt_researcher.master.actions import (
     add_references,
     extract_headers,
     extract_sections,
     table_of_contents,
 )
-from gpt_researcher.orchestrator.agent import GPTResearcher
+from gpt_researcher.master.agent import GPTResearcher
 from gpt_researcher.utils.enum import Tone
 from gpt_researcher.utils.validators import Subtopics
-from gpt_researcher.orchestrator.actions.markdown_processing import extract_headers
+from gpt_researcher.master.actions.markdown_processing import extract_headers
 
 
 class DetailedReport:

diff --git a/backend/server/server.py b/backend/server/server.py
@@ -13,7 +13,7 @@
 from backend.server.websocket_manager import WebSocketManager
 from multi_agents.main import run_research_task
 from gpt_researcher.document.document import DocumentLoader
-from gpt_researcher.orchestrator.actions import stream_output
+from gpt_researcher.master.actions import stream_output
 from backend.server.server_utils import (
     sanitize_filename, handle_start_command, handle_human_feedback,
     generate_report_files, send_file_paths, get_config_dict,

diff --git a/backend/server/websocket_manager.py b/backend/server/websocket_manager.py
@@ -7,7 +7,7 @@
 from backend.report_type import BasicReport, DetailedReport
 from gpt_researcher.utils.enum import ReportType, Tone
 from multi_agents.main import run_research_task
-from gpt_researcher.orchestrator.actions import stream_output  # Import stream_output
+from gpt_researcher.master.actions import stream_output  # Import stream_output
 
 
 class WebSocketManager:

diff --git a/gpt_researcher/__init__.py b/gpt_researcher/__init__.py
@@ -1,4 +1,4 @@
-from .orchestrator import GPTResearcher
+from .master import GPTResearcher
 from .config import Config
 
 __all__ = ['GPTResearcher', 'Config']
diff --git a/gpt_researcher/orchestrator/__init__.py → gpt_researcher/master/__init__.py b/gpt_researcher/orchestrator/__init__.py → gpt_researcher/master/__init__.py
diff --git a/...searcher/orchestrator/actions/__init__.py → gpt_researcher/master/actions/__init__.py b/...searcher/orchestrator/actions/__init__.py → gpt_researcher/master/actions/__init__.py
diff --git a/...chestrator/actions/markdown_processing.py → ...her/master/actions/markdown_processing.py b/...chestrator/actions/markdown_processing.py → ...her/master/actions/markdown_processing.py
diff --git a/.../orchestrator/actions/query_processing.py → ...archer/master/actions/query_processing.py b/.../orchestrator/actions/query_processing.py → ...archer/master/actions/query_processing.py
@@ -4,7 +4,7 @@
 from typing import List, Dict, Any
 from gpt_researcher.config.config import Config
 from gpt_researcher.utils.llm import create_chat_completion
-from gpt_researcher.orchestrator.prompts import auto_agent_instructions, generate_search_queries_prompt
+from gpt_researcher.master.prompts import auto_agent_instructions, generate_search_queries_prompt
 
 
 async def choose_agent(

diff --git a/...orchestrator/actions/report_generation.py → ...rcher/master/actions/report_generation.py b/...orchestrator/actions/report_generation.py → ...rcher/master/actions/report_generation.py
@@ -3,7 +3,7 @@
 from gpt_researcher.config.config import Config
 from gpt_researcher.utils.llm import create_chat_completion
 from gpt_researcher.utils.logger import get_formatted_logger
-from gpt_researcher.orchestrator.prompts import (
+from gpt_researcher.master.prompts import (
     generate_report_introduction,
     generate_draft_titles_prompt,
     generate_report_conclusion,

diff --git a/...earcher/orchestrator/actions/retriever.py → gpt_researcher/master/actions/retriever.py b/...earcher/orchestrator/actions/retriever.py → gpt_researcher/master/actions/retriever.py
diff --git a/gpt_researcher/orchestrator/actions/utils.py → gpt_researcher/master/actions/utils.py b/gpt_researcher/orchestrator/actions/utils.py → gpt_researcher/master/actions/utils.py
diff --git a/...cher/orchestrator/actions/web_scraping.py → ...researcher/master/actions/web_scraping.py b/...cher/orchestrator/actions/web_scraping.py → ...researcher/master/actions/web_scraping.py
diff --git a/...researcher/orchestrator/agent/__init__.py → gpt_researcher/master/agent/__init__.py b/...researcher/orchestrator/agent/__init__.py → gpt_researcher/master/agent/__init__.py
diff --git a/...her/orchestrator/agent/context_manager.py → ...esearcher/master/agent/context_manager.py b/...her/orchestrator/agent/context_manager.py → ...esearcher/master/agent/context_manager.py
@@ -4,7 +4,7 @@
 from gpt_researcher.context.compression import ContextCompressor, WrittenContentCompressor, VectorstoreCompressor
 from gpt_researcher.document import DocumentLoader, LangChainDocumentLoader
 from gpt_researcher.utils.enum import ReportSource
-from gpt_researcher.orchestrator.actions.utils import stream_output
+from gpt_researcher.master.actions.utils import stream_output
 
 
 class ContextManager:
@@ -215,7 +215,7 @@ async def get_similar_content_by_query(self, query, pages):
         )
 
     async def __get_sub_queries(self, query):
-        from gpt_researcher.orchestrator.actions import get_sub_queries
+        from gpt_researcher.master.actions import get_sub_queries
         return await get_sub_queries(
             query=query,
             agent_role_prompt=self.researcher.role,

diff --git a/gpt_researcher/orchestrator/agent/master.py → gpt_researcher/master/agent/master.py b/gpt_researcher/orchestrator/agent/master.py → gpt_researcher/master/agent/master.py
@@ -4,11 +4,11 @@
 from gpt_researcher.memory import Memory
 from gpt_researcher.utils.enum import ReportSource, ReportType, Tone
 from gpt_researcher.llm_provider import GenericLLMProvider
-from gpt_researcher.orchestrator.agent.researcher import ResearchConductor
-from gpt_researcher.orchestrator.agent.scraper import ReportScraper
-from gpt_researcher.orchestrator.agent.writer import ReportGenerator
-from gpt_researcher.orchestrator.agent.context_manager import ContextManager
-from gpt_researcher.orchestrator.actions import get_retrievers, choose_agent
+from gpt_researcher.master.agent.researcher import ResearchConductor
+from gpt_researcher.master.agent.scraper import ReportScraper
+from gpt_researcher.master.agent.writer import ReportGenerator
+from gpt_researcher.master.agent.context_manager import ContextManager
+from gpt_researcher.master.actions import get_retrievers, choose_agent
 from gpt_researcher.vector_store import VectorStoreWrapper
 
 

diff --git a/...searcher/orchestrator/agent/researcher.py → gpt_researcher/master/agent/researcher.py b/...searcher/orchestrator/agent/researcher.py → gpt_researcher/master/agent/researcher.py
@@ -2,8 +2,8 @@
 import random
 from typing import Dict, Optional
 
-from gpt_researcher.orchestrator.actions.utils import stream_output
-from gpt_researcher.orchestrator.actions import get_sub_queries, scrape_urls
+from gpt_researcher.master.actions.utils import stream_output
+from gpt_researcher.master.actions import get_sub_queries, scrape_urls
 from gpt_researcher.document import DocumentLoader, LangChainDocumentLoader
 from gpt_researcher.utils.enum import ReportSource, ReportType, Tone
 

diff --git a/gpt_researcher/orchestrator/agent/scraper.py → gpt_researcher/master/agent/scraper.py b/gpt_researcher/orchestrator/agent/scraper.py → gpt_researcher/master/agent/scraper.py
@@ -1,6 +1,6 @@
 import asyncio
 from typing import List, Dict
-from gpt_researcher.orchestrator.actions import scrape_urls
+from gpt_researcher.master.actions import scrape_urls
 
 
 class ReportScraper:

diff --git a/gpt_researcher/orchestrator/agent/writer.py → gpt_researcher/master/agent/writer.py b/gpt_researcher/orchestrator/agent/writer.py → gpt_researcher/master/agent/writer.py
@@ -1,7 +1,7 @@
 from typing import Dict, Optional
 
 from gpt_researcher.utils.llm import construct_subtopics
-from gpt_researcher.orchestrator.actions import (
+from gpt_researcher.master.actions import (
     stream_output,
     generate_report,
     generate_draft_section_titles,

diff --git a/gpt_researcher/orchestrator/prompts.py → gpt_researcher/master/prompts.py b/gpt_researcher/orchestrator/prompts.py → gpt_researcher/master/prompts.py
diff --git a/gpt_researcher/utils/llm.py b/gpt_researcher/utils/llm.py
@@ -9,7 +9,7 @@
 from langchain.output_parsers import PydanticOutputParser
 from langchain.prompts import PromptTemplate
 
-from gpt_researcher.orchestrator.prompts import generate_subtopics_prompt
+from gpt_researcher.master.prompts import generate_subtopics_prompt
 from .costs import estimate_llm_cost
 from .validators import Subtopics
 

diff --git a/multi_agents/agents/utils/llms.py b/multi_agents/agents/utils/llms.py
@@ -3,7 +3,7 @@
 from langchain_community.adapters.openai import convert_openai_messages
 
 from gpt_researcher.config.config import Config
-from gpt_researcher.orchestrator.actions.query_processing import handle_json_error
+from gpt_researcher.master.actions.query_processing import handle_json_error
 from gpt_researcher.utils.llm import create_chat_completion
 
 from loguru import logger

diff --git a/tests/documents-report-source.py b/tests/documents-report-source.py
@@ -2,7 +2,7 @@
 import asyncio
 import pytest
 # Ensure this path is correct
-from gpt_researcher.orchestrator.agent import GPTResearcher
+from gpt_researcher.master.agent import GPTResearcher
 from dotenv import load_dotenv
 load_dotenv()