runloop-api-client 0.19.0__tar.gz → 0.20.0__tar.gz

runloop_api_client-0.20.0/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.20.0"
+}

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.20.0 (2025-02-04)
+
+Full Changelog: [v0.19.0...v0.20.0](https://github.com/runloopai/api-client-python/compare/v0.19.0...v0.20.0)
+
+### Features
+
+* add helpers for blueprint and scenario run creation ([b00a7c1](https://github.com/runloopai/api-client-python/commit/b00a7c1b935db7c919d79ed10c135bf5ed2a9b4f))
+* **api:** api update ([#526](https://github.com/runloopai/api-client-python/issues/526)) ([be26ed7](https://github.com/runloopai/api-client-python/commit/be26ed7c82017d9bff67c9920c078808f8a675e3))
+
+
+### Chores
+
+* **internal:** bummp ruff dependency ([#525](https://github.com/runloopai/api-client-python/issues/525)) ([84051db](https://github.com/runloopai/api-client-python/commit/84051db83a6347f28ee4891be52f5eee7fa9d02a))
+* **internal:** change default timeout to an int ([#524](https://github.com/runloopai/api-client-python/issues/524)) ([a15ccaa](https://github.com/runloopai/api-client-python/commit/a15ccaa45f69331d57be0144a16ba3b1df387245))
+
 ## 0.19.0 (2025-02-03)
 
 Full Changelog: [v0.18.0...v0.19.0](https://github.com/runloopai/api-client-python/compare/v0.18.0...v0.19.0)

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runloop_api_client
-Version: 0.19.0
+Version: 0.20.0
 Summary: The official Python library for the runloop API
 Project-URL: Homepage, https://github.com/runloopai/api-client-python
 Project-URL: Repository, https://github.com/runloopai/api-client-python

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/api.md

@@ -274,6 +274,28 @@ Methods:
 - <code title="post /v1/scenarios/runs/{id}/complete">client.scenarios.runs.<a href="./src/runloop_api_client/resources/scenarios/runs.py">complete</a>(id) -> <a href="./src/runloop_api_client/types/scenario_run_view.py">ScenarioRunView</a></code>
 - <code title="post /v1/scenarios/runs/{id}/score">client.scenarios.runs.<a href="./src/runloop_api_client/resources/scenarios/runs.py">score</a>(id) -> <a href="./src/runloop_api_client/types/scenario_run_view.py">ScenarioRunView</a></code>
 
+## Scorers
+
+Types:
+
+```python
+from runloop_api_client.types.scenarios import (
+    ScorerCreateResponse,
+    ScorerRetrieveResponse,
+    ScorerUpdateResponse,
+    ScorerListResponse,
+    ScorerValidateResponse,
+)
+```
+
+Methods:
+
+- <code title="post /v1/scenarios/scorers">client.scenarios.scorers.<a href="./src/runloop_api_client/resources/scenarios/scorers.py">create</a>(\*\*<a href="src/runloop_api_client/types/scenarios/scorer_create_params.py">params</a>) -> <a href="./src/runloop_api_client/types/scenarios/scorer_create_response.py">ScorerCreateResponse</a></code>
+- <code title="get /v1/scenarios/scorers/{id}">client.scenarios.scorers.<a href="./src/runloop_api_client/resources/scenarios/scorers.py">retrieve</a>(id) -> <a href="./src/runloop_api_client/types/scenarios/scorer_retrieve_response.py">ScorerRetrieveResponse</a></code>
+- <code title="post /v1/scenarios/scorers/{id}">client.scenarios.scorers.<a href="./src/runloop_api_client/resources/scenarios/scorers.py">update</a>(id, \*\*<a href="src/runloop_api_client/types/scenarios/scorer_update_params.py">params</a>) -> <a href="./src/runloop_api_client/types/scenarios/scorer_update_response.py">ScorerUpdateResponse</a></code>
+- <code title="get /v1/scenarios/scorers">client.scenarios.scorers.<a href="./src/runloop_api_client/resources/scenarios/scorers.py">list</a>(\*\*<a href="src/runloop_api_client/types/scenarios/scorer_list_params.py">params</a>) -> <a href="./src/runloop_api_client/types/scenarios/scorer_list_response.py">SyncScenarioScorersCursorIDPage[ScorerListResponse]</a></code>
+- <code title="post /v1/scenarios/scorers/{id}/validate">client.scenarios.scorers.<a href="./src/runloop_api_client/resources/scenarios/scorers.py">validate</a>(id, \*\*<a href="src/runloop_api_client/types/scenarios/scorer_validate_params.py">params</a>) -> <a href="./src/runloop_api_client/types/scenarios/scorer_validate_response.py">ScorerValidateResponse</a></code>
+
 # Repositories
 
 Types:

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "runloop_api_client"
-version = "0.19.0"
+version = "0.20.0"
 description = "The official Python library for the runloop API"
 dynamic = ["readme"]
 license = "MIT"
@@ -177,7 +177,7 @@ select = [
   "T201",
   "T203",
   # misuse of typing.TYPE_CHECKING
-  "TCH004",
+  "TC004",
   # import rules
   "TID251",
 ]

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/requirements-dev.lock

@@ -79,7 +79,7 @@ pytz==2023.3.post1
     # via dirty-equals
 respx==0.22.0
 rich==13.7.1
-ruff==0.6.9
+ruff==0.9.4
 setuptools==68.2.2
     # via nodeenv
 six==1.16.0

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/_constants.py

@@ -6,7 +6,7 @@ RAW_RESPONSE_HEADER = "X-Stainless-Raw-Response"
 OVERRIDE_CAST_TO_HEADER = "____stainless_override_cast_to"
 
 # default timeout is 1 minute
-DEFAULT_TIMEOUT = httpx.Timeout(timeout=60.0, connect=5.0)
+DEFAULT_TIMEOUT = httpx.Timeout(timeout=60, connect=5.0)
 DEFAULT_MAX_RETRIES = 2
 DEFAULT_CONNECTION_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
 

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/_models.py

@@ -172,7 +172,7 @@ class BaseModel(pydantic.BaseModel):
     @override
     def __str__(self) -> str:
         # mypy complains about an invalid self arg
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'  # type: ignore[misc]
+        return f"{self.__repr_name__()}({self.__repr_str__(', ')})"  # type: ignore[misc]
 
     # Override the 'construct' method in a way that supports recursive parsing without validation.
     # Based on https://github.com/samuelcolvin/pydantic/issues/1168#issuecomment-817742836.

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "runloop_api_client"
-__version__ = "0.19.0"  # x-release-please-version
+__version__ = "0.20.0"  # x-release-please-version

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/pagination.py

@@ -22,6 +22,8 @@ __all__ = [
     "AsyncScenariosCursorIDPage",
     "SyncScenarioRunsCursorIDPage",
     "AsyncScenarioRunsCursorIDPage",
+    "SyncScenarioScorersCursorIDPage",
+    "AsyncScenarioScorersCursorIDPage",
 ]
 
 _T = TypeVar("_T")
@@ -67,6 +69,11 @@ class ScenarioRunsCursorIDPageItem(Protocol):
     id: str
 
 
+@runtime_checkable
+class ScenarioScorersCursorIDPageItem(Protocol):
+    id: str
+
+
 class SyncBlueprintsCursorIDPage(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
     blueprints: List[_T]
     has_more: Optional[bool] = None
@@ -481,3 +488,55 @@ class AsyncScenarioRunsCursorIDPage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]
             return None
 
         return PageInfo(params={"starting_after": item.id})
+
+
+class SyncScenarioScorersCursorIDPage(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
+    scorers: List[_T]
+    has_more: Optional[bool] = None
+    total_count: Optional[int] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        scorers = self.scorers
+        if not scorers:
+            return []
+        return scorers
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        scorers = self.scorers
+        if not scorers:
+            return None
+
+        item = cast(Any, scorers[-1])
+        if not isinstance(item, ScenarioScorersCursorIDPageItem) or item.id is None:  # pyright: ignore[reportUnnecessaryComparison]
+            # TODO emit warning log
+            return None
+
+        return PageInfo(params={"starting_after": item.id})
+
+
+class AsyncScenarioScorersCursorIDPage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
+    scorers: List[_T]
+    has_more: Optional[bool] = None
+    total_count: Optional[int] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        scorers = self.scorers
+        if not scorers:
+            return []
+        return scorers
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        scorers = self.scorers
+        if not scorers:
+            return None
+
+        item = cast(Any, scorers[-1])
+        if not isinstance(item, ScenarioScorersCursorIDPageItem) or item.id is None:  # pyright: ignore[reportUnnecessaryComparison]
+            # TODO emit warning log
+            return None
+
+        return PageInfo(params={"starting_after": item.id})

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/resources/blueprints.py

@@ -20,6 +20,9 @@ from .._response import (
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from .._exceptions import RunloopError
+from ..lib.polling import PollingConfig, poll_until
+from ..lib.polling_async import async_poll_until
 from ..pagination import SyncBlueprintsCursorIDPage, AsyncBlueprintsCursorIDPage
 from .._base_client import AsyncPaginator, make_request_options
 from ..types.blueprint_view import BlueprintView
@@ -154,6 +157,119 @@ class BlueprintsResource(SyncAPIResource):
             cast_to=BlueprintView,
         )
 
+    def await_build_complete(
+        self,
+        id: str,
+        *,
+        polling_config: PollingConfig | None = None,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> BlueprintView:
+        """Wait for a blueprint to finish building.
+
+        Args:
+            id: The ID of the blueprint to wait for
+            polling_config: Optional polling configuration
+            extra_headers: Send extra headers
+            extra_query: Add additional query parameters to the request
+            extra_body: Add additional JSON properties to the request
+            timeout: Override the client-level default timeout for this request, in seconds
+
+        Returns:
+            The blueprint in built state
+
+        Raises:
+            PollingTimeout: If polling times out before blueprint is built
+            RunloopError: If blueprint enters a non-built terminal state
+        """
+        def retrieve_blueprint() -> BlueprintView:
+            return self.retrieve(
+                id,
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout
+            )
+
+        def is_done_building(blueprint: BlueprintView) -> bool:
+            return blueprint.status not in ["building", "provisioning"]
+
+        blueprint = poll_until(retrieve_blueprint, is_done_building, polling_config)
+
+        if blueprint.status != "build_complete":
+            raise RunloopError(
+                f"Blueprint entered non-built terminal state: {blueprint.status}"
+            )
+
+        return blueprint
+
+    def create_and_await_build_complete(
+        self,
+        *,
+        name: str,
+        code_mounts: Optional[Iterable[CodeMountParameters]] | NotGiven = NOT_GIVEN,
+        dockerfile: Optional[str] | NotGiven = NOT_GIVEN,
+        file_mounts: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
+        launch_parameters: Optional[LaunchParameters] | NotGiven = NOT_GIVEN,
+        system_setup_commands: Optional[List[str]] | NotGiven = NOT_GIVEN,
+        polling_config: PollingConfig | None = None,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        idempotency_key: str | None = None,
+    ) -> BlueprintView:
+        """Create a new Blueprint and wait for it to finish building.
+
+        Args:
+            dockerfile: The Dockerfile contents to use for building the Blueprint
+            file_mounts: Files to mount into the Blueprint
+            launch_parameters: Launch parameters for Devboxes created from this Blueprint
+            name: Name for the Blueprint
+            system_setup_commands: Commands to run during Blueprint build
+            polling_config: Optional polling configuration
+            extra_headers: Send extra headers
+            extra_query: Add additional query parameters to the request
+            extra_body: Add additional JSON properties to the request
+            timeout: Override the client-level default timeout for this request, in seconds
+            idempotency_key: Specify a custom idempotency key for this request
+
+        Returns:
+            The built blueprint
+
+        Raises:
+            PollingTimeout: If polling times out before blueprint is built
+            RunloopError: If blueprint enters a non-built terminal state
+        """
+        blueprint = self.create(
+            name=name,
+            dockerfile=dockerfile,
+            code_mounts=code_mounts,
+            file_mounts=file_mounts,
+            launch_parameters=launch_parameters,
+            system_setup_commands=system_setup_commands,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+            idempotency_key=idempotency_key,
+        )
+
+        return self.await_build_complete(
+            blueprint.id,
+            polling_config=polling_config,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
     def list(
         self,
         *,
@@ -429,6 +545,119 @@ class AsyncBlueprintsResource(AsyncAPIResource):
             ),
             cast_to=BlueprintView,
         )
+    
+    async def await_build_complete(
+        self,
+        id: str,
+        *,
+        polling_config: PollingConfig | None = None,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> BlueprintView:
+        """Wait for a blueprint to finish building.
+
+        Args:
+            id: The ID of the blueprint to wait for
+            polling_config: Optional polling configuration
+            extra_headers: Send extra headers
+            extra_query: Add additional query parameters to the request
+            extra_body: Add additional JSON properties to the request
+            timeout: Override the client-level default timeout for this request, in seconds
+
+        Returns:
+            The blueprint in built state
+
+        Raises:
+            PollingTimeout: If polling times out before blueprint is built
+            RunloopError: If blueprint enters a non-built terminal state
+        """
+        async def retrieve_blueprint() -> BlueprintView:
+            return await self.retrieve(
+                id,
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout
+            )
+
+        def is_done_building(blueprint: BlueprintView) -> bool:
+            return blueprint.status not in ["building", "provisioning"]
+
+        blueprint = await async_poll_until(retrieve_blueprint, is_done_building, polling_config)
+
+        if blueprint.status != "build_complete":
+            raise RunloopError(
+                f"Blueprint entered non-built terminal state: {blueprint.status}"
+            )
+
+        return blueprint
+
+    async def create_and_await_build_complete(
+        self,
+        *,
+        name: str,
+        code_mounts: Optional[Iterable[CodeMountParameters]] | NotGiven = NOT_GIVEN,
+        dockerfile: Optional[str] | NotGiven = NOT_GIVEN,
+        file_mounts: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
+        launch_parameters: Optional[LaunchParameters] | NotGiven = NOT_GIVEN,
+        system_setup_commands: Optional[List[str]] | NotGiven = NOT_GIVEN,
+        polling_config: PollingConfig | None = None,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        idempotency_key: str | None = None,
+    ) -> BlueprintView:
+        """Create a new Blueprint and wait for it to finish building.
+
+        Args:
+            dockerfile: The Dockerfile contents to use for building the Blueprint
+            file_mounts: Files to mount into the Blueprint
+            launch_parameters: Launch parameters for Devboxes created from this Blueprint
+            name: Name for the Blueprint
+            system_setup_commands: Commands to run during Blueprint build
+            polling_config: Optional polling configuration
+            extra_headers: Send extra headers
+            extra_query: Add additional query parameters to the request
+            extra_body: Add additional JSON properties to the request
+            timeout: Override the client-level default timeout for this request, in seconds
+            idempotency_key: Specify a custom idempotency key for this request
+
+        Returns:
+            The built blueprint
+
+        Raises:
+            PollingTimeout: If polling times out before blueprint is built
+            RunloopError: If blueprint enters a non-built terminal state
+        """
+        blueprint = await self.create(
+            name=name,
+            dockerfile=dockerfile,
+            code_mounts=code_mounts,
+            file_mounts=file_mounts,
+            launch_parameters=launch_parameters,
+            system_setup_commands=system_setup_commands,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+            idempotency_key=idempotency_key,
+        )
+
+        return await self.await_build_complete(
+            blueprint.id,
+            polling_config=polling_config,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
 
     def list(
         self,

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/resources/scenarios/__init__.py

@@ -8,6 +8,14 @@ from .runs import (
     RunsResourceWithStreamingResponse,
     AsyncRunsResourceWithStreamingResponse,
 )
+from .scorers import (
+    ScorersResource,
+    AsyncScorersResource,
+    ScorersResourceWithRawResponse,
+    AsyncScorersResourceWithRawResponse,
+    ScorersResourceWithStreamingResponse,
+    AsyncScorersResourceWithStreamingResponse,
+)
 from .scenarios import (
     ScenariosResource,
     AsyncScenariosResource,
@@ -24,6 +32,12 @@ __all__ = [
     "AsyncRunsResourceWithRawResponse",
     "RunsResourceWithStreamingResponse",
     "AsyncRunsResourceWithStreamingResponse",
+    "ScorersResource",
+    "AsyncScorersResource",
+    "ScorersResourceWithRawResponse",
+    "AsyncScorersResourceWithRawResponse",
+    "ScorersResourceWithStreamingResponse",
+    "AsyncScorersResourceWithStreamingResponse",
     "ScenariosResource",
     "AsyncScenariosResource",
     "ScenariosResourceWithRawResponse",

{runloop_api_client-0.19.0 → runloop_api_client-0.20.0}/src/runloop_api_client/resources/scenarios/scenarios.py

@@ -20,11 +20,20 @@ from ...types import (
     scenario_start_run_params,
     scenario_list_public_params,
 )
+from .scorers import (
+    ScorersResource,
+    AsyncScorersResource,
+    ScorersResourceWithRawResponse,
+    AsyncScorersResourceWithRawResponse,
+    ScorersResourceWithStreamingResponse,
+    AsyncScorersResourceWithStreamingResponse,
+)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
     async_maybe_transform,
 )
+from ...lib.polling import PollingConfig
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -49,6 +58,10 @@ class ScenariosResource(SyncAPIResource):
     def runs(self) -> RunsResource:
         return RunsResource(self._client)
 
+    @cached_property
+    def scorers(self) -> ScorersResource:
+        return ScorersResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> ScenariosResourceWithRawResponse:
         """
@@ -317,12 +330,73 @@ class ScenariosResource(SyncAPIResource):
             cast_to=ScenarioRunView,
         )
 
+    def start_run_and_await_env_ready(
+        self,
+        *,
+        scenario_id: str,
+        benchmark_run_id: Optional[str] | NotGiven = NOT_GIVEN,
+        run_name: Optional[str] | NotGiven = NOT_GIVEN,
+        polling_config: PollingConfig | None = None,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        idempotency_key: str | None = None,
+    ) -> ScenarioRunView:
+        """Start a new ScenarioRun and wait for its environment to be ready.
+
+        Args:
+            scenario_id: ID of the Scenario to run
+            benchmark_run_id: Benchmark to associate the run
+            run_name: Display name of the run
+            polling_config: Optional polling configuration
+            extra_headers: Send extra headers
+            extra_query: Add additional query parameters to the request
+            extra_body: Add additional JSON properties to the request
+            timeout: Override the client-level default timeout for this request, in seconds
+            idempotency_key: Specify a custom idempotency key for this request
+
+        Returns:
+            The scenario run in running state
+
+        Raises:
+            PollingTimeout: If polling times out before environment is ready
+            RunloopError: If environment enters a non-running terminal state
+        """
+        run = self.start_run(
+            scenario_id=scenario_id,
+            benchmark_run_id=benchmark_run_id,
+            run_name=run_name,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+            idempotency_key=idempotency_key,
+        )
+
+        self._client.devboxes.await_running(
+            run.devbox_id,
+            polling_config=polling_config,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
+        return run
+
 
 class AsyncScenariosResource(AsyncAPIResource):
     @cached_property
     def runs(self) -> AsyncRunsResource:
         return AsyncRunsResource(self._client)
 
+    @cached_property
+    def scorers(self) -> AsyncScorersResource:
+        return AsyncScorersResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncScenariosResourceWithRawResponse:
         """
@@ -591,6 +665,40 @@ class AsyncScenariosResource(AsyncAPIResource):
             cast_to=ScenarioRunView,
         )
 
+    async def start_run_and_await_env_ready(
+        self,
+        scenario_id: str,
+        benchmark_run_id: Optional[str] | NotGiven = NOT_GIVEN,
+        run_name: Optional[str] | NotGiven = NOT_GIVEN,
+        polling_config: PollingConfig | None = None,
+    ) -> ScenarioRunView:
+        """Start a new ScenarioRun and wait for its environment to be ready.
+
+        Args:
+            scenario_id: ID of the Scenario to run
+            benchmark_run_id: Benchmark to associate the run
+            run_name: Display name of the run
+            polling_config: Optional polling configuration
+
+        Returns:
+            The scenario run in running state
+
+        Raises:
+            PollingTimeout: If polling times out before environment is ready
+            RunloopError: If environment enters a non-running terminal state
+        """
+        run = await self.start_run(
+            scenario_id=scenario_id,
+            benchmark_run_id=benchmark_run_id,
+            run_name=run_name,
+        )
+
+        await self._client.devboxes.await_running(
+            run.devbox_id,
+            polling_config=polling_config,
+        )
+
+        return run
 
 class ScenariosResourceWithRawResponse:
     def __init__(self, scenarios: ScenariosResource) -> None:
@@ -616,6 +724,10 @@ class ScenariosResourceWithRawResponse:
     def runs(self) -> RunsResourceWithRawResponse:
         return RunsResourceWithRawResponse(self._scenarios.runs)
 
+    @cached_property
+    def scorers(self) -> ScorersResourceWithRawResponse:
+        return ScorersResourceWithRawResponse(self._scenarios.scorers)
+
 
 class AsyncScenariosResourceWithRawResponse:
     def __init__(self, scenarios: AsyncScenariosResource) -> None:
@@ -641,6 +753,10 @@ class AsyncScenariosResourceWithRawResponse:
     def runs(self) -> AsyncRunsResourceWithRawResponse:
         return AsyncRunsResourceWithRawResponse(self._scenarios.runs)
 
+    @cached_property
+    def scorers(self) -> AsyncScorersResourceWithRawResponse:
+        return AsyncScorersResourceWithRawResponse(self._scenarios.scorers)
+
 
 class ScenariosResourceWithStreamingResponse:
     def __init__(self, scenarios: ScenariosResource) -> None:
@@ -666,6 +782,10 @@ class ScenariosResourceWithStreamingResponse:
     def runs(self) -> RunsResourceWithStreamingResponse:
         return RunsResourceWithStreamingResponse(self._scenarios.runs)
 
+    @cached_property
+    def scorers(self) -> ScorersResourceWithStreamingResponse:
+        return ScorersResourceWithStreamingResponse(self._scenarios.scorers)
+
 
 class AsyncScenariosResourceWithStreamingResponse:
     def __init__(self, scenarios: AsyncScenariosResource) -> None:
@@ -690,3 +810,7 @@ class AsyncScenariosResourceWithStreamingResponse:
     @cached_property
     def runs(self) -> AsyncRunsResourceWithStreamingResponse:
         return AsyncRunsResourceWithStreamingResponse(self._scenarios.runs)
+
+    @cached_property
+    def scorers(self) -> AsyncScorersResourceWithStreamingResponse:
+        return AsyncScorersResourceWithStreamingResponse(self._scenarios.scorers)