Merge branch 'main' into fix-index-generation-workflow

Author: bennyz

__templates__/driver/pyproject.toml.tmpl

@@ -9,7 +9,7 @@ authors = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
 ]
 

packages/jumpstarter-driver-energenie/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
     "jumpstarter-driver-power"
 ]

packages/jumpstarter-driver-flashers/pyproject.toml

@@ -11,7 +11,7 @@ authors = [
 requires-python = ">=3.11"
 dependencies = [
     "oras>=0.2.25",
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
     "jumpstarter-driver-opendal",
     "jumpstarter-driver-pyserial",

packages/jumpstarter-driver-http-power/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
     "jumpstarter-driver-power",
 ]

packages/jumpstarter-driver-http/pyproject.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 authors = [{ name = "Benny Zlotnik", email = "bzlotnik@redhat.com" }]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
     "jumpstarter-driver-composite",
     "jumpstarter-driver-opendal",

packages/jumpstarter-driver-iscsi/pyproject.toml

@@ -6,7 +6,7 @@ readme = "README.md"
 authors = [{ name = "Benny Zlotnik", email = "bzlotnik@redhat.com" }]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "jumpstarter",
     "jumpstarter-driver-composite",
     "jumpstarter-driver-opendal",

packages/jumpstarter-driver-network/jumpstarter_driver_network/client.py

@@ -1,8 +1,11 @@
-from contextlib import AbstractContextManager
+from collections.abc import Generator
+from contextlib import contextmanager
 from ipaddress import IPv6Address, ip_address
 from threading import Event
+from typing import Any
 
 import click
+from anyio import ContextManagerMixin
 
 from .adapters import DbusAdapter, TcpPortforwardAdapter, UnixPortforwardAdapter
 from .driver import DbusNetwork
@@ -62,13 +65,11 @@ def forward_unix(path: str | None):
         return base
 
 
-class DbusNetworkClient(NetworkClient, AbstractContextManager):
-    def __enter__(self):
-        self.adapter = DbusAdapter(client=self)
-        self.adapter.__enter__()
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.adapter.__exit__(exc_type, exc_value, traceback)
+class DbusNetworkClient(NetworkClient, ContextManagerMixin):
+    @contextmanager
+    def __contextmanager__(self) -> Generator[Any]:
+        with DbusAdapter(client=self) as value:
+            yield value
 
     @property
     def kind(self):

packages/jumpstarter-driver-probe-rs/pyproject.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 authors = [{ name = "Miguel Angel Ajo", email = "miguelangel@ajo.es" }]
 requires-python = ">=3.11"
 dependencies = [
-    "anyio>=4.6.2.post1",
+    "anyio>=4.10.0",
     "click>=8.1.7.2",
     "jumpstarter",
     "jumpstarter-driver-opendal",

packages/jumpstarter-driver-shell/README.md

@@ -63,3 +63,53 @@ methods will be generated dynamically, and they will be available as follows:
 
     :returns: A tuple(stdout, stderr, return_code)
 ```
+
+## CLI Usage
+
+The shell driver also provides a CLI when using `jmp shell`. All configured methods become available as CLI commands, except for methods starting with `_` which are considered private and hidden from the end user:
+
+```console
+$ jmp shell --exporter shell-exporter
+$ j shell
+Usage: j shell [OPTIONS] COMMAND [ARGS]...
+
+  Shell command executor
+
+Commands:
+  env_var  Execute the env_var shell method
+  ls       Execute the ls shell method
+  method2  Execute the method2 shell method
+  method3  Execute the method3 shell method
+```
+
+### CLI Command Usage
+
+Each configured method becomes a CLI command with the following options:
+
+```console
+$ j shell ls --help
+Usage: j shell ls [OPTIONS] [ARGS]...
+
+  Execute the ls shell method
+
+Options:
+  -e, --env TEXT  Environment variables in KEY=VALUE format
+  --help          Show this message and exit.
+```
+
+### Examples
+
+```console
+# Execute simple commands
+$ j shell ls
+file1.txt  file2.txt  directory/
+
+# Pass arguments to shell methods
+$ j shell method3 "first arg" "second arg"
+Hello World first arg
+Hello World second arg
+
+# Set environment variables
+$ j shell env_var arg1 arg2 --env ENV_VAR=myvalue
+arg1,arg2,myvalue
+```

packages/jumpstarter-driver-shell/jumpstarter_driver_shell/client.py

@@ -1,5 +1,8 @@
+import sys
 from dataclasses import dataclass
 
+import click
+
 from jumpstarter.client import DriverClient
 
 
@@ -11,8 +14,8 @@ class ShellClient(DriverClient):
     Client interface for Shell driver.
 
     This client dynamically checks that the method is configured
-    on the driver, and if it is, it will call it and get the results
-    in the form of (stdout, stderr, returncode).
+    on the driver, and if it is, it will call it with live streaming output.
+    Output chunks are displayed as they arrive.
     """
 
     def _check_method_exists(self, method):
@@ -24,4 +27,59 @@ def _check_method_exists(self, method):
     ## capture any method calls dynamically
     def __getattr__(self, name):
         self._check_method_exists(name)
-        return lambda *args, **kwargs: tuple(self.call("call_method", name, kwargs, *args))
+        def execute(*args, **kwargs):
+            returncode = 0
+            for stdout, stderr, code in self.streamingcall("call_method", name, kwargs, *args):
+                if stdout:
+                    print(stdout, end='', flush=True)
+                if stderr:
+                    print(stderr, end='', file=sys.stderr, flush=True)
+                if code is not None:
+                    returncode = code
+            return returncode
+        return execute
+
+    def cli(self):
+        """Create CLI interface for dynamically configured shell methods"""
+        @click.group
+        def base():
+            """Shell command executor"""
+            pass
+
+        # Get available methods from the driver
+        if self._methods is None:
+            self._methods = self.call("get_methods")
+
+        # Create a command for each configured method
+        for method_name in self._methods:
+            self._add_method_command(base, method_name)
+
+        return base
+
+    def _add_method_command(self, group, method_name):
+        """Add a Click command for a specific shell method"""
+        @group.command(
+            name=method_name,
+            context_settings={"ignore_unknown_options": True, "allow_interspersed_args": False},
+        )
+        @click.argument('args', nargs=-1, type=click.UNPROCESSED)
+        @click.option('--env', '-e', multiple=True,
+                     help='Environment variables in KEY=VALUE format')
+        def method_command(args, env):
+            # Parse environment variables
+            env_dict = {}
+            for env_var in env:
+                if '=' in env_var:
+                    key, value = env_var.split('=', 1)
+                    env_dict[key] = value
+                else:
+                    raise click.BadParameter(f"Invalid --env value '{env_var}'. Use KEY=VALUE.")
+
+            returncode = getattr(self, method_name)(*args, **env_dict)
+
+            # Exit with the same return code as the shell command
+            if returncode != 0:
+                raise click.exceptions.Exit(returncode)
+
+        # Update the docstring dynamically
+        method_command.__doc__ = f"Execute the {method_name} shell method"