Merge branch 'main' into codex/acp-config-option-model

Author: neubig

.github/scripts/check_agent_server_rest_api_breakage.py

@@ -574,6 +574,33 @@ def _validate_removed_schema_properties(
 _EXTENSIBLE_DISCRIMINATOR_PROPERTY_RE = re.compile(
     r"HookConfig\b.*\bhooks/items/type\b"
 )
+_ACCEPTED_CLOUD_PROXY_PATH_REMOVAL_ID = "api-path-removed-without-deprecation"
+_ACCEPTED_CLOUD_PROXY_REMOVAL_PATH = "/api/cloud-proxy"
+_ACCEPTED_CLOUD_PROXY_REMOVAL_METHOD = "post"
+_ACCEPTED_CLOUD_PROXY_REMOVAL_OPERATION_ID = "cloud_proxy_api_cloud_proxy_post"
+
+
+def _is_accepted_cloud_proxy_removal(operation: dict) -> bool:
+    """Return True for the accepted /api/cloud-proxy removal from PR #3326."""
+    path = str(operation.get("path", ""))
+    method = str(operation.get("method", "")).lower()
+    return (
+        path == _ACCEPTED_CLOUD_PROXY_REMOVAL_PATH
+        and method == _ACCEPTED_CLOUD_PROXY_REMOVAL_METHOD
+        and operation.get("deprecated", False) is False
+    )
+
+
+def _is_accepted_cloud_proxy_path_removal(change: dict) -> bool:
+    """Return True for oasdiff's accepted /api/cloud-proxy path-removal shape."""
+    return (
+        str(change.get("id", "")) == _ACCEPTED_CLOUD_PROXY_PATH_REMOVAL_ID
+        and str(change.get("path", "")) == _ACCEPTED_CLOUD_PROXY_REMOVAL_PATH
+        and str(change.get("operation", "")).lower()
+        == _ACCEPTED_CLOUD_PROXY_REMOVAL_METHOD
+        and str(change.get("operationId", ""))
+        == _ACCEPTED_CLOUD_PROXY_REMOVAL_OPERATION_ID
+    )
 
 
 def _is_additive_discriminator_enum_value(change: dict) -> bool:
@@ -815,6 +842,26 @@ def main() -> int:
             for change in other_breaking_changes
             if not _is_union_type_change_artifact(change)
         ]
+        accepted_cloud_proxy_removals = [
+            operation
+            for operation in removed_operations
+            if _is_accepted_cloud_proxy_removal(operation)
+        ]
+        removed_operations = [
+            operation
+            for operation in removed_operations
+            if not _is_accepted_cloud_proxy_removal(operation)
+        ]
+        accepted_cloud_proxy_path_removals = [
+            change
+            for change in other_breaking_changes
+            if _is_accepted_cloud_proxy_path_removal(change)
+        ]
+        other_breaking_changes = [
+            change
+            for change in other_breaking_changes
+            if not _is_accepted_cloud_proxy_path_removal(change)
+        ]
 
         removal_errors = _validate_removed_operations(
             removed_operations,
@@ -830,6 +877,14 @@ def main() -> int:
         for error in removal_errors + property_removal_errors:
             print(f"::error title={PYPI_DISTRIBUTION} REST API::{error}")
 
+        if accepted_cloud_proxy_removals or accepted_cloud_proxy_path_removals:
+            print(
+                f"\n::notice title={PYPI_DISTRIBUTION} REST API::"
+                "Accepted removal of POST /api/cloud-proxy. Maintainers "
+                "explicitly accepted this REST break in PR #3326, and that PR "
+                "is labeled release-note-required."
+            )
+
         if additive_response_oneof:
             print(
                 f"\n::notice title={PYPI_DISTRIBUTION} REST API::"
@@ -881,7 +936,8 @@ def main() -> int:
             print(
                 "Breaking changes are limited to previously-deprecated operations "
                 "or properties whose scheduled removal versions have been reached, "
-                "and/or additive response oneOf expansions."
+                "the accepted POST /api/cloud-proxy removal, and/or additive "
+                "response oneOf expansions."
             )
         else:
             return 1

tests/cross/test_check_agent_server_rest_api_breakage.py

@@ -239,6 +239,56 @@ def test_rest_deprecation_regex_matches_deprecation_check_regex():
     assert _rest_route_deprecation_re.flags == _deprecation_check_re.flags
 
 
+def test_accepted_cloud_proxy_removal_detection_is_exact():
+    assert _prod._is_accepted_cloud_proxy_removal(
+        {"path": "/api/cloud-proxy", "method": "post", "deprecated": False}
+    )
+    assert not _prod._is_accepted_cloud_proxy_removal(
+        {"path": "/api/cloud-proxy", "method": "get", "deprecated": False}
+    )
+    assert not _prod._is_accepted_cloud_proxy_removal(
+        {"path": "/api/cloud-proxy/other", "method": "post", "deprecated": False}
+    )
+    assert not _prod._is_accepted_cloud_proxy_removal(
+        {"path": "/api/cloud-proxy", "method": "post", "deprecated": True}
+    )
+
+
+def test_accepted_cloud_proxy_path_removal_detection_is_exact():
+    assert _prod._is_accepted_cloud_proxy_path_removal(
+        {
+            "id": "api-path-removed-without-deprecation",
+            "path": "/api/cloud-proxy",
+            "operation": "POST",
+            "operationId": "cloud_proxy_api_cloud_proxy_post",
+        }
+    )
+    assert not _prod._is_accepted_cloud_proxy_path_removal(
+        {
+            "id": "api-path-removed-without-deprecation",
+            "path": "/api/cloud-proxy",
+            "operation": "GET",
+            "operationId": "cloud_proxy_api_cloud_proxy_post",
+        }
+    )
+    assert not _prod._is_accepted_cloud_proxy_path_removal(
+        {
+            "id": "api-path-removed-without-deprecation",
+            "path": "/api/cloud-proxy/other",
+            "operation": "POST",
+            "operationId": "cloud_proxy_api_cloud_proxy_post",
+        }
+    )
+    assert not _prod._is_accepted_cloud_proxy_path_removal(
+        {
+            "id": "api-path-removed-without-deprecation",
+            "path": "/api/cloud-proxy",
+            "operation": "POST",
+            "operationId": "other_operation",
+        }
+    )
+
+
 def test_parse_openapi_deprecation_description_extracts_versions_from_example():
     description = (
         "Nice description here with more context for API consumers.\n\n"
@@ -418,6 +468,80 @@ def test_validate_removed_schema_properties_requires_removal_target_to_be_reache
     ]
 
 
+def test_main_allows_accepted_cloud_proxy_removal(monkeypatch, capsys):
+    monkeypatch.setattr(_prod, "_read_version_from_pyproject", lambda _path: "1.28.0")
+    monkeypatch.setattr(
+        _prod, "_get_baseline_version", lambda _distribution, _current: "1.28.0"
+    )
+    monkeypatch.setattr(_prod, "_find_sdk_deprecated_fastapi_routes", lambda _root: [])
+    monkeypatch.setattr(_prod, "_generate_current_openapi", lambda: {"paths": {}})
+    monkeypatch.setattr(_prod, "_find_deprecation_policy_errors", lambda _schema: [])
+    monkeypatch.setattr(
+        _prod, "_generate_openapi_for_git_ref", lambda _ref: {"paths": {}}
+    )
+    monkeypatch.setattr(_prod, "_normalize_openapi_for_oasdiff", lambda schema: schema)
+    monkeypatch.setattr(
+        _prod,
+        "_run_oasdiff_breakage_check",
+        lambda _prev, _cur: (
+            [
+                {
+                    "id": "removed-operation",
+                    "details": {
+                        "path": "/api/cloud-proxy",
+                        "method": "post",
+                        "deprecated": False,
+                    },
+                    "text": "removed POST /api/cloud-proxy",
+                }
+            ],
+            1,
+        ),
+    )
+
+    assert _prod.main() == 0
+
+    captured = capsys.readouterr()
+    assert "Accepted removal of POST /api/cloud-proxy" in captured.out
+    assert "accepted POST /api/cloud-proxy removal" in captured.out
+
+
+def test_main_allows_accepted_cloud_proxy_path_removal(monkeypatch, capsys):
+    monkeypatch.setattr(_prod, "_read_version_from_pyproject", lambda _path: "1.28.0")
+    monkeypatch.setattr(
+        _prod, "_get_baseline_version", lambda _distribution, _current: "1.28.0"
+    )
+    monkeypatch.setattr(_prod, "_find_sdk_deprecated_fastapi_routes", lambda _root: [])
+    monkeypatch.setattr(_prod, "_generate_current_openapi", lambda: {"paths": {}})
+    monkeypatch.setattr(_prod, "_find_deprecation_policy_errors", lambda _schema: [])
+    monkeypatch.setattr(
+        _prod, "_generate_openapi_for_git_ref", lambda _ref: {"paths": {}}
+    )
+    monkeypatch.setattr(_prod, "_normalize_openapi_for_oasdiff", lambda schema: schema)
+    monkeypatch.setattr(
+        _prod,
+        "_run_oasdiff_breakage_check",
+        lambda _prev, _cur: (
+            [
+                {
+                    "id": "api-path-removed-without-deprecation",
+                    "text": "api path removed without deprecation",
+                    "operation": "POST",
+                    "operationId": "cloud_proxy_api_cloud_proxy_post",
+                    "path": "/api/cloud-proxy",
+                }
+            ],
+            1,
+        ),
+    )
+
+    assert _prod.main() == 0
+
+    captured = capsys.readouterr()
+    assert "Accepted removal of POST /api/cloud-proxy" in captured.out
+    assert "accepted POST /api/cloud-proxy removal" in captured.out
+
+
 def test_main_allows_scheduled_removal_with_documented_target(monkeypatch, capsys):
     prev_schema = _schema_with_operation(
         "/api/foo",