rename agents to agents_deprecated

README.md

@@ -260,7 +260,7 @@ yarn dev # you may need to run sudo if previously built via Docker
 from dimos.robot.unitree.unitree_go2 import UnitreeGo2
 from dimos.robot.unitree.unitree_skills import MyUnitreeSkills
 from dimos.robot.unitree.unitree_ros_control import UnitreeROSControl
-from dimos.agents.agent import OpenAIAgent
+from dimos.agents_deprecated.agent import OpenAIAgent
 
 # Initialize robot
 robot = UnitreeGo2(ip=robot_ip,

dimos/agents/__init__.py

@@ -0,0 +1,13 @@
+from langchain_core.messages import (
+    AIMessage,
+    HumanMessage,
+    MessageLikeRepresentation,
+    SystemMessage,
+    ToolCall,
+    ToolMessage,
+)
+
+from dimos.agents.agent import Agent, deploy
+from dimos.agents.spec import AgentSpec
+from dimos.protocol.skill.skill import skill
+from dimos.protocol.skill.type import Output, Reducer, Stream

dimos/agents2/cli/human.py → dimos/agents/cli/human.py

@@ -16,7 +16,7 @@
 
 from reactivex.disposable import Disposable
 
-from dimos.agents2 import Output, Reducer, Stream, skill  # type: ignore[attr-defined]
+from dimos.agents import Output, Reducer, Stream, skill  # type: ignore[attr-defined]
 from dimos.core import pLCMTransport, rpc
 from dimos.core.module import Module
 from dimos.core.rpc_client import RpcCall

dimos/agents2/conftest.py → dimos/agents/conftest.py

@@ -16,8 +16,8 @@
 
 import pytest
 
-from dimos.agents2.agent import Agent
-from dimos.agents2.testing import MockModel
+from dimos.agents.agent import Agent
+from dimos.agents.testing import MockModel
 from dimos.protocol.skill.test_coordinator import SkillContainerTest
 
 

dimos/agents2/constants.py → dimos/agents/constants.py

@@ -14,4 +14,4 @@
 
 from dimos.constants import DIMOS_PROJECT_ROOT
 
-AGENT_SYSTEM_PROMPT_PATH = DIMOS_PROJECT_ROOT / "assets/agent/prompt_agents2.txt"
+AGENT_SYSTEM_PROMPT_PATH = DIMOS_PROJECT_ROOT / "assets/agent/prompt_agents.txt"

dimos/agents2/skills/conftest.py → dimos/agents/skills/conftest.py

@@ -17,10 +17,10 @@
 import pytest
 from reactivex.scheduler import ThreadPoolScheduler
 
-from dimos.agents2.skills.google_maps_skill_container import GoogleMapsSkillContainer
-from dimos.agents2.skills.gps_nav_skill import GpsNavSkillContainer
-from dimos.agents2.skills.navigation import NavigationSkillContainer
-from dimos.agents2.system_prompt import get_system_prompt
+from dimos.agents.skills.google_maps_skill_container import GoogleMapsSkillContainer
+from dimos.agents.skills.gps_nav_skill import GpsNavSkillContainer
+from dimos.agents.skills.navigation import NavigationSkillContainer
+from dimos.agents.system_prompt import get_system_prompt
 from dimos.robot.unitree_webrtc.unitree_skill_container import UnitreeSkillContainer
 
 system_prompt = get_system_prompt()

dimos/agents2/skills/demo_google_maps_skill.py → dimos/agents/skills/demo_google_maps_skill.py

@@ -15,11 +15,11 @@
 
 from dotenv import load_dotenv
 
-from dimos.agents2.agent import llm_agent
-from dimos.agents2.cli.human import human_input
-from dimos.agents2.skills.demo_robot import demo_robot
-from dimos.agents2.skills.google_maps_skill_container import google_maps_skill
-from dimos.agents2.system_prompt import get_system_prompt
+from dimos.agents.agent import llm_agent
+from dimos.agents.cli.human import human_input
+from dimos.agents.skills.demo_robot import demo_robot
+from dimos.agents.skills.google_maps_skill_container import google_maps_skill
+from dimos.agents.system_prompt import get_system_prompt
 from dimos.core.blueprints import autoconnect
 
 load_dotenv()

dimos/agents2/skills/demo_gps_nav.py → dimos/agents/skills/demo_gps_nav.py

@@ -15,11 +15,11 @@
 
 from dotenv import load_dotenv
 
-from dimos.agents2.agent import llm_agent
-from dimos.agents2.cli.human import human_input
-from dimos.agents2.skills.demo_robot import demo_robot
-from dimos.agents2.skills.gps_nav_skill import gps_nav_skill
-from dimos.agents2.system_prompt import get_system_prompt
+from dimos.agents.agent import llm_agent
+from dimos.agents.cli.human import human_input
+from dimos.agents.skills.demo_robot import demo_robot
+from dimos.agents.skills.gps_nav_skill import gps_nav_skill
+from dimos.agents.system_prompt import get_system_prompt
 from dimos.core.blueprints import autoconnect
 
 load_dotenv()

dimos/agents2/skills/demo_skill.py → dimos/agents/skills/demo_skill.py

@@ -15,10 +15,10 @@
 
 from dotenv import load_dotenv
 
-from dimos.agents2.agent import llm_agent
-from dimos.agents2.cli.human import human_input
-from dimos.agents2.skills.demo_calculator_skill import demo_calculator_skill
-from dimos.agents2.system_prompt import get_system_prompt
+from dimos.agents.agent import llm_agent
+from dimos.agents.cli.human import human_input
+from dimos.agents.skills.demo_calculator_skill import demo_calculator_skill
+from dimos.agents.system_prompt import get_system_prompt
 from dimos.core.blueprints import autoconnect
 
 load_dotenv()

dimos/agents2/skills/test_navigation.py → dimos/agents/skills/test_navigation.py

@@ -42,7 +42,7 @@ def test_take_a_look_around(create_navigation_agent, navigation_skill_container,
     navigation_skill_container._bound_rpc_calls[
         "WavefrontFrontierExplorer.is_exploration_active"
     ] = is_exploration_active_mock
-    mocker.patch("dimos.agents2.skills.navigation.time.sleep")
+    mocker.patch("dimos.agents.skills.navigation.time.sleep")
     agent = create_navigation_agent(fixture="test_take_a_look_around.json")
 
     agent.query("take a look around for 10 seconds")
@@ -54,15 +54,15 @@ def test_go_to_semantic_location(
     create_navigation_agent, navigation_skill_container, mocker
 ) -> None:
     mocker.patch(
-        "dimos.agents2.skills.navigation.NavigationSkillContainer._navigate_by_tagged_location",
+        "dimos.agents.skills.navigation.NavigationSkillContainer._navigate_by_tagged_location",
         return_value=None,
     )
     mocker.patch(
-        "dimos.agents2.skills.navigation.NavigationSkillContainer._navigate_to_object",
+        "dimos.agents.skills.navigation.NavigationSkillContainer._navigate_to_object",
         return_value=None,
     )
     navigate_to_mock = mocker.patch(
-        "dimos.agents2.skills.navigation.NavigationSkillContainer._navigate_to",
+        "dimos.agents.skills.navigation.NavigationSkillContainer._navigate_to",
         return_value=True,
     )
     query_by_text_mock = mocker.Mock(

dimos/agents2/system_prompt.py → dimos/agents/system_prompt.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from dimos.agents2.constants import AGENT_SYSTEM_PROMPT_PATH
+from dimos.agents.constants import AGENT_SYSTEM_PROMPT_PATH
 
 _SYSTEM_PROMPT = None
 

dimos/agents2/temp/webcam_agent.py → dimos/agents/temp/webcam_agent.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Run script for Unitree Go2 robot with agents2 framework.
+Run script for Unitree Go2 robot with agents framework.
 This is the migrated version using the new LangChain-based agent system.
 """
 
@@ -24,9 +24,9 @@
 import reactivex as rx
 import reactivex.operators as ops
 
-from dimos.agents2 import Agent, Output, Reducer, Stream, skill  # type: ignore[attr-defined]
-from dimos.agents2.cli.human import HumanInput
-from dimos.agents2.spec import Model, Provider
+from dimos.agents import Agent, Output, Reducer, Stream, skill  # type: ignore[attr-defined]
+from dimos.agents.cli.human import HumanInput
+from dimos.agents.spec import Model, Provider
 from dimos.core import LCMTransport, Module, rpc, start
 from dimos.hardware.camera import zed
 from dimos.hardware.camera.module import CameraModule

dimos/agents2/test_agent.py → dimos/agents/test_agent.py

@@ -15,7 +15,7 @@
 import pytest
 import pytest_asyncio
 
-from dimos.agents2.agent import Agent
+from dimos.agents.agent import Agent
 from dimos.core import start
 from dimos.protocol.skill.test_coordinator import SkillContainerTest
 

dimos/agents2/test_agent_direct.py → dimos/agents/test_agent_direct.py

@@ -16,7 +16,7 @@
 
 from contextlib import contextmanager
 
-from dimos.agents2.agent import Agent
+from dimos.agents.agent import Agent
 from dimos.core import start
 from dimos.protocol.skill.test_coordinator import SkillContainerTest
 

dimos/agents2/test_mock_agent.py → dimos/agents/test_mock_agent.py

@@ -20,8 +20,8 @@
 from langchain_core.messages import AIMessage, HumanMessage
 import pytest
 
-from dimos.agents2.agent import Agent
-from dimos.agents2.testing import MockModel
+from dimos.agents.agent import Agent
+from dimos.agents.testing import MockModel
 from dimos.core import LCMTransport, start
 from dimos.msgs.geometry_msgs import PoseStamped, Vector3
 from dimos.msgs.sensor_msgs import Image

dimos/agents2/test_stash_agent.py → dimos/agents/test_stash_agent.py

@@ -14,7 +14,7 @@
 
 import pytest
 
-from dimos.agents2.agent import Agent
+from dimos.agents.agent import Agent
 from dimos.protocol.skill.test_coordinator import SkillContainerTest