Splits source files into text and audio queries

Bug: 78773302
Change-Id: I14d4b1bc71a2578f484bd29edf5c2af8c2d36791

Author: Fleker

.gitignore

@@ -7,6 +7,7 @@ client_secret.json
 credentials.json
 # Do not commit binaries
 googleapis.ar
-run_assistant
+run_assistant_audio
+run_assistant_text
 # Generated files
 src/embedded_assistant*

Makefile

@@ -75,16 +75,26 @@ CXXFLAGS += $(ALSA_CFLAGS)
 LDFLAGS += $(ALSA_LDFLAGS)
 endif
 
+ASSISTANT_O = $(AUDIO_SRCS:.cc=.o) ./src/audio_input_file.o ./src/json_util.o \
+	./src/run_assistant_audio.o ./src/run_assistant_text.o
+ASSISTANT_AUDIO_O = $(AUDIO_SRCS:.cc=.o) ./src/audio_input_file.o ./src/json_util.o \
+	./src/run_assistant_audio.o
+ASSISTANT_TEXT_O = ./src/json_util.o ./src/run_assistant_text.o
+
 .PHONY: all
 all: run_assistant
 
 googleapis.ar: $(GOOGLEAPIS_CCS:.cc=.o)
 	$(AR) r $@ $?
 
-run_assistant.o: $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.h)
+run_assistant: run_assistant_audio run_assistant_text
+
+run_assistant_audio: $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.o) googleapis.ar \
+	$(ASSISTANT_AUDIO_O)
+	$(CXX) $^ $(LDFLAGS) -o $@
 
-run_assistant: $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.o) googleapis.ar \
-	$(AUDIO_SRCS:.cc=.o) ./src/audio_input_file.o ./src/json_util.o ./src/run_assistant.o
+run_assistant_text: $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.o) googleapis.ar \
+	$(ASSISTANT_TEXT_O)
 	$(CXX) $^ $(LDFLAGS) -o $@
 
 json_util_test: ./src/json_util.o ./src/json_util_test.o
@@ -102,8 +112,8 @@ protobufs: $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.h) $(GOOGLEAPIS_ASSISTANT_CCS)
 
 .PHONY: clean
 clean:
-	rm -f *.o run_assistant googleapis.ar \
+	rm -f run_assistant_audio run_assistant_text googleapis.ar \
 		$(GOOGLEAPIS_CCS:.cc=.o) \
 		$(GOOGLEAPIS_ASSISTANT_CCS) $(GOOGLEAPIS_ASSISTANT_CCS:.cc=.h) \
 		$(GOOGLEAPIS_ASSISTANT_CCS:.cc=.o) \
-		./src/*.o
+		$(ASSISTANT_O)

README.md

@@ -82,31 +82,34 @@ make run_assistant
 * Move it in this folder and rename it to `client_secret.json`
 * run `get_credentials.sh` in this folder. It will create the file `credentials.json`.
 
-7. Start `run_assistant`
-```
-./run_assistant --audio_input ./resources/weather_in_mountain_view.raw --credentials_file ./credentials.json
+7. Start one of the `run_assistant` samples
+
+```bash
+./run_assistant_audio --audio_input ./resources/weather_in_mountain_view.raw --credentials_file ./credentials.json
 ```
 
 On a Linux workstation, you can alternatively use ALSA for audio input:
-```
-./run_assistant --audio_input ALSA_INPUT --credentials_file ./credentials.json
+
+```bash
+./run_assistant_audio --audio_input ALSA_INPUT --credentials_file ./credentials.json
 ```
 
 You can use a text-based query instead of audio. This allows you to continually enter text queries to the Assistant.
-```
-./run_assistant --text_input --credentials_file ./credentials.json --credentials_type USER_ACCOUNT
+
+```bash
+./run_assistant_text --credentials_file ./credentials.json
 ```
 
 This takes input from `cin`, so you can send data to the program when it starts.
 
-```
-echo "what time is it" | ./run_assistant --text_input --credentials_file ./credentials.json --credentials_type USER_ACCOUNT
+```bash
+echo "what time is it" | ./run_assistant_text --credentials_file ./credentials.json
 ```
 
 To change the locale, include a `locale` parameter:
 
-```
-echo "Bonjour" | ./run_assistant --text_input --credentials_file ./credentials.json --credentials_type USER_ACCOUNT --locale "fr-FR"
+```bash
+echo "Bonjour" | ./run_assistant_text --credentials_file ./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.cc src/run_assistant_audio.ccsrc/run_assistant.cc renamed to src/run_assistant_audio.cc

@@ -86,8 +86,8 @@ std::shared_ptr<Channel> CreateChannel(const std::string& host) {
 }
 
 void PrintUsage() {
-  std::cerr << "Usage: ./run_assistant "
-            << "[--audio_input [<" << kALSAAudioInput << ">|<audio_file>] OR --text_input] "
+  std::cerr << "Usage: ./run_assistant_audio "
+            << "--audio_input [<" << kALSAAudioInput << ">|<audio_file>] "
             << "--credentials_file <credentials_file> "
             << "[--credentials_type <" << kCredentialsTypeUserAccount << ">] "
             << "[--api_endpoint <API endpoint>] "
@@ -101,7 +101,6 @@ bool GetCommandLineFlags(
     std::string* locale) {
   const struct option long_options[] = {
     {"audio_input",      required_argument, nullptr, 'a'},
-    {"text_input",       no_argument, nullptr, 't'},
     {"credentials_file", required_argument, nullptr, 'f'},
     {"credentials_type", required_argument, nullptr, 'c'},
     {"api_endpoint",     required_argument, nullptr, 'e'},
@@ -113,17 +112,14 @@ bool GetCommandLineFlags(
   while (true) {
     int option_index;
     int option_char =
-        getopt_long(argc, argv, "a:t:f:c:e:l:v", long_options, &option_index);
+        getopt_long(argc, argv, "a:f:c:e:l:v", long_options, &option_index);
     if (option_char == -1) {
       break;
     }
     switch (option_char) {
       case 'a':
         *audio_input = optarg;
         break;
-      case 't':
-        use_text = true;
-        break;
       case 'f':
         *credentials_file_path = optarg;
         break;
@@ -154,7 +150,7 @@ bool GetCommandLineFlags(
 }
 
 int main(int argc, char** argv) {
-  std::string audio_input_source, text_input_source, credentials_file_path, credentials_type,
+  std::string audio_input_source, credentials_file_path, credentials_type,
               api_endpoint, locale;
   // Initialize gRPC and DNS resolvers
   // https://github.com/grpc/grpc/issues/11366#issuecomment-328595941
@@ -169,19 +165,6 @@ int main(int argc, char** argv) {
   }
 
   while (true) {
-      if (use_text) {
-        // Take in any text
-        std::clog << ": " << std::endl;
-        std::getline(std::cin, text_input_source);
-        // Take in any text
-        if (text_input_source.empty()) {
-          // Input is empty. This can happen if the user entered
-          // no text or if the input source is through a terminal
-          // pipe. In either case, this will be interpreted as
-          // an exit condition.
-          return 0;
-        }
-      }
     // Create an AssistRequest
     AssistRequest request;
     auto* assist_config = request.mutable_config();
@@ -210,10 +193,8 @@ int main(int argc, char** argv) {
       assist_config->mutable_audio_in_config()->set_encoding(
         AudioInConfig::LINEAR16);
       assist_config->mutable_audio_in_config()->set_sample_rate_hertz(16000);
-    } else if (!text_input_source.empty()) {
-      assist_config->set_text_query(text_input_source);
     } else {
-      std::cerr << "requires either --audio_input or --text_input" << std::endl;
+      std::cerr << "requires --audio_input" << std::endl;
       return -1;
     }
 
@@ -344,7 +325,7 @@ int main(int argc, char** argv) {
       return -1;
     }
 
-    if (!use_text && audio_input_source != kALSAAudioInput) {
+    if (audio_input_source != kALSAAudioInput) {
       // A filepath was used as the audio input to this program
       // If this is the case, then we can stop the program after
       // one turn.