flowstash-cli 0.6.4__tar.gz → 0.7.1__tar.gz

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flowstash-cli
-Version: 0.6.4
+Version: 0.7.1
 Summary: CLI for the flowstash Managed Platform
 Author: juraj.bezdek@gmail.com
 Author-email: juraj.bezdek@gmail.com
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: flowstash-runtime (>=0.6.4,<0.7.0)
+Requires-Dist: flowstash-runtime (>=0.7.1,<0.8.0)
 Requires-Dist: httpx (>=0.27.0)
 Requires-Dist: keyring (>=25.0.0)
 Requires-Dist: libcst (>=1.1.0)

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "flowstash-cli"
-version = "0.6.4"
+version = "0.7.1"
 description = "CLI for the flowstash Managed Platform"
 authors = [{name = "juraj.bezdek@gmail.com", email = "juraj.bezdek@gmail.com"}]
 requires-python = ">=3.11"
 dependencies = [
-    "flowstash-runtime>=0.6.4,<0.7.0",
+    "flowstash-runtime>=0.7.1,<0.8.0",
     "typer[all]>=0.12.0",
     "httpx>=0.27.0",
     "pyyaml>=6.0.1",

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/commands/auth.py

@@ -7,35 +7,42 @@ from rich.console import Console
 import asyncio
 import httpx
 from ..core.auth_server import start_callback_server
+from ..core.api_client import APIClient
 from ..core.config import (
-    load_global_config, 
-    set_access_token, 
-    get_access_token, 
+    load_global_config,
+    set_access_token,
+    get_access_token,
     delete_access_token,
-    load_project_config
+    load_project_config,
 )
 
 app = typer.Typer()
 console = Console()
 import os
+
 API_URL = os.getenv("FLOWSTASH_API_URL", "https://api.flowstash.dev")
 
+
 @app.command()
 def login(
-    username: Optional[str] = typer.Option(None, "--username", "-u", help="Username for manual login"),
-    password: Optional[str] = typer.Option(None, "--password", "-p", help="Password for manual login")
+    username: Optional[str] = typer.Option(
+        None, "--username", "-u", help="Username for manual login"
+    ),
+    password: Optional[str] = typer.Option(
+        None, "--password", "-p", help="Password for manual login"
+    ),
 ):
     """Log in to the flowstash Managed Platform."""
     if username and password:
         # Manual login
         console.print(f"Logging in to {API_URL} as {username}...")
-        
+
         async def do_login():
             async with httpx.AsyncClient() as client:
                 try:
                     resp = await client.post(
                         f"{API_URL}/v1/auth/login",
-                        json={"email": username, "password": password}
+                        json={"email": username, "password": password},
                     )
                     resp.raise_for_status()
                     return resp.json()
@@ -46,10 +53,10 @@ def login(
         result = asyncio.run(do_login())
         if not result:
             raise typer.Exit(code=1)
-            
+
         access_token = result.get("access_token")
         tenant_id = result.get("tenant_id")
-        
+
         set_access_token(access_token)
         console.print(f"[green]Successfully logged in as tenant: {tenant_id}[/green]")
         return
@@ -58,55 +65,87 @@ def login(
     state = secrets.token_urlsafe(16)
     port = 8888
     callback_url = f"http://localhost:{port}/callback"
-    
+
     login_url = f"{API_URL}/cli-login?redirect_uri={callback_url}&state={state}"
-    
+
     console.print(f"Opening your browser to authenticate...")
-    console.print(f"If the browser doesn't open, visit: [link={login_url}]{login_url}[/link]")
-    
+    console.print(
+        f"If the browser doesn't open, visit: [link={login_url}]{login_url}[/link]"
+    )
+
     webbrowser.open(login_url)
-    
+
     console.print("Waiting for authentication...")
     result = start_callback_server(port)
-    
+
     if not result:
         console.print("[red]Authentication timed out or failed.[/red]")
         raise typer.Exit(code=1)
-    
+
     if result.get("state") != state:
-        console.print("[red]Invalid state received. Auth session might be compromised.[/red]")
+        console.print(
+            "[red]Invalid state received. Auth session might be compromised.[/red]"
+        )
         raise typer.Exit(code=1)
-    
+
     access_token = result.get("access_token")
     tenant_id = result.get("tenant_id")
-    
+
     if not access_token:
         console.print("[red]No access token received.[/red]")
         raise typer.Exit(code=1)
-    
+
     set_access_token(access_token)
-    
+
     console.print(f"[green]Successfully logged in as tenant: {tenant_id}[/green]")
 
+
 @app.command()
 def logout():
     """Log out from the flowstash Managed Platform."""
     delete_access_token()
     console.print("[yellow]Logged out successfully.[/yellow]")
 
+
+def _fetch_current_user() -> Optional[dict]:
+    try:
+        return asyncio.run(APIClient().get("/v1/auth/me"))
+    except Exception:
+        return None
+
+
 @app.command()
 def whoami():
     """Show current login status."""
     token = get_access_token()
     global_config = load_global_config()
     project_config = load_project_config()
-    
+
     if token:
         console.print(f"API URL: {global_config.api_url}")
+        user_info = _fetch_current_user()
+        login = None
+        tenant_id = None
+
+        if user_info:
+            login = (
+                user_info.get("email")
+                or user_info.get("username")
+                or user_info.get("login")
+            )
+            tenant_id = user_info.get("tenant_id")
+        elif project_config:
+            login = project_config.user_email
+            tenant_id = project_config.tenant_id
+
+        if login:
+            console.print(f"Logged in as: [bold]{login}[/bold]")
+        if tenant_id:
+            console.print(f"Tenant: [bold]{tenant_id}[/bold]")
+
         if project_config:
-            console.print(f"Logged in as tenant: [bold]{project_config.tenant_id}[/bold]")
             console.print(f"Current Project: [bold]{project_config.project_id}[/bold]")
-        else:
+        elif not user_info:
             console.print("Logged in, but no project context found in this directory.")
     else:
         console.print("Not logged in.")

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/commands/deploy.py

@@ -7,6 +7,7 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from ..core.api_client import APIClient
 from ..core.config import load_project_config
 from .build import run_build_flow
+import flowstash.runtime
 
 app = typer.Typer()
 console = Console()
@@ -17,7 +18,7 @@ _STATUS_LABELS = {
     "VALIDATING": "Validating container images...",
     "DEPLOYING": "Deploying services...",
     "HEALTH_CHECK": "Health-checking API and Worker...",
-    "SYNCING_SCHEDULES": "Fetching and syncing scheduled tasks...",
+    "SYNCING_SCHEDULES": "Waiting for deployment verification...",
     "DEPLOYED": "Deployed successfully ✓",
     "FAILED": "Deployment failed.",
 }
@@ -60,6 +61,7 @@ async def run_deploy_flow(env: str, artifact_id: Optional[str] = None):
                 "project_id": project_id,
                 "artifact_id": artifact_id,
                 "env_vars": {"ENVIRONMENT": env},
+                "flowstash_runtime_version": flowstash.runtime.__version__,
             },
         )
         deploy_id = deploy_data["deploy_id"]

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/commands/webhook.py

@@ -36,6 +36,10 @@ def get_api_url() -> str:
     )
 
 
+def _build_target_url(target: str, path: str) -> str:
+    return f"{target.rstrip('/')}/{path.lstrip('/')}"
+
+
 def _get_webhooks_from_app(entry: str, debug: bool = False) -> List[Dict[str, Any]]:
     """Loads the app entrypoint in a subprocess and extracts registered webhooks."""
 
@@ -168,7 +172,10 @@ print(json.dumps({{"webhooks": result}}))
 
 
 async def _listen_stream(
-    ws_url: str, captures_buffer: List[Dict[str, Any]], stop_event: asyncio.Event
+    ws_url: str,
+    captures_buffer: List[Dict[str, Any]],
+    stop_event: asyncio.Event,
+    error_ref: Optional[List[str]] = None,
 ):
     """Connects to the WebSocket and appends captures to the buffer."""
 
@@ -189,10 +196,14 @@ async def _listen_stream(
                 except asyncio.TimeoutError:
                     continue
                 except websockets.exceptions.ConnectionClosed:
-                    console.print("[yellow]Connection closed by server.[/yellow]")
+                    if error_ref is not None:
+                        error_ref.append("Connection closed by server.")
+                    stop_event.set()
                     break
     except Exception as e:
-        console.print(f"[red]WebSocket connection error:[/red] {e}")
+        if error_ref is not None:
+            error_ref.append(str(e))
+        stop_event.set()
 
 
 async def _wait_for_keypress(stop_event: asyncio.Event):
@@ -205,9 +216,12 @@ async def _wait_for_keypress(stop_event: asyncio.Event):
 async def _run_listen_ui(ws_url: str, path: str, ingest_url: str):
     captures_buffer: List[Dict[str, Any]] = []
     stop_event = asyncio.Event()
+    ws_error: List[str] = []
 
     # Start WS listener task
-    ws_task = asyncio.create_task(_listen_stream(ws_url, captures_buffer, stop_event))
+    ws_task = asyncio.create_task(
+        _listen_stream(ws_url, captures_buffer, stop_event, ws_error)
+    )
     input_task = asyncio.create_task(_wait_for_keypress(stop_event))
 
     console.print(f"[green]Listening on[/green] [bold]{ingest_url}[/bold]")
@@ -271,6 +285,11 @@ async def _run_listen_ui(ws_url: str, path: str, ingest_url: str):
 
     # Wait for tasks to clean up
     ws_task.cancel()
+    input_task.cancel()
+
+    if ws_error:
+        console.print(f"[red]WebSocket connection error:[/red] {ws_error[0]}")
+        return []
 
     return captures_buffer
 
@@ -552,6 +571,7 @@ def test(
         raise typer.Exit(code=0)
 
     actual_path = path
+    prompt_for_target_url = False
     selected_webhook = None
 
     if actual_path:
@@ -578,17 +598,13 @@ def test(
         if not webhook_path:
             raise typer.Exit(code=0)
 
+        prompt_for_target_url = True
         selected_webhook = next(
             (w for w in webhooks if w["path"] == webhook_path), None
         )
 
         if not actual_path:
-            actual_path = questionary.text(
-                "Target URL path (modify if needed for router prefixes):",
-                default=webhook_path,
-            ).ask()
-            if not actual_path:
-                raise typer.Exit(code=0)
+            actual_path = webhook_path
 
     test_payload_path = selected_webhook.get("test_payload_path")
     if not test_payload_path:
@@ -624,8 +640,15 @@ def test(
             if k.lower() not in ("content-length", "host", "connection")
         }
 
-    # Optional logic for target_url
-    target_url = target.rstrip("/") + "/" + actual_path.lstrip("/")
+    target_url = _build_target_url(target, actual_path)
+
+    if prompt_for_target_url:
+        target_url = questionary.text(
+            "Target URL to call (modify base URL, port, or path):",
+            default=target_url,
+        ).ask()
+        if not target_url:
+            raise typer.Exit(code=0)
 
     console.print(f"[cyan]Testing {method} {target_url}...[/cyan]")
 

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/main.py

@@ -356,6 +356,12 @@ def whoami():
     auth_cmds.whoami()
 
 
+@app.command("logged-in")
+def logged_in():
+    """Show who is currently logged in."""
+    auth_cmds.whoami()
+
+
 @app.command()
 def logout():
     """Log out from the platform."""

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/templates/_deployment/shared/api.Dockerfile

@@ -11,8 +11,8 @@ ARG SERVICE_EXTRAS="api"
 # Install base deps + extras into system site-packages
 # Base deps:
 RUN uv pip install --system -r pyproject.toml
-RUN uv pip install --system -r pyproject.toml --extra api || echo "no worker extra; skipping"
+RUN uv pip install --system -r pyproject.toml --extra api || echo "no api extra; skipping"
 RUN rm -rf src/worker
 EXPOSE 8000
 ENV PYTHONPATH=/app/src:/app
-CMD ["python", "api_main.py"]
+ENTRYPOINT ["python", "api_main.py"]

{flowstash_cli-0.6.4 → flowstash_cli-0.7.1}/src/flowstash/cli/templates/_deployment/shared/worker.Dockerfile

@@ -15,4 +15,4 @@ RUN uv pip install --system -r pyproject.toml --extra worker || echo "no worker
 
 RUN rm -rf src/api
 ENV PYTHONPATH=/app/src:/app
-CMD ["python", "-u", "worker_main.py"]
+ENTRYPOINT ["python", "-u", "worker_main.py"]