merge conflict

libs/cli/langgraph_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.31.dev0"
+__version__ = "0.4.32.dev0"

libs/cli/langgraph_cli/deploy.py

@@ -805,6 +805,46 @@ def _find_deployment(
     selector: ByName | ByAgent,
     *,
     not_found_message: str,
+<<<<<<< HEAD
+    agent: dict[str, str] | None = None,
+) -> tuple[str | None, bool, int]:
+    """Resolve an existing deployment by ID or exact name match."""
+    needs_creation = False
+    if deployment_id:
+        _log_deploy_step(step, f"Using deployment {deployment_id}")
+        _call_host_backend_with_optional_tenant(
+            client, lambda c: c.get_deployment(deployment_id)
+        )
+        return deployment_id, needs_creation, step + 1
+
+    if agent is not None:
+        _log_deploy_step(
+            step, f"Looking up agent '{agent['agent_id']}' in {agent['environment']}"
+        )
+        existing = _call_host_backend_with_optional_tenant(
+            client,
+            lambda c: c.list_deployments(
+                agent_id=agent["agent_id"], agent_environment=agent["environment"]
+            ),
+        )
+        found_id = next(
+            (
+                dep["id"]
+                for dep in existing.get("resources", [])
+                if not dep.get("is_preview")
+            ),
+            None,
+        )
+    else:
+        _log_deploy_step(step, f"Looking up deployment '{name}'")
+        found_id = _call_host_backend_with_optional_tenant(
+            client, lambda c: find_deployment_id_by_name(c, name)
+        )
+    em = _get_emitter()
+    if found_id:
+        deployment_id = str(found_id)
+        em.info(f"Found existing deployment (ID: {deployment_id})")
+=======
 ) -> tuple[ExistingDeployment | None, int]:
     if isinstance(selector, ByAgent):
         _log_deploy_step(
@@ -832,6 +872,7 @@ def _find_deployment(
             ),
             None,
         )
+>>>>>>> origin
     else:
         _log_deploy_step(step, f"Looking up deployment '{selector.name}'")
         found = _call_host_backend_with_optional_tenant(
@@ -856,12 +897,22 @@ def _create_deployment(
     step: int,
     *,
     name: str | None,
+<<<<<<< HEAD
+    deployment_type: str,
+    source: str,
+    config_rel: str | None = None,
+    secrets: list[dict[str, str]] | None = None,
+    agent: dict[str, str] | None = None,
+) -> tuple[str, int]:
+    """Create a deployment and return its ID and next step number."""
+=======
     source: str,
     source_config: dict[str, object],
     source_revision_config: dict[str, object],
     secrets: list[dict[str, str]],
     agent: dict[str, str] | None = None,
 ) -> tuple[CreatedDeployment, int]:
+>>>>>>> origin
     _log_deploy_step(
         step,
         f"Creating deployment for agent '{agent['agent_id']}' in {agent['environment']}"
@@ -871,9 +922,15 @@ def _create_deployment(
     try:
         created = client.create_deployment(
             name=name,
+<<<<<<< HEAD
+            deployment_type=deployment_type,
+            source=source,
+            config_path=config_rel,
+=======
             source=source,
             source_config=source_config,
             source_revision_config=source_revision_config,
+>>>>>>> origin
             secrets=secrets,
             agent=agent,
         )
@@ -890,9 +947,36 @@ def _create_deployment(
             "POST /v2/deployments succeeded but response missing a valid 'id'"
         )
     if agent is not None:
+<<<<<<< HEAD
+        _get_emitter().info(f"Deployment name: {created['name']}")
+    _get_emitter().info(f"Deployment ID: {created_id}", deployment_id=created_id)
+    return created_id, step + 1
+
+
+def _smith_dashboard_base_url(host_url: str | None) -> str:
+    """Derive the LangSmith dashboard base URL from the API host URL."""
+    from urllib.parse import urlparse
+
+    if not host_url:
+        return "https://smith.langchain.com"
+    parsed = urlparse(host_url)
+    hostname = parsed.hostname or ""
+    if hostname in ("localhost", "127.0.0.1"):
+        return host_url.rstrip("/")
+
+    for api_host_suffix in ("api.host.langchain.com", "api.smith.langchain.com"):
+        if hostname == api_host_suffix:
+            return "https://smith.langchain.com"
+        if hostname.endswith(f".{api_host_suffix}"):
+            prefix = hostname[: -(len(api_host_suffix) + 1)]
+            return f"https://{prefix}.smith.langchain.com"
+
+    return "https://smith.langchain.com"
+=======
         _get_emitter().info(f"Deployment name: {created.get('name')}")
     _get_emitter().info(f"Deployment ID: {created_id}", deployment_id=created_id)
     return CreatedDeployment(created_id, created), step + 1
+>>>>>>> origin
 
 
 def _get_deployment_status_url(
@@ -2226,6 +2310,15 @@ def _deploy_cmd(
     validate_deploy_commands(install_command, build_command)
     agent = None
     if agent_id is not None or environment is not None:
+<<<<<<< HEAD
+        if not agent_id or not agent_id.strip() or not environment:
+            raise click.UsageError(
+                "--agent-id and --environment are required together."
+            )
+        if name is not None or deployment_id is not None:
+            raise click.UsageError(
+                "--agent-id and --environment cannot be combined with --name or --deployment-id."
+=======
         em.note("Note: --agent-id and --agent-environment flags are in private beta")
         if not agent_id or not agent_id.strip() or not environment:
             raise click.UsageError(
@@ -2234,6 +2327,7 @@ def _deploy_cmd(
         if name is not None or deployment_id is not None:
             raise click.UsageError(
                 "--agent-id and --agent-environment cannot be combined with --name or --deployment-id."
+>>>>>>> origin
             )
         agent = {"agent_id": agent_id, "environment": environment}
     if not config.exists():
@@ -2281,6 +2375,41 @@ def _deploy_cmd(
     )
 
     client = _create_host_backend_client(host_url, api_key, env_vars=env_vars)
+<<<<<<< HEAD
+    step = 1
+
+    deployment_id, needs_creation, step = _resolve_deployment(
+        client,
+        step,
+        deployment_id,
+        name,
+        not_found_message=(
+            "No deployment found. Will create."
+            if use_remote_build
+            else "No deployment found. Will create after build."
+        ),
+        agent=agent,
+    )
+
+    if needs_creation:
+        deployment_id, step = _create_deployment(
+            client,
+            step,
+            name=name,
+            deployment_type=deployment_type,
+            source="internal_source" if use_remote_build else "internal_docker",
+            secrets=secrets,
+            agent=agent,
+        )
+
+    if not deployment_id:
+        raise click.ClickException("Failed to determine deployment ID")
+
+    # Scan local sources for tracked packages so the new revision carries
+    # the same metadata GitHub-backed deploys produce. Failures must never
+    # block a deploy.
+=======
+>>>>>>> origin
     try:
         tracked_packages = find_tracked_packages(config, config_json) or None
     except Exception as exc:
@@ -2385,11 +2514,14 @@ def deploy_list(
     agent_id: str | None,
     environment: str | None,
 ) -> None:
+<<<<<<< HEAD
+=======
     if agent_id is not None or environment is not None:
         click.secho(
             "Note: --agent-id and --agent-environment flags are in private beta",
             fg="yellow",
         )
+>>>>>>> origin
     if agent_id is not None and not agent_id.strip():
         raise click.UsageError("--agent-id must not be empty.")
     filters = {}
@@ -2401,6 +2533,15 @@ def deploy_list(
     deployments = _call_host_backend_with_optional_tenant(
         client,
         lambda c: c.list_deployments(name_contains=name_contains, **filters),
+<<<<<<< HEAD
+    )
+    resources = response.get("resources") if isinstance(response, dict) else None
+    deployments = (
+        [item for item in resources if isinstance(item, dict)]
+        if isinstance(resources, list)
+        else []
+=======
+>>>>>>> origin
     )
     if not deployments:
         click.echo("No deployments found.")

libs/cli/langgraph_cli/host_backend.py

@@ -78,10 +78,9 @@ def _cloud_control_plane_host_for(langsmith_api_host: str) -> str:
 
 
 def _cloud_dashboard_for(control_plane_host: str) -> str:
-    for api_host in (CLOUD_CONTROL_PLANE_HOST, CLOUD_API_HOST):
-        if control_plane_host.endswith(f".{api_host}"):
-            region = control_plane_host[: -len(api_host) - 1]
-            return f"https://{region}.{CLOUD_DASHBOARD_HOST}"
+    if control_plane_host.endswith(f".{CLOUD_CONTROL_PLANE_HOST}"):
+        region = control_plane_host[: -len(CLOUD_CONTROL_PLANE_HOST) - 1]
+        return f"https://{region}.{CLOUD_DASHBOARD_HOST}"
     return CLOUD_DASHBOARD_URL
 
 

libs/cli/tests/unit_tests/test_host_backend.py

@@ -527,12 +527,6 @@ CLOUD = ("https://api.host.langchain.com", "https://smith.langchain.com")
             ("https://eu.api.host.langchain.com", "https://eu.smith.langchain.com"),
             id="regional_control_plane_maps_to_regional_dashboard",
         ),
-        pytest.param(
-            "https://dev.api.smith.langchain.com/",
-            None,
-            ("https://dev.api.smith.langchain.com", "https://dev.smith.langchain.com"),
-            id="dev_smith_api_maps_to_dev_dashboard",
-        ),
     ],
 )
 def test_control_plane_endpoints_resolve(host_url, langsmith_endpoint, expected):