|
@@ -1402,26 +1402,22 @@ def hermes_env_enablement_fn() -> Optional[dict]:
|
|
|
know that it is needed for plugin register().
|
|
know that it is needed for plugin register().
|
|
|
"""
|
|
"""
|
|
|
|
|
|
|
|
- def _add_env_to_seed(seed: dict, our_key: str) -> dict:
|
|
|
|
|
- env_value = os.getenv(our_key.upper())
|
|
|
|
|
|
|
+ # Seed keys must be the config.yaml "extra" keys (config_key), NOT the env
|
|
|
|
|
+ # var names — ChattoConfiguration reads extra[config_key].
|
|
|
|
|
+ seed: Dict[str, Any] = {
|
|
|
|
|
+ ChattoConfiguration.base_url.config_key: (
|
|
|
|
|
+ os.getenv(ChattoConfiguration.base_url.env_name) or ChattoClient.DEFAULT_BASE_URL
|
|
|
|
|
+ ).strip(),
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for field in ChattoConfiguration.fields():
|
|
|
|
|
+ if field.field_name == ChattoConfiguration.base_url.field_name:
|
|
|
|
|
+ continue
|
|
|
|
|
+ env_value = os.getenv(field.env_name)
|
|
|
if env_value:
|
|
if env_value:
|
|
|
- seed[our_key.lower()] = env_value
|
|
|
|
|
- return seed
|
|
|
|
|
-
|
|
|
|
|
- seed = {}
|
|
|
|
|
- seed["base_url"] = (os.getenv(ChattoConfiguration.base_url.env_name) or ChattoClient.DEFAULT_BASE_URL).strip()
|
|
|
|
|
-
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.token.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.login.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.password.env_name)
|
|
|
|
|
-
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.channels.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.home_channel.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.require_mention.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.free_response_channels_list.env_name)
|
|
|
|
|
- seed = _add_env_to_seed(seed, ChattoConfiguration.auto_thread.env_name)
|
|
|
|
|
|
|
+ seed[field.config_key] = env_value.strip()
|
|
|
|
|
|
|
|
- logger.debug("seed: " + str(seed))
|
|
|
|
|
|
|
+ logger.debug("seed: %s", {k: v for k, v in seed.items() if k not in ("token", "password")})
|
|
|
|
|
|
|
|
return seed
|
|
return seed
|
|
|
|
|
|