Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ yolo11n.pt
# symlink one of .envrc.* if you'd like to use
.envrc
.claude

/logs
2 changes: 1 addition & 1 deletion dimos/agents/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
load_dotenv()

# Initialize logger for the agent module
logger = setup_logger("dimos.agents")
logger = setup_logger()

# Constants
_TOKEN_BUDGET_PARTS = 4 # Number of parts to divide token budget
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/claude_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
load_dotenv()

# Initialize logger for the Claude agent
logger = setup_logger("dimos.agents.claude")
logger = setup_logger()


# Response object compatible with LLMAgent
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/memory/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, connection_type: str = "local", **kwargs) -> None: # type: i
UnknownConnectionTypeError: If an unrecognized connection type is specified.
AgentMemoryConnectionError: If initializing the database connection fails.
"""
self.logger = setup_logger(self.__class__.__name__)
self.logger = setup_logger()
self.logger.info("Initializing AgentMemory with connection type: %s", connection_type)
self.connection_params = kwargs
self.db_connection = (
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/memory/image_embedding.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from dimos.utils.data import get_data
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.agents.memory.image_embedding")
logger = setup_logger()


class ImageEmbeddingProvider:
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/memory/spatial_vector_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from dimos.types.robot_location import RobotLocation
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.agents.memory.spatial_vector_db")
logger = setup_logger()


class SpatialVectorDB:
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/memory/visual_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.agents.memory.visual_memory")
logger = setup_logger()


class VisualMemory:
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/modules/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
except ImportError:
from dimos.agents.modules.gateway import UnifiedGatewayClient

logger = setup_logger("dimos.agents.modules.base")
logger = setup_logger()

# Vision-capable models
VISION_MODELS = {
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/modules/base_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
except ImportError:
from dimos.agents.modules.base import BaseAgent

logger = setup_logger("dimos.agents.modules.base_agent")
logger = setup_logger()


class BaseAgentModule(BaseAgent, Module): # type: ignore[misc]
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/tokenizer/huggingface_tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def image_token_count(image_width, image_height, image_detail: str = "high"): #
"""
Calculate the number of tokens in an image. Low detail is 85 tokens, high detail is 170 tokens per 512x512 square.
"""
logger = setup_logger("dimos.agents.tokenizer.HuggingFaceTokenizer.image_token_count")
logger = setup_logger()

if image_detail == "low":
return 85
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents/tokenizer/openai_tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def image_token_count(image_width, image_height, image_detail: str = "high"): #
"""
Calculate the number of tokens in an image. Low detail is 85 tokens, high detail is 170 tokens per 512x512 square.
"""
logger = setup_logger("dimos.agents.tokenizer.openai.image_token_count")
logger = setup_logger()

if image_detail == "low":
return 85
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from dimos.protocol.skill.type import Output
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.protocol.agents2")
logger = setup_logger()


SYSTEM_MSG_APPEND = "\nYour message history will always be appended with a System Overview message that provides situational awareness."
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/cli/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if TYPE_CHECKING:
from dimos.stream.audio.base import AudioEvent

logger = setup_logger(__name__)
logger = setup_logger()


class WebInput(Module):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/ollama_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


def ensure_ollama_model(model_name: str) -> None:
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/skills/google_maps_skill_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from dimos.protocol.skill.skill import skill
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class GoogleMapsSkillContainer(SkillModule):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/skills/gps_nav_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from dimos.protocol.skill.skill import skill
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class GpsNavSkillContainer(SkillModule):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/skills/navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from dimos.types.robot_location import RobotLocation
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class NavigationSkillContainer(SkillModule):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/skills/osm.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from dimos.protocol.skill.skill import skill
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class OsmSkill(SkillModule):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/skills/speak_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from dimos.stream.audio.tts.node_openai import OpenAITTSNode, Voice
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.agents2.skills.speak_skill")
logger = setup_logger()


class SpeakSkill(SkillModule):
Expand Down
2 changes: 1 addition & 1 deletion dimos/agents2/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from dimos.utils.generic import truncate_display_string
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.agents.modules.base_agent")
logger = setup_logger()


# Dynamically create ModelProvider enum from LangChain's supported providers
Expand Down
2 changes: 2 additions & 0 deletions dimos/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

DIMOS_PROJECT_ROOT = Path(__file__).parent.parent

DIMOS_LOG_DIR = DIMOS_PROJECT_ROOT / "logs"

"""
Constants for shared memory
Usually, auto-detection for size would be preferred. Sadly, though, channels are made
Expand Down
7 changes: 5 additions & 2 deletions dimos/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
from dimos.protocol.rpc.spec import RPCSpec
from dimos.protocol.tf import LCMTF, TF, PubSubTF, TFConfig, TFSpec
from dimos.utils.actor_registry import ActorRegistry
from dimos.utils.logging_config import setup_logger

logger = setup_logger()

__all__ = [
"LCMRPC",
Expand Down Expand Up @@ -91,7 +94,7 @@ def deploy( # type: ignore[no-untyped-def]
**kwargs,
):
console = Console()
with console.status(f"deploying [green]{actor_class.__name__}", spinner="arc"):
with console.status(f"deploying [green]{actor_class.__name__}\n", spinner="arc"):
actor = dask_client.submit( # type: ignore[no-untyped-call]
actor_class,
*args,
Expand All @@ -100,7 +103,7 @@ def deploy( # type: ignore[no-untyped-def]
).result()

worker = actor.set_ref(actor).result()
print(f"deployed: {colors.blue(actor)} @ {colors.orange('worker ' + str(worker))}")
logger.info("Deployed module.", module=actor._cls.__name__, worker_id=worker)

# Register actor deployment in shared memory
ActorRegistry.update(str(actor), str(worker))
Expand Down
2 changes: 1 addition & 1 deletion dimos/core/rpc_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from dimos.protocol.rpc.lcmrpc import LCMRPC
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class RpcCall:
Expand Down
2 changes: 1 addition & 1 deletion dimos/core/stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
T = TypeVar("T")


logger = setup_logger(__file__)
logger = setup_logger()


class ObservableMixin(Generic[T]):
Expand Down
2 changes: 1 addition & 1 deletion dimos/hardware/camera/zed/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from dimos.protocol.tf import TF
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__name__)
logger = setup_logger()


class ZEDCamera:
Expand Down
2 changes: 1 addition & 1 deletion dimos/hardware/fake_zed_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from dimos.utils.logging_config import setup_logger
from dimos.utils.testing import TimedSensorReplay

logger = setup_logger(__name__, level=logging.INFO)
logger = setup_logger(level=logging.INFO)


class FakeZEDModule(Module):
Expand Down
2 changes: 1 addition & 1 deletion dimos/hardware/gstreamer_camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
gi.require_version("GstApp", "1.0")
from gi.repository import GLib, Gst # type: ignore[import-not-found]

logger = setup_logger("dimos.hardware.gstreamer_camera", level=logging.INFO)
logger = setup_logger(level=logging.INFO)

Gst.init(None)

Expand Down
2 changes: 1 addition & 1 deletion dimos/hardware/piper_arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from dimos.utils.logging_config import setup_logger
from dimos.utils.transform_utils import euler_to_quaternion, quaternion_to_euler

logger = setup_logger(__file__)
logger = setup_logger()


class PiperArm:
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/manip_aio_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from dimos.perception.pointcloud.utils import create_point_cloud_overlay_visualization
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.perception.manip_aio_pipeline")
logger = setup_logger()


class ManipulationPipeline:
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/manip_aio_processer.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
from dimos.perception.segmentation.sam_2d_seg import Sam2DSegmenter
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.perception.manip_aio_processor")
logger = setup_logger()


class ManipulationProcessor:
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/manipulation_history.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.types.manipulation_history")
logger = setup_logger()


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/manipulation_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
if TYPE_CHECKING:
from reactivex.disposable import Disposable

logger = setup_logger("dimos.robot.manipulation_interface")
logger = setup_logger()


class ManipulationInterface:
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/visual_servoing/detection3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
from dimos.perception.segmentation.sam_2d_seg import Sam2DSegmenter
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.manipulation.visual_servoing.detection3d")
logger = setup_logger()


class Detection3DProcessor:
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/visual_servoing/manipulation_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
pose_to_matrix,
)

logger = setup_logger("dimos.manipulation.visual_servoing.manipulation_module")
logger = setup_logger()


class GraspStage(Enum):
Expand Down
2 changes: 1 addition & 1 deletion dimos/manipulation/visual_servoing/pbvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from dimos.msgs.vision_msgs import Detection3DArray
from dimos.utils.logging_config import setup_logger

logger = setup_logger("dimos.manipulation.pbvs")
logger = setup_logger()


class PBVS:
Expand Down
2 changes: 1 addition & 1 deletion dimos/mapping/google_maps/google_maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from dimos.mapping.utils.distance import distance_in_meters
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class GoogleMaps:
Expand Down
2 changes: 1 addition & 1 deletion dimos/mapping/osm/current_location_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from dimos.models.vl.base import VlModel
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


class CurrentLocationMap:
Expand Down
2 changes: 1 addition & 1 deletion dimos/mapping/osm/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

_PROLOGUE = "This is an image of an open street map I'm on."
_JSON = "Please only respond with valid JSON."
logger = setup_logger(__name__)
logger = setup_logger()


def query_for_one_position(vl_model: VlModel, map_image: MapImage, query: str) -> LatLon | None:
Expand Down
2 changes: 1 addition & 1 deletion dimos/navigation/bbox_navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from dimos.msgs.vision_msgs import Detection2DArray
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__name__, level=logging.DEBUG)
logger = setup_logger(level=logging.DEBUG)


class BBoxNavigationModule(Module):
Expand Down
2 changes: 1 addition & 1 deletion dimos/navigation/bt_navigator/navigator.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from dimos.utils.logging_config import setup_logger
from dimos.utils.transform_utils import apply_transform

logger = setup_logger(__file__)
logger = setup_logger()


class BehaviorTreeNavigator(Module, NavigationInterface):
Expand Down
2 changes: 1 addition & 1 deletion dimos/navigation/bt_navigator/recovery_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from dimos.utils.logging_config import setup_logger
from dimos.utils.transform_utils import get_distance

logger = setup_logger("dimos.navigation.bt_navigator.recovery_server")
logger = setup_logger()


class RecoveryServer:
Expand Down
2 changes: 1 addition & 1 deletion dimos/navigation/demo_ros_navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from dimos.protocol import pubsub
from dimos.utils.logging_config import setup_logger

logger = setup_logger(__file__)
logger = setup_logger()


def main() -> None:
Expand Down
Loading
Loading