Merge branch 'develop' into main

Author: gsaluja9

aperturedb/cli/configure.py

@@ -28,7 +28,7 @@ def default(self, o):
 app = typer.Typer()
 
 
-def _config_file_path(as_global: bool):
+def _config_file_path(as_global: bool) -> Path:
     config_path: Path = Path(os.path.join(
         os.getcwd(),
         f".{APP_NAME}",
@@ -39,6 +39,11 @@ def _config_file_path(as_global: bool):
     return config_path
 
 
+def _write_config(config_path: Path, config: dict):
+    with open(config_path.as_posix(), "w") as config_file:
+        config_file.write(json.dumps(config, indent=2, cls=ObjEncoder))
+
+
 def has_environment_configuration():
     for known_variable in ["APERTUREDB_KEY", "APERTUREDB_JSON"]:
         if (data := os.environ.get(known_variable)) is not None and data != "":
@@ -237,8 +242,7 @@ def check_for_overwrite(name):
     else:
         configs["active"] = ac
 
-    with open(config_path.as_posix(), "w") as config_file:
-        config_file.write(json.dumps(configs, indent=2, cls=ObjEncoder))
+    _write_config(config_path, configs)
 
 
 @app.command()
@@ -266,8 +270,61 @@ def activate(
         check_configured(as_global=False) or \
             check_configured(as_global=True, show_error=True)
 
-    with open(config_path.as_posix(), "w") as config_file:
-        config_file.write(json.dumps(configs, indent=2, cls=ObjEncoder))
+    _write_config(config_path, configs)
+
+
+@app.command()
+def remove(
+        name: Annotated[Optional[str], typer.Argument(
+            help="Name of this configuration to remove")],
+        remove_if_active: Annotated[bool, typer.Option(
+            help="If true; if active, remove and assign other configuration to be active; If false refuse to delete if active")] = False,
+        new_active: Annotated[str, typer.Option(
+            help="If deleting active, use name as new active")] = None,
+        as_global: Annotated[bool, typer.Option(
+            help="Project level vs global level")] = True):
+    """
+    Remove a configuration from a Configuriation file
+    """
+    config_path = _config_file_path(as_global)
+    configs = {}
+    config_level = "global" if as_global else "project"
+    try:
+        configs, ac = get_configurations(config_path.as_posix())
+    except FileNotFoundError as e:
+        console.log(
+            f"No configuration available at {config_level} level.")
+        raise typer.Exit(code=2)
+    except json.JSONDecodeError:
+        console.log(
+            f"Configuration file at {config_level} level was malformed.")
+        raise typer.Exit(code=2)
+
+    if not name in configs:
+        console.log(
+            f"Configuration file at {config_level} level does not have a config with the name {name}.")
+        raise typer.Exit(code=2)
+
+    change_active = False
+    if name == ac:
+        change_active = True
+        if new_active is None and not remove_if_active:
+            console.log(
+                f"Configuration {name} is active and no options for removing active were supplied.")
+            raise typer.Exit(code=2)
+        if new_active is not None and not new_active in configs:
+            console.log(
+                f"Configuration {new_active} does not exist in Configuration file at {config_level} and cannot be set active")
+            raise typer.Exit(code=2)
+
+    del configs[name]
+    if change_active:
+        if new_active:
+            ac = new_active
+        else:
+            ac = next(iter(configs))
+    configs["active"] = ac
+    _write_config(config_path, configs)
 
 
 @app.command()
@@ -309,9 +366,7 @@ def get_key(name: Annotated[str, typer.Argument(
 
             user_key = keys.generate_user_key(conn, key_user)
             configs[name].add_user_key(key_user, user_key)
-            with open(config_path.as_posix(), "w") as config_file:
-                config_file.write(json.dumps(
-                    configs, indent=2, cls=ObjEncoder))
+            _write_config(config_path, configs)
     except FileNotFoundError:
         check_configured(as_global=False) or \
             check_configured(as_global=True, show_error=True)