beamflow-cli 0.3.1__tar.gz → 0.3.2__tar.gz

{beamflow_cli-0.3.1 → beamflow_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: beamflow-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: CLI for the Beamflow Managed Platform
 Author: juraj.bezdek@gmail.com
 Author-email: juraj.bezdek@gmail.com
@@ -9,14 +9,11 @@ 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: beamflow-runtime (>=0.3.0,<0.4.0)
-Requires-Dist: fastapi (>=0.110.0)
+Requires-Dist: beamflow-runtime (>=0.3.0,<0.3.2)
 Requires-Dist: httpx (>=0.27.0)
 Requires-Dist: keyring (>=25.0.0)
 Requires-Dist: pydantic (>=2.0.0)
-Requires-Dist: python-dotenv (>=1.0.1)
 Requires-Dist: pyyaml (>=6.0.1)
 Requires-Dist: questionary (>=2.0.1)
 Requires-Dist: rich (>=13.7.0)
 Requires-Dist: typer[all] (>=0.12.0)
-Requires-Dist: uvicorn (>=0.29.0)

{beamflow_cli-0.3.1 → beamflow_cli-0.3.2}/beamflow/commands/project.py

@@ -242,6 +242,89 @@ def init_env(env_name: str) -> EnvironmentMode:
     is_managed = (answers.get("backend") == "managed") or (answers.get("observability") == "managed")
     return EnvironmentMode(name=env_name, managed=is_managed, options=answers)
 
+def init_vscode_launch(env_name: str, force: bool = False):
+    """Initialize VS Code launch settings for a specific environment."""
+    root = find_project_root()
+    if not root:
+        console.print("[red]Not in a Beamflow project. Run 'beamflow init' first.[/red]")
+        raise typer.Exit(code=1)
+
+    project_config = load_project_config()
+    if not project_config:
+        console.print("[red]Invalid project configuration.[/red]")
+        raise typer.Exit(code=1)
+
+    # Find the environment
+    env_to_init = next((e for e in project_config.environments if e.name == env_name), None)
+    if not env_to_init:
+        console.print(f"[red]Environment '{env_name}' not found.[/red]")
+        raise typer.Exit(code=1)
+    
+    if env_to_init.managed:
+        console.print(f"[red]Cannot initialize VS Code launch for managed environment '{env_name}'.[/red]")
+        raise typer.Exit(code=1)
+
+    vscode_dir = root / ".vscode"
+    vscode_dir.mkdir(parents=True, exist_ok=True)
+    launch_json_path = vscode_dir / "launch.json"
+
+    import json
+    
+    launch_data = {"version": "0.2.0", "configurations": []}
+    if launch_json_path.exists():
+        try:
+            with open(launch_json_path, "r") as f:
+                launch_data = json.load(f)
+        except json.JSONDecodeError:
+            # Maybe there are comments or it's malformed. We'll ask to overwrite.
+            if not force:
+                console.print(f"[yellow]Warning: {launch_json_path} contains invalid JSON or comments. Cannot parse it automatically. Use --force to overwrite it entirely.[/yellow]")
+                raise typer.Exit(code=1)
+            launch_data = {"version": "0.2.0", "configurations": []}
+
+    api_config_name = f"Launch {env_name} API"
+    worker_config_name = f"Launch {env_name} Worker"
+
+    existing_configs = {cfg.get("name") for cfg in launch_data.get("configurations", [])}
+
+    added = False
+    
+    if api_config_name not in existing_configs or force:
+        # Remove old if force
+        launch_data["configurations"] = [c for c in launch_data.setdefault("configurations", []) if c.get("name") != api_config_name]
+        
+        launch_data["configurations"].append({
+            "name": api_config_name,
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/api_main.py",
+            "console": "integratedTerminal",
+            "env": {"ENVIRONMENT": env_name}
+        })
+        added = True
+        
+    if worker_config_name not in existing_configs or force:
+        # Remove old if force
+        launch_data["configurations"] = [c for c in launch_data.setdefault("configurations", []) if c.get("name") != worker_config_name]
+        
+        launch_data["configurations"].append({
+            "name": worker_config_name,
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/worker_main.py",
+            "console": "integratedTerminal",
+            "env": {"ENVIRONMENT": env_name}
+        })
+        added = True
+
+    if added:
+        with open(launch_json_path, "w") as f:
+            json.dump(launch_data, f, indent=4)
+        console.print(f"[green]Added VS Code launch configurations for '{env_name}' to {launch_json_path}[/green]")
+    else:
+        console.print(f"VS Code launch configurations already exist for '{env_name}'.")
+
+
 
 def add_environment(project_config: ProjectConfig, env_name: Optional[str] = None):
     if not env_name:
@@ -270,11 +353,12 @@ def add_environment(project_config: ProjectConfig, env_name: Optional[str] = Non
         
     if not env_name or any(e.name == env_name for e in project_config.environments):
         console.print("[red]Environment already exists or invalid name![/red]")
-        return
+        return None
         
     mode = init_env(env_name)
     project_config.environments.append(mode)
     save_project_config(project_config)
+    return mode
 
 
 @app.command("add")
@@ -293,11 +377,16 @@ def env_add(
         console.print("[red]Invalid project configuration.[/red]")
         raise typer.Exit(code=1)
     
-    add_environment(project_config, env_name=env_name)
+    added_mode = add_environment(project_config, env_name=env_name)
+    if not added_mode:
+        return
     
     # Reload config to get the newly added environment
     project_config = load_project_config()
     
+    # We now know the actual environment name picked
+    env_name = added_mode.name
+    
     # Check if we should ask for linkage
     is_managed = any(e.managed for e in project_config.environments)
     if not project_config.project_id and is_managed:
@@ -313,6 +402,10 @@ def env_add(
         process_node(child, root, None, is_fix=True, is_check=False, force=force, project_name=project_name, root_path=root, errors=errors, target_env=env_name)
 
     console.print(f"[green]Environment configuration updated![/green]")
+    
+    if not added_mode.managed:
+        if Prompt.ask("Would you like to initialize VS Code launch configurations for this environment?", choices=["y", "n"], default="y") == "y":
+            init_vscode_launch(env_name=env_name, force=force)
 
 
 @app.command("delete")
@@ -392,11 +485,18 @@ def init(
         # Ask to configure at least the first environment
         setup_first = Prompt.ask("Setup first eniroment? y/n?", choices=["y", "n"], default="y")
         if setup_first == "y":
-            add_environment(project_config)
+            added_mode = add_environment(project_config)
+            if added_mode and not added_mode.managed:
+                if Prompt.ask(f"Would you like to initialize VS Code launch configurations for {added_mode.name}?", choices=["y", "n"], default="y") == "y":
+                    init_vscode_launch(env_name=added_mode.name, force=force)
     else:
         if not fix:
             while Prompt.ask("Add another enviroment? y/n?", choices=["y", "n"], default="n") == "y":
-                add_environment(project_config)
+                added_mode = add_environment(project_config)
+                if added_mode and not added_mode.managed:
+                    if Prompt.ask(f"Would you like to initialize VS Code launch configurations for {added_mode.name}?", choices=["y", "n"], default="y") == "y":
+                        init_vscode_launch(env_name=added_mode.name, force=force)
+
 
     templates_dir = Path(__file__).parent.parent / "templates"
     errors = []

beamflow_cli-0.3.2/beamflow/core/auth_server.py

@@ -0,0 +1,45 @@
+from typing import Dict, Optional
+import threading
+import queue
+from http.server import HTTPServer, BaseHTTPRequestHandler
+from urllib.parse import urlparse, parse_qs
+
+result_queue = queue.Queue()
+
+class CallbackHandler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        query_components = parse_qs(urlparse(self.path).query)
+        params = {k: v[0] for k, v in query_components.items()}
+        result_queue.put(params)
+        
+        self.send_response(200)
+        self.send_header('Content-type', 'text/html')
+        self.end_headers()
+        
+        content = """
+        <html>
+            <body style="font-family: sans-serif; text-align: center; padding-top: 50px;">
+                <h1>Authentication Successful</h1>
+                <p>You can now close this window and return to the CLI.</p>
+            </body>
+        </html>
+        """
+        self.wfile.write(content.encode('utf-8'))
+
+    def log_message(self, format, *args):
+        # Suppress logging
+        pass
+
+def start_callback_server(port: int = 8888) -> Dict[str, str]:
+    server = HTTPServer(('127.0.0.1', port), CallbackHandler)
+    thread = threading.Thread(target=server.serve_forever, daemon=True)
+    thread.start()
+    
+    # Wait for result
+    try:
+        result = result_queue.get(timeout=300) # 5 minutes timeout
+        server.shutdown()
+        return result
+    except queue.Empty:
+        server.shutdown()
+        return {}

{beamflow_cli-0.3.1 → beamflow_cli-0.3.2}/beamflow/main.py

@@ -97,6 +97,20 @@ def env_del(
     """
     project_cmds.env_delete(env_name=env_name)
 
+@env_app.command("init-vscode")
+def env_init_vscode(
+    env_name: str = typer.Argument(..., help="Environment name to initialize VS Code for"),
+    force: bool = typer.Option(False, "--force", help="Force overwrite existing launch.json if it's malformed or already has the configuration")
+):
+    """
+    [bold blue]Initialize VS Code launch configurations[/bold blue] for an environment.
+    
+    This command will add 'Launch <env> API' and 'Launch <env> Worker' to your .vscode/launch.json, 
+    allowing you to easily debug your environment's API and Worker using VS Code.
+    """
+    project_cmds.init_vscode_launch(env_name=env_name, force=force)
+
+
 @app.command()
 def run(
     ctx: typer.Context,

{beamflow_cli-0.3.1 → beamflow_cli-0.3.2}/pyproject.toml

@@ -1,20 +1,17 @@
 [project]
 name = "beamflow-cli"
-version = "0.3.1"
+version = "0.3.2"
 description = "CLI for the Beamflow Managed Platform"
 authors = [{name = "juraj.bezdek@gmail.com", email = "juraj.bezdek@gmail.com"}]
 requires-python = ">=3.11"
 dependencies = [
-    "beamflow-runtime>=0.3.0,<0.4.0",
+    "beamflow-runtime>=0.3.0,<0.3.2",
     "typer[all]>=0.12.0",
     "httpx>=0.27.0",
     "pyyaml>=6.0.1",
     "keyring>=25.0.0",
     "rich>=13.7.0",
     "pydantic>=2.0.0",
-    "python-dotenv>=1.0.1",
-    "fastapi>=0.110.0",
-    "uvicorn>=0.29.0",
     "questionary>=2.0.1",
 ]
 

beamflow_cli-0.3.1/beamflow/core/auth_server.py

@@ -1,36 +0,0 @@
-from typing import Dict
-from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse
-import uvicorn
-import threading
-import queue
-from typing import Optional
-
-app = FastAPI()
-result_queue = queue.Queue()
-
-@app.get("/callback")
-async def callback(request: Request):
-    params = dict(request.query_params)
-    result_queue.put(params)
-    return HTMLResponse(content="""
-        <html>
-            <body style="font-family: sans-serif; text-align: center; padding-top: 50px;">
-                <h1>Authentication Successful</h1>
-                <p>You can now close this window and return to the CLI.</p>
-            </body>
-        </html>
-    """)
-
-def run_server(port: int):
-    uvicorn.run(app, host="127.0.0.1", port=port, log_level="error")
-
-def start_callback_server(port: int = 8888) -> Dict[str, str]:
-    thread = threading.Thread(target=run_server, args=(port,), daemon=True)
-    thread.start()
-    # Wait for result
-    try:
-        result = result_queue.get(timeout=300) # 5 minutes timeout
-        return result
-    except queue.Empty:
-        return {}