From 78a04d4b57e8ef1e37d325312c9c87353b863e3f Mon Sep 17 00:00:00 2001 From: Paul Nechifor Date: Thu, 25 Dec 2025 06:50:42 +0200 Subject: [PATCH 1/2] rename agents to agents_deprecated --- README.md | 2 +- dimos/{agents => agents_deprecated}/__init__.py | 0 dimos/{agents => agents_deprecated}/agent.py | 10 +++++----- dimos/{agents => agents_deprecated}/agent_config.py | 2 +- dimos/{agents => agents_deprecated}/agent_message.py | 2 +- dimos/{agents => agents_deprecated}/agent_types.py | 0 dimos/{agents => agents_deprecated}/claude_agent.py | 6 +++--- dimos/{agents => agents_deprecated}/memory/__init__.py | 0 dimos/{agents => agents_deprecated}/memory/base.py | 0 .../memory/chroma_impl.py | 2 +- .../memory/image_embedding.py | 0 .../memory/spatial_vector_db.py | 4 ++-- .../memory/test_image_embedding.py | 2 +- .../memory/visual_memory.py | 0 .../{agents => agents_deprecated}/modules/__init__.py | 0 dimos/{agents => agents_deprecated}/modules/base.py | 10 +++++----- .../modules/base_agent.py | 8 ++++---- .../modules/gateway/__init__.py | 0 .../modules/gateway/client.py | 0 .../modules/gateway/tensorzero_embedded.py | 0 .../modules/gateway/tensorzero_simple.py | 0 .../modules/gateway/utils.py | 0 .../prompt_builder/__init__.py | 0 .../prompt_builder/impl.py | 4 ++-- .../tokenizer/__init__.py | 0 dimos/{agents => agents_deprecated}/tokenizer/base.py | 0 .../tokenizer/huggingface_tokenizer.py | 2 +- .../tokenizer/openai_tokenizer.py | 2 +- dimos/models/qwen/video_query.py | 4 ++-- dimos/perception/spatial_perception.py | 6 +++--- dimos/robot/agilex/README.md | 4 ++-- dimos/robot/agilex/README_CN.md | 4 ++-- dimos/robot/agilex/run.py | 2 +- dimos/web/README.md | 2 +- dimos/web/dimos_interface/api/README.md | 2 +- tests/agent_manip_flow_flask_test.py | 2 +- tests/agent_memory_test.py | 2 +- tests/simple_agent_test.py | 2 +- tests/test_agent_alibaba.py | 4 ++-- tests/test_audio_agent.py | 2 +- tests/test_audio_robot_agent.py | 2 +- tests/test_claude_agent_query.py | 2 +- tests/test_claude_agent_skills_query.py | 2 +- tests/test_manipulation_agent.py | 2 +- tests/test_object_detection_agent_data_query_stream.py | 2 +- tests/test_semantic_seg_robot_agent.py | 2 +- tests/test_skills.py | 6 +++--- tests/test_skills_rest.py | 2 +- tests/test_spatial_memory.py | 2 +- tests/test_spatial_memory_query.py | 2 +- tests/test_standalone_project_out.py | 6 +++--- tests/test_unitree_agent.py | 2 +- tests/test_unitree_agent_queries_fastapi.py | 2 +- tests/test_unitree_ros_v0.0.4.py | 2 +- 54 files changed, 64 insertions(+), 64 deletions(-) rename dimos/{agents => agents_deprecated}/__init__.py (100%) rename dimos/{agents => agents_deprecated}/agent.py (99%) rename dimos/{agents => agents_deprecated}/agent_config.py (97%) rename dimos/{agents => agents_deprecated}/agent_message.py (98%) rename dimos/{agents => agents_deprecated}/agent_types.py (100%) rename dimos/{agents => agents_deprecated}/claude_agent.py (99%) rename dimos/{agents => agents_deprecated}/memory/__init__.py (100%) rename dimos/{agents => agents_deprecated}/memory/base.py (100%) rename dimos/{agents => agents_deprecated}/memory/chroma_impl.py (98%) rename dimos/{agents => agents_deprecated}/memory/image_embedding.py (100%) rename dimos/{agents => agents_deprecated}/memory/spatial_vector_db.py (98%) rename dimos/{agents => agents_deprecated}/memory/test_image_embedding.py (99%) rename dimos/{agents => agents_deprecated}/memory/visual_memory.py (100%) rename dimos/{agents => agents_deprecated}/modules/__init__.py (100%) rename dimos/{agents => agents_deprecated}/modules/base.py (98%) rename dimos/{agents => agents_deprecated}/modules/base_agent.py (96%) rename dimos/{agents => agents_deprecated}/modules/gateway/__init__.py (100%) rename dimos/{agents => agents_deprecated}/modules/gateway/client.py (100%) rename dimos/{agents => agents_deprecated}/modules/gateway/tensorzero_embedded.py (100%) rename dimos/{agents => agents_deprecated}/modules/gateway/tensorzero_simple.py (100%) rename dimos/{agents => agents_deprecated}/modules/gateway/utils.py (100%) rename dimos/{agents => agents_deprecated}/prompt_builder/__init__.py (100%) rename dimos/{agents => agents_deprecated}/prompt_builder/impl.py (98%) rename dimos/{agents => agents_deprecated}/tokenizer/__init__.py (100%) rename dimos/{agents => agents_deprecated}/tokenizer/base.py (100%) rename dimos/{agents => agents_deprecated}/tokenizer/huggingface_tokenizer.py (98%) rename dimos/{agents => agents_deprecated}/tokenizer/openai_tokenizer.py (98%) diff --git a/README.md b/README.md index e859c9924c..9a74d63aa7 100644 --- a/README.md +++ b/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, diff --git a/dimos/agents/__init__.py b/dimos/agents_deprecated/__init__.py similarity index 100% rename from dimos/agents/__init__.py rename to dimos/agents_deprecated/__init__.py diff --git a/dimos/agents/agent.py b/dimos/agents_deprecated/agent.py similarity index 99% rename from dimos/agents/agent.py rename to dimos/agents_deprecated/agent.py index fc771ffecf..01ef36ad24 100644 --- a/dimos/agents/agent.py +++ b/dimos/agents_deprecated/agent.py @@ -41,9 +41,9 @@ from reactivex.subject import Subject # Local imports -from dimos.agents.memory.chroma_impl import OpenAISemanticMemory -from dimos.agents.prompt_builder.impl import PromptBuilder -from dimos.agents.tokenizer.openai_tokenizer import OpenAITokenizer +from dimos.agents_deprecated.memory.chroma_impl import OpenAISemanticMemory +from dimos.agents_deprecated.prompt_builder.impl import PromptBuilder +from dimos.agents_deprecated.tokenizer.openai_tokenizer import OpenAITokenizer from dimos.skills.skills import AbstractSkill, SkillLibrary from dimos.stream.frame_processor import FrameProcessor from dimos.stream.stream_merger import create_stream_merger @@ -54,8 +54,8 @@ if TYPE_CHECKING: from reactivex.scheduler import ThreadPoolScheduler - from dimos.agents.memory.base import AbstractAgentSemanticMemory - from dimos.agents.tokenizer.base import AbstractTokenizer + from dimos.agents_deprecated.memory.base import AbstractAgentSemanticMemory + from dimos.agents_deprecated.tokenizer.base import AbstractTokenizer # Initialize environment variables load_dotenv() diff --git a/dimos/agents/agent_config.py b/dimos/agents_deprecated/agent_config.py similarity index 97% rename from dimos/agents/agent_config.py rename to dimos/agents_deprecated/agent_config.py index 5b9027b072..ee6be0e3ad 100644 --- a/dimos/agents/agent_config.py +++ b/dimos/agents_deprecated/agent_config.py @@ -13,7 +13,7 @@ # limitations under the License. -from dimos.agents.agent import Agent +from dimos.agents_deprecated.agent import Agent class AgentConfig: diff --git a/dimos/agents/agent_message.py b/dimos/agents_deprecated/agent_message.py similarity index 98% rename from dimos/agents/agent_message.py rename to dimos/agents_deprecated/agent_message.py index 7be0ad84f2..e43f141bd4 100644 --- a/dimos/agents/agent_message.py +++ b/dimos/agents_deprecated/agent_message.py @@ -17,7 +17,7 @@ from dataclasses import dataclass, field import time -from dimos.agents.agent_types import AgentImage +from dimos.agents_deprecated.agent_types import AgentImage from dimos.msgs.sensor_msgs.Image import Image diff --git a/dimos/agents/agent_types.py b/dimos/agents_deprecated/agent_types.py similarity index 100% rename from dimos/agents/agent_types.py rename to dimos/agents_deprecated/agent_types.py diff --git a/dimos/agents/claude_agent.py b/dimos/agents_deprecated/claude_agent.py similarity index 99% rename from dimos/agents/claude_agent.py rename to dimos/agents_deprecated/claude_agent.py index 0e3fda3d59..cf1042909c 100644 --- a/dimos/agents/claude_agent.py +++ b/dimos/agents_deprecated/claude_agent.py @@ -29,7 +29,7 @@ from dotenv import load_dotenv # Local imports -from dimos.agents.agent import LLMAgent +from dimos.agents_deprecated.agent import LLMAgent from dimos.skills.skills import AbstractSkill, SkillLibrary from dimos.stream.frame_processor import FrameProcessor from dimos.utils.logging_config import setup_logger @@ -39,8 +39,8 @@ from reactivex import Observable from reactivex.scheduler import ThreadPoolScheduler - from dimos.agents.memory.base import AbstractAgentSemanticMemory - from dimos.agents.prompt_builder.impl import PromptBuilder + from dimos.agents_deprecated.memory.base import AbstractAgentSemanticMemory + from dimos.agents_deprecated.prompt_builder.impl import PromptBuilder # Initialize environment variables load_dotenv() diff --git a/dimos/agents/memory/__init__.py b/dimos/agents_deprecated/memory/__init__.py similarity index 100% rename from dimos/agents/memory/__init__.py rename to dimos/agents_deprecated/memory/__init__.py diff --git a/dimos/agents/memory/base.py b/dimos/agents_deprecated/memory/base.py similarity index 100% rename from dimos/agents/memory/base.py rename to dimos/agents_deprecated/memory/base.py diff --git a/dimos/agents/memory/chroma_impl.py b/dimos/agents_deprecated/memory/chroma_impl.py similarity index 98% rename from dimos/agents/memory/chroma_impl.py rename to dimos/agents_deprecated/memory/chroma_impl.py index 96cc32aa54..a594f4a682 100644 --- a/dimos/agents/memory/chroma_impl.py +++ b/dimos/agents_deprecated/memory/chroma_impl.py @@ -19,7 +19,7 @@ from langchain_openai import OpenAIEmbeddings import torch -from dimos.agents.memory.base import AbstractAgentSemanticMemory +from dimos.agents_deprecated.memory.base import AbstractAgentSemanticMemory class ChromaAgentSemanticMemory(AbstractAgentSemanticMemory): diff --git a/dimos/agents/memory/image_embedding.py b/dimos/agents_deprecated/memory/image_embedding.py similarity index 100% rename from dimos/agents/memory/image_embedding.py rename to dimos/agents_deprecated/memory/image_embedding.py diff --git a/dimos/agents/memory/spatial_vector_db.py b/dimos/agents_deprecated/memory/spatial_vector_db.py similarity index 98% rename from dimos/agents/memory/spatial_vector_db.py rename to dimos/agents_deprecated/memory/spatial_vector_db.py index 1e0611d643..69cbbbf9cd 100644 --- a/dimos/agents/memory/spatial_vector_db.py +++ b/dimos/agents_deprecated/memory/spatial_vector_db.py @@ -24,7 +24,7 @@ import chromadb import numpy as np -from dimos.agents.memory.visual_memory import VisualMemory +from dimos.agents_deprecated.memory.visual_memory import VisualMemory from dimos.types.robot_location import RobotLocation from dimos.utils.logging_config import setup_logger @@ -247,7 +247,7 @@ def query_by_text(self, text: str, limit: int = 5) -> list[dict]: # type: ignor List of results, each containing the image, its metadata, and similarity score """ if self.embedding_provider is None: - from dimos.agents.memory.image_embedding import ImageEmbeddingProvider + from dimos.agents_deprecated.memory.image_embedding import ImageEmbeddingProvider self.embedding_provider = ImageEmbeddingProvider(model_name="clip") diff --git a/dimos/agents/memory/test_image_embedding.py b/dimos/agents_deprecated/memory/test_image_embedding.py similarity index 99% rename from dimos/agents/memory/test_image_embedding.py rename to dimos/agents_deprecated/memory/test_image_embedding.py index b1e7cabf09..98574462d5 100644 --- a/dimos/agents/memory/test_image_embedding.py +++ b/dimos/agents_deprecated/memory/test_image_embedding.py @@ -23,7 +23,7 @@ import pytest from reactivex import operators as ops -from dimos.agents.memory.image_embedding import ImageEmbeddingProvider +from dimos.agents_deprecated.memory.image_embedding import ImageEmbeddingProvider from dimos.stream.video_provider import VideoProvider diff --git a/dimos/agents/memory/visual_memory.py b/dimos/agents_deprecated/memory/visual_memory.py similarity index 100% rename from dimos/agents/memory/visual_memory.py rename to dimos/agents_deprecated/memory/visual_memory.py diff --git a/dimos/agents/modules/__init__.py b/dimos/agents_deprecated/modules/__init__.py similarity index 100% rename from dimos/agents/modules/__init__.py rename to dimos/agents_deprecated/modules/__init__.py diff --git a/dimos/agents/modules/base.py b/dimos/agents_deprecated/modules/base.py similarity index 98% rename from dimos/agents/modules/base.py rename to dimos/agents_deprecated/modules/base.py index 8714378a89..898047e4d9 100644 --- a/dimos/agents/modules/base.py +++ b/dimos/agents_deprecated/modules/base.py @@ -21,17 +21,17 @@ from reactivex.subject import Subject -from dimos.agents.agent_message import AgentMessage -from dimos.agents.agent_types import AgentResponse, ConversationHistory, ToolCall -from dimos.agents.memory.base import AbstractAgentSemanticMemory -from dimos.agents.memory.chroma_impl import OpenAISemanticMemory +from dimos.agents_deprecated.agent_message import AgentMessage +from dimos.agents_deprecated.agent_types import AgentResponse, ConversationHistory, ToolCall +from dimos.agents_deprecated.memory.base import AbstractAgentSemanticMemory +from dimos.agents_deprecated.memory.chroma_impl import OpenAISemanticMemory from dimos.skills.skills import AbstractSkill, SkillLibrary from dimos.utils.logging_config import setup_logger try: from .gateway import UnifiedGatewayClient except ImportError: - from dimos.agents.modules.gateway import UnifiedGatewayClient + from dimos.agents_deprecated.modules.gateway import UnifiedGatewayClient logger = setup_logger() diff --git a/dimos/agents/modules/base_agent.py b/dimos/agents_deprecated/modules/base_agent.py similarity index 96% rename from dimos/agents/modules/base_agent.py rename to dimos/agents_deprecated/modules/base_agent.py index 2ebd253530..0516a5a0bc 100644 --- a/dimos/agents/modules/base_agent.py +++ b/dimos/agents_deprecated/modules/base_agent.py @@ -17,9 +17,9 @@ import threading from typing import Any -from dimos.agents.agent_message import AgentMessage -from dimos.agents.agent_types import AgentResponse -from dimos.agents.memory.base import AbstractAgentSemanticMemory +from dimos.agents_deprecated.agent_message import AgentMessage +from dimos.agents_deprecated.agent_types import AgentResponse +from dimos.agents_deprecated.memory.base import AbstractAgentSemanticMemory from dimos.core import In, Module, Out, rpc from dimos.skills.skills import AbstractSkill, SkillLibrary from dimos.utils.logging_config import setup_logger @@ -27,7 +27,7 @@ try: from .base import BaseAgent except ImportError: - from dimos.agents.modules.base import BaseAgent + from dimos.agents_deprecated.modules.base import BaseAgent logger = setup_logger() diff --git a/dimos/agents/modules/gateway/__init__.py b/dimos/agents_deprecated/modules/gateway/__init__.py similarity index 100% rename from dimos/agents/modules/gateway/__init__.py rename to dimos/agents_deprecated/modules/gateway/__init__.py diff --git a/dimos/agents/modules/gateway/client.py b/dimos/agents_deprecated/modules/gateway/client.py similarity index 100% rename from dimos/agents/modules/gateway/client.py rename to dimos/agents_deprecated/modules/gateway/client.py diff --git a/dimos/agents/modules/gateway/tensorzero_embedded.py b/dimos/agents_deprecated/modules/gateway/tensorzero_embedded.py similarity index 100% rename from dimos/agents/modules/gateway/tensorzero_embedded.py rename to dimos/agents_deprecated/modules/gateway/tensorzero_embedded.py diff --git a/dimos/agents/modules/gateway/tensorzero_simple.py b/dimos/agents_deprecated/modules/gateway/tensorzero_simple.py similarity index 100% rename from dimos/agents/modules/gateway/tensorzero_simple.py rename to dimos/agents_deprecated/modules/gateway/tensorzero_simple.py diff --git a/dimos/agents/modules/gateway/utils.py b/dimos/agents_deprecated/modules/gateway/utils.py similarity index 100% rename from dimos/agents/modules/gateway/utils.py rename to dimos/agents_deprecated/modules/gateway/utils.py diff --git a/dimos/agents/prompt_builder/__init__.py b/dimos/agents_deprecated/prompt_builder/__init__.py similarity index 100% rename from dimos/agents/prompt_builder/__init__.py rename to dimos/agents_deprecated/prompt_builder/__init__.py diff --git a/dimos/agents/prompt_builder/impl.py b/dimos/agents_deprecated/prompt_builder/impl.py similarity index 98% rename from dimos/agents/prompt_builder/impl.py rename to dimos/agents_deprecated/prompt_builder/impl.py index 42deea09dd..0714e39895 100644 --- a/dimos/agents/prompt_builder/impl.py +++ b/dimos/agents_deprecated/prompt_builder/impl.py @@ -15,8 +15,8 @@ from textwrap import dedent -from dimos.agents.tokenizer.base import AbstractTokenizer -from dimos.agents.tokenizer.openai_tokenizer import OpenAITokenizer +from dimos.agents_deprecated.tokenizer.base import AbstractTokenizer +from dimos.agents_deprecated.tokenizer.openai_tokenizer import OpenAITokenizer # TODO: Make class more generic when implementing other tokenizers. Presently its OpenAI specific. # TODO: Build out testing and logging diff --git a/dimos/agents/tokenizer/__init__.py b/dimos/agents_deprecated/tokenizer/__init__.py similarity index 100% rename from dimos/agents/tokenizer/__init__.py rename to dimos/agents_deprecated/tokenizer/__init__.py diff --git a/dimos/agents/tokenizer/base.py b/dimos/agents_deprecated/tokenizer/base.py similarity index 100% rename from dimos/agents/tokenizer/base.py rename to dimos/agents_deprecated/tokenizer/base.py diff --git a/dimos/agents/tokenizer/huggingface_tokenizer.py b/dimos/agents_deprecated/tokenizer/huggingface_tokenizer.py similarity index 98% rename from dimos/agents/tokenizer/huggingface_tokenizer.py rename to dimos/agents_deprecated/tokenizer/huggingface_tokenizer.py index cf51347253..5b1eef7357 100644 --- a/dimos/agents/tokenizer/huggingface_tokenizer.py +++ b/dimos/agents_deprecated/tokenizer/huggingface_tokenizer.py @@ -14,7 +14,7 @@ from transformers import AutoTokenizer # type: ignore[import-untyped] -from dimos.agents.tokenizer.base import AbstractTokenizer +from dimos.agents_deprecated.tokenizer.base import AbstractTokenizer from dimos.utils.logging_config import setup_logger diff --git a/dimos/agents/tokenizer/openai_tokenizer.py b/dimos/agents_deprecated/tokenizer/openai_tokenizer.py similarity index 98% rename from dimos/agents/tokenizer/openai_tokenizer.py rename to dimos/agents_deprecated/tokenizer/openai_tokenizer.py index 15de95aafe..a8b75b8558 100644 --- a/dimos/agents/tokenizer/openai_tokenizer.py +++ b/dimos/agents_deprecated/tokenizer/openai_tokenizer.py @@ -14,7 +14,7 @@ import tiktoken -from dimos.agents.tokenizer.base import AbstractTokenizer +from dimos.agents_deprecated.tokenizer.base import AbstractTokenizer from dimos.utils.logging_config import setup_logger diff --git a/dimos/models/qwen/video_query.py b/dimos/models/qwen/video_query.py index 0b14bdfbc8..7ba80ae069 100644 --- a/dimos/models/qwen/video_query.py +++ b/dimos/models/qwen/video_query.py @@ -8,8 +8,8 @@ from reactivex import Observable, operators as ops from reactivex.subject import Subject -from dimos.agents.agent import OpenAIAgent -from dimos.agents.tokenizer.huggingface_tokenizer import HuggingFaceTokenizer +from dimos.agents_deprecated.agent import OpenAIAgent +from dimos.agents_deprecated.tokenizer.huggingface_tokenizer import HuggingFaceTokenizer from dimos.utils.threadpool import get_scheduler BBox = tuple[float, float, float, float] # (x1, y1, x2, y2) diff --git a/dimos/perception/spatial_perception.py b/dimos/perception/spatial_perception.py index 58b51563c8..3c6de9a429 100644 --- a/dimos/perception/spatial_perception.py +++ b/dimos/perception/spatial_perception.py @@ -28,9 +28,9 @@ from reactivex.disposable import Disposable from dimos import spec -from dimos.agents.memory.image_embedding import ImageEmbeddingProvider -from dimos.agents.memory.spatial_vector_db import SpatialVectorDB -from dimos.agents.memory.visual_memory import VisualMemory +from dimos.agents_deprecated.memory.image_embedding import ImageEmbeddingProvider +from dimos.agents_deprecated.memory.spatial_vector_db import SpatialVectorDB +from dimos.agents_deprecated.memory.visual_memory import VisualMemory from dimos.constants import DIMOS_PROJECT_ROOT from dimos.core import DimosCluster, In, Module, rpc from dimos.msgs.sensor_msgs import Image diff --git a/dimos/robot/agilex/README.md b/dimos/robot/agilex/README.md index 5d43fa3c3f..8342a6045e 100644 --- a/dimos/robot/agilex/README.md +++ b/dimos/robot/agilex/README.md @@ -135,7 +135,7 @@ The run file pattern for agent integration: #!/usr/bin/env python3 import asyncio import reactivex as rx -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.web.robot_web_interface import RobotWebInterface def main(): @@ -266,7 +266,7 @@ class MyRobot: import asyncio import os from my_robot import MyRobot -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.skills.basic import BasicSkill from dimos.web.robot_web_interface import RobotWebInterface import reactivex as rx diff --git a/dimos/robot/agilex/README_CN.md b/dimos/robot/agilex/README_CN.md index bc82697776..a8d79ebec1 100644 --- a/dimos/robot/agilex/README_CN.md +++ b/dimos/robot/agilex/README_CN.md @@ -135,7 +135,7 @@ self.manipulation.camera_info.connect(self.camera.camera_info) #!/usr/bin/env python3 import asyncio import reactivex as rx -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.web.robot_web_interface import RobotWebInterface def main(): @@ -266,7 +266,7 @@ class MyRobot: import asyncio import os from my_robot import MyRobot -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.skills.basic import BasicSkill from dimos.web.robot_web_interface import RobotWebInterface import reactivex as rx diff --git a/dimos/robot/agilex/run.py b/dimos/robot/agilex/run.py index b810272e0a..38a231b211 100644 --- a/dimos/robot/agilex/run.py +++ b/dimos/robot/agilex/run.py @@ -26,7 +26,7 @@ import reactivex as rx import reactivex.operators as ops -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.robot.agilex.piper_arm import PiperArmRobot from dimos.skills.kill_skill import KillSkill from dimos.skills.manipulation.pick_and_place import PickAndPlace diff --git a/dimos/web/README.md b/dimos/web/README.md index c7bcd5df20..28f418bb55 100644 --- a/dimos/web/README.md +++ b/dimos/web/README.md @@ -85,7 +85,7 @@ The frontend will be available at http://localhost:3000 ### Unitree Go2 Example ```python -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.web.robot_web_interface import RobotWebInterface diff --git a/dimos/web/dimos_interface/api/README.md b/dimos/web/dimos_interface/api/README.md index 37cafd6e52..a2c15015e8 100644 --- a/dimos/web/dimos_interface/api/README.md +++ b/dimos/web/dimos_interface/api/README.md @@ -34,7 +34,7 @@ The server will start on `http://0.0.0.0:5555`. See DimOS Documentation for more info. ```python -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.web.robot_web_interface import RobotWebInterface diff --git a/tests/agent_manip_flow_flask_test.py b/tests/agent_manip_flow_flask_test.py index 7f7887004b..7a7504e628 100644 --- a/tests/agent_manip_flow_flask_test.py +++ b/tests/agent_manip_flow_flask_test.py @@ -31,7 +31,7 @@ from reactivex.scheduler import ThreadPoolScheduler # Local application imports -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.stream.frame_processor import FrameProcessor from dimos.stream.video_operators import VideoOperators as vops from dimos.stream.video_provider import VideoProvider diff --git a/tests/agent_memory_test.py b/tests/agent_memory_test.py index c2c41ad502..44f1a38397 100644 --- a/tests/agent_memory_test.py +++ b/tests/agent_memory_test.py @@ -18,7 +18,7 @@ load_dotenv() -from dimos.agents.memory.chroma_impl import OpenAISemanticMemory +from dimos.agents_deprecated.memory.chroma_impl import OpenAISemanticMemory agent_memory = OpenAISemanticMemory() print("Initialization done.") diff --git a/tests/simple_agent_test.py b/tests/simple_agent_test.py index f2cf8493d4..482f131f4e 100644 --- a/tests/simple_agent_test.py +++ b/tests/simple_agent_test.py @@ -14,7 +14,7 @@ import os -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_ros_control import UnitreeROSControl from dimos.robot.unitree.unitree_skills import MyUnitreeSkills diff --git a/tests/test_agent_alibaba.py b/tests/test_agent_alibaba.py index fa4dfe80bf..1b26a7f009 100644 --- a/tests/test_agent_alibaba.py +++ b/tests/test_agent_alibaba.py @@ -16,8 +16,8 @@ from openai import OpenAI -from dimos.agents.agent import OpenAIAgent -from dimos.agents.tokenizer.huggingface_tokenizer import HuggingFaceTokenizer +from dimos.agents_deprecated.agent import OpenAIAgent +from dimos.agents_deprecated.tokenizer.huggingface_tokenizer import HuggingFaceTokenizer from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.stream.video_provider import VideoProvider from dimos.utils.threadpool import get_scheduler diff --git a/tests/test_audio_agent.py b/tests/test_audio_agent.py index d79d2040c2..be1322be10 100644 --- a/tests/test_audio_agent.py +++ b/tests/test_audio_agent.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.stream.audio.pipelines import stt, tts from dimos.stream.audio.utils import keepalive from dimos.utils.threadpool import get_scheduler diff --git a/tests/test_audio_robot_agent.py b/tests/test_audio_robot_agent.py index 27340fcd80..68c523d0f9 100644 --- a/tests/test_audio_robot_agent.py +++ b/tests/test_audio_robot_agent.py @@ -14,7 +14,7 @@ import os -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_ros_control import UnitreeROSControl from dimos.robot.unitree.unitree_skills import MyUnitreeSkills diff --git a/tests/test_claude_agent_query.py b/tests/test_claude_agent_query.py index 05893a6b9d..548ed4351d 100644 --- a/tests/test_claude_agent_query.py +++ b/tests/test_claude_agent_query.py @@ -14,7 +14,7 @@ from dotenv import load_dotenv -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent # Load API key from environment load_dotenv() diff --git a/tests/test_claude_agent_skills_query.py b/tests/test_claude_agent_skills_query.py index bb5753d2db..c02e895bd7 100644 --- a/tests/test_claude_agent_skills_query.py +++ b/tests/test_claude_agent_skills_query.py @@ -19,7 +19,7 @@ import reactivex as rx import reactivex.operators as ops -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_ros_control import UnitreeROSControl from dimos.robot.unitree.unitree_skills import MyUnitreeSkills diff --git a/tests/test_manipulation_agent.py b/tests/test_manipulation_agent.py index 7651d38fef..312b530744 100644 --- a/tests/test_manipulation_agent.py +++ b/tests/test_manipulation_agent.py @@ -22,7 +22,7 @@ import reactivex.operators as ops from reactivex.subject import BehaviorSubject -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.perception.detection2d.detic_2d_det import Detic2DDetector from dimos.perception.object_detection_stream import ObjectDetectionStream from dimos.robot.robot import MockManipulationRobot diff --git a/tests/test_object_detection_agent_data_query_stream.py b/tests/test_object_detection_agent_data_query_stream.py index ca5671f78e..e788e92c13 100644 --- a/tests/test_object_detection_agent_data_query_stream.py +++ b/tests/test_object_detection_agent_data_query_stream.py @@ -20,7 +20,7 @@ from dotenv import load_dotenv from reactivex import operators as ops -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.perception.detection2d.detic_2d_det import Detic2DDetector from dimos.perception.object_detection_stream import ObjectDetectionStream from dimos.robot.unitree.unitree_go2 import UnitreeGo2 diff --git a/tests/test_semantic_seg_robot_agent.py b/tests/test_semantic_seg_robot_agent.py index f35fdb53d4..2791f23211 100644 --- a/tests/test_semantic_seg_robot_agent.py +++ b/tests/test_semantic_seg_robot_agent.py @@ -17,7 +17,7 @@ import cv2 from reactivex import Subject, operators as RxOps -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.perception.semantic_seg import SemanticSegmentationStream from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_ros_control import UnitreeROSControl diff --git a/tests/test_skills.py b/tests/test_skills.py index 139a4efe59..a4bdd5942e 100644 --- a/tests/test_skills.py +++ b/tests/test_skills.py @@ -17,7 +17,7 @@ import unittest from unittest import mock -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.robot import MockRobot from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.skills.skills import AbstractSkill @@ -123,7 +123,7 @@ def setUp(self): skills=self.skill_library, ) - @mock.patch("dimos.agents.agent.OpenAIAgent.run_observable_query") + @mock.patch("dimos.agents_deprecated.agent.OpenAIAgent.run_observable_query") def test_agent_skill_identification(self, mock_query): """Test that the agent can identify skills based on natural language.""" # Mock the agent response @@ -139,7 +139,7 @@ def test_agent_skill_identification(self, mock_query): self.assertEqual(response, "I found the TestSkill and executed it.") @mock.patch.object(TestSkill, "__call__") - @mock.patch("dimos.agents.agent.OpenAIAgent.run_observable_query") + @mock.patch("dimos.agents_deprecated.agent.OpenAIAgent.run_observable_query") def test_agent_skill_execution(self, mock_query, mock_skill_call): """Test that the agent can execute skills properly.""" # Mock the agent and skill call diff --git a/tests/test_skills_rest.py b/tests/test_skills_rest.py index a9493e3c79..6d3afc522c 100644 --- a/tests/test_skills_rest.py +++ b/tests/test_skills_rest.py @@ -18,7 +18,7 @@ import reactivex as rx import reactivex.operators as ops -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.skills.rest.rest import GenericRestSkill from dimos.skills.skills import SkillLibrary from dimos.web.robot_web_interface import RobotWebInterface diff --git a/tests/test_spatial_memory.py b/tests/test_spatial_memory.py index e9c8c623b9..5cd587f28c 100644 --- a/tests/test_spatial_memory.py +++ b/tests/test_spatial_memory.py @@ -22,7 +22,7 @@ import reactivex from reactivex import operators as ops -from dimos.agents.memory.visual_memory import VisualMemory +from dimos.agents_deprecated.memory.visual_memory import VisualMemory from dimos.msgs.geometry_msgs import Quaternion, Vector3 # from dimos.robot.unitree_webrtc.unitree_go2 import UnitreeGo2 # Uncomment when properly configured diff --git a/tests/test_spatial_memory_query.py b/tests/test_spatial_memory_query.py index 539f5f5eb0..d6935a2116 100644 --- a/tests/test_spatial_memory_query.py +++ b/tests/test_spatial_memory_query.py @@ -28,7 +28,7 @@ import cv2 import matplotlib.pyplot as plt -from dimos.agents.memory.visual_memory import VisualMemory +from dimos.agents_deprecated.memory.visual_memory import VisualMemory from dimos.perception.spatial_perception import SpatialMemory diff --git a/tests/test_standalone_project_out.py b/tests/test_standalone_project_out.py index 9a924f7f42..13211d8032 100644 --- a/tests/test_standalone_project_out.py +++ b/tests/test_standalone_project_out.py @@ -122,14 +122,14 @@ def extract_function_info(filename): # Usage: -file_path = "./dimos/agents/memory/base.py" +file_path = "./dimos/agents_deprecated/memory/base.py" extracted_info = extract_function_info(file_path) print(extracted_info) -file_path = "./dimos/agents/memory/chroma_impl.py" +file_path = "./dimos/agents_deprecated/memory/chroma_impl.py" extracted_info = extract_function_info(file_path) print(extracted_info) -file_path = "./dimos/agents/agent.py" +file_path = "./dimos/agents_deprecated/agent.py" extracted_info = extract_function_info(file_path) print(extracted_info) diff --git a/tests/test_unitree_agent.py b/tests/test_unitree_agent.py index 5c4b6acb7b..c9999b6f20 100644 --- a/tests/test_unitree_agent.py +++ b/tests/test_unitree_agent.py @@ -21,7 +21,7 @@ # ----- -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.stream.data_provider import QueryDataProvider diff --git a/tests/test_unitree_agent_queries_fastapi.py b/tests/test_unitree_agent_queries_fastapi.py index e144b8856c..77c36c14ef 100644 --- a/tests/test_unitree_agent_queries_fastapi.py +++ b/tests/test_unitree_agent_queries_fastapi.py @@ -30,7 +30,7 @@ import reactivex.operators as ops # Local application imports -from dimos.agents.agent import OpenAIAgent +from dimos.agents_deprecated.agent import OpenAIAgent from dimos.robot.unitree.unitree_go2 import UnitreeGo2 from dimos.robot.unitree.unitree_skills import MyUnitreeSkills from dimos.utils.logging_config import setup_logger diff --git a/tests/test_unitree_ros_v0.0.4.py b/tests/test_unitree_ros_v0.0.4.py index efb39be2bf..bee088b85a 100644 --- a/tests/test_unitree_ros_v0.0.4.py +++ b/tests/test_unitree_ros_v0.0.4.py @@ -18,7 +18,7 @@ import reactivex as rx import reactivex.operators as ops -from dimos.agents.claude_agent import ClaudeAgent +from dimos.agents_deprecated.claude_agent import ClaudeAgent from dimos.perception.detection2d.detic_2d_det import Detic2DDetector from dimos.perception.object_detection_stream import ObjectDetectionStream from dimos.robot.unitree.unitree_go2 import UnitreeGo2 From 0c6c85a1051dbb613ca396391c990d483a87205f Mon Sep 17 00:00:00 2001 From: Paul Nechifor Date: Thu, 25 Dec 2025 07:00:35 +0200 Subject: [PATCH 2/2] rename agents2 to agents --- .../{prompt_agents2.txt => prompt_agents.txt} | 0 dimos/{agents2 => agents}/__init__.py | 4 ++-- dimos/{agents2 => agents}/agent.py | 8 +++---- dimos/{agents2 => agents}/cli/human.py | 2 +- dimos/{agents2 => agents}/cli/web.py | 0 dimos/{agents2 => agents}/conftest.py | 4 ++-- dimos/{agents2 => agents}/constants.py | 2 +- .../test_get_gps_position_for_queries.json | 0 .../fixtures/test_go_to_object.json | 0 .../test_go_to_semantic_location.json | 0 ...est_how_much_is_124181112_plus_124124.json | 0 .../fixtures/test_pounce.json | 0 .../fixtures/test_set_gps_travel_points.json | 0 .../test_set_gps_travel_points_multiple.json | 0 .../fixtures/test_show_your_love.json | 0 .../fixtures/test_stop_movement.json | 0 .../fixtures/test_take_a_look_around.json | 0 .../test_what_do_you_see_in_this_picture.json | 0 .../fixtures/test_what_is_your_name.json | 0 .../fixtures/test_where_am_i.json | 0 dimos/{agents2 => agents}/ollama_agent.py | 0 dimos/{agents2 => agents}/skills/conftest.py | 8 +++---- .../skills/demo_calculator_skill.py | 0 .../skills/demo_google_maps_skill.py | 10 ++++----- .../skills/demo_gps_nav.py | 10 ++++----- .../{agents2 => agents}/skills/demo_robot.py | 0 .../{agents2 => agents}/skills/demo_skill.py | 8 +++---- .../skills/google_maps_skill_container.py | 0 .../skills/gps_nav_skill.py | 0 .../{agents2 => agents}/skills/navigation.py | 0 dimos/{agents2 => agents}/skills/osm.py | 0 .../{agents2 => agents}/skills/speak_skill.py | 0 .../test_google_maps_skill_container.py | 0 .../skills/test_gps_nav_skills.py | 0 .../skills/test_navigation.py | 8 +++---- .../skills/test_unitree_skill_container.py | 0 dimos/{agents2 => agents}/spec.py | 0 dimos/{agents2 => agents}/system_prompt.py | 2 +- .../{agents2 => agents}/temp/webcam_agent.py | 8 +++---- dimos/{agents2 => agents}/test_agent.py | 2 +- .../{agents2 => agents}/test_agent_direct.py | 2 +- dimos/{agents2 => agents}/test_agent_fake.py | 0 dimos/{agents2 => agents}/test_mock_agent.py | 4 ++-- dimos/{agents2 => agents}/test_stash_agent.py | 2 +- dimos/{agents2 => agents}/testing.py | 0 dimos/hardware/camera/module.py | 2 +- dimos/mapping/osm/demo_osm.py | 10 ++++----- dimos/navigation/rosnav.py | 2 +- dimos/perception/detection/module3D.py | 2 +- dimos/robot/all_blueprints.py | 22 +++++++++---------- dimos/robot/drone/drone.py | 10 ++++----- dimos/robot/unitree/g1/g1agent.py | 6 ++--- dimos/robot/unitree/go2/go2.py | 2 +- .../modular/connection_module.py | 2 +- .../unitree_webrtc/modular/ivan_unitree.py | 6 ++--- .../unitree_webrtc/unitree_g1_blueprints.py | 6 ++--- .../unitree_g1_skill_container.py | 2 +- .../unitree_webrtc/unitree_go2_blueprints.py | 14 ++++++------ 58 files changed, 85 insertions(+), 85 deletions(-) rename assets/agent/{prompt_agents2.txt => prompt_agents.txt} (100%) rename dimos/{agents2 => agents}/__init__.py (75%) rename dimos/{agents2 => agents}/agent.py (98%) rename dimos/{agents2 => agents}/cli/human.py (95%) rename dimos/{agents2 => agents}/cli/web.py (100%) rename dimos/{agents2 => agents}/conftest.py (96%) rename dimos/{agents2 => agents}/constants.py (97%) rename dimos/{agents2 => agents}/fixtures/test_get_gps_position_for_queries.json (100%) rename dimos/{agents2 => agents}/fixtures/test_go_to_object.json (100%) rename dimos/{agents2 => agents}/fixtures/test_go_to_semantic_location.json (100%) rename dimos/{agents2 => agents}/fixtures/test_how_much_is_124181112_plus_124124.json (100%) rename dimos/{agents2 => agents}/fixtures/test_pounce.json (100%) rename dimos/{agents2 => agents}/fixtures/test_set_gps_travel_points.json (100%) rename dimos/{agents2 => agents}/fixtures/test_set_gps_travel_points_multiple.json (100%) rename dimos/{agents2 => agents}/fixtures/test_show_your_love.json (100%) rename dimos/{agents2 => agents}/fixtures/test_stop_movement.json (100%) rename dimos/{agents2 => agents}/fixtures/test_take_a_look_around.json (100%) rename dimos/{agents2 => agents}/fixtures/test_what_do_you_see_in_this_picture.json (100%) rename dimos/{agents2 => agents}/fixtures/test_what_is_your_name.json (100%) rename dimos/{agents2 => agents}/fixtures/test_where_am_i.json (100%) rename dimos/{agents2 => agents}/ollama_agent.py (100%) rename dimos/{agents2 => agents}/skills/conftest.py (92%) rename dimos/{agents2 => agents}/skills/demo_calculator_skill.py (100%) rename dimos/{agents2 => agents}/skills/demo_google_maps_skill.py (75%) rename dimos/{agents2 => agents}/skills/demo_gps_nav.py (76%) rename dimos/{agents2 => agents}/skills/demo_robot.py (100%) rename dimos/{agents2 => agents}/skills/demo_skill.py (78%) rename dimos/{agents2 => agents}/skills/google_maps_skill_container.py (100%) rename dimos/{agents2 => agents}/skills/gps_nav_skill.py (100%) rename dimos/{agents2 => agents}/skills/navigation.py (100%) rename dimos/{agents2 => agents}/skills/osm.py (100%) rename dimos/{agents2 => agents}/skills/speak_skill.py (100%) rename dimos/{agents2 => agents}/skills/test_google_maps_skill_container.py (100%) rename dimos/{agents2 => agents}/skills/test_gps_nav_skills.py (100%) rename dimos/{agents2 => agents}/skills/test_navigation.py (90%) rename dimos/{agents2 => agents}/skills/test_unitree_skill_container.py (100%) rename dimos/{agents2 => agents}/spec.py (100%) rename dimos/{agents2 => agents}/system_prompt.py (92%) rename dimos/{agents2 => agents}/temp/webcam_agent.py (95%) rename dimos/{agents2 => agents}/test_agent.py (99%) rename dimos/{agents2 => agents}/test_agent_direct.py (98%) rename dimos/{agents2 => agents}/test_agent_fake.py (100%) rename dimos/{agents2 => agents}/test_mock_agent.py (98%) rename dimos/{agents2 => agents}/test_stash_agent.py (98%) rename dimos/{agents2 => agents}/testing.py (100%) diff --git a/assets/agent/prompt_agents2.txt b/assets/agent/prompt_agents.txt similarity index 100% rename from assets/agent/prompt_agents2.txt rename to assets/agent/prompt_agents.txt diff --git a/dimos/agents2/__init__.py b/dimos/agents/__init__.py similarity index 75% rename from dimos/agents2/__init__.py rename to dimos/agents/__init__.py index c817bb3aee..8e099a21b4 100644 --- a/dimos/agents2/__init__.py +++ b/dimos/agents/__init__.py @@ -7,7 +7,7 @@ ToolMessage, ) -from dimos.agents2.agent import Agent, deploy -from dimos.agents2.spec import AgentSpec +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 diff --git a/dimos/agents2/agent.py b/dimos/agents/agent.py similarity index 98% rename from dimos/agents2/agent.py rename to dimos/agents/agent.py index 45852767d3..a232876fec 100644 --- a/dimos/agents2/agent.py +++ b/dimos/agents/agent.py @@ -29,9 +29,9 @@ ) from langchain_huggingface import ChatHuggingFace, HuggingFacePipeline -from dimos.agents2.ollama_agent import ensure_ollama_model -from dimos.agents2.spec import AgentSpec, Model, Provider -from dimos.agents2.system_prompt import get_system_prompt +from dimos.agents.ollama_agent import ensure_ollama_model +from dimos.agents.spec import AgentSpec, Model, Provider +from dimos.agents.system_prompt import get_system_prompt from dimos.core import DimosCluster, rpc from dimos.protocol.skill.coordinator import ( SkillCoordinator, @@ -413,7 +413,7 @@ def deploy( provider: Provider = Provider.OPENAI, # type: ignore[attr-defined] skill_containers: list[SkillContainer] | None = None, ) -> Agent: - from dimos.agents2.cli.human import HumanInput + from dimos.agents.cli.human import HumanInput if skill_containers is None: skill_containers = [] diff --git a/dimos/agents2/cli/human.py b/dimos/agents/cli/human.py similarity index 95% rename from dimos/agents2/cli/human.py rename to dimos/agents/cli/human.py index bbeee4961f..09e2ed24d4 100644 --- a/dimos/agents2/cli/human.py +++ b/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 diff --git a/dimos/agents2/cli/web.py b/dimos/agents/cli/web.py similarity index 100% rename from dimos/agents2/cli/web.py rename to dimos/agents/cli/web.py diff --git a/dimos/agents2/conftest.py b/dimos/agents/conftest.py similarity index 96% rename from dimos/agents2/conftest.py rename to dimos/agents/conftest.py index 769523f8c5..757fc839e9 100644 --- a/dimos/agents2/conftest.py +++ b/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 diff --git a/dimos/agents2/constants.py b/dimos/agents/constants.py similarity index 97% rename from dimos/agents2/constants.py rename to dimos/agents/constants.py index 0d7d4832a0..2f78e92f96 100644 --- a/dimos/agents2/constants.py +++ b/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" diff --git a/dimos/agents2/fixtures/test_get_gps_position_for_queries.json b/dimos/agents/fixtures/test_get_gps_position_for_queries.json similarity index 100% rename from dimos/agents2/fixtures/test_get_gps_position_for_queries.json rename to dimos/agents/fixtures/test_get_gps_position_for_queries.json diff --git a/dimos/agents2/fixtures/test_go_to_object.json b/dimos/agents/fixtures/test_go_to_object.json similarity index 100% rename from dimos/agents2/fixtures/test_go_to_object.json rename to dimos/agents/fixtures/test_go_to_object.json diff --git a/dimos/agents2/fixtures/test_go_to_semantic_location.json b/dimos/agents/fixtures/test_go_to_semantic_location.json similarity index 100% rename from dimos/agents2/fixtures/test_go_to_semantic_location.json rename to dimos/agents/fixtures/test_go_to_semantic_location.json diff --git a/dimos/agents2/fixtures/test_how_much_is_124181112_plus_124124.json b/dimos/agents/fixtures/test_how_much_is_124181112_plus_124124.json similarity index 100% rename from dimos/agents2/fixtures/test_how_much_is_124181112_plus_124124.json rename to dimos/agents/fixtures/test_how_much_is_124181112_plus_124124.json diff --git a/dimos/agents2/fixtures/test_pounce.json b/dimos/agents/fixtures/test_pounce.json similarity index 100% rename from dimos/agents2/fixtures/test_pounce.json rename to dimos/agents/fixtures/test_pounce.json diff --git a/dimos/agents2/fixtures/test_set_gps_travel_points.json b/dimos/agents/fixtures/test_set_gps_travel_points.json similarity index 100% rename from dimos/agents2/fixtures/test_set_gps_travel_points.json rename to dimos/agents/fixtures/test_set_gps_travel_points.json diff --git a/dimos/agents2/fixtures/test_set_gps_travel_points_multiple.json b/dimos/agents/fixtures/test_set_gps_travel_points_multiple.json similarity index 100% rename from dimos/agents2/fixtures/test_set_gps_travel_points_multiple.json rename to dimos/agents/fixtures/test_set_gps_travel_points_multiple.json diff --git a/dimos/agents2/fixtures/test_show_your_love.json b/dimos/agents/fixtures/test_show_your_love.json similarity index 100% rename from dimos/agents2/fixtures/test_show_your_love.json rename to dimos/agents/fixtures/test_show_your_love.json diff --git a/dimos/agents2/fixtures/test_stop_movement.json b/dimos/agents/fixtures/test_stop_movement.json similarity index 100% rename from dimos/agents2/fixtures/test_stop_movement.json rename to dimos/agents/fixtures/test_stop_movement.json diff --git a/dimos/agents2/fixtures/test_take_a_look_around.json b/dimos/agents/fixtures/test_take_a_look_around.json similarity index 100% rename from dimos/agents2/fixtures/test_take_a_look_around.json rename to dimos/agents/fixtures/test_take_a_look_around.json diff --git a/dimos/agents2/fixtures/test_what_do_you_see_in_this_picture.json b/dimos/agents/fixtures/test_what_do_you_see_in_this_picture.json similarity index 100% rename from dimos/agents2/fixtures/test_what_do_you_see_in_this_picture.json rename to dimos/agents/fixtures/test_what_do_you_see_in_this_picture.json diff --git a/dimos/agents2/fixtures/test_what_is_your_name.json b/dimos/agents/fixtures/test_what_is_your_name.json similarity index 100% rename from dimos/agents2/fixtures/test_what_is_your_name.json rename to dimos/agents/fixtures/test_what_is_your_name.json diff --git a/dimos/agents2/fixtures/test_where_am_i.json b/dimos/agents/fixtures/test_where_am_i.json similarity index 100% rename from dimos/agents2/fixtures/test_where_am_i.json rename to dimos/agents/fixtures/test_where_am_i.json diff --git a/dimos/agents2/ollama_agent.py b/dimos/agents/ollama_agent.py similarity index 100% rename from dimos/agents2/ollama_agent.py rename to dimos/agents/ollama_agent.py diff --git a/dimos/agents2/skills/conftest.py b/dimos/agents/skills/conftest.py similarity index 92% rename from dimos/agents2/skills/conftest.py rename to dimos/agents/skills/conftest.py index f7d1500847..9b0b7b125a 100644 --- a/dimos/agents2/skills/conftest.py +++ b/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() diff --git a/dimos/agents2/skills/demo_calculator_skill.py b/dimos/agents/skills/demo_calculator_skill.py similarity index 100% rename from dimos/agents2/skills/demo_calculator_skill.py rename to dimos/agents/skills/demo_calculator_skill.py diff --git a/dimos/agents2/skills/demo_google_maps_skill.py b/dimos/agents/skills/demo_google_maps_skill.py similarity index 75% rename from dimos/agents2/skills/demo_google_maps_skill.py rename to dimos/agents/skills/demo_google_maps_skill.py index 4bee8691a3..52b5917f58 100644 --- a/dimos/agents2/skills/demo_google_maps_skill.py +++ b/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() diff --git a/dimos/agents2/skills/demo_gps_nav.py b/dimos/agents/skills/demo_gps_nav.py similarity index 76% rename from dimos/agents2/skills/demo_gps_nav.py rename to dimos/agents/skills/demo_gps_nav.py index 55ffd052ff..f0eebd7ee9 100644 --- a/dimos/agents2/skills/demo_gps_nav.py +++ b/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() diff --git a/dimos/agents2/skills/demo_robot.py b/dimos/agents/skills/demo_robot.py similarity index 100% rename from dimos/agents2/skills/demo_robot.py rename to dimos/agents/skills/demo_robot.py diff --git a/dimos/agents2/skills/demo_skill.py b/dimos/agents/skills/demo_skill.py similarity index 78% rename from dimos/agents2/skills/demo_skill.py rename to dimos/agents/skills/demo_skill.py index f549e6115c..835bd6b24f 100644 --- a/dimos/agents2/skills/demo_skill.py +++ b/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() diff --git a/dimos/agents2/skills/google_maps_skill_container.py b/dimos/agents/skills/google_maps_skill_container.py similarity index 100% rename from dimos/agents2/skills/google_maps_skill_container.py rename to dimos/agents/skills/google_maps_skill_container.py diff --git a/dimos/agents2/skills/gps_nav_skill.py b/dimos/agents/skills/gps_nav_skill.py similarity index 100% rename from dimos/agents2/skills/gps_nav_skill.py rename to dimos/agents/skills/gps_nav_skill.py diff --git a/dimos/agents2/skills/navigation.py b/dimos/agents/skills/navigation.py similarity index 100% rename from dimos/agents2/skills/navigation.py rename to dimos/agents/skills/navigation.py diff --git a/dimos/agents2/skills/osm.py b/dimos/agents/skills/osm.py similarity index 100% rename from dimos/agents2/skills/osm.py rename to dimos/agents/skills/osm.py diff --git a/dimos/agents2/skills/speak_skill.py b/dimos/agents/skills/speak_skill.py similarity index 100% rename from dimos/agents2/skills/speak_skill.py rename to dimos/agents/skills/speak_skill.py diff --git a/dimos/agents2/skills/test_google_maps_skill_container.py b/dimos/agents/skills/test_google_maps_skill_container.py similarity index 100% rename from dimos/agents2/skills/test_google_maps_skill_container.py rename to dimos/agents/skills/test_google_maps_skill_container.py diff --git a/dimos/agents2/skills/test_gps_nav_skills.py b/dimos/agents/skills/test_gps_nav_skills.py similarity index 100% rename from dimos/agents2/skills/test_gps_nav_skills.py rename to dimos/agents/skills/test_gps_nav_skills.py diff --git a/dimos/agents2/skills/test_navigation.py b/dimos/agents/skills/test_navigation.py similarity index 90% rename from dimos/agents2/skills/test_navigation.py rename to dimos/agents/skills/test_navigation.py index 93c0a4f5be..4a4388e661 100644 --- a/dimos/agents2/skills/test_navigation.py +++ b/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( diff --git a/dimos/agents2/skills/test_unitree_skill_container.py b/dimos/agents/skills/test_unitree_skill_container.py similarity index 100% rename from dimos/agents2/skills/test_unitree_skill_container.py rename to dimos/agents/skills/test_unitree_skill_container.py diff --git a/dimos/agents2/spec.py b/dimos/agents/spec.py similarity index 100% rename from dimos/agents2/spec.py rename to dimos/agents/spec.py diff --git a/dimos/agents2/system_prompt.py b/dimos/agents/system_prompt.py similarity index 92% rename from dimos/agents2/system_prompt.py rename to dimos/agents/system_prompt.py index 6b14f3e193..33bb887d63 100644 --- a/dimos/agents2/system_prompt.py +++ b/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 diff --git a/dimos/agents2/temp/webcam_agent.py b/dimos/agents/temp/webcam_agent.py similarity index 95% rename from dimos/agents2/temp/webcam_agent.py rename to dimos/agents/temp/webcam_agent.py index 2a70770e14..f3eae0ab0f 100644 --- a/dimos/agents2/temp/webcam_agent.py +++ b/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 diff --git a/dimos/agents2/test_agent.py b/dimos/agents/test_agent.py similarity index 99% rename from dimos/agents2/test_agent.py rename to dimos/agents/test_agent.py index 447d02e6e3..ed8ca74926 100644 --- a/dimos/agents2/test_agent.py +++ b/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 diff --git a/dimos/agents2/test_agent_direct.py b/dimos/agents/test_agent_direct.py similarity index 98% rename from dimos/agents2/test_agent_direct.py rename to dimos/agents/test_agent_direct.py index ee3f9aa091..ae9307457f 100644 --- a/dimos/agents2/test_agent_direct.py +++ b/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 diff --git a/dimos/agents2/test_agent_fake.py b/dimos/agents/test_agent_fake.py similarity index 100% rename from dimos/agents2/test_agent_fake.py rename to dimos/agents/test_agent_fake.py diff --git a/dimos/agents2/test_mock_agent.py b/dimos/agents/test_mock_agent.py similarity index 98% rename from dimos/agents2/test_mock_agent.py rename to dimos/agents/test_mock_agent.py index 4b113b45a0..fdda8f52e6 100644 --- a/dimos/agents2/test_mock_agent.py +++ b/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 diff --git a/dimos/agents2/test_stash_agent.py b/dimos/agents/test_stash_agent.py similarity index 98% rename from dimos/agents2/test_stash_agent.py rename to dimos/agents/test_stash_agent.py index 8e2972568a..4cd8ccf714 100644 --- a/dimos/agents2/test_stash_agent.py +++ b/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 diff --git a/dimos/agents2/testing.py b/dimos/agents/testing.py similarity index 100% rename from dimos/agents2/testing.py rename to dimos/agents/testing.py diff --git a/dimos/hardware/camera/module.py b/dimos/hardware/camera/module.py index 929e9548e5..1cb30b671a 100644 --- a/dimos/hardware/camera/module.py +++ b/dimos/hardware/camera/module.py @@ -23,7 +23,7 @@ from reactivex.observable import Observable from dimos import spec -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 Module, ModuleConfig, Out, rpc from dimos.hardware.camera.spec import CameraHardware from dimos.hardware.camera.webcam import Webcam diff --git a/dimos/mapping/osm/demo_osm.py b/dimos/mapping/osm/demo_osm.py index 20d9e40e74..d35794aa22 100644 --- a/dimos/mapping/osm/demo_osm.py +++ b/dimos/mapping/osm/demo_osm.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.osm import osm_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.osm import osm_skill +from dimos.agents.system_prompt import get_system_prompt from dimos.core.blueprints import autoconnect load_dotenv() diff --git a/dimos/navigation/rosnav.py b/dimos/navigation/rosnav.py index bc58e2937c..5c112e52e3 100644 --- a/dimos/navigation/rosnav.py +++ b/dimos/navigation/rosnav.py @@ -45,7 +45,7 @@ from tf2_msgs.msg import TFMessage as ROSTFMessage # type: ignore[attr-defined, import-untyped] from dimos import spec -from dimos.agents2 import Reducer, Stream, skill # type: ignore[attr-defined] +from dimos.agents import Reducer, Stream, skill # type: ignore[attr-defined] from dimos.core import DimosCluster, In, LCMTransport, Module, Out, pSHMTransport, rpc from dimos.core.module import ModuleConfig from dimos.msgs.geometry_msgs import ( diff --git a/dimos/perception/detection/module3D.py b/dimos/perception/detection/module3D.py index a7602ce3b5..cb2d1fb326 100644 --- a/dimos/perception/detection/module3D.py +++ b/dimos/perception/detection/module3D.py @@ -21,7 +21,7 @@ from reactivex.observable import Observable from dimos import spec -from dimos.agents2 import skill # type: ignore[attr-defined] +from dimos.agents import skill # type: ignore[attr-defined] from dimos.core import DimosCluster, In, Out, rpc from dimos.msgs.geometry_msgs import PoseStamped, Quaternion, Transform, Vector3 from dimos.msgs.sensor_msgs import Image, PointCloud2 diff --git a/dimos/robot/all_blueprints.py b/dimos/robot/all_blueprints.py index 432e89e190..fd969f6d38 100644 --- a/dimos/robot/all_blueprints.py +++ b/dimos/robot/all_blueprints.py @@ -37,9 +37,9 @@ "unitree-g1-full": "dimos.robot.unitree_webrtc.unitree_g1_blueprints:full_featured", "unitree-g1-detection": "dimos.robot.unitree_webrtc.unitree_g1_blueprints:detection", "demo-osm": "dimos.mapping.osm.demo_osm:demo_osm", - "demo-skill": "dimos.agents2.skills.demo_skill:demo_skill", - "demo-gps-nav": "dimos.agents2.skills.demo_gps_nav:demo_gps_nav_skill", - "demo-google-maps-skill": "dimos.agents2.skills.demo_google_maps_skill:demo_google_maps_skill", + "demo-skill": "dimos.agents.skills.demo_skill:demo_skill", + "demo-gps-nav": "dimos.agents.skills.demo_gps_nav:demo_gps_nav_skill", + "demo-google-maps-skill": "dimos.agents.skills.demo_google_maps_skill:demo_google_maps_skill", "demo-remapping": "dimos.robot.unitree_webrtc.demo_remapping:remapping", "demo-remapping-transport": "dimos.robot.unitree_webrtc.demo_remapping:remapping_and_transport", "demo-error-on-name-conflicts": "dimos.robot.unitree_webrtc.demo_error_on_name_conflicts:blueprint", @@ -56,25 +56,25 @@ "g1_connection": "dimos.robot.unitree.connection.g1", "g1_joystick": "dimos.robot.unitree_webrtc.g1_joystick_module", "g1_skills": "dimos.robot.unitree_webrtc.unitree_g1_skill_container", - "google_maps_skill": "dimos.agents2.skills.google_maps_skill_container", - "gps_nav_skill": "dimos.agents2.skills.gps_nav_skill", + "google_maps_skill": "dimos.agents.skills.google_maps_skill_container", + "gps_nav_skill": "dimos.agents.skills.gps_nav_skill", "holonomic_local_planner": "dimos.navigation.local_planner.holonomic_local_planner", - "human_input": "dimos.agents2.cli.human", + "human_input": "dimos.agents.cli.human", "keyboard_teleop": "dimos.robot.unitree_webrtc.keyboard_teleop", - "llm_agent": "dimos.agents2.agent", + "llm_agent": "dimos.agents.agent", "mapper": "dimos.robot.unitree_webrtc.type.map", - "navigation_skill": "dimos.agents2.skills.navigation", + "navigation_skill": "dimos.agents.skills.navigation", "object_tracking": "dimos.perception.object_tracker", - "osm_skill": "dimos.agents2.skills.osm", + "osm_skill": "dimos.agents.skills.osm", "replanning_a_star_planner": "dimos.navigation.replanning_a_star.module", "ros_nav": "dimos.navigation.rosnav", "spatial_memory": "dimos.perception.spatial_perception", - "speak_skill": "dimos.agents2.skills.speak_skill", + "speak_skill": "dimos.agents.skills.speak_skill", "unitree_skills": "dimos.robot.unitree_webrtc.unitree_skill_container", "utilization": "dimos.utils.monitoring", "wavefront_frontier_explorer": "dimos.navigation.frontier_exploration.wavefront_frontier_goal_selector", "websocket_vis": "dimos.web.websocket_vis.websocket_vis_module", - "web_input": "dimos.agents2.cli.web", + "web_input": "dimos.agents.cli.web", } diff --git a/dimos/robot/drone/drone.py b/dimos/robot/drone/drone.py index 7816d6a9aa..40f6d1fcb9 100644 --- a/dimos/robot/drone/drone.py +++ b/dimos/robot/drone/drone.py @@ -28,8 +28,8 @@ from reactivex import Observable from dimos import core -from dimos.agents2.skills.google_maps_skill_container import GoogleMapsSkillContainer -from dimos.agents2.skills.osm import OsmSkill +from dimos.agents.skills.google_maps_skill_container import GoogleMapsSkillContainer +from dimos.agents.skills.osm import OsmSkill from dimos.mapping.types import LatLon from dimos.msgs.geometry_msgs import PoseStamped, Twist, Vector3 from dimos.msgs.sensor_msgs import Image @@ -451,9 +451,9 @@ def main() -> None: print(" • /drone/tracking_overlay - Object tracking visualization (Image)") print(" • /drone/tracking_status - Tracking status (String/JSON)") - from dimos.agents2 import Agent # type: ignore[attr-defined] - from dimos.agents2.cli.human import HumanInput - from dimos.agents2.spec import Model, Provider # type: ignore[attr-defined] + from dimos.agents import Agent # type: ignore[attr-defined] + from dimos.agents.cli.human import HumanInput + from dimos.agents.spec import Model, Provider # type: ignore[attr-defined] assert drone.dimos is not None human_input = drone.dimos.deploy(HumanInput) # type: ignore[attr-defined] diff --git a/dimos/robot/unitree/g1/g1agent.py b/dimos/robot/unitree/g1/g1agent.py index 9c94445a1d..ca89319f8e 100644 --- a/dimos/robot/unitree/g1/g1agent.py +++ b/dimos/robot/unitree/g1/g1agent.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dimos import agents2 -from dimos.agents2.skills.navigation import NavigationSkillContainer +from dimos import agents +from dimos.agents.skills.navigation import NavigationSkillContainer from dimos.core import DimosCluster from dimos.perception import spatial_perception from dimos.robot.unitree.g1 import g1detector @@ -37,7 +37,7 @@ def deploy(dimos: DimosCluster, ip: str): # type: ignore[no-untyped-def] ) navskills.start() - agent = agents2.deploy( # type: ignore[attr-defined] + agent = agents.deploy( # type: ignore[attr-defined] dimos, "You are controling a humanoid robot", skill_containers=[connection, nav, camera, spatialmem, navskills], diff --git a/dimos/robot/unitree/go2/go2.py b/dimos/robot/unitree/go2/go2.py index eee38a3cad..11b369f12e 100644 --- a/dimos/robot/unitree/go2/go2.py +++ b/dimos/robot/unitree/go2/go2.py @@ -32,6 +32,6 @@ def deploy(dimos: DimosCluster, ip: str): # type: ignore[no-untyped-def] # lidar=connection, # ) - # agent = agents2.deploy(dimos) + # agent = agents.deploy(dimos) # agent.register_skills(detector) return connection diff --git a/dimos/robot/unitree_webrtc/modular/connection_module.py b/dimos/robot/unitree_webrtc/modular/connection_module.py index fb4e6ac570..0ff7528d41 100644 --- a/dimos/robot/unitree_webrtc/modular/connection_module.py +++ b/dimos/robot/unitree_webrtc/modular/connection_module.py @@ -27,7 +27,7 @@ from reactivex import operators as ops from reactivex.observable import Observable -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.constants import DEFAULT_CAPACITY_COLOR_IMAGE from dimos.core import DimosCluster, In, LCMTransport, Module, ModuleConfig, Out, pSHMTransport, rpc from dimos.core.global_config import GlobalConfig diff --git a/dimos/robot/unitree_webrtc/modular/ivan_unitree.py b/dimos/robot/unitree_webrtc/modular/ivan_unitree.py index 9c79274eb2..18f676a8fe 100644 --- a/dimos/robot/unitree_webrtc/modular/ivan_unitree.py +++ b/dimos/robot/unitree_webrtc/modular/ivan_unitree.py @@ -15,7 +15,7 @@ import logging import time -from dimos.agents2.spec import Model, Provider +from dimos.agents.spec import Model, Provider from dimos.core import LCMTransport, start from dimos.msgs.foxglove_msgs import ImageAnnotations from dimos.msgs.sensor_msgs import Image @@ -63,8 +63,8 @@ def goto(pose) -> bool: # type: ignore[no-untyped-def] connection.start() reid.start() - from dimos.agents2 import Agent # type: ignore[attr-defined] - from dimos.agents2.cli.human import HumanInput + from dimos.agents import Agent # type: ignore[attr-defined] + from dimos.agents.cli.human import HumanInput agent = Agent( system_prompt="You are a helpful assistant for controlling a Unitree Go2 robot.", diff --git a/dimos/robot/unitree_webrtc/unitree_g1_blueprints.py b/dimos/robot/unitree_webrtc/unitree_g1_blueprints.py index 0cc76ae51b..c4fd583aef 100644 --- a/dimos/robot/unitree_webrtc/unitree_g1_blueprints.py +++ b/dimos/robot/unitree_webrtc/unitree_g1_blueprints.py @@ -25,9 +25,9 @@ ) from dimos_lcm.sensor_msgs import CameraInfo # type: ignore[import-untyped] -from dimos.agents2.agent import llm_agent -from dimos.agents2.cli.human import human_input -from dimos.agents2.skills.navigation import navigation_skill +from dimos.agents.agent import llm_agent +from dimos.agents.cli.human import human_input +from dimos.agents.skills.navigation import navigation_skill from dimos.constants import DEFAULT_CAPACITY_COLOR_IMAGE from dimos.core.blueprints import autoconnect from dimos.core.transport import LCMTransport, pSHMTransport diff --git a/dimos/robot/unitree_webrtc/unitree_g1_skill_container.py b/dimos/robot/unitree_webrtc/unitree_g1_skill_container.py index 7b1b0757e0..7e027afc0d 100644 --- a/dimos/robot/unitree_webrtc/unitree_g1_skill_container.py +++ b/dimos/robot/unitree_webrtc/unitree_g1_skill_container.py @@ -13,7 +13,7 @@ # limitations under the License. """ -Unitree G1 skill container for the new agents2 framework. +Unitree G1 skill container for the new agents framework. Dynamically generates skills for G1 humanoid robot including arm controls and movement modes. """ diff --git a/dimos/robot/unitree_webrtc/unitree_go2_blueprints.py b/dimos/robot/unitree_webrtc/unitree_go2_blueprints.py index 6f27909de3..d65d9b7b5c 100644 --- a/dimos/robot/unitree_webrtc/unitree_go2_blueprints.py +++ b/dimos/robot/unitree_webrtc/unitree_go2_blueprints.py @@ -18,13 +18,13 @@ from dimos_lcm.sensor_msgs import CameraInfo # type: ignore[import-untyped] -from dimos.agents2.agent import llm_agent -from dimos.agents2.cli.human import human_input -from dimos.agents2.cli.web import web_input -from dimos.agents2.ollama_agent import ollama_installed -from dimos.agents2.skills.navigation import navigation_skill -from dimos.agents2.skills.speak_skill import speak_skill -from dimos.agents2.spec import Provider +from dimos.agents.agent import llm_agent +from dimos.agents.cli.human import human_input +from dimos.agents.cli.web import web_input +from dimos.agents.ollama_agent import ollama_installed +from dimos.agents.skills.navigation import navigation_skill +from dimos.agents.skills.speak_skill import speak_skill +from dimos.agents.spec import Provider from dimos.constants import DEFAULT_CAPACITY_COLOR_IMAGE from dimos.core.blueprints import autoconnect from dimos.core.transport import JpegLcmTransport, JpegShmTransport, LCMTransport, pSHMTransport