[dialogflow_task_executive] merge dialogflow_intent_client package in…

…to dialogflow_task_executive
jsk-ros-pkg · Nov 14, 2023 · b574005 · b574005
1 parent d03ed03
commit b574005
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 81 deletions.
diff --git a/dialogflow_intent_client/CMakeLists.txt b/dialogflow_intent_client/CMakeLists.txt
diff --git a/dialogflow_intent_client/action/RegisterIntent.action b/dialogflow_intent_client/action/RegisterIntent.action
diff --git a/dialogflow_intent_client/package.xml b/dialogflow_intent_client/package.xml
diff --git a/dialogflow_intent_client/requirements.txt b/dialogflow_intent_client/requirements.txt
diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -21,15 +21,19 @@ find_package(catkin REQUIRED COMPONENTS
 add_message_files(
   FILES
   DialogResponse.msg
+  IntentInfo.msg
 )
 
 add_action_files(
   FILES
   DialogText.action
+  RegisterIntent.action
+  ListIntent.action
 )
 
 generate_messages(
   DEPENDENCIES
+  std_msgs
   actionlib_msgs
 )
 

diff --git a/...ow_intent_client/action/ListIntent.action → ...w_task_executive/action/ListIntent.action b/...ow_intent_client/action/ListIntent.action → ...w_task_executive/action/ListIntent.action
@@ -1,6 +1,6 @@
 std_msgs/Empty request
 ---
-dialogflow_intent_client/IntentInfo[] intents
+dialogflow_task_executive/IntentInfo[] intents
 bool done
 ---
 string status
diff --git a/dialogflow_task_executive/action/RegisterIntent.action b/dialogflow_task_executive/action/RegisterIntent.action
@@ -0,0 +1,5 @@
+dialogflow_task_executive/IntentInfo intent
+---
+bool done
+---
+string status
diff --git a/...nt/launch/dialogflow_intent_client.launch → ...ve/launch/dialogflow_intent_client.launch b/...nt/launch/dialogflow_intent_client.launch → ...ve/launch/dialogflow_intent_client.launch
@@ -2,7 +2,7 @@
 <launch>
   <arg name="credential" />
     <node name="dialogflow_intent_client"
-        pkg="dialogflow_intent_client" type="dialogflow_intent_node.py"
+        pkg="dialogflow_task_executive" type="dialogflow_intent_node.py"
         output="screen">
       <rosparam subst_value="true">
         google_cloud_credentials_json: $(arg credential)

diff --git a/dialogflow_intent_client/msg/IntentInfo.msg → dialogflow_task_executive/msg/IntentInfo.msg b/dialogflow_intent_client/msg/IntentInfo.msg → dialogflow_task_executive/msg/IntentInfo.msg
diff --git a/...nt/node_scripts/dialogflow_intent_node.py → ...ve/node_scripts/dialogflow_intent_node.py b/...nt/node_scripts/dialogflow_intent_node.py → ...ve/node_scripts/dialogflow_intent_node.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 import actionlib
-from dialogflow_intent_client.msg import RegisterIntentAction, RegisterIntentGoal, RegisterIntentResult, RegisterIntentFeedback
-from dialogflow_intent_client.msg import ListIntentAction, ListIntentGoal, ListIntentResult, ListIntentFeedback
-from dialogflow_intent_client.msg import IntentInfo
+from dialogflow_task_executive.msg import RegisterIntentAction, RegisterIntentGoal, RegisterIntentResult, RegisterIntentFeedback
+from dialogflow_task_executive.msg import ListIntentAction, ListIntentGoal, ListIntentResult, ListIntentFeedback
+from dialogflow_task_executive.msg import IntentInfo
 import google.cloud.dialogflow as df
 from google.oauth2.service_account import Credentials
 import rospy

diff --git a/dialogflow_task_executive/requirements.in b/dialogflow_task_executive/requirements.in
@@ -1 +1,3 @@
 dialogflow==1.1.1
+google-auth==2.9.0
+google-cloud-dialogflow==2.14.1
diff --git a/dialogflow_task_executive/requirements.in.noetic b/dialogflow_task_executive/requirements.in.noetic
@@ -4,3 +4,5 @@ grpcio-status==1.48.1
 googleapis-common-protos[grpc]==1.56.2
 protobuf==3.20.1  # fix Could not find a version that matches protobuf<4.0.0dev,<5.0.0dev,>=3.15.0,>=3.20.1,>=4.21.3 (from google-api-core[grpc]==1.33.1->dialogflow==1.1.1->-r requirements.in (line 1))
 grpcio==1.54.0            # via google-api-core, googleapis-common-protos, grpcio-status
+google-auth==2.9.0
+google-cloud-dialogflow==2.14.1
diff --git a/ros_google_cloud_language/test/test_rospy_node.py b/ros_google_cloud_language/test/test_rospy_node.py