diff --git a/dialogflow_intent_client/CMakeLists.txt b/dialogflow_intent_client/CMakeLists.txt deleted file mode 100644 index 7480c57f4..000000000 --- a/dialogflow_intent_client/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -cmake_minimum_required(VERSION 3.0.2) -project(dialogflow_intent_client) - -find_package(catkin REQUIRED COMPONENTS - catkin_virtualenv REQUIRED - message_generation - std_msgs - actionlib_msgs - ) - -add_message_files( - FILES - IntentInfo.msg - ) - -add_action_files( - FILES - RegisterIntent.action - ListIntent.action - ) - -generate_messages( - DEPENDENCIES - std_msgs - actionlib_msgs - ) - -catkin_package( - CATKIN_DEPENDS message_runtime - ) - -catkin_generate_virtualenv( - PYTHON_INTERPRETER python3 - ) - -file(GLOB NODE_SCRIPTS_FILES node_scripts/*.py) - -catkin_install_python( - PROGRAMS ${NODE_SCRIPTS_FILES} - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -) - -install(DIRECTORY launch - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} - USE_SOURCE_PERMISSIONS -) diff --git a/dialogflow_intent_client/action/RegisterIntent.action b/dialogflow_intent_client/action/RegisterIntent.action deleted file mode 100644 index 30bc6f3a4..000000000 --- a/dialogflow_intent_client/action/RegisterIntent.action +++ /dev/null @@ -1,5 +0,0 @@ -dialogflow_intent_client/IntentInfo intent ---- -bool done ---- -string status diff --git a/dialogflow_intent_client/package.xml b/dialogflow_intent_client/package.xml deleted file mode 100644 index 888319578..000000000 --- a/dialogflow_intent_client/package.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - dialogflow_intent_client - 2.1.24 - The dialogflow_intent_client package - - Yoshiki Obinata - - BSD - - Yoshiki Obinata - - catkin - catkin_virtualenv - message_generation - std_msgs - roslaunch - message_runtime - - - requirements.txt - - diff --git a/dialogflow_intent_client/requirements.txt b/dialogflow_intent_client/requirements.txt deleted file mode 100644 index 257568462..000000000 --- a/dialogflow_intent_client/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -google-auth==2.9.0 -google-cloud-dialogflow==2.14.1 diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt index 9e67eb43a..ae531e7c9 100644 --- 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/dialogflow_intent_client/action/ListIntent.action b/dialogflow_task_executive/action/ListIntent.action similarity index 53% rename from dialogflow_intent_client/action/ListIntent.action rename to dialogflow_task_executive/action/ListIntent.action index 024a3eb7e..7d2d078d4 100644 --- a/dialogflow_intent_client/action/ListIntent.action +++ b/dialogflow_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 new file mode 100644 index 000000000..dd6d81d65 --- /dev/null +++ b/dialogflow_task_executive/action/RegisterIntent.action @@ -0,0 +1,5 @@ +dialogflow_task_executive/IntentInfo intent +--- +bool done +--- +string status diff --git a/dialogflow_intent_client/launch/dialogflow_intent_client.launch b/dialogflow_task_executive/launch/dialogflow_intent_client.launch similarity index 79% rename from dialogflow_intent_client/launch/dialogflow_intent_client.launch rename to dialogflow_task_executive/launch/dialogflow_intent_client.launch index d5db77a9f..f25db1127 100644 --- a/dialogflow_intent_client/launch/dialogflow_intent_client.launch +++ b/dialogflow_task_executive/launch/dialogflow_intent_client.launch @@ -2,7 +2,7 @@ google_cloud_credentials_json: $(arg credential) diff --git a/dialogflow_intent_client/msg/IntentInfo.msg b/dialogflow_task_executive/msg/IntentInfo.msg similarity index 100% rename from dialogflow_intent_client/msg/IntentInfo.msg rename to dialogflow_task_executive/msg/IntentInfo.msg diff --git a/dialogflow_intent_client/node_scripts/dialogflow_intent_node.py b/dialogflow_task_executive/node_scripts/dialogflow_intent_node.py similarity index 94% rename from dialogflow_intent_client/node_scripts/dialogflow_intent_node.py rename to dialogflow_task_executive/node_scripts/dialogflow_intent_node.py index 1af4e9cb4..b07e6e0f9 100644 --- a/dialogflow_intent_client/node_scripts/dialogflow_intent_node.py +++ b/dialogflow_task_executive/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 index e0fae0c7e..541f8331c 100644 --- 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 index 63615e454..2591bca47 100644 --- 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 old mode 100755 new mode 100644