return lost functionality

Author: tode-rl

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
     "distro>=1.7.0, <2",
     "sniffio",
 ]
+
 requires-python = ">= 3.8"
 classifiers = [
   "Typing :: Typed",
@@ -93,6 +94,11 @@ typecheck = { chain = [
 requires = ["hatchling==1.26.3", "hatch-fancy-pypi-readme"]
 build-backend = "hatchling.build"
 
+[dependency-groups]
+lint = [
+    "ruff>=0.12.7",
+]
+
 [tool.hatch.build]
 include = [
   "src/*"

src/runloop_api_client/resources/blueprints.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Iterable, Optional
+from typing import Dict, List, Iterable, Optional, TypedDict
 
 import httpx
 
@@ -28,7 +28,19 @@
 from ..types.shared_params.launch_parameters import LaunchParameters
 from ..types.shared_params.code_mount_parameters import CodeMountParameters
 
-__all__ = ["BlueprintsResource", "AsyncBlueprintsResource"]
+
+# Type for request arguments that combine polling config with additional request options
+class BlueprintRequestArgs(TypedDict, total=False):
+    polling_config: PollingConfig | 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
+    extra_query: Query | None
+    extra_body: Body | None
+    timeout: float | httpx.Timeout | None | NotGiven
+
+
+__all__ = ["BlueprintsResource", "AsyncBlueprintsResource", "BlueprintRequestArgs"]
 
 
 class BlueprintsResource(SyncAPIResource):
@@ -188,13 +200,10 @@ def await_build_complete(
             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
+                id, extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             )
 
         def is_done_building(blueprint: BlueprintView) -> bool:
@@ -203,25 +212,23 @@ def is_done_building(blueprint: BlueprintView) -> bool:
         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}"
-            )
+            raise RunloopError(f"Blueprint entered non-built terminal state: {blueprint.status}")
 
         return blueprint
 
     def create_and_await_build_complete(
         self,
         *,
         create_args: blueprint_create_params.BlueprintCreateParams,
-        polling_config: PollingConfig | None = None,
+        request_args: BlueprintRequestArgs | None = None,
     ) -> BlueprintView:
         """Create a new Blueprint and wait for it to finish building.
 
         This is a wrapper around the `create` method that waits for the blueprint to finish building.
 
         Args:
             create_args: Arguments to pass to the `create` method. See the `create` method for detailed documentation.
-            polling_config: Optional polling configuration
+            request_args: Optional request arguments including polling configuration and additional request options
 
         Returns:
             The built blueprint
@@ -233,9 +240,16 @@ def create_and_await_build_complete(
         # Pass all create_args to the underlying create method
         blueprint = self.create(**create_args)
 
+        if request_args is None:
+            request_args = {}
+
         return self.await_build_complete(
             blueprint.id,
-            polling_config=polling_config,
+            polling_config=request_args.get("polling_config", None),
+            extra_headers=request_args.get("extra_headers", None),
+            extra_query=request_args.get("extra_query", None),
+            extra_body=request_args.get("extra_body", None),
+            timeout=request_args.get("timeout", None),
         )
 
     def list(
@@ -563,7 +577,7 @@ async def retrieve(
             ),
             cast_to=BlueprintView,
         )
-    
+
     async def await_build_complete(
         self,
         id: str,
@@ -593,13 +607,10 @@ async def await_build_complete(
             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
+                id, extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             )
 
         def is_done_building(blueprint: BlueprintView) -> bool:
@@ -608,25 +619,23 @@ def is_done_building(blueprint: BlueprintView) -> bool:
         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}"
-            )
+            raise RunloopError(f"Blueprint entered non-built terminal state: {blueprint.status}")
 
         return blueprint
 
     async def create_and_await_build_complete(
         self,
         *,
         create_args: blueprint_create_params.BlueprintCreateParams,
-        polling_config: PollingConfig | None = None,
+        request_args: BlueprintRequestArgs | None = None,
     ) -> BlueprintView:
         """Create a new Blueprint and wait for it to finish building.
 
         This is a wrapper around the `create` method that waits for the blueprint to finish building.
 
         Args:
             create_args: Arguments to pass to the `create` method. See the `create` method for detailed documentation.
-            polling_config: Optional polling configuration
+            request_args: Optional request arguments including polling configuration and additional request options
 
         Returns:
             The built blueprint
@@ -638,9 +647,17 @@ async def create_and_await_build_complete(
         # Pass all create_args to the underlying create method
         blueprint = await self.create(**create_args)
 
+        # Extract polling config and other request args
+        if request_args is None:
+            request_args = {}
+
         return await self.await_build_complete(
             blueprint.id,
-            polling_config=polling_config,
+            polling_config=request_args.get("polling_config", None),
+            extra_headers=request_args.get("extra_headers", None),
+            extra_query=request_args.get("extra_query", None),
+            extra_body=request_args.get("extra_body", None),
+            timeout=request_args.get("timeout", None),
         )
 
     def list(

src/runloop_api_client/resources/devboxes/devboxes.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Mapping, Iterable, Optional, cast
+from typing import Dict, Mapping, Iterable, Optional, cast, TypedDict
 from typing_extensions import Literal
 
 import httpx
@@ -110,11 +110,20 @@
 from ...types.devbox_async_execution_detail_view import DevboxAsyncExecutionDetailView
 from ...types.shared_params.code_mount_parameters import CodeMountParameters
 
-__all__ = ["DevboxesResource", "AsyncDevboxesResource"]
+__all__ = ["DevboxesResource", "AsyncDevboxesResource", "DevboxRequestArgs"]
 
 DEVBOX_BOOTING_STATES = frozenset(("provisioning", "initializing"))
 
 
+# Type for request arguments that combine polling config with additional request options
+class DevboxRequestArgs(TypedDict, total=False):
+    polling_config: PollingConfig | None
+    extra_headers: Headers | None
+    extra_query: Query | None
+    extra_body: Body | None
+    timeout: float | httpx.Timeout | None | NotGiven
+
+
 def placeholder_devbox_view(id: str) -> DevboxView:
     return DevboxView(
         id=id,
@@ -374,6 +383,10 @@ def await_running(
         *,
         # Use polling_config to configure the "long" polling behavior.
         polling_config: PollingConfig | None = None,
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> DevboxView:
         """Wait for a devbox to be in running state.
 
@@ -427,15 +440,15 @@ def create_and_await_running(
         self,
         *,
         create_args: devbox_create_params.DevboxCreateParams,
-        polling_config: PollingConfig | None = None,
+        request_args: DevboxRequestArgs | None = None,
     ) -> DevboxView:
         """Create a new devbox and wait for it to be in running state.
 
         This is a wrapper around the `create` method that waits for the devbox to reach running state.
-        
+
         Args:
             create_args: Arguments to pass to the `create` method. See the `create` method for detailed documentation.
-            polling_config: Optional polling configuration
+            request_args: Optional request arguments including polling configuration and additional request options
 
         Returns:
             The devbox in running state
@@ -444,12 +457,22 @@ def create_and_await_running(
             PollingTimeout: If polling times out before devbox is running
             RunloopError: If devbox enters a non-running terminal state
         """
+        # Extract polling config and other request args
+        if request_args is None:
+            request_args = {}
+
         # Pass all create_args to the underlying create method
-        devbox = self.create(**create_args)
+        devbox = self.create(
+            **create_args,
+            extra_headers=request_args.get("extra_headers", None),
+            extra_query=request_args.get("extra_query", None),
+            extra_body=request_args.get("extra_body", None),
+            timeout=request_args.get("timeout", None),
+        )
 
         return self.await_running(
             devbox.id,
-            polling_config=polling_config,
+            polling_config=request_args.get("polling_config", None),
         )
 
     def list(
@@ -1570,15 +1593,15 @@ async def create_and_await_running(
         self,
         *,
         create_args: devbox_create_params.DevboxCreateParams,
-        polling_config: PollingConfig | None = None,
+        request_args: DevboxRequestArgs | None = None,
     ) -> DevboxView:
         """Create a devbox and wait for it to be in running state.
 
         This is a wrapper around the `create` method that waits for the devbox to reach running state.
-        
+
         Args:
             create_args: Arguments to pass to the `create` method. See the `create` method for detailed documentation.
-            polling_config: Optional polling configuration
+            request_args: Optional request arguments including polling configuration and additional request options
 
         Returns:
             The devbox in running state
@@ -1590,9 +1613,13 @@ async def create_and_await_running(
         # Pass all create_args to the underlying create method
         devbox = await self.create(**create_args)
 
+        # Extract polling config and other request args
+        if request_args is None:
+            request_args = {}
+
         return await self.await_running(
             devbox.id,
-            polling_config=polling_config,
+            polling_config=request_args.get("polling_config", None),
         )
 
     async def await_running(