fluxloop-cli 0.3.4__tar.gz → 0.3.5__tar.gz

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluxloop-cli
-Version: 0.3.4
+Version: 0.3.5
 Summary: FluxLoop CLI for running agent simulations
 Author-email: FluxLoop Team <team@fluxloop.dev>
 License: Apache-2.0

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/__init__.py

@@ -2,7 +2,7 @@
 FluxLoop CLI - Command-line interface for running agent simulations.
 """
 
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 
 from .main import app
 

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/api_utils.py

@@ -20,18 +20,41 @@ from rich.console import Console
 console = Console()
 
 
-def resolve_api_url(override: Optional[str]) -> str:
+PRODUCTION_API_URL = "https://api.fluxloop.ai"
+STAGING_API_URL = "https://staging.api.fluxloop.ai"
+
+
+def _read_project_json_api_url() -> Optional[str]:
+    """Read api_url from .fluxloop/project.json if it exists."""
+    try:
+        from .context_manager import load_project_connection
+
+        conn = load_project_connection()
+        if conn and conn.api_url:
+            return conn.api_url
+    except Exception:
+        pass
+    return None
+
+
+def resolve_api_url(
+    override: Optional[str] = None,
+    *,
+    staging: bool = False,
+) -> str:
     """
-    Resolve API URL from override or environment variables.
+    Resolve API URL with a single, unified priority chain.
 
     Priority:
-    1. Override parameter
-    2. FLUXLOOP_API_URL
-    3. FLUXLOOP_SYNC_URL
-    4. Default: https://api.fluxloop.ai
+    1. ``override`` parameter (--api-url)
+    2. FLUXLOOP_API_URL environment variable
+    3. .fluxloop/project.json ``api_url``
+    4. ``--staging`` flag → staging URL
+    5. Hardcoded production URL (final fallback)
 
     Args:
-        override: Optional URL override.
+        override: Optional URL override (--api-url).
+        staging: When True, use staging URL as fallback instead of production.
 
     Returns:
         Resolved API URL (trailing slash removed).
@@ -39,8 +62,8 @@ def resolve_api_url(override: Optional[str]) -> str:
     url = (
         override
         or os.getenv("FLUXLOOP_API_URL")
-        or os.getenv("FLUXLOOP_SYNC_URL")
-        or "https://api.fluxloop.ai"
+        or _read_project_json_api_url()
+        or (STAGING_API_URL if staging else PRODUCTION_API_URL)
     )
     return url.rstrip("/")
 

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/commands/auth.py

@@ -16,6 +16,7 @@ from rich.panel import Panel
 from rich.spinner import Spinner
 from rich.live import Live
 
+from ..api_utils import resolve_api_url
 from ..auth_manager import (
     start_device_code_flow,
     poll_device_code,
@@ -35,17 +36,6 @@ app = typer.Typer(help="Manage FluxLoop authentication")
 console = Console()
 
 
-def _resolve_api_url(override: Optional[str]) -> str:
-    """Resolve API URL from override or environment variables."""
-    url = (
-        override
-        or os.getenv("FLUXLOOP_API_URL")
-        or os.getenv("FLUXLOOP_SYNC_URL")
-        or "https://api.fluxloop.ai"
-    )
-    return url.rstrip("/")
-
-
 def _is_agent_environment() -> bool:
     """Detect if running in an agent/headless environment."""
     # Check common agent environment indicators
@@ -63,6 +53,9 @@ def login(
     api_url: Optional[str] = typer.Option(
         None, "--api-url", help="FluxLoop API base URL"
     ),
+    staging: bool = typer.Option(
+        False, "--staging", help="Use staging API (staging.api.fluxloop.ai)"
+    ),
     force: bool = typer.Option(
         False, "--force", "-f", help="Force re-login even if already logged in"
     ),
@@ -87,7 +80,7 @@ def login(
     unless --force is specified. This makes the command idempotent and
     safe to call from automated scripts or AI agents.
     """
-    api_url = _resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url, staging=staging)
 
     # Check if already logged in (idempotent behavior)
     if not force:
@@ -290,7 +283,7 @@ def status():
     If token is expired or about to expire, automatically attempts to refresh.
     Only suggests re-login if refresh fails.
     """
-    api_url = _resolve_api_url(None)
+    api_url = resolve_api_url()
     token = load_auth_token()
 
     if not token:

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/commands/config.py

@@ -191,8 +191,7 @@ def env(
         loaded_paths = []
 
     env_vars = [
-        ("FLUXLOOP_SYNC_URL", "Sync API base URL", "https://api.fluxloop.ai"),
-        ("FLUXLOOP_API_KEY", "API key for authentication", None),
+        ("FLUXLOOP_API_URL", "API base URL override (optional, project.json is primary)", None),
         ("FLUXLOOP_SYNC_API_KEY", "Sync API key for uploads", None),
         ("FLUXLOOP_ENABLED", "Enable/disable tracing", "true"),
         ("FLUXLOOP_DEBUG", "Enable debug mode", "false"),
@@ -327,13 +326,12 @@ def set_llm(
 @app.command()
 def set_sync_key(
     api_key: str = typer.Argument(..., help="Sync API key"),
-    api_url: Optional[str] = typer.Option(None, "--url", help="Sync API base URL"),
     overwrite_env: bool = typer.Option(False, "--overwrite-env", help="Overwrite existing key in .env"),
     env_file: Path = typer.Option(Path(".env"), "--env-file", help="Path to environment file"),
     project: Optional[str] = typer.Option(None, "--project", help="Project name under the FluxLoop root"),
     root: Path = typer.Option(Path(DEFAULT_ROOT_DIR_NAME), "--root", help="FluxLoop root directory"),
 ):
-    """Save Sync API credentials to .env."""
+    """Save Sync API key to .env."""
 
     env_path = resolve_env_path(env_file, project, root)
     env_contents: Dict[str, str] = {}
@@ -351,12 +349,9 @@ def set_sync_key(
     else:
         env_contents["FLUXLOOP_SYNC_API_KEY"] = api_key
 
-    if api_url:
-        env_contents["FLUXLOOP_SYNC_URL"] = api_url
-
     env_lines = [f"{key}={value}" for key, value in env_contents.items()]
     env_path.write_text("\n".join(env_lines) + "\n")
-    console.print(f"[green]✓[/green] Saved sync credentials to {env_path}")
+    console.print(f"[green]✓[/green] Saved sync API key to {env_path}")
 
 
 @app.command()

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/commands/projects.py

@@ -120,6 +120,9 @@ def create_project(
     api_url: Optional[str] = typer.Option(
         None, "--api-url", help="FluxLoop API base URL"
     ),
+    staging: bool = typer.Option(
+        False, "--staging", help="Use staging API (staging.api.fluxloop.ai)"
+    ),
     select: bool = typer.Option(
         True, "--select/--no-select", help="Automatically select the created project"
     ),
@@ -127,7 +130,7 @@ def create_project(
     """
     Create a new Web Project.
     """
-    api_url = resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url, staging=staging)
     
     try:
         client = create_authenticated_client(api_url, use_jwt=True)
@@ -165,6 +168,9 @@ def select_project(
     api_url: Optional[str] = typer.Option(
         None, "--api-url", help="FluxLoop API base URL"
     ),
+    staging: bool = typer.Option(
+        False, "--staging", help="Use staging API (staging.api.fluxloop.ai)"
+    ),
 ):
     """
     Select a Web Project for this workspace.
@@ -176,7 +182,7 @@ def select_project(
     Use this to connect your local workspace to a Web Project before
     creating scenarios with 'fluxloop init scenario'.
     """
-    api_url = resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url, staging=staging)
     
     try:
         # Verify project exists by fetching it

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/commands/sync.py

@@ -16,6 +16,7 @@ import typer
 import yaml
 from rich.console import Console
 
+from ..api_utils import resolve_api_url
 from ..config_loader import load_experiment_config
 from ..constants import DEFAULT_CONFIG_PATH, FLUXLOOP_DIR_NAME, SCENARIOS_DIR_NAME
 from ..context_manager import get_current_web_project_id, get_current_scenario
@@ -98,15 +99,6 @@ def _load_env(scenario: Optional[str], base_dir: Optional[Path] = None) -> None:
     load_env_chain(source_dir, refresh_config=False)
 
 
-def _resolve_api_url(override: Optional[str]) -> str:
-    url = (
-        override
-        or os.getenv("FLUXLOOP_SYNC_URL")
-        or "https://api.fluxloop.ai"
-    )
-    return url.rstrip("/")
-
-
 def _resolve_api_key(override: Optional[str]) -> str:
     key = (
         override
@@ -165,7 +157,7 @@ def precreate_runs(
     Precreate runs via /api/sync/upload so streaming can reference existing runs.
     """
     _load_env(scenario, base_dir)
-    api_url = _resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url)
     api_key = _resolve_api_key(api_key)
     scenario_root = _resolve_scenario_dir(scenario, base_dir)
     sync_state = _read_sync_state(scenario_root)
@@ -229,7 +221,7 @@ def stream_turn(
     Stream a single turn to the sync API (best-effort).
     """
     try:
-        api_url = _resolve_api_url(api_url)
+        api_url = resolve_api_url(api_url)
         api_key = _resolve_api_key(api_key)
         run_id = turn.get("run_id")
         turn_id = turn.get("turn_id")
@@ -543,7 +535,7 @@ def pull(
         console.print(f"[dim]Using scenario: {scenario}[/dim]")
     
     _load_env(scenario)
-    api_url = _resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url)
     api_key = _resolve_api_key(api_key)
 
     if not project_id:
@@ -661,7 +653,7 @@ def upload(
         console.print(f"[dim]Using scenario: {scenario}[/dim]")
     
     _load_env(scenario)
-    api_url = _resolve_api_url(api_url)
+    api_url = resolve_api_url(api_url)
     api_key = _resolve_api_key(api_key)
 
     scenario_root = _resolve_scenario_dir(scenario)

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/context_manager.py

@@ -40,7 +40,7 @@ class WebProjectConnection:
     """
     project_id: str
     project_name: str
-    api_url: str = "https://api.fluxloop.ai"
+    api_url: str = ""
     connected_at: Optional[str] = None
     
     def to_dict(self) -> dict:
@@ -56,7 +56,7 @@ class WebProjectConnection:
         return cls(
             project_id=data["project_id"],
             project_name=data["project_name"],
-            api_url=data.get("api_url", "https://api.fluxloop.ai"),
+            api_url=data.get("api_url", ""),
             connected_at=data.get("connected_at"),
         )
 
@@ -336,7 +336,7 @@ def save_project_connection(connection: WebProjectConnection, base_dir: Optional
 def select_web_project(
     project_id: str, 
     project_name: str, 
-    api_url: str = "https://api.fluxloop.ai",
+    api_url: str = "",
     base_dir: Optional[Path] = None
 ) -> WebProjectConnection:
     """Select a Web Project for this workspace."""

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli/templates.py

@@ -336,9 +336,8 @@ def create_env_file() -> str:
     return dedent(
         """
         # FluxLoop Configuration
-        FLUXLOOP_SYNC_URL=https://api.fluxloop.ai
+        # API URL is managed via .fluxloop/project.json (set by 'fluxloop projects select')
         FLUXLOOP_SYNC_API_KEY=your-api-key-here
-        # Legacy alias (still supported): FLUXLOOP_API_KEY
         FLUXLOOP_ENABLED=true
         FLUXLOOP_DEBUG=false
         FLUXLOOP_SAMPLE_RATE=1.0

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/fluxloop_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluxloop-cli
-Version: 0.3.4
+Version: 0.3.5
 Summary: FluxLoop CLI for running agent simulations
 Author-email: FluxLoop Team <team@fluxloop.dev>
 License: Apache-2.0

{fluxloop_cli-0.3.4 → fluxloop_cli-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fluxloop-cli"
-version = "0.3.4"
+version = "0.3.5"
 description = "FluxLoop CLI for running agent simulations"
 authors = [
     {name = "FluxLoop Team", email = "team@fluxloop.dev"}