diff options
Diffstat (limited to 'agl_service_voiceagent/service.py')
| -rw-r--r-- | agl_service_voiceagent/service.py | 63 |
1 files changed, 58 insertions, 5 deletions
diff --git a/agl_service_voiceagent/service.py b/agl_service_voiceagent/service.py index 1b34c27..784d8d9 100644 --- a/agl_service_voiceagent/service.py +++ b/agl_service_voiceagent/service.py @@ -25,7 +25,7 @@ generated_dir = os.path.join(current_dir, "generated") sys.path.append(generated_dir) import argparse -from agl_service_voiceagent.utils.config import update_config_value, get_config_value +from agl_service_voiceagent.utils.config import set_config_path, load_config, update_config_value, get_config_value from agl_service_voiceagent.utils.common import add_trailing_slash from agl_service_voiceagent.server import run_server from agl_service_voiceagent.client import run_client @@ -33,7 +33,7 @@ from agl_service_voiceagent.client import run_client def print_version(): print("Automotive Grade Linux (AGL)") - print(f"Voice Agent Service v{get_config_value('SERVICE_VERSION')}") + print(f"Voice Agent Service v0.3.0") def main(): @@ -47,10 +47,15 @@ def main(): server_parser = subparsers.add_parser('run-server', help='Run the Voice Agent gRPC Server') client_parser = subparsers.add_parser('run-client', help='Run the Voice Agent gRPC Client') - server_parser.add_argument('--config', action='store_true', help='Starts the server solely based on values provided in config file.') - server_parser.add_argument('--stt-model-path', required=False, help='Path to the Speech To Text model. Currently only supports VOSK Kaldi.') + server_parser.add_argument('--default', action='store_true', help='Starts the server based on default config file.') + server_parser.add_argument('--config', required=False, help='Path to a config file. Server is started based on this config file.') + server_parser.add_argument('--stt-model-path', required=False, help='Path to the Speech To Text model for Voice Commad detection. Currently only supports VOSK Kaldi.') + server_parser.add_argument('--ww-model-path', required=False, help='Path to the Speech To Text model for Wake Word detection. Currently only supports VOSK Kaldi. Defaults to the same model as --stt-model-path if not provided.') server_parser.add_argument('--snips-model-path', required=False, help='Path to the Snips NLU model.') server_parser.add_argument('--rasa-model-path', required=False, help='Path to the RASA NLU model.') + server_parser.add_argument('--rasa-detached-mode', required=False, help='Assume that the RASA server is already running and does not start it as a sub process.') + server_parser.add_argument('--intents-vss-map-path', required=False, help='Path to the JSON file containing Intent to VSS map.') + server_parser.add_argument('--vss-signals-spec-path', required=False, help='Path to the VSS signals specification JSON file.') server_parser.add_argument('--audio-store-dir', required=False, help='Directory to store the generated audio files.') server_parser.add_argument('--log-store-dir', required=False, help='Directory to store the generated log files.') @@ -63,7 +68,7 @@ def main(): print_version() elif args.subcommand == 'run-server': - if not args.config: + if not args.default and not args.config: if not args.stt_model_path: raise ValueError("The --stt-model-path is missing. Please provide a value. Use --help to see available options.") @@ -72,20 +77,42 @@ def main(): if not args.rasa_model_path: raise ValueError("The --rasa-model-path is missing. Please provide a value. Use --help to see available options.") + + if not args.intents_vss_map_path: + raise ValueError("The --intents-vss-map-path is missing. Please provide a value. Use --help to see available options.") + + if not args.vss_signals_spec_path: + raise ValueError("The --vss-signals-spec is missing. Please provide a value. Use --help to see available options.") + + # Contruct the default config file path + config_path = os.path.join(current_dir, "config.ini") + # Load the config values from the config file + set_config_path(config_path) + load_config() + + # Get the values provided by the user stt_path = args.stt_model_path snips_model_path = args.snips_model_path rasa_model_path = args.rasa_model_path + intents_vss_map_path = args.intents_vss_map_path + vss_signals_spec_path = args.vss_signals_spec_path # Convert to an absolute path if it's a relative path stt_path = add_trailing_slash(os.path.abspath(stt_path)) if not os.path.isabs(stt_path) else stt_path snips_model_path = add_trailing_slash(os.path.abspath(snips_model_path)) if not os.path.isabs(snips_model_path) else snips_model_path rasa_model_path = add_trailing_slash(os.path.abspath(rasa_model_path)) if not os.path.isabs(rasa_model_path) else rasa_model_path + intents_vss_map_path = os.path.abspath(intents_vss_map_path) if not os.path.isabs(intents_vss_map_path) else intents_vss_map_path + vss_signals_spec_path = os.path.abspath(vss_signals_spec_path) if not os.path.isabs(vss_signals_spec_path) else vss_signals_spec_path # Also update the config.ini file update_config_value(stt_path, 'STT_MODEL_PATH') update_config_value(snips_model_path, 'SNIPS_MODEL_PATH') update_config_value(rasa_model_path, 'RASA_MODEL_PATH') + update_config_value(intents_vss_map_path, 'INTENTS_VSS_MAP') + update_config_value(vss_signals_spec_path, 'VSS_SIGNALS_SPEC') + if args.rasa_detached_mode: + update_config_value('1', 'RASA_DETACHED_MODE') # Update the audio store dir in config.ini if provided audio_dir = args.audio_store_dir or get_config_value('BASE_AUDIO_DIR') @@ -98,6 +125,25 @@ def main(): update_config_value(log_dir, 'BASE_LOG_DIR') + elif args.config: + # Get config file path value + cli_config_path = args.config + + # if config file path provided then load the config values from it + if cli_config_path : + cli_config_path = os.path.abspath(cli_config_path) if not os.path.isabs(cli_config_path) else cli_config_path + print(f"New config file path provided: {cli_config_path}. Overriding the default config file path.") + set_config_path(cli_config_path) + load_config() + + elif args.default: + # Contruct the default config file path + config_path = os.path.join(current_dir, "config.ini") + + # Load the config values from the config file + set_config_path(config_path) + load_config() + # create the base audio dir if not exists if not os.path.exists(get_config_value('BASE_AUDIO_DIR')): os.makedirs(get_config_value('BASE_AUDIO_DIR')) @@ -109,6 +155,13 @@ def main(): run_server() elif args.subcommand == 'run-client': + # Contruct the default config file path + config_path = os.path.join(current_dir, "config.ini") + + # Load the config values from the config file + set_config_path(config_path) + load_config() + mode = args.mode if mode not in ['wake-word', 'auto', 'manual']: raise ValueError("Invalid mode. Supported modes: 'wake-word', 'auto' and 'manual'. Use --help to see available options.") |