remove "warnet consumes plugin"

Author: mplsgrant

resources/plugins/simln/plugin.yaml

@@ -4,14 +4,13 @@
 import logging
 import time
 from pathlib import Path
-from typing import Optional
 
 import click
 from kubernetes.stream import stream
 
 # When we want to select pods based on their role in Warnet, we use "mission" tags. The "mission"
 # tag for "lightning" nodes is stored in LIGHTNING_MISSION.
-from warnet.constants import LIGHTNING_MISSION, USER_DIR_TAG
+from warnet.constants import LIGHTNING_MISSION, PLUGIN_DIR_TAG
 from warnet.k8s import (
     download,
     get_default_namespace,
@@ -20,7 +19,6 @@
     wait_for_init,
     write_file_to_container,
 )
-from warnet.plugins import get_plugins_directory_or
 from warnet.process import run_command
 
 # To make a "mission" tag for your plugin, declare it using the variable name MISSION. This will
@@ -55,15 +53,9 @@ class SimLNError(Exception):
 @click.pass_context
 def simln(ctx):
     """Commands for the SimLN plugin"""
-    try:
-        # check if we have set a user directory
-        ctx.obj.get(USER_DIR_TAG)
-    except Exception:
-        # if not, set the great-grandparent of this file as the user dir
-        ctx.ensure_object(dict)
-        user_dir = Path(__file__).resolve().parent.parent.parent
-        ctx.obj[USER_DIR_TAG] = Path(user_dir)
-    pass
+    ctx.ensure_object(dict)
+    plugin_dir = Path(__file__).resolve().parent
+    ctx.obj[PLUGIN_DIR_TAG] = Path(plugin_dir)
 
 
 # Make sure to register your plugin by adding the group function like so:
@@ -74,8 +66,8 @@ def warnet_register_plugin(register_command):
 # The group function name is then used in decorators to create commands. These commands are
 # available to users when they access your plugin from the command line in Warnet.
 @simln.command()
-def list_simln_podnames():
-    """Get a list of simln pod names"""
+def list_pod_names():
+    """Get a list of SimLN pod names"""
     print([pod.metadata.name for pod in get_mission(MISSION)])
 
 
@@ -111,14 +103,12 @@ def get_example_activity():
     print(json.dumps(_get_example_activity()))
 
 
-def _launch_activity(activity: list[dict], user_dir: Optional[str] = None) -> str:
+def _launch_activity(activity: list[dict], plugin_dir: str) -> str:
     """Launch a SimLN chart which includes the `activity`"""
-    plugin_dir = get_plugins_directory_or(user_dir)
-
     timestamp = int(time.time())
     name = f"simln-{timestamp}"
 
-    command = f"helm upgrade --install {timestamp} {plugin_dir}/simln/charts/simln"
+    command = f"helm upgrade --install {timestamp} {plugin_dir}/charts/simln"
     run_command(command)
 
     activity_json = _generate_activity_json(activity)
@@ -147,8 +137,8 @@ def launch_activity(ctx, activity: str):
     except json.JSONDecodeError:
         log.error("Invalid JSON input for activity.")
         raise click.BadArgumentUsage("Activity must be a valid JSON string.") from None
-    user_dir = ctx.obj.get(USER_DIR_TAG)
-    print(_launch_activity(parsed_activity, user_dir))
+    plugin_dir = ctx.obj.get(PLUGIN_DIR_TAG)
+    print(_launch_activity(parsed_activity, plugin_dir))
 
 
 def _generate_activity_json(activity: list[dict]) -> str:

resources/plugins/simln/simln.py

@@ -42,7 +42,7 @@
 DEFAULTS_NAMESPACE_FILE = "namespace-defaults.yaml"
 
 # Plugin architecture
-USER_DIR_TAG = "user_dir"
+PLUGIN_DIR_TAG = "plugin_dir"
 PLUGINS_TAG = "plugins"
 ENABLED_TAG = "enabled"
 PLUGIN_YAML = "plugin.yaml"

src/warnet/constants.py

@@ -1,5 +1,4 @@
 import io
-import itertools
 import json
 import os
 import subprocess
@@ -41,7 +40,6 @@
     wait_for_pod,
     write_file_to_container,
 )
-from .plugins import get_plugin_missions, get_plugin_primary_containers
 from .process import run_command, stream_command
 
 console = Console()
@@ -377,11 +375,8 @@ def format_pods(pods: list[V1Pod]) -> list[str]:
             pod_list = []
             formatted_commanders = format_pods(get_mission(COMMANDER_MISSION))
             formatted_tanks = format_pods(get_mission(TANK_MISSION))
-            plugin_pods = [get_mission(mission) for mission in get_plugin_missions()]
-            formatted_plugins = format_pods(list(itertools.chain.from_iterable(plugin_pods)))
             pod_list.extend(formatted_commanders)
             pod_list.extend(formatted_tanks)
-            pod_list.extend(formatted_plugins)
 
         except Exception as e:
             print(f"Could not fetch any pods in namespace ({namespace}): {e}")
@@ -407,7 +402,6 @@ def format_pods(pods: list[V1Pod]) -> list[str]:
     try:
         pod = get_pod(pod_name, namespace=namespace)
         eligible_container_names = [BITCOINCORE_CONTAINER, COMMANDER_CONTAINER]
-        eligible_container_names.extend(get_plugin_primary_containers())
         available_container_names = [container.name for container in pod.spec.containers]
         container_name = next(
             (

src/warnet/control.py

@@ -1,9 +1,5 @@
-from pathlib import Path
-
 import click
 
-from warnet.constants import USER_DIR_TAG
-
 from .admin import admin
 from .bitcoin import bitcoin
 from .control import down, logs, run, snapshot, stop
@@ -12,25 +8,13 @@
 from .graph import create, graph, import_network
 from .image import image
 from .ln import ln
-from .plugins import load_plugins, load_user_modules, plugins
 from .project import init, new, setup
 from .status import status
 from .users import auth
 
 
 @click.group()
-@click.option(
-    "--user-dir",
-    type=click.Path(exists=True, file_okay=False),
-    help="Path to the user's Warnet project directory.",
-)
-@click.pass_context
-def cli(ctx, user_dir: str):
-    ctx.ensure_object(dict)  # initialize ctx object
-    if user_dir:
-        ctx.obj[USER_DIR_TAG] = Path(user_dir)
-    if load_user_modules(ctx.obj.get(USER_DIR_TAG)):
-        load_plugins()
+def cli():
     pass
 
 
@@ -53,7 +37,6 @@ def cli(ctx, user_dir: str):
 cli.add_command(status)
 cli.add_command(stop)
 cli.add_command(create)
-cli.add_command(plugins)
 
 
 if __name__ == "__main__":