agentstack-cli 0.4.0rc1__tar.gz → 0.4.1__tar.gz

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agentstack-cli
-Version: 0.4.0rc1
+Version: 0.4.1
 Summary: Agent Stack CLI
 Author: IBM Corp.
 Requires-Dist: anyio~=4.10.0

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentstack-cli"
-version = "0.4.0-rc1"
+version = "0.4.1"
 description = "Agent Stack CLI"
 readme = "README.md"
 authors = [{ name = "IBM Corp." }]

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/src/agentstack_cli/auth_manager.py

@@ -18,6 +18,8 @@ class AuthToken(BaseModel):
 
 
 class AuthServer(BaseModel):
+    client_id: str = "df82a687-d647-4247-838b-7080d7d83f6c"  # Backwards compatibility default
+    client_secret: str | None = None
     token: AuthToken | None = None
 
 
@@ -48,9 +50,18 @@ class AuthManager:
     def _save(self) -> None:
         self._auth_path.write_text(self._auth.model_dump_json(indent=2))
 
-    def save_auth_token(self, server: str, auth_server: str | None = None, token: dict[str, Any] | None = None) -> None:
-        if auth_server is not None and token is not None:
-            self._auth.servers[server].authorization_servers[auth_server] = AuthServer(token=AuthToken(**token))
+    def save_auth_token(
+        self,
+        server: str,
+        auth_server: str | None = None,
+        client_id: str | None = None,
+        client_secret: str | None = None,
+        token: dict[str, Any] | None = None,
+    ) -> None:
+        if auth_server is not None and client_id is not None and token is not None:
+            self._auth.servers[server].authorization_servers[auth_server] = AuthServer(
+                client_id=client_id, client_secret=client_secret, token=AuthToken(**token)
+            )
         else:
             self._auth.servers[server]  # touch
         self._save()

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/src/agentstack_cli/commands/agent.py

@@ -68,7 +68,6 @@ from pydantic import BaseModel
 from rich.box import HORIZONTALS
 from rich.console import ConsoleRenderable, Group, NewLine
 from rich.panel import Panel
-from rich.rule import Rule
 from rich.text import Text
 
 from agentstack_cli.commands.build import build
@@ -721,54 +720,6 @@ def _create_input_handler(
     return handler
 
 
-def _setup_sequential_workflow(providers: list[Provider], splash_screen: ConsoleRenderable | None = None):
-    prompt_agents = {
-        provider.agent_card.name: provider
-        for provider in providers
-        if (ProviderUtils.detail(provider) or {}).get("interaction_mode") == InteractionMode.SINGLE_TURN
-    }
-    steps = []
-
-    console.print(Rule(title="Configure Workflow", style="white"))
-
-    handle_input = _create_input_handler(
-        [], prompt="Agent: ", choice=list(prompt_agents), placeholder="Select agent", splash_screen=splash_screen
-    )
-    handle_instruction_input = _create_input_handler(
-        [], prompt="Instruction: ", placeholder="Enter agent instruction", splash_screen=splash_screen
-    )
-    i = 0
-
-    while True:
-        if not (agent := handle_input()):
-            console.print(Rule(style="white"))
-            break
-        instruction = handle_instruction_input()
-
-        if not steps:
-            # change prompt for other passes
-            handle_input = _create_input_handler(
-                [],
-                prompt="Agent: ",
-                placeholder="Select agent (Leave empty to execute)",
-                choice=list(prompt_agents),
-                optional=True,
-                splash_screen=splash_screen,
-            )
-            handle_instruction_input = _create_input_handler(
-                [],
-                prompt="Instruction: ",
-                placeholder="Enter agent instruction (leave empty to pass raw output from previous agent)",
-                optional=True,
-                splash_screen=splash_screen,
-            )
-        console.print(Rule(style="dim", characters="·"))
-        i += 1
-        steps.append({"provider_id": prompt_agents[agent].id, "instruction": instruction})
-
-    return steps
-
-
 @app.command("run")
 async def run_agent(
     search_path: typing.Annotated[
@@ -810,7 +761,6 @@ async def run_agent(
 
     ui_annotations = ProviderUtils.detail(provider) or {}
     interaction_mode = ui_annotations.get("interaction_mode")
-    is_sequential_workflow = agent.name in {"sequential_workflow"}
 
     user_greeting = ui_annotations.get("user_greeting", None) or "How can I help you?"
 
@@ -818,10 +768,7 @@ async def run_agent(
     handle_input = _create_input_handler([], splash_screen=splash_screen)
 
     if not input:
-        if (
-            interaction_mode not in {InteractionMode.MULTI_TURN, InteractionMode.SINGLE_TURN}
-            and not is_sequential_workflow
-        ):
+        if interaction_mode not in {InteractionMode.MULTI_TURN, InteractionMode.SINGLE_TURN}:
             err_console.error(
                 f"Agent {agent.name} does not use any supported UIs.\n"
                 + "Please use the agent according to the following examples and schema:"
@@ -867,19 +814,6 @@ async def run_agent(
                     dump_files_path=dump_files,
                     handle_input=handle_input,
                 )
-        elif is_sequential_workflow:
-            workflow_steps = _setup_sequential_workflow(providers, splash_screen=splash_screen)
-            console.print()
-            message_part = DataPart(data={"steps": workflow_steps}, metadata={"kind": "configuration"})
-            async with a2a_client(provider.agent_card) as client:
-                await _run_agent(
-                    client,
-                    message_part,
-                    agent_card=agent,
-                    context_token=context_token,
-                    dump_files_path=dump_files,
-                    handle_input=handle_input,
-                )
 
     else:
         async with a2a_client(provider.agent_card) as client:

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/src/agentstack_cli/commands/platform/base_driver.py

@@ -183,7 +183,7 @@ class BaseDriver(abc.ABC):
                 "--namespace=default",
                 "--create-namespace",
                 "--values=/tmp/agentstack/values.yaml",
-                "--timeout=5m",
+                "--timeout=20m",
                 "--wait",
                 "--kubeconfig=/etc/rancher/k3s/k3s.yaml",
                 *(f"--set={value}" for value in set_values_list),

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/src/agentstack_cli/commands/server.py

@@ -91,7 +91,7 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
     )
     server = server or await inquirer.text(message="Enter server URL:").execute_async()  #  type: ignore
 
-    if server is None:
+    if not server:
         raise RuntimeError("No server selected. Action cancelled.")
 
     if "://" not in server:
@@ -134,6 +134,10 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
         auth_servers = metadata.get("authorization_servers", [])
         auth_server = None
         token = None
+
+        client_id = config.client_id
+        client_secret = config.client_secret
+
         if auth_servers:
             if len(auth_servers) == 1:
                 auth_server = auth_servers[0]
@@ -154,15 +158,44 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
                 except Exception as e:
                     raise RuntimeError(f"OIDC discovery failed: {e}") from e
 
+            registration_endpoint = oidc["registration_endpoint"]
+            if not client_id and registration_endpoint:
+                async with httpx.AsyncClient() as client:
+                    try:
+                        resp = await client.post(
+                            registration_endpoint,
+                            json={"client_name": "Agent Stack CLI", "redirect_uris": [REDIRECT_URI]},
+                        )
+                        resp.raise_for_status()
+                        data = resp.json()
+                        client_id = data["client_id"]
+                        client_secret = data["client_secret"]
+                    except Exception:
+                        console.warning("Dynamic client registration failed. Proceed with manual input.")
+
+            if not client_id:
+                client_id = await inquirer.text(  #  type: ignore
+                    message="Enter Client ID:",
+                    instruction=f"(Redirect URI: {REDIRECT_URI})",
+                ).execute_async()
+                if not client_id:
+                    raise RuntimeError("Client ID is mandatory. Action cancelled.")
+                client_secret = (
+                    await inquirer.text(  #  type: ignore
+                        message="Enter Client Secret (optional):"
+                    ).execute_async()
+                    or None
+                )
+
             code_verifier = generate_token(64)
 
             auth_url = f"{oidc['authorization_endpoint']}?{
                 urlencode(
                     {
-                        'client_id': config.client_id,
+                        'client_id': client_id,
                         'response_type': 'code',
                         'redirect_uri': REDIRECT_URI,
-                        'scope': ' '.join(metadata.get('scopes_supported', ['openid'])),
+                        'scope': ' '.join(metadata.get('scopes_supported', ['openid', 'email', 'profile'])),
                         'code_challenge': typing.cast(str, create_s256_code_challenge(code_verifier)),
                         'code_challenge_method': 'S256',
                     }
@@ -182,7 +215,8 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
                             "grant_type": "authorization_code",
                             "code": code,
                             "redirect_uri": REDIRECT_URI,
-                            "client_id": config.client_id,
+                            "client_id": client_id,
+                            "client_secret": client_secret,
                             "code_verifier": code_verifier,
                         },
                     )
@@ -194,7 +228,13 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
             if not token:
                 raise RuntimeError("Login timed out or not successful.")
 
-        config.auth_manager.save_auth_token(server, auth_server, token)
+        config.auth_manager.save_auth_token(
+            server=server,
+            auth_server=auth_server,
+            client_id=client_id,
+            client_secret=client_secret,
+            token=token,
+        )
 
     config.auth_manager.active_server = server
     config.auth_manager.active_auth_server = auth_server

{agentstack_cli-0.4.0rc1 → agentstack_cli-0.4.1}/src/agentstack_cli/configuration.py

@@ -36,9 +36,11 @@ class Configuration(pydantic_settings.BaseSettings):
         f"https://github.com/i-am-bee/agentstack@v{version()}#path=agent-registry.yaml"
     )
     admin_password: SecretStr | None = None
-    oidc_enabled: bool = False
     server_metadata_ttl: int = 86400
-    client_id: str = "df82a687-d647-4247-838b-7080d7d83f6c"  # pre-registered with AS
+
+    oidc_enabled: bool = False
+    client_id: str | None = None
+    client_secret: str | None = None
 
     @property
     def lima_home(self) -> pathlib.Path: