refactoring config-env

popenta · popenta · commit 61818679c51b · 2025-06-25T11:17:00.000+03:00
diff --git a/CLI.md b/CLI.md
@@ -5651,13 +5651,13 @@ OPTIONS:
 COMMANDS summary
 ----------------
 new                            Creates a new environment and sets it as the active environment.
-get                            Gets an env value from the active environment.
-set                            Sets an env value for the active environment.
+get                            Gets an env value from the specified environment.
+set                            Sets an env value for the specified environment.
 dump                           Dumps the active environment.
-delete                         Deletes an env value from the active environment.
+delete                         Deletes an env value from the specified environment.
 switch                         Switch to a different environment.
 list                           List available environments
-remove                         Deletes an environment from the env file. Will switch to default env.
+remove                         Deletes an environment from the env file. Use `mxpy config-env switch` to move to another env.
 reset                          Deletes the environment file. Default env will be used.
 
 ```
@@ -5671,7 +5671,7 @@ usage: mxpy config-env new [-h] ...
 Creates a new environment and sets it as the active environment.
 
 positional arguments:
-  name                 the name of the configuration entry
+  name                 the name of the new environment
 
 options:
   -h, --help           show this help message and exit
@@ -5685,14 +5685,15 @@ options:
 $ mxpy config-env set --help
 usage: mxpy config-env set [-h] ...
 
-Sets an env value for the active environment.
+Sets an env value for the specified environment.
 
 positional arguments:
   name        the name of the configuration entry
   value       the new value
 
 options:
   -h, --help  show this help message and exit
+  --env ENV   the name of the environment to operate on
 
 ```
 ### ConfigEnv.Get
@@ -5702,13 +5703,14 @@ options:
 $ mxpy config-env get --help
 usage: mxpy config-env get [-h] ...
 
-Gets an env value from the active environment.
+Gets an env value from the specified environment.
 
 positional arguments:
   name        the name of the configuration entry
 
 options:
   -h, --help  show this help message and exit
+  --env ENV   the name of the environment to operate on
 
 ```
 ### ConfigEnv.Dump
@@ -5734,11 +5736,9 @@ usage: mxpy config-env switch [-h] ...
 
 Switch to a different environment.
 
-positional arguments:
-  name        the name of the configuration entry
-
 options:
   -h, --help  show this help message and exit
+  --env ENV   the name of the environment to operate on
 
 ```
 ### ConfigEnv.List
@@ -5761,13 +5761,11 @@ options:
 $ mxpy config-env remove --help
 usage: mxpy config-env remove [-h] ...
 
-Deletes an environment from the env file. Will switch to default env.
-
-positional arguments:
-  environment  The environment to remove from env file.
+Deletes an environment from the env file. Use `mxpy config-env switch` to move to another env.
 
 options:
-  -h, --help   show this help message and exit
+  -h, --help  show this help message and exit
+  --env ENV   the name of the environment to operate on
 
 ```
 ### ConfigEnv.Reset
diff --git a/multiversx_sdk_cli/cli_config_env.py b/multiversx_sdk_cli/cli_config_env.py
@@ -30,7 +30,7 @@ def setup_parser(subparsers: Any) -> Any:
     sub = cli_shared.add_command_subparser(
         subparsers, "config-env", "new", "Creates a new environment and sets it as the active environment."
     )
-    _add_name_arg(sub)
+    sub.add_argument("name", type=str, help="the name of the new environment")
     sub.add_argument(
         "--template",
         required=False,
@@ -39,16 +39,18 @@ def setup_parser(subparsers: Any) -> Any:
     sub.set_defaults(func=new_env)
 
     sub = cli_shared.add_command_subparser(
-        subparsers, "config-env", "get", "Gets an env value from the active environment."
+        subparsers, "config-env", "get", "Gets an env value from the specified environment."
     )
     _add_name_arg(sub)
+    _add_env_arg(sub)
     sub.set_defaults(func=get_env_value)
 
     sub = cli_shared.add_command_subparser(
-        subparsers, "config-env", "set", "Sets an env value for the active environment."
+        subparsers, "config-env", "set", "Sets an env value for the specified environment."
     )
     _add_name_arg(sub)
     sub.add_argument("value", type=str, help="the new value")
+    _add_env_arg(sub)
     sub.set_defaults(func=set_env_value)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-env", "dump", "Dumps the active environment.")
@@ -61,13 +63,14 @@ def setup_parser(subparsers: Any) -> Any:
     sub.set_defaults(func=dump)
 
     sub = cli_shared.add_command_subparser(
-        subparsers, "config-env", "delete", "Deletes an env value from the active environment."
+        subparsers, "config-env", "delete", "Deletes an env value from the specified environment."
     )
     _add_name_arg(sub)
+    _add_env_arg(sub)
     sub.set_defaults(func=delete_env_value)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-env", "switch", "Switch to a different environment.")
-    _add_name_arg(sub)
+    _add_env_arg(sub)
     sub.set_defaults(func=switch_env)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-env", "list", "List available environments")
@@ -77,9 +80,9 @@ def setup_parser(subparsers: Any) -> Any:
         subparsers,
         "config-env",
         "remove",
-        "Deletes an environment from the env file. Will switch to default env.",
+        "Deletes an environment from the env file. Use `mxpy config-env switch` to move to another env.",
     )
-    sub.add_argument("environment", type=str, help="The environment to remove from env file.")
+    _add_env_arg(sub)
     sub.set_defaults(func=remove_env_entry)
 
     sub = cli_shared.add_command_subparser(
@@ -98,6 +101,10 @@ def _add_name_arg(sub: Any):
     sub.add_argument("name", type=str, help="the name of the configuration entry")
 
 
+def _add_env_arg(sub: Any):
+    sub.add_argument("--env", required=True, type=str, help="the name of the environment to operate on")
+
+
 def dump(args: Any):
     if args.default:
         dump_out_json(get_defaults())
@@ -106,16 +113,16 @@ def dump(args: Any):
 
 
 def get_env_value(args: Any):
-    value = get_value(args.name)
+    value = get_value(args.name, args.env)
     print(value)
 
 
 def set_env_value(args: Any):
-    set_value(args.name, args.value)
+    set_value(args.name, args.value, args.env)
 
 
 def delete_env_value(args: Any):
-    delete_value(args.name)
+    delete_value(args.name, args.env)
 
 
 def new_env(args: Any):
@@ -124,7 +131,7 @@ def new_env(args: Any):
 
 
 def switch_env(args: Any):
-    set_active(args.name)
+    set_active(args.env)
     dump_out_json(get_active_env())
 
 
@@ -139,7 +146,7 @@ def remove_env_entry(args: Any):
         logger.info("Environment file not found. Aborting...")
         return
 
-    delete_env(args.environment)
+    delete_env(args.env)
 
 
 def delete_env_file(args: Any):
diff --git a/multiversx_sdk_cli/config_env.py b/multiversx_sdk_cli/config_env.py
@@ -46,22 +46,47 @@ def get_defaults() -> dict[str, str]:
 
 @cache
 def get_address_hrp() -> str:
-    return get_value("default_address_hrp")
+    """
+    Returns the HRP for the active environment.
+    If not set, it returns the default value.
+    """
+    data = read_env_file()
+    active_env_name: str = data.get("active", "default")
+    return get_value("default_address_hrp", active_env_name)
 
 
 @cache
 def get_proxy_url() -> str:
-    return get_value("proxy_url")
+    """
+    Returns the proxy URL for the active environment.
+    If not set, it returns an empty string.
+    """
+    data = read_env_file()
+    active_env_name: str = data.get("active", "default")
+    return get_value("proxy_url", active_env_name)
 
 
 @cache
 def get_explorer_url() -> str:
-    return get_value("explorer_url")
+    """
+    Returns the explorer URL for the active environment.
+    If not set, it returns an empty string.
+    """
+    data = read_env_file()
+    active_env_name: str = data.get("active", "default")
+    return get_value("explorer_url", active_env_name)
 
 
 @cache
 def get_confirmation_setting() -> bool:
-    confirmation_value = get_value("ask_confirmation")
+    """
+    Returns the confirmation setting for the active environment.
+    If not set, it defaults to False.
+    """
+    data = read_env_file()
+    active_env_name: str = data.get("active", "default")
+
+    confirmation_value = get_value("ask_confirmation", active_env_name)
     if confirmation_value.lower() in ["true", "yes", "1"]:
         return True
     elif confirmation_value.lower() in ["false", "no", "0"]:
@@ -71,11 +96,17 @@ def get_confirmation_setting() -> bool:
 
 
 @cache
-def get_value(name: str) -> str:
+def get_value(name: str, env_name: str) -> str:
     _guard_valid_name(name)
-    data = get_active_env()
+    data = read_env_file()
+
+    envs = data.get("environments", {})
+    env = envs.get(env_name, None)
+    if env is None:
+        raise UnknownEnvironmentError(env_name)
+
     default_value = get_defaults()[name]
-    value = data.get(name, default_value)
+    value = env.get(name, default_value)
     assert isinstance(value, str)
     return value
 
@@ -109,13 +140,18 @@ def resolve_env_path() -> Path:
     return GLOBAL_ENV_PATH
 
 
-def set_value(name: str, value: Any):
+def set_value(name: str, value: str, env_name: str):
     _guard_valid_name(name)
     data = read_env_file()
-    active_env = data.get("active", "default")
-    data.setdefault("environments", {})
-    data["environments"].setdefault(active_env, {})
-    data["environments"][active_env][name] = value
+
+    envs = data.get("environments", {})
+    env = envs.get(env_name, None)
+    if env is None:
+        raise UnknownEnvironmentError(env_name)
+
+    env[name] = value
+    envs[env_name] = env
+    data["environments"] = envs
     write_file(data)
 
 
@@ -124,14 +160,19 @@ def write_file(data: dict[str, Any]):
     write_json_file(str(env_path), data)
 
 
-def delete_value(name: str):
+def delete_value(name: str, env_name: str):
     """Deletes a key-value pair of the active env."""
     _guard_valid_env_deletion(name)
     data = read_env_file()
-    active_env = data.get("active", "default")
-    data.setdefault("environments", {})
-    data["environments"].setdefault(active_env, {})
-    del data["environments"][active_env][name]
+
+    envs = data.get("environments", {})
+    env = envs.get(env_name, None)
+    if env is None:
+        raise UnknownEnvironmentError(env_name)
+
+    del env[name]
+    envs[env_name] = env
+    data["environments"] = envs
     write_file(data)
 
 
