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
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
tb3_agent/.env
turtlebo3_agent/.env
__pycache__/
tb3_agent/tools/navigation_tools.py
tb3_agent/tools/api_tools.py
turtlebo3_agent/tools/navigation_tools.py
turtlebo3_agent/tools/api_tools.py

devel/
logs/
Expand Down
2 changes: 1 addition & 1 deletion launch/tb3_agent.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def generate_launch_description():
)

ekf_config_file_path = os.path.join(
get_package_share_directory("tb3_agent"), "config", "ekf_turtlebot3.yaml"
get_package_share_directory("turtlebot3_agent"), "config", "ekf_turtlebot3.yaml"
)

ekf_node = Node(
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>tb3_agent</name>
<name>turtlebot3_agent</name>
<version>0.0.0</version>
<description>
A ROS2 package that integrates a TurtleBot3 with LangChain and language models
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[develop]
script_dir=$base/lib/tb3_agent
script_dir=$base/lib/turtlebot3_agent
[install]
install_scripts=$base/lib/tb3_agent
install_scripts=$base/lib/turtlebot3_agent
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import find_packages, setup

package_name = "tb3_agent"
package_name = "turtlebot3_agent"

setup(
name=package_name,
Expand All @@ -28,8 +28,8 @@
tests_require=["pytest"],
entry_points={
"console_scripts": [
"tb3_node_entrypoint = tb3_agent.tb3_node_entrypoint:main",
"main = tb3_agent.main:main",
"tb3_node_entrypoint = turtlebot3_agent.tb3_node_entrypoint:main",
"main = turtlebot3_agent.main:main",
],
},
)
8 changes: 2 additions & 6 deletions tb3_agent.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ repositories:
turtlebot3_simulations:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
version: humble-devel
version: humble
turtlebot3_msgs:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
version: humble-devel
version: humble
turtlebot3:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3.git
version: humble-devel
robot_localization:
type: git
url: https://github.com/cra-ros-pkg/robot_localization.git
version: humble-devel
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from langchain.agents import AgentExecutor
from rclpy.node import Node

from tb3_agent.interface.chat_gui import ChatUI
from tb3_agent.interface.gui_interface import GUIAgentInterface
from turtlebot3_agent.interface.chat_gui import ChatUI
from turtlebot3_agent.interface.gui_interface import GUIAgentInterface


def chat_invoke(
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import tkinter as tk
from tkinter import scrolledtext

from tb3_agent.interface.gui_interface import GUIAgentInterface
from turtlebot3_agent.interface.gui_interface import GUIAgentInterface


class ChatUI:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from tb3_agent.interface.base_interface import BaseAgentInterface
from turtlebot3_agent.interface.base_interface import BaseAgentInterface


class GUIAgentInterface(BaseAgentInterface):
Expand Down
3 changes: 2 additions & 1 deletion tb3_agent/llms.py → turtlebot3_agent/llms.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
from langchain_mistralai import ChatMistralAI
from langchain_ollama import ChatOllama
from langchain_openai import ChatOpenAI
from turtlesim_agent.prompts import prompt

from turtlebot3_agent.prompts import prompt

URL = os.getenv("URL")

Expand Down
8 changes: 4 additions & 4 deletions tb3_agent/main.py → turtlebot3_agent/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
from langchain.agents import AgentExecutor
from rclpy.executors import ExternalShutdownException, SingleThreadedExecutor

from tb3_agent.chat_entrypoint import chat_invoke
from tb3_agent.llms import create_agent
from tb3_agent.tb3_node import TB3Agent
from tb3_agent.tools.all_tools import make_all_tools
from turtlebot3_agent.chat_entrypoint import chat_invoke
from turtlebot3_agent.llms import create_agent
from turtlebot3_agent.tb3_node import TB3Agent
from turtlebot3_agent.tools.all_tools import make_all_tools

load_dotenv()

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions tb3_agent/tb3_node.py → turtlebot3_agent/tb3_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from sensor_msgs.msg import Image, LaserScan
from transforms3d.euler import quat2euler

from tb3_agent.utils import normalize_angle
from turtlebot3_agent.utils import normalize_angle

TWIST_ANGULAR = 0.30
TWIST_VELOCITY = 0.21
Expand All @@ -33,7 +33,7 @@
class TB3Agent(Node):
def __init__(self):
"""Initialize the TB3Agent node with publishers and subscribers."""
super().__init__("tb3_agent")
super().__init__("turtlebot3_agent")
self.declare_parameter("interface", "cli")
self.declare_parameter("agent_model", "gemini-2.0-flash")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
import rclpy

from tb3_agent.tb3_node import TB3Agent
from turtlebot3_agent.tb3_node import TB3Agent


def main():
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# from tb3_agent.tools.api_tools import get_information_from_internet
from tb3_agent.tools.math_tools import (
# from turtlebot3_agent.tools.api_tools import get_information_from_internet
from turtlebot3_agent.tools.math_tools import (
calculate_absolute_angle,
calculate_distance_and_relative_angle,
calculate_euclidean_distance,
calculate_relative_angle,
calculate_relative_angle_from_yaw,
degrees_to_radians,
)
from tb3_agent.tools.motion_tools import (
from turtlebot3_agent.tools.motion_tools import (
make_move_linear_tool,
make_move_non_linear_tool,
make_rotate_tool,
)

# from tb3_agent.tools.navigation_tools import make_navigate_to_goal_tool
from tb3_agent.tools.sensor_tools import (
# from turtlebot3_agent.tools.navigation_tools import make_navigate_to_goal_tool
from turtlebot3_agent.tools.sensor_tools import (
make_get_lidar_scan_tool,
make_start_camera_display_tool,
)
from tb3_agent.tools.status_tools import make_get_turtle_pose_tool
from turtlebot3_agent.tools.status_tools import make_get_turtle_pose_tool


def make_all_tools(node) -> list:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from langchain.tools import tool

from tb3_agent.utils import normalize_angle
from turtlebot3_agent.utils import normalize_angle


@tool
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.