Merge remote-tracking branch 'origin/package_refactoring' into packag…

…e_refactoring
assafelovic · Nov 13, 2023 · 2ef7523 · 2ef7523
2 parents 09a09cb + ef794cf
commit 2ef7523
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 12 deletions.
diff --git a/examples/permchain_example/README.md → examples/permchain_agents/README.md b/examples/permchain_example/README.md → examples/permchain_agents/README.md
diff --git a/...permchain_example/editor_actors/editor.py → .../permchain_agents/editor_actors/editor.py b/...permchain_example/editor_actors/editor.py → .../permchain_agents/editor_actors/editor.py
diff --git a/examples/permchain_example/research_team.py → examples/permchain_agents/research_team.py b/examples/permchain_example/research_team.py → examples/permchain_agents/research_team.py
diff --git a/examples/permchain_example/researcher.py → examples/permchain_agents/researcher.py b/examples/permchain_example/researcher.py → examples/permchain_agents/researcher.py
diff --git a/...rmchain_example/reviser_actors/reviser.py → ...ermchain_agents/reviser_actors/reviser.py b/...rmchain_example/reviser_actors/reviser.py → ...ermchain_agents/reviser_actors/reviser.py
diff --git a/...n_example/search_actors/gpt_researcher.py → ...in_agents/search_actors/gpt_researcher.py b/...n_example/search_actors/gpt_researcher.py → ...in_agents/search_actors/gpt_researcher.py
diff --git a/...chain_example/search_actors/search_api.py → ...mchain_agents/search_actors/search_api.py b/...chain_example/search_actors/search_api.py → ...mchain_agents/search_actors/search_api.py
diff --git a/examples/permchain_example/test.py → examples/permchain_agents/test.py b/examples/permchain_example/test.py → examples/permchain_agents/test.py
@@ -2,12 +2,12 @@
 import os, sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
 
-from examples.permchain_example.researcher import Researcher
-from examples.permchain_example.editor_actors.editor import EditorActor
-from examples.permchain_example.reviser_actors.reviser import ReviserActor
-from examples.permchain_example.search_actors.gpt_researcher import GPTResearcherActor
-from examples.permchain_example.writer_actors.writer import WriterActor
-from examples.permchain_example.research_team import ResearchTeam
+from examples.permchain_agents.researcher import Researcher
+from examples.permchain_agents.editor_actors.editor import EditorActor
+from examples.permchain_agents.reviser_actors.reviser import ReviserActor
+from examples.permchain_agents.search_actors.gpt_researcher import GPTResearcherActor
+from examples.permchain_agents.writer_actors.writer import WriterActor
+from examples.permchain_agents.research_team import ResearchTeam
 from scraping.processing.text import md_to_pdf
 
 

diff --git a/...permchain_example/writer_actors/writer.py → .../permchain_agents/writer_actors/writer.py b/...permchain_example/writer_actors/writer.py → .../permchain_agents/writer_actors/writer.py
diff --git a/gpt_researcher/master/agent.py b/gpt_researcher/master/agent.py
@@ -87,9 +87,9 @@ async def run_sub_query(self, sub_query):
         new_search_urls = await self.get_new_urls([url.get("href") for url in search_results])
 
         # Scrape Urls
-        await stream_output("logs", f"📝 Summarizing sources...\n", self.websocket)
+        # await stream_output("logs", f"📝Scraping urls {new_search_urls}...\n", self.websocket)
         content = scrape_urls(new_search_urls, self.cfg)
-
+        await stream_output("logs", f"🤔Researching for relevant information...\n", self.websocket)
         # Summarize Raw Data
         summary = await summarize(query=sub_query, content=content, agent_role_prompt=self.role, cfg=self.cfg, websocket=self.websocket)
 

diff --git a/gpt_researcher/master/functions.py b/gpt_researcher/master/functions.py
@@ -220,7 +220,7 @@ async def generate_report(query, context, agent_role_prompt, report_type, websoc
     return report
 
 
-async def stream_output(type, output, websocket=None):
+async def stream_output(type, output, websocket=None, logging=True):
     """
     Streams output to the websocket
     Args:
@@ -230,6 +230,8 @@ async def stream_output(type, output, websocket=None):
     Returns:
         None
     """
-    if not websocket:
-        return print(output)
-    await websocket.send_json({"type": type, "output": output})
+    if not websocket or logging:
+        print(output)
+
+    if websocket:
+        await websocket.send_json({"type": type, "output": output})