f-d

Author: unkcpz

aiidalab_launch/__main__.py

@@ -238,27 +238,27 @@ def remove_profile(ctx, app_state, profile, yes, force, purge):
         profile = app_state.config.get_profile(profile)
     except ValueError:
         raise click.ClickException(f"Profile with name '{profile}' does not exist.")
-    else:
-        if not force:
-            instance = AiidaLabInstance(client=app_state.docker_client, profile=profile)
-            status = asyncio.run(instance.status())
-            if status not in (
-                instance.AiidaLabInstanceStatus.DOWN,
-                instance.AiidaLabInstanceStatus.CREATED,
-                instance.AiidaLabInstanceStatus.EXITED,
-            ):
-                raise click.ClickException(
-                    f"The instance associated with profile '{profile.name}' "
-                    "is still running. Use the -f/--force option to remove the "
-                    "profile anyways."
-                )
 
-        if yes or click.confirm(
-            f"Are you sure you want to remove profile '{profile.name}'?"
+    if not force:
+        instance = AiidaLabInstance(client=app_state.docker_client, profile=profile)
+        status = asyncio.run(instance.status())
+        if status not in (
+            instance.AiidaLabInstanceStatus.DOWN,
+            instance.AiidaLabInstanceStatus.CREATED,
+            instance.AiidaLabInstanceStatus.EXITED,
         ):
-            app_state.config.profiles.remove(profile)
-            app_state.save_config()
-            click.echo(f"Removed profile with name '{profile.name}'.")
+            raise click.ClickException(
+                f"The instance associated with profile '{profile.name}' "
+                "is still running. Use the -f/--force option to remove the "
+                "profile anyways."
+            )
+
+    if yes or click.confirm(
+        f"Are you sure you want to remove profile '{profile.name}'?"
+    ):
+        app_state.config.profiles.remove(profile)
+        app_state.save_config()
+        click.echo(f"Removed profile with name '{profile.name}'.")
 
     if purge:
         ctx.invoke(reset, profile=profile, yes=yes)
@@ -701,7 +701,7 @@ def reset(app_state, profile, yes):
         )
 
     click.secho(
-        f"Resetting instance for profile '{profile.name}'. This action cannot be undone!",
+        f"Resetting instance for profile '{profile.name}'. It will remove ALL DATA, the docker container and the volumes associated. This action cannot be undone!",
         err=True,
         fg="red",
     )

tests/test_cli.py

@@ -107,6 +107,7 @@ def test_add_remove_profile():
     # Check that new-profile exists
     result: Result = runner.invoke(cli.cli, ["profile", "list"])
     assert "new-profile" in result.output
+    assert "second-profile" in result.output
     result: Result = runner.invoke(cli.cli, ["profile", "show", "new-profile"])
     assert result.exit_code == 0