flowstash-cli 0.3.0__tar.gz → 0.4.1__tar.gz

{flowstash_cli-0.3.0 → flowstash_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flowstash-cli
-Version: 0.3.0
+Version: 0.4.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.3.0,<0.4.0)
+Requires-Dist: flowstash-runtime (>=0.4.1,<0.5.0)
 Requires-Dist: httpx (>=0.27.0)
 Requires-Dist: keyring (>=25.0.0)
 Requires-Dist: libcst (>=1.1.0)

{flowstash_cli-0.3.0 → flowstash_cli-0.4.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "flowstash-cli"
-version = "0.3.0"
+version = "0.4.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.3.0,<0.4.0",
+    "flowstash-runtime>=0.4.1,<0.5.0",
     "typer[all]>=0.12.0",
     "httpx>=0.27.0",
     "pyyaml>=6.0.1",

{flowstash_cli-0.3.0 → flowstash_cli-0.4.1}/src/flowstash/cli/commands/build.py

@@ -14,26 +14,34 @@ app = typer.Typer()
 console = Console()
 
 from .project import find_project_root
-from ..core.docker_utils import check_docker_binary, check_docker_daemon, get_docker_compose_cmd
+from ..core.docker_utils import (
+    check_docker_binary,
+    check_docker_daemon,
+    get_docker_compose_cmd,
+)
+
 
 async def run_managed_build(tag: str = "latest"):
     project_config = load_project_config()
     if not project_config or not project_config.project_id:
-        console.print("[red]Project not linked. Run 'flowstash init' to link to a managed project.[/red]")
+        console.print(
+            "[red]Project not linked. Run 'flowstash init' to link to a managed project.[/red]"
+        )
         raise typer.Exit(code=1)
-    
+
     api = APIClient()
     # ... rest of existing managed build logic ...
     # (I'll keep the existing implementation but wrap it)
 
+
 @app.command()
 def build(
     env: str = typer.Argument(..., help="Environment to build"),
-    tag: str = typer.Option("latest", "--tag", "-t", help="Tag for the image")
+    tag: str = typer.Option("latest", "--tag", "-t", help="Tag for the image"),
 ):
     """Build project artifacts/images for the specified environment."""
     project_config = load_project_config()
-    
+
     # Check if env is managed
     is_managed = False
     if project_config:
@@ -41,7 +49,7 @@ def build(
             if em.name == env:
                 is_managed = em.managed
                 break
-    
+
     if is_managed:
         result = asyncio.run(run_build_flow(tag))
         console.print(f"[green]Managed build completed successfully![/green]")
@@ -59,7 +67,9 @@ def build(
 
         compose_file = root / "deployment" / env / "docker-compose.yaml"
         if not compose_file.exists():
-            console.print(f"[red]No docker-compose.yaml found for env '{env}' at {compose_file}[/red]")
+            console.print(
+                f"[red]No docker-compose.yaml found for env '{env}' at {compose_file}[/red]"
+            )
             raise typer.Exit(code=1)
 
         cmd = get_docker_compose_cmd() + ["-f", str(compose_file), "build"]
@@ -71,12 +81,13 @@ def build(
             console.print("[red]Local build failed.[/red]")
             raise typer.Exit(code=1)
 
+
 async def run_build_flow(tag: str = "latest"):
     # (Moved existing run_build_flow logic here for completeness in the file)
     project_config = load_project_config()
     project_id = project_config.project_id
     api = APIClient()
-    
+
     try:
         with Progress(
             SpinnerColumn(),
@@ -85,26 +96,35 @@ async def run_build_flow(tag: str = "latest"):
             task = progress.add_task(description="Bundling source code...", total=None)
             tar_path = bundle_source(Path.cwd())
             progress.update(task, description="Source bundled.")
-            
-            task = progress.add_task(description="Requesting upload path...", total=None)
-            upload_data = await api.get("/v1/builds/upload-path")
+
+            task = progress.add_task(
+                description="Requesting upload path...", total=None
+            )
+            upload_data = await api.get(
+                "/v1/builds/upload-path?project_id=" + project_id
+            )
             build_id = upload_data["build_id"]
             upload_url = upload_data["upload_url"]
             progress.update(task, description="Upload path received.")
-            
+
             task = progress.add_task(description="Uploading source...", total=None)
             with open(tar_path, "rb") as f:
                 data = f.read()
-            await api.put_binary(upload_url, data, headers={"Content-Type": "application/gzip"})
+            await api.put_binary(
+                upload_url, data, headers={"Content-Type": "application/gzip"}
+            )
             progress.update(task, description="Source uploaded.")
-            
+
             task = progress.add_task(description="Triggering build...", total=None)
-            trigger_resp = await api.post(f"/v1/builds/{build_id}/trigger", json={"image_tag": tag})
-            
+            trigger_resp = await api.post(
+                f"/v1/builds/{build_id}/trigger",
+                json={"image_tag": tag, "project_id": project_id},
+            )
+
             # update build_id to the triggered true GCP build ID
             build_id = trigger_resp["build_id"]
             progress.update(task, description=f"Build triggered (ID: {build_id}).")
-            
+
             task = progress.add_task(description="Building...", total=None)
             while True:
                 status_data = await api.get(f"/v1/builds/{build_id}/status")
@@ -113,11 +133,15 @@ async def run_build_flow(tag: str = "latest"):
                     progress.update(task, description="Build successful!")
                     return status_data
                 elif status in ["FAILURE", "INTERNAL_ERROR", "TIMEOUT", "CANCELLED"]:
-                    progress.update(task, description=f"[red]Build failed: {status}[/red]")
+                    progress.update(
+                        task, description=f"[red]Build failed: {status}[/red]"
+                    )
                     console.print(f"[red]Build ended with status: {status}[/red]")
-                    log_url = status_data.get('log_url')
+                    log_url = status_data.get("log_url")
                     if log_url:
-                        console.print(f"Check logs here: [link={log_url}]{log_url}[/link]")
+                        console.print(
+                            f"Check logs here: [link={log_url}]{log_url}[/link]"
+                        )
                     raise typer.Exit(code=1)
                 await asyncio.sleep(5)
     except Exception as e:

{flowstash_cli-0.3.0 → flowstash_cli-0.4.1}/src/flowstash/cli/commands/deploy.py

@@ -13,12 +13,12 @@ console = Console()
 
 # Status labels shown to the user while polling
 _STATUS_LABELS = {
-    "QUEUED":         "Queued, waiting for deployment to start...",
-    "DEPLOYING":      "Deploying services to Cloud Run...",
-    "HEALTH_CHECK":   "Health-checking API and Worker...",
+    "QUEUED": "Queued, waiting for deployment to start...",
+    "DEPLOYING": "Deploying services...",
+    "HEALTH_CHECK": "Health-checking API and Worker...",
     "SYNCING_SCHEDULES": "Fetching and syncing scheduled tasks...",
-    "DEPLOYED":       "Deployed successfully ✓",
-    "FAILED":         "Deployment failed.",
+    "DEPLOYED": "Deployed successfully ✓",
+    "FAILED": "Deployment failed.",
 }
 
 _TERMINAL_STATUSES = {"DEPLOYED", "FAILED"}
@@ -27,7 +27,9 @@ _TERMINAL_STATUSES = {"DEPLOYED", "FAILED"}
 async def run_deploy_flow(env: str, artifact_id: Optional[str] = None):
     project_config = load_project_config()
     if not project_config:
-        console.print("[red]No .flowstash found. Please run 'flowstash init' first.[/red]")
+        console.print(
+            "[red]No .flowstash found. Please run 'flowstash init' first.[/red]"
+        )
         raise typer.Exit(code=1)
 
     project_id = project_config.project_id
@@ -51,11 +53,14 @@ async def run_deploy_flow(env: str, artifact_id: Optional[str] = None):
     ) as progress:
         # 2. Trigger deployment
         task = progress.add_task(description="Triggering deployment...", total=None)
-        deploy_data = await api.post("/v1/deploy", json={
-            "project_id": project_id,
-            "artifact_id": artifact_id,
-            "env_vars": {"ENVIRONMENT": env}
-        })
+        deploy_data = await api.post(
+            "/v1/deploy",
+            json={
+                "project_id": project_id,
+                "artifact_id": artifact_id,
+                "env_vars": {"ENVIRONMENT": env},
+            },
+        )
         deploy_id = deploy_data["deploy_id"]
         progress.update(task, description=f"Deployment triggered (ID: {deploy_id}).")
 
@@ -85,18 +90,25 @@ async def run_deploy_flow(env: str, artifact_id: Optional[str] = None):
 @app.command()
 def deploy(
     env: str = typer.Argument(..., help="Environment to deploy to"),
-    artifact: Optional[str] = typer.Option(None, "--artifact", "-a", help="Artifact ID to deploy"),
-    non_interactive: bool = typer.Option(False, "--non-interactive", help="Do not ask for confirmation")
+    artifact: Optional[str] = typer.Option(
+        None, "--artifact", "-a", help="Artifact ID to deploy"
+    ),
+    non_interactive: bool = typer.Option(
+        False, "--non-interactive", help="Do not ask for confirmation"
+    ),
 ):
     """Deploy an artifact to the managed platform for a specified environment."""
     project_config = load_project_config()
     if not project_config:
-        console.print("[red]No .flowstash found. Please run 'flowstash init' first.[/red]")
+        console.print(
+            "[red]No .flowstash found. Please run 'flowstash init' first.[/red]"
+        )
         raise typer.Exit(code=1)
 
     # Ask for confirmation unless non-interactive is provided
     if not non_interactive:
         from rich.prompt import Confirm
+
         if not Confirm.ask(f"Are you sure you want to deploy to '{env}'?"):
             console.print("Deployment cancelled.")
             raise typer.Exit(code=0)
@@ -109,21 +121,31 @@ def deploy(
             break
 
     if not is_managed:
-        console.print(f"[red]Environment '{env}' is not managed. Deployment is only supported for managed environments.[/red]")
-        console.print("[yellow]Update your .flowstash environments if this is incorrect.[/yellow]")
+        console.print(
+            f"[red]Environment '{env}' is not managed. Deployment is only supported for managed environments.[/red]"
+        )
+        console.print(
+            "[yellow]Update your .flowstash environments if this is incorrect.[/yellow]"
+        )
         raise typer.Exit(code=1)
 
     project_id = project_config.project_id
     if not project_id:
         if not non_interactive:
             from rich.prompt import Confirm
-            if Confirm.ask("Project ID not found. Would you like to link to a managed project now?"):
+
+            if Confirm.ask(
+                "Project ID not found. Would you like to link to a managed project now?"
+            ):
                 from .project import _link_project
+
                 _link_project(project_config)
                 project_id = project_config.project_id
 
         if not project_id:
-            console.print("[red]project_id not found in .flowstash. Use 'flowstash init' or link to a project.[/red]")
+            console.print(
+                "[red]project_id not found in .flowstash. Use 'flowstash init' or link to a project.[/red]"
+            )
             raise typer.Exit(code=1)
 
     result = asyncio.run(run_deploy_flow(env, artifact))
@@ -133,11 +155,13 @@ def deploy(
     console.print(f"  Deployment ID : [bold]{result['deploy_id']}[/bold]")
     if api_url:
         console.print(f"  API URL       : [bold]{api_url}[/bold]")
-    
+
     scheduled_tasks = result.get("scheduled_tasks")
     if scheduled_tasks:
         console.print("  Scheduled Tasks:")
         for task in scheduled_tasks:
-            console.print(f"    - [cyan]{task['task_name']}[/cyan] : [yellow]{task['cron']}[/yellow]")
+            console.print(
+                f"    - [cyan]{task['task_name']}[/cyan] : [yellow]{task['cron']}[/yellow]"
+            )
     elif scheduled_tasks is not None:
         console.print("  Scheduled Tasks: [dim]None[/dim]")

flowstash_cli-0.3.0/src/flowstash/cli/templates/_config/[env]/.env

@@ -1,3 +0,0 @@
-# Specific Envirment Variables for this enviroment belong here
-# i.e.
-# FOO_SEVICE_BASE_URL=dev/prod.rest.domain.com/v1

flowstash_cli-0.3.0/src/flowstash/cli/templates/_config/shared/.env

@@ -1,2 +0,0 @@
-# Flowstash managed observability API key (required when storeType: managed)
-# FLOWSTASH_API_KEY=

flowstash_cli-0.3.0/src/flowstash/cli/templates/_deployment/shared/.env

@@ -1,5 +0,0 @@
-# Any ENV variables that should have the same value for any enviroment bellong here
-# i.e.
-# TEST_ENV_VAR=demo-value
-# DEMO_CLIENT_ID=123
-# DEMO_CLIENT_SECRET=456