Removes credentials_type flag

This flag is unnecessary since USER_ACCOUNT was
the only possible value and that was not used in
the request or response. This removes the flag
and renames --credentials_file to --credentials

Bug: 80474131
Change-Id: Icbca28d23f7eb36a7d3c25d905808c5223229754

Author: Fleker

README.md

@@ -85,31 +85,32 @@ make run_assistant
 7. Start one of the `run_assistant` samples:
 
 ```bash
-./run_assistant_file --input ./resources/weather_in_mountain_view.raw --credentials_file ./credentials.json
+./run_assistant_file --input ./resources/weather_in_mountain_view.raw --audio_output ./response.wav --credentials ./credentials.json
+aplay ./response.wav --rate=16000 --format=S16_LE
 ```
 
 On a Linux workstation, you can alternatively use ALSA for audio input:
 
 ```bash
-./run_assistant_audio --credentials_file ./credentials.json
+./run_assistant_audio --credentials ./credentials.json
 ```
 
 You can use a text-based query instead of audio. This allows you to continually enter text queries to the Assistant.
 
 ```bash
-./run_assistant_text --credentials_file ./credentials.json
+./run_assistant_text --credentials ./credentials.json
 ```
 
 This takes input from `cin`, so you can send data to the program when it starts.
 
 ```bash
-echo "what time is it" | ./run_assistant_text --credentials_file ./credentials.json
+echo "what time is it" | ./run_assistant_text --credentials ./credentials.json
 ```
 
 To change the locale, include a `locale` parameter:
 
 ```bash
-echo "Bonjour" | ./run_assistant_text --credentials_file ./credentials.json --locale "fr-FR"
+echo "Bonjour" | ./run_assistant_text --credentials ./credentials.json --locale "fr-FR"
 ```
 
 Default Assistant gRPC API endpoint is embeddedassistant.googleapis.com. If you want to test with a custom Assistant gRPC API endpoint, you can pass an extra "--api_endpoint CUSTOM_API_ENDPOINT" to run_assistant.

src/run_assistant_audio.cc

@@ -87,20 +87,17 @@ std::shared_ptr<Channel> CreateChannel(const std::string& host) {
 
 void PrintUsage() {
   std::cerr << "Usage: ./run_assistant_audio "
-            << "--credentials_file <credentials_file> "
-            << "[--credentials_type <" << kCredentialsTypeUserAccount << ">] "
+            << "--credentials <credentials_file> "
             << "[--api_endpoint <API endpoint>] "
             << "[--locale <locale>]"
             << std::endl;
 }
 
 bool GetCommandLineFlags(
     int argc, char** argv, std::string* credentials_file_path,
-    std::string* credentials_type, std::string* api_endpoint,
-    std::string* locale) {
+    std::string* api_endpoint, std::string* locale) {
   const struct option long_options[] = {
-    {"credentials_file", required_argument, nullptr, 'f'},
-    {"credentials_type", required_argument, nullptr, 'c'},
+    {"credentials", required_argument, nullptr, 'c'},
     {"api_endpoint",     required_argument, nullptr, 'e'},
     {"locale",           required_argument, nullptr, 'l'},
     {"verbose",          no_argument, nullptr, 'v'},
@@ -110,22 +107,13 @@ bool GetCommandLineFlags(
   while (true) {
     int option_index;
     int option_char =
-        getopt_long(argc, argv, "f:c:e:l:v", long_options, &option_index);
+        getopt_long(argc, argv, "c:e:l:v", long_options, &option_index);
     if (option_char == -1) {
       break;
     }
     switch (option_char) {
-      case 'f':
-        *credentials_file_path = optarg;
-        break;
       case 'c':
-        *credentials_type = optarg;
-        if (*credentials_type != kCredentialsTypeUserAccount) {
-          std::cerr << "Invalid credentials_type: \"" << *credentials_type
-                    << "\". Should be \"" << kCredentialsTypeUserAccount
-                    << "\"" << std::endl;
-          return false;
-        }
+        *credentials_file_path = optarg;
         break;
       case 'e':
         *api_endpoint = optarg;
@@ -145,8 +133,7 @@ bool GetCommandLineFlags(
 }
 
 int main(int argc, char** argv) {
-  std::string credentials_file_path, credentials_type,
-              api_endpoint, locale;
+  std::string credentials_file_path, api_endpoint, locale;
   #ifndef ENABLE_ALSA
     std::cerr << "ALSA audio input is not supported on this platform."
               << std::endl;
@@ -157,14 +144,10 @@ int main(int argc, char** argv) {
   // https://github.com/grpc/grpc/issues/11366#issuecomment-328595941
   grpc_init();
   if (!GetCommandLineFlags(argc, argv, &credentials_file_path,
-                          &credentials_type, &api_endpoint, &locale)) {
+                          &api_endpoint, &locale)) {
     return -1;
   }
 
-  if (credentials_type.empty()) {
-    credentials_type = kCredentialsTypeUserAccount; // Default is USER_ACCOUNT
-  }
-
   while (true) {
     // Create an AssistRequest
     AssistRequest request;

src/run_assistant_file.cc

@@ -78,21 +78,21 @@ std::shared_ptr<Channel> CreateChannel(const std::string& host) {
 void PrintUsage() {
   std::cerr << "Usage: ./run_assistant_file "
             << "--input <audio_file> "
-            << "--credentials_file <credentials_file> "
-            << "[--credentials_type <" << kCredentialsTypeUserAccount << ">] "
+            << "--output <audio_file> "
+            << "--credentials <credentials_file> "
             << "[--api_endpoint <API endpoint>] "
             << "[--locale <locale>]"
             << std::endl;
 }
 
 bool GetCommandLineFlags(
-    int argc, char** argv, std::string* audio_input, std::string* credentials_file_path,
-    std::string* credentials_type, std::string* api_endpoint,
+    int argc, char** argv, std::string* audio_input, std::string* audio_output,
+    std::string* credentials_file_path, std::string* api_endpoint,
     std::string* locale) {
   const struct option long_options[] = {
     {"input",      required_argument, nullptr, 'i'},
-    {"credentials_file", required_argument, nullptr, 'f'},
-    {"credentials_type", required_argument, nullptr, 'c'},
+    {"output",      required_argument, nullptr, 'o'},
+    {"credentials", required_argument, nullptr, 'c'},
     {"api_endpoint",     required_argument, nullptr, 'e'},
     {"locale",           required_argument, nullptr, 'l'},
     {"verbose",          no_argument, nullptr, 'v'},
@@ -102,25 +102,19 @@ bool GetCommandLineFlags(
   while (true) {
     int option_index;
     int option_char =
-        getopt_long(argc, argv, "i:f:c:e:l:v", long_options, &option_index);
+        getopt_long(argc, argv, "i:o:c:e:l:v", long_options, &option_index);
     if (option_char == -1) {
       break;
     }
     switch (option_char) {
       case 'i':
         *audio_input = optarg;
         break;
-      case 'f':
-        *credentials_file_path = optarg;
+      case 'o':
+        *audio_output = optarg;
         break;
       case 'c':
-        *credentials_type = optarg;
-        if (*credentials_type != kCredentialsTypeUserAccount) {
-          std::cerr << "Invalid credentials_type: \"" << *credentials_type
-                    << "\". Should be \"" << kCredentialsTypeUserAccount
-                    << "\"" << std::endl;
-          return false;
-        }
+        *credentials_file_path = optarg;
         break;
       case 'e':
         *api_endpoint = optarg;
@@ -140,20 +134,16 @@ bool GetCommandLineFlags(
 }
 
 int main(int argc, char** argv) {
-  std::string audio_input_source, credentials_file_path, credentials_type,
+  std::string audio_input_source, audio_output_source, credentials_file_path,
               api_endpoint, locale;
   // Initialize gRPC and DNS resolvers
   // https://github.com/grpc/grpc/issues/11366#issuecomment-328595941
   grpc_init();
-  if (!GetCommandLineFlags(argc, argv, &audio_input_source, &credentials_file_path,
-                          &credentials_type, &api_endpoint, &locale)) {
+  if (!GetCommandLineFlags(argc, argv, &audio_input_source, &audio_output_source, &credentials_file_path,
+                          &api_endpoint, &locale)) {
     return -1;
   }
 
-  if (credentials_type.empty()) {
-    credentials_type = kCredentialsTypeUserAccount; // Default is USER_ACCOUNT
-  }
-
   // Create an AssistRequest
   AssistRequest request;
   auto* assist_config = request.mutable_config();

src/run_assistant_text.cc

@@ -77,20 +77,17 @@ std::shared_ptr<Channel> CreateChannel(const std::string& host) {
 
 void PrintUsage() {
   std::cerr << "Usage: ./run_assistant_text "
-            << "--credentials_file <credentials_file> "
-            << "[--credentials_type <" << kCredentialsTypeUserAccount << ">] "
+            << "--credentials <credentials_file> "
             << "[--api_endpoint <API endpoint>] "
             << "[--locale <locale>]"
             << std::endl;
 }
 
 bool GetCommandLineFlags(
     int argc, char** argv, std::string* credentials_file_path,
-    std::string* credentials_type, std::string* api_endpoint,
-    std::string* locale) {
+    std::string* api_endpoint, std::string* locale) {
   const struct option long_options[] = {
-    {"credentials_file", required_argument, nullptr, 'f'},
-    {"credentials_type", required_argument, nullptr, 'c'},
+    {"credentials", required_argument, nullptr, 'c'},
     {"api_endpoint",     required_argument, nullptr, 'e'},
     {"locale",           required_argument, nullptr, 'l'},
     {"verbose",          no_argument, nullptr, 'v'},
@@ -100,22 +97,13 @@ bool GetCommandLineFlags(
   while (true) {
     int option_index;
     int option_char =
-        getopt_long(argc, argv, "f:c:e:l:v", long_options, &option_index);
+        getopt_long(argc, argv, "c:e:l:v", long_options, &option_index);
     if (option_char == -1) {
       break;
     }
     switch (option_char) {
-      case 'f':
-        *credentials_file_path = optarg;
-        break;
       case 'c':
-        *credentials_type = optarg;
-        if (*credentials_type != kCredentialsTypeUserAccount) {
-          std::cerr << "Invalid credentials_type: \"" << *credentials_type
-                    << "\". Should be \"" << kCredentialsTypeUserAccount
-                    << "\"" << std::endl;
-          return false;
-        }
+        *credentials_file_path = optarg;
         break;
       case 'e':
         *api_endpoint = optarg;
@@ -135,21 +123,15 @@ bool GetCommandLineFlags(
 }
 
 int main(int argc, char** argv) {
-  std::string credentials_file_path, credentials_type,
-              api_endpoint, locale, text_input_source;
+  std::string credentials_file_path, api_endpoint, locale, text_input_source;
   // Initialize gRPC and DNS resolvers
   // https://github.com/grpc/grpc/issues/11366#issuecomment-328595941
   grpc_init();
   if (!GetCommandLineFlags(argc, argv, &credentials_file_path,
-                          &credentials_type, &api_endpoint, &locale)) {
+                          &api_endpoint, &locale)) {
     return -1;
   }
 
-  if (credentials_type.empty()) {
-    credentials_type = kCredentialsTypeUserAccount; // Default is USER_ACCOUNT
-  }
-
-
   while (std::getline(std::cin, text_input_source)) {
     // Create an AssistRequest
     AssistRequest request;

tests/integration_audio_file.sh

@@ -5,5 +5,6 @@ set -e
 set -x
 
 ./run_assistant_file --input ./resources/weather_in_mountain_view.raw \
-  --credentials_file ./credentials.json \
+  --output /tmp/google-assistant-sdk-audio-output.raw \
+  --credentials ./credentials.json \
   | grep "Mountain View"

tests/integration_en_us.sh

@@ -5,4 +5,4 @@ set -e
 set -x
 
 echo "how do you say hi in spanish" | ./run_assistant_text \
-  --credentials_file ./credentials.json --verbose | grep "Hola"
+  --credentials ./credentials.json --verbose | grep "Hola"

tests/integration_fr.sh

@@ -5,5 +5,5 @@ set -e
 set -x
 
 echo "comment dit-on bonjour en español" | ./run_assistant_text \
-  --credentials_file ./credentials.json \
+  --credentials ./credentials.json \
   --locale "fr-FR" --verbose | grep "Buenos dias"