From 6b065c5c09c0b1c6b72f950f53629d21711bd82d Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 18:54:53 +0100 Subject: [PATCH 1/9] (issue14) Move user_agent to respective app/agents folder --- agents/buddy.py | 8 +++++--- agents/services/chat_service.py | 15 +++------------ agents/services/planner_service.py | 8 -------- {agents => app/agents}/user_agent.py | 0 tests/agents/services/chat_service_test.py | 2 +- tests/{ => app}/agents/user_agent_test.py | 7 +------ 6 files changed, 10 insertions(+), 30 deletions(-) rename {agents => app/agents}/user_agent.py (100%) rename tests/{ => app}/agents/user_agent_test.py (89%) diff --git a/agents/buddy.py b/agents/buddy.py index 6e26b5d..def4042 100644 --- a/agents/buddy.py +++ b/agents/buddy.py @@ -9,7 +9,7 @@ GPT3_5_TURBO_0613, CONFIG_LIST, ) -from .user_agent import UserAgent +from app.agents.user_agent import UserAgent class Buddy: @@ -63,10 +63,12 @@ def start(self, message: str): message=message, recipient=self.assistant, request_reply=True ) else: - self.user_proxy.initiate_chat(recipient=self.assistant, message=message) + self.user_proxy.initiate_chat( + recipient=self.assistant, message=message) # Store the assistant's reply to the conversation context reply = self.user_proxy.last_message()["content"] - self.conversation_context.append({"role": "assistant", "content": reply}) + self.conversation_context.append( + {"role": "assistant", "content": reply}) return reply diff --git a/agents/services/chat_service.py b/agents/services/chat_service.py index 6f14223..45cc13d 100644 --- a/agents/services/chat_service.py +++ b/agents/services/chat_service.py @@ -1,15 +1,5 @@ -# agents/services/chat_service.py - -import sys -import os - -sys.path.insert( - 0, - os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")), -) - +from app.agents.user_agent import UserAgent from autogen import AssistantAgent -from agents.user_agent import UserAgent class ChatService: @@ -25,7 +15,8 @@ def __init__(self, config_list, function_map, assistant=None, user_proxy=None): if assistant is None: self.assistant = AssistantAgent( name="assistant", - llm_config={"config_list": config_list, "functions": function_map}, + llm_config={"config_list": config_list, + "functions": function_map}, ) else: self.assistant = assistant diff --git a/agents/services/planner_service.py b/agents/services/planner_service.py index 43083be..8171fea 100644 --- a/agents/services/planner_service.py +++ b/agents/services/planner_service.py @@ -1,11 +1,3 @@ -import sys -import os - -sys.path.insert( - 0, - os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")), -) - from autogen import AssistantAgent, UserProxyAgent diff --git a/agents/user_agent.py b/app/agents/user_agent.py similarity index 100% rename from agents/user_agent.py rename to app/agents/user_agent.py diff --git a/tests/agents/services/chat_service_test.py b/tests/agents/services/chat_service_test.py index b814655..6580e7b 100644 --- a/tests/agents/services/chat_service_test.py +++ b/tests/agents/services/chat_service_test.py @@ -10,7 +10,7 @@ def test_initiate_chat(mocked_wait, mocked_create): mocked_wait.return_value = None with patch("autogen.AssistantAgent") as MockedAssistant, patch( - "agents.user_agent.UserAgent" + "app.agents.user_agent.UserAgent" ) as MockedProxy: service = ChatService( "some_config", {}, MockedAssistant.return_value, MockedProxy.return_value diff --git a/tests/agents/user_agent_test.py b/tests/app/agents/user_agent_test.py similarity index 89% rename from tests/agents/user_agent_test.py rename to tests/app/agents/user_agent_test.py index 8a61762..2d4f297 100644 --- a/tests/agents/user_agent_test.py +++ b/tests/app/agents/user_agent_test.py @@ -1,9 +1,4 @@ -import sys -import os - -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))) - -from agents.user_agent import UserAgent +from app.agents.user_agent import UserAgent import pytest From 6f4e67b164bc5584cdece8dfaf21146991242998 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:11:24 +0100 Subject: [PATCH 2/9] (issue14) Move buddy to respective app/agents folder --- agents/planner.py | 3 ++- {agents => app/agents}/buddy.py | 0 streamlit_app.py | 9 +++++---- tests/{ => app}/agents/buddy_test.py | 10 +++++----- tests/streamlit_app_test.py | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) rename {agents => app/agents}/buddy.py (100%) rename tests/{ => app}/agents/buddy_test.py (92%) diff --git a/agents/planner.py b/agents/planner.py index b1d9fdb..065d3a3 100644 --- a/agents/planner.py +++ b/agents/planner.py @@ -13,7 +13,8 @@ if __name__ == "__main__": planner_service = PlannerService(CONFIG_LIST) function_service = FunctionService() - chat_service = ChatService(CONFIG_LIST, function_service.registry.functions) + chat_service = ChatService( + CONFIG_LIST, function_service.registry.functions) message = input("Enter a message to send to the assistant: ") chat_service.initiate_chat(message) diff --git a/agents/buddy.py b/app/agents/buddy.py similarity index 100% rename from agents/buddy.py rename to app/agents/buddy.py diff --git a/streamlit_app.py b/streamlit_app.py index 0fc09f8..a8a9f5c 100644 --- a/streamlit_app.py +++ b/streamlit_app.py @@ -1,7 +1,6 @@ import streamlit as st -import sqlite3 import pandas as pd -from agents.buddy import Buddy +from app.agents.buddy import Buddy def main(): @@ -23,7 +22,8 @@ def main(): st.subheader("Agent Interaction") # Agent selection - agent_selection = st.selectbox("Choose an agent:", ["Buddy", "Planner"]) + agent_selection = st.selectbox( + "Choose an agent:", ["Buddy", "Planner"]) # Message input and interaction with the selected agent user_input = st.text_input( @@ -32,7 +32,8 @@ def main(): if st.button("Send"): if agent_selection == "Buddy": - st.session_state.response = st.session_state.buddy.start(user_input) + st.session_state.response = st.session_state.buddy.start( + user_input) elif agent_selection == "Planner": st.session_state.response = ( "Planner agent interaction not yet implemented." diff --git a/tests/agents/buddy_test.py b/tests/app/agents/buddy_test.py similarity index 92% rename from tests/agents/buddy_test.py rename to tests/app/agents/buddy_test.py index fa17e9d..28feddf 100644 --- a/tests/agents/buddy_test.py +++ b/tests/app/agents/buddy_test.py @@ -2,14 +2,14 @@ This module contains unit tests for the Buddy class. """ -from agents.buddy import Buddy, UserAgent, AssistantAgent +from app.agents.buddy import Buddy, UserAgent, AssistantAgent from unittest.mock import Mock, patch -import os -import sys +# import os +# import sys import unittest -sys.path.insert(0, os.path.abspath( - os.path.join(os.path.dirname(__file__), "..", ".."))) +# sys.path.insert(0, os.path.abspath( +# os.path.join(os.path.dirname(__file__), "..", ".."))) class TestBuddy(unittest.TestCase): diff --git a/tests/streamlit_app_test.py b/tests/streamlit_app_test.py index 72df8ad..e87908d 100644 --- a/tests/streamlit_app_test.py +++ b/tests/streamlit_app_test.py @@ -6,7 +6,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) from streamlit_app import main -from agents.buddy import Buddy +from app.agents.buddy import Buddy class DynamicMock(Mock): From 477709334670d2fc41381f4c54ba7e5d5e5450f0 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:13:02 +0100 Subject: [PATCH 3/9] (issue14) Move planner to respective app/agents folder --- {agents => app/agents}/planner.py | 0 tests/{ => app}/agents/planner_test.py | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename {agents => app/agents}/planner.py (100%) rename tests/{ => app}/agents/planner_test.py (92%) diff --git a/agents/planner.py b/app/agents/planner.py similarity index 100% rename from agents/planner.py rename to app/agents/planner.py diff --git a/tests/agents/planner_test.py b/tests/app/agents/planner_test.py similarity index 92% rename from tests/agents/planner_test.py rename to tests/app/agents/planner_test.py index c1306bd..97bb009 100644 --- a/tests/agents/planner_test.py +++ b/tests/app/agents/planner_test.py @@ -1,5 +1,3 @@ -# ./tests/agents/planner_test.py - import pytest from unittest.mock import patch from agents.services.planner_service import PlannerService @@ -22,7 +20,8 @@ def planner_service(): @patch("agents.services.planner_service.UserProxyAgent.last_message") def test_ask_planner(mocked_last_message, mocked_initiate_chat, planner_service): # Mock the last_message() method to return a dict with 'content' key - mocked_last_message.return_value = {"content": "Go to the store and buy groceries"} + mocked_last_message.return_value = { + "content": "Go to the store and buy groceries"} response = planner_service.ask_planner("buy groceries") From 99915ce0381ed007f1bf3bb21c0a73006d0b87c6 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:15:14 +0100 Subject: [PATCH 4/9] (issue14) Move message_router to respective app/helpers folder --- {agents => app}/helpers/message_router.py | 0 .../helpers/message_router_test.py} | 19 +++++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) rename {agents => app}/helpers/message_router.py (100%) rename tests/{agents/helpers/message_router.py => app/helpers/message_router_test.py} (69%) diff --git a/agents/helpers/message_router.py b/app/helpers/message_router.py similarity index 100% rename from agents/helpers/message_router.py rename to app/helpers/message_router.py diff --git a/tests/agents/helpers/message_router.py b/tests/app/helpers/message_router_test.py similarity index 69% rename from tests/agents/helpers/message_router.py rename to tests/app/helpers/message_router_test.py index 1b73df4..1239ab7 100644 --- a/tests/agents/helpers/message_router.py +++ b/tests/app/helpers/message_router_test.py @@ -1,20 +1,15 @@ -import os -import sys -import pytest - -sys.path.insert( - 0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..")) -) - +from app.helpers.message_router import MessageRouter from agents.helpers.agent_manager import AgentManager -from agents.helpers.message_router import MessageRouter +from agents.helpers.inter_agent_comm import InterAgentComm +import pytest @pytest.mark.asyncio async def test_message_routing(): - # Initialize AgentManager and MessageRouter - agent_manager = AgentManager() - message_router = MessageRouter(agent_manager) + # Initialize InterAgentComm, AgentManager and MessageRouter + inter_agent_comm = InterAgentComm() + agent_manager = AgentManager(inter_agent_comm) + message_router = MessageRouter(agent_manager, inter_agent_comm) # Register an agent for testing await agent_manager.register_agent( From 1cb670e26ce91e278ae0fd61016febf1e6e4ba1c Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:21:29 +0100 Subject: [PATCH 5/9] (issue14) Move inter_agent_comm to respective app/helpers folder --- {agents => app}/helpers/inter_agent_comm.py | 0 tests/agents/helpers/agent_manager_test.py | 11 ++--------- .../helpers/inter_agent_comm_test.py} | 9 +-------- tests/app/helpers/message_router_test.py | 2 +- 4 files changed, 4 insertions(+), 18 deletions(-) rename {agents => app}/helpers/inter_agent_comm.py (100%) rename tests/{agents/helpers/inter_agent_comm.py => app/helpers/inter_agent_comm_test.py} (75%) diff --git a/agents/helpers/inter_agent_comm.py b/app/helpers/inter_agent_comm.py similarity index 100% rename from agents/helpers/inter_agent_comm.py rename to app/helpers/inter_agent_comm.py diff --git a/tests/agents/helpers/agent_manager_test.py b/tests/agents/helpers/agent_manager_test.py index e83fabc..5052f2c 100644 --- a/tests/agents/helpers/agent_manager_test.py +++ b/tests/agents/helpers/agent_manager_test.py @@ -1,14 +1,7 @@ -from agents.helpers.inter_agent_comm import InterAgentComm -from agents.helpers.agent_manager import AgentManager -import sys -import os import pytest - -sys.path.insert( - 0, os.path.abspath(os.path.join( - os.path.dirname(__file__), "..", "..", "..")) -) +from app.helpers.inter_agent_comm import InterAgentComm +from agents.helpers.agent_manager import AgentManager @pytest.mark.asyncio diff --git a/tests/agents/helpers/inter_agent_comm.py b/tests/app/helpers/inter_agent_comm_test.py similarity index 75% rename from tests/agents/helpers/inter_agent_comm.py rename to tests/app/helpers/inter_agent_comm_test.py index 36804e8..2faf643 100644 --- a/tests/agents/helpers/inter_agent_comm.py +++ b/tests/app/helpers/inter_agent_comm_test.py @@ -1,12 +1,5 @@ -import sys -import os - -sys.path.insert( - 0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..")) -) - import pytest -from inter_agent_comm import InterAgentComm +from app.helpers.inter_agent_comm import InterAgentComm @pytest.mark.asyncio diff --git a/tests/app/helpers/message_router_test.py b/tests/app/helpers/message_router_test.py index 1239ab7..9f90404 100644 --- a/tests/app/helpers/message_router_test.py +++ b/tests/app/helpers/message_router_test.py @@ -1,6 +1,6 @@ from app.helpers.message_router import MessageRouter from agents.helpers.agent_manager import AgentManager -from agents.helpers.inter_agent_comm import InterAgentComm +from app.helpers.inter_agent_comm import InterAgentComm import pytest From fae2422954092c737b17b9ae1b821cb92c624c25 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:22:58 +0100 Subject: [PATCH 6/9] (issue14) Move function_registry to respective app/helpers folder --- agents/services/function_service.py | 2 +- {agents => app}/helpers/function_registry.py | 0 tests/{agents => app}/helpers/function_registry_test.py | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename {agents => app}/helpers/function_registry.py (100%) rename tests/{agents => app}/helpers/function_registry_test.py (83%) diff --git a/agents/services/function_service.py b/agents/services/function_service.py index c9c7b9b..c2a1e5e 100644 --- a/agents/services/function_service.py +++ b/agents/services/function_service.py @@ -1,5 +1,5 @@ import ast -from agents.helpers.function_registry import FunctionRegistry +from app.helpers.function_registry import FunctionRegistry class FunctionService: diff --git a/agents/helpers/function_registry.py b/app/helpers/function_registry.py similarity index 100% rename from agents/helpers/function_registry.py rename to app/helpers/function_registry.py diff --git a/tests/agents/helpers/function_registry_test.py b/tests/app/helpers/function_registry_test.py similarity index 83% rename from tests/agents/helpers/function_registry_test.py rename to tests/app/helpers/function_registry_test.py index d99d0f4..b220064 100644 --- a/tests/agents/helpers/function_registry_test.py +++ b/tests/app/helpers/function_registry_test.py @@ -1,14 +1,14 @@ +import pytest +from app.helpers.function_registry import FunctionRegistry import sys import os sys.path.insert( - 0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..")) + 0, os.path.abspath(os.path.join( + os.path.dirname(__file__), "..", "..", "..")) ) -from agents.helpers.function_registry import FunctionRegistry -import pytest - class TestFunctionRegistry: def setup_method(self): From 9d766ac21b6ef098da0827c8652f240714b1feae Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:24:20 +0100 Subject: [PATCH 7/9] (issue14) Move function_registry to respective app/helpers folder --- {agents => app}/helpers/agent_registry.py | 0 tests/{agents => app}/helpers/agent_registry_test.py | 9 +-------- tests/app/helpers/function_registry_test.py | 8 -------- 3 files changed, 1 insertion(+), 16 deletions(-) rename {agents => app}/helpers/agent_registry.py (100%) rename tests/{agents => app}/helpers/agent_registry_test.py (88%) diff --git a/agents/helpers/agent_registry.py b/app/helpers/agent_registry.py similarity index 100% rename from agents/helpers/agent_registry.py rename to app/helpers/agent_registry.py diff --git a/tests/agents/helpers/agent_registry_test.py b/tests/app/helpers/agent_registry_test.py similarity index 88% rename from tests/agents/helpers/agent_registry_test.py rename to tests/app/helpers/agent_registry_test.py index 9a6f536..59ab3c5 100644 --- a/tests/agents/helpers/agent_registry_test.py +++ b/tests/app/helpers/agent_registry_test.py @@ -1,13 +1,6 @@ -import sys -import os +from app.helpers.agent_registry import AgentRegistry import pytest -sys.path.insert( - 0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..")) -) - -from agents.helpers.agent_registry import AgentRegistry - @pytest.mark.asyncio async def test_register_agent(): diff --git a/tests/app/helpers/function_registry_test.py b/tests/app/helpers/function_registry_test.py index b220064..917c3de 100644 --- a/tests/app/helpers/function_registry_test.py +++ b/tests/app/helpers/function_registry_test.py @@ -1,13 +1,5 @@ import pytest from app.helpers.function_registry import FunctionRegistry -import sys -import os - - -sys.path.insert( - 0, os.path.abspath(os.path.join( - os.path.dirname(__file__), "..", "..", "..")) -) class TestFunctionRegistry: From f5ab6a1c8af153d5f32ab14257e0b5b019e4bf2a Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:26:08 +0100 Subject: [PATCH 8/9] (issue14) Move agent_manager to respective app/helpers folder --- {agents => app}/helpers/agent_manager.py | 0 tests/app/agents/message_router.py | 38 +++++++++++++++++++ .../helpers/agent_manager_test.py | 2 +- tests/app/helpers/message_router_test.py | 2 +- 4 files changed, 40 insertions(+), 2 deletions(-) rename {agents => app}/helpers/agent_manager.py (100%) create mode 100644 tests/app/agents/message_router.py rename tests/{agents => app}/helpers/agent_manager_test.py (94%) diff --git a/agents/helpers/agent_manager.py b/app/helpers/agent_manager.py similarity index 100% rename from agents/helpers/agent_manager.py rename to app/helpers/agent_manager.py diff --git a/tests/app/agents/message_router.py b/tests/app/agents/message_router.py new file mode 100644 index 0000000..a329692 --- /dev/null +++ b/tests/app/agents/message_router.py @@ -0,0 +1,38 @@ +from app.helpers.message_router import MessageRouter +from app.helpers.agent_manager import AgentManager +import os +import sys +import pytest + +sys.path.insert( + 0, os.path.abspath(os.path.join( + os.path.dirname(__file__), "..", "..", "..")) +) + + +@pytest.mark.asyncio +async def test_message_routing(): + # Initialize AgentManager and MessageRouter + agent_manager = AgentManager() + message_router = MessageRouter(agent_manager) + + # Register an agent for testing + await agent_manager.register_agent( + "001", {"name": "Agent Smith", "status": "active"} + ) + + # Test message sending + assert ( + await message_router.send_message("001", "Hello, Agent Smith.") + == "Message sent to agent 001." + ) + + # Test message fetching + assert await message_router.fetch_messages("001") == ["Hello, Agent Smith."] + + # Test message sending after unregistration + await agent_manager.unregister_agent("001") + assert ( + await message_router.send_message("001", "Hello, Agent Smith.") + == "Agent 001 not found." + ) diff --git a/tests/agents/helpers/agent_manager_test.py b/tests/app/helpers/agent_manager_test.py similarity index 94% rename from tests/agents/helpers/agent_manager_test.py rename to tests/app/helpers/agent_manager_test.py index 5052f2c..c43e9c6 100644 --- a/tests/agents/helpers/agent_manager_test.py +++ b/tests/app/helpers/agent_manager_test.py @@ -1,7 +1,7 @@ import pytest from app.helpers.inter_agent_comm import InterAgentComm -from agents.helpers.agent_manager import AgentManager +from app.helpers.agent_manager import AgentManager @pytest.mark.asyncio diff --git a/tests/app/helpers/message_router_test.py b/tests/app/helpers/message_router_test.py index 9f90404..d775547 100644 --- a/tests/app/helpers/message_router_test.py +++ b/tests/app/helpers/message_router_test.py @@ -1,5 +1,5 @@ from app.helpers.message_router import MessageRouter -from agents.helpers.agent_manager import AgentManager +from app.helpers.agent_manager import AgentManager from app.helpers.inter_agent_comm import InterAgentComm import pytest From c3dafe7f30b1b6bae52799c09da86c8582e7dc15 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 18 Oct 2023 19:30:58 +0100 Subject: [PATCH 9/9] (issue14) Move all services to respective app/services folder --- app/agents/planner.py | 6 ++--- {agents => app}/services/chat_service.py | 0 {agents => app}/services/function_service.py | 0 {agents => app}/services/planner_service.py | 0 tests/app/agents/planner_test.py | 10 ++++---- .../services/chat_service_test.py | 2 +- .../services/function_service_test.py | 2 +- .../services/planner_service_test.py | 23 ++++++++----------- 8 files changed, 19 insertions(+), 24 deletions(-) rename {agents => app}/services/chat_service.py (100%) rename {agents => app}/services/function_service.py (100%) rename {agents => app}/services/planner_service.py (100%) rename tests/{agents => app}/services/chat_service_test.py (93%) rename tests/{agents => app}/services/function_service_test.py (96%) rename tests/{agents => app}/services/planner_service_test.py (65%) diff --git a/app/agents/planner.py b/app/agents/planner.py index 065d3a3..7b54f2f 100644 --- a/app/agents/planner.py +++ b/app/agents/planner.py @@ -6,9 +6,9 @@ CONFIG_LIST, ) -from agents.services.planner_service import PlannerService -from agents.services.function_service import FunctionService -from agents.services.chat_service import ChatService +from app.services.planner_service import PlannerService +from app.services.function_service import FunctionService +from app.services.chat_service import ChatService if __name__ == "__main__": planner_service = PlannerService(CONFIG_LIST) diff --git a/agents/services/chat_service.py b/app/services/chat_service.py similarity index 100% rename from agents/services/chat_service.py rename to app/services/chat_service.py diff --git a/agents/services/function_service.py b/app/services/function_service.py similarity index 100% rename from agents/services/function_service.py rename to app/services/function_service.py diff --git a/agents/services/planner_service.py b/app/services/planner_service.py similarity index 100% rename from agents/services/planner_service.py rename to app/services/planner_service.py diff --git a/tests/app/agents/planner_test.py b/tests/app/agents/planner_test.py index 97bb009..ca154fc 100644 --- a/tests/app/agents/planner_test.py +++ b/tests/app/agents/planner_test.py @@ -1,6 +1,6 @@ import pytest from unittest.mock import patch -from agents.services.planner_service import PlannerService +from app.services.planner_service import PlannerService @pytest.fixture @@ -16,8 +16,8 @@ def planner_service(): return service -@patch("agents.services.planner_service.UserProxyAgent.initiate_chat") -@patch("agents.services.planner_service.UserProxyAgent.last_message") +@patch("app.services.planner_service.UserProxyAgent.initiate_chat") +@patch("app.services.planner_service.UserProxyAgent.last_message") def test_ask_planner(mocked_last_message, mocked_initiate_chat, planner_service): # Mock the last_message() method to return a dict with 'content' key mocked_last_message.return_value = { @@ -32,8 +32,8 @@ def test_ask_planner(mocked_last_message, mocked_initiate_chat, planner_service) assert response == "Go to the store and buy groceries" -@patch("agents.services.planner_service.UserProxyAgent.initiate_chat") -@patch("agents.services.planner_service.UserProxyAgent.last_message") +@patch("app.services.planner_service.UserProxyAgent.initiate_chat") +@patch("app.services.planner_service.UserProxyAgent.last_message") def test_ask_planner_invalid_input( mocked_last_message, mocked_initiate_chat, planner_service ): diff --git a/tests/agents/services/chat_service_test.py b/tests/app/services/chat_service_test.py similarity index 93% rename from tests/agents/services/chat_service_test.py rename to tests/app/services/chat_service_test.py index 6580e7b..997784b 100644 --- a/tests/agents/services/chat_service_test.py +++ b/tests/app/services/chat_service_test.py @@ -1,6 +1,6 @@ from unittest.mock import patch import pytest -from agents.services.chat_service import ChatService +from app.services.chat_service import ChatService @patch("autogen.oai.ChatCompletion.create") diff --git a/tests/agents/services/function_service_test.py b/tests/app/services/function_service_test.py similarity index 96% rename from tests/agents/services/function_service_test.py rename to tests/app/services/function_service_test.py index 4b6e5c0..8c82914 100644 --- a/tests/agents/services/function_service_test.py +++ b/tests/app/services/function_service_test.py @@ -1,5 +1,5 @@ import pytest -from agents.services.function_service import FunctionService +from app.services.function_service import FunctionService @pytest.fixture diff --git a/tests/agents/services/planner_service_test.py b/tests/app/services/planner_service_test.py similarity index 65% rename from tests/agents/services/planner_service_test.py rename to tests/app/services/planner_service_test.py index 78c50a5..8b9070f 100644 --- a/tests/agents/services/planner_service_test.py +++ b/tests/app/services/planner_service_test.py @@ -1,20 +1,12 @@ -import sys -import os import pytest from unittest.mock import patch - -sys.path.insert( - 0, - os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")), -) - -from agents.services.planner_service import PlannerService +from app.services.planner_service import PlannerService @pytest.fixture(scope="function") def planner_service_with_mocked_chat(): with patch( - "agents.services.planner_service.UserProxyAgent.initiate_chat" + "app.services.planner_service.UserProxyAgent.initiate_chat" ) as MockedInitiateChat: MockedInitiateChat.return_value = ( None # No return value as we're mocking the method @@ -31,7 +23,8 @@ def planner_service_with_mocked_chat(): def test_get_service(planner_service_with_mocked_chat): - assert planner_service_with_mocked_chat.get_service("test_service") == "TestService" + assert planner_service_with_mocked_chat.get_service( + "test_service") == "TestService" def test_get_parameters(planner_service_with_mocked_chat): @@ -42,8 +35,10 @@ def test_get_parameters(planner_service_with_mocked_chat): def test_ask_planner(planner_service_with_mocked_chat): with patch( - "agents.services.planner_service.UserProxyAgent.last_message" + "app.services.planner_service.UserProxyAgent.last_message" ) as MockedLastMessage: - MockedLastMessage.return_value = {"content": "Test response from planner"} - response = planner_service_with_mocked_chat.ask_planner("buy groceries") + MockedLastMessage.return_value = { + "content": "Test response from planner"} + response = planner_service_with_mocked_chat.ask_planner( + "buy groceries") assert response == "Test response from planner"