feat(api): codegen changes

stainless-app[bot] · Stainless Bot · commit 4dc617943e28 · 2024-07-12T15:30:20.000-04:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 
 USER vscode
 
-RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.24.0" RYE_INSTALL_OPTION="--yes" bash
+RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.35.0" RYE_INSTALL_OPTION="--yes" bash
 ENV PATH=/home/vscode/.rye/shims:$PATH
 
 RUN echo "[[ -d .venv ]] && source .venv/bin/activate" >> /home/vscode/.bashrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - main
+      - next
 
 jobs:
   lint:
@@ -21,7 +22,7 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: 0.24.0
+          RYE_VERSION: '0.35.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Install dependencies
@@ -41,7 +42,7 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: 0.24.0
+          RYE_VERSION: '0.35.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Bootstrap
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -21,8 +21,8 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: 0.24.0
-          RYE_INSTALL_OPTION: "--yes"
+          RYE_VERSION: '0.35.0'
+          RYE_INSTALL_OPTION: '--yes'
 
       - name: Publish to PyPI
         run: |
diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -6,6 +6,7 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
+#   generate-hashes: false
 
 -e file:.
 annotated-types==0.6.0
@@ -48,7 +49,7 @@ markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-mypy==1.7.1
+mypy==1.10.1
 mypy-extensions==1.0.0
     # via mypy
 nodeenv==1.8.0
diff --git a/requirements.lock b/requirements.lock
@@ -6,6 +6,7 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
+#   generate-hashes: false
 
 -e file:.
 annotated-types==0.6.0
diff --git a/src/runloop_api_client/_base_client.py b/src/runloop_api_client/_base_client.py
@@ -955,6 +955,11 @@ def _request(
         stream: bool,
         stream_cls: type[_StreamT] | None,
     ) -> ResponseT | _StreamT:
+        # create a copy of the options we were given so that if the
+        # options are mutated later & we then retry, the retries are
+        # given the original options
+        input_options = model_copy(options)
+
         cast_to = self._maybe_override_cast_to(cast_to, options)
         self._prepare_options(options)
 
@@ -979,7 +984,7 @@ def _request(
 
             if retries > 0:
                 return self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     stream=stream,
@@ -994,7 +999,7 @@ def _request(
 
             if retries > 0:
                 return self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     stream=stream,
@@ -1022,7 +1027,7 @@ def _request(
             if retries > 0 and self._should_retry(err.response):
                 err.response.close()
                 return self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     err.response.headers,
@@ -1518,6 +1523,11 @@ async def _request(
             # execute it earlier while we are in an async context
             self._platform = await asyncify(get_platform)()
 
+        # create a copy of the options we were given so that if the
+        # options are mutated later & we then retry, the retries are
+        # given the original options
+        input_options = model_copy(options)
+
         cast_to = self._maybe_override_cast_to(cast_to, options)
         await self._prepare_options(options)
 
@@ -1540,7 +1550,7 @@ async def _request(
 
             if retries > 0:
                 return await self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     stream=stream,
@@ -1555,7 +1565,7 @@ async def _request(
 
             if retries > 0:
                 return await self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     stream=stream,
@@ -1578,7 +1588,7 @@ async def _request(
             if retries > 0 and self._should_retry(err.response):
                 await err.response.aclose()
                 return await self._retry_request(
-                    options,
+                    input_options,
                     cast_to,
                     retries,
                     err.response.headers,
diff --git a/src/runloop_api_client/_models.py b/src/runloop_api_client/_models.py
@@ -643,6 +643,14 @@ def validate_type(*, type_: type[_T], value: object) -> _T:
     return cast(_T, _validate_non_model_type(type_=type_, value=value))
 
 
+def set_pydantic_config(typ: Any, config: pydantic.ConfigDict) -> None:
+    """Add a pydantic config for the given type.
+
+    Note: this is a no-op on Pydantic v1.
+    """
+    setattr(typ, "__pydantic_config__", config)  # noqa: B010
+
+
 # our use of subclasssing here causes weirdness for type checkers,
 # so we just pretend that we don't subclass
 if TYPE_CHECKING:
diff --git a/src/runloop_api_client/resources/devboxes/devboxes.py b/src/runloop_api_client/resources/devboxes/devboxes.py
@@ -28,9 +28,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._base_client import (
-    make_request_options,
-)
+from ..._base_client import make_request_options
 from ...types.devbox_view import DevboxView
 from ...types.devbox_list_view import DevboxListView
 from ...types.devbox_execution_detail_view import DevboxExecutionDetailView
diff --git a/src/runloop_api_client/resources/devboxes/logs.py b/src/runloop_api_client/resources/devboxes/logs.py
@@ -13,9 +13,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._base_client import (
-    make_request_options,
-)
+from ..._base_client import make_request_options
 from ...types.devboxes.devbox_logs_list_view import DevboxLogsListView
 
 __all__ = ["LogsResource", "AsyncLogsResource"]
diff --git a/src/runloop_api_client/resources/functions/functions.py b/src/runloop_api_client/resources/functions/functions.py
@@ -26,9 +26,7 @@
     InvocationsResourceWithStreamingResponse,
     AsyncInvocationsResourceWithStreamingResponse,
 )
-from ..._base_client import (
-    make_request_options,
-)
+from ..._base_client import make_request_options
 from .invocations.invocations import InvocationsResource, AsyncInvocationsResource
 from ...types.function_list_view import FunctionListView
 from ...types.shared.function_invocation_detail_view import FunctionInvocationDetailView
diff --git a/src/runloop_api_client/resources/functions/invocations/invocations.py b/src/runloop_api_client/resources/functions/invocations/invocations.py
@@ -13,9 +13,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._base_client import (
-    make_request_options,
-)
+from ...._base_client import make_request_options
 from ....types.shared.function_invocation_detail_view import FunctionInvocationDetailView
 from ....types.functions.function_invocation_list_view import FunctionInvocationListView
 
diff --git a/src/runloop_api_client/resources/projects/logs.py b/src/runloop_api_client/resources/projects/logs.py
@@ -13,9 +13,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._base_client import (
-    make_request_options,
-)
+from ..._base_client import make_request_options
 from ...types.shared.project_logs_view import ProjectLogsView
 
 __all__ = ["LogsResource", "AsyncLogsResource"]
diff --git a/src/runloop_api_client/resources/projects/projects.py b/src/runloop_api_client/resources/projects/projects.py
@@ -21,9 +21,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._base_client import (
-    make_request_options,
-)
+from ..._base_client import make_request_options
 from ...types.project_list_view import ProjectListView
 
 __all__ = ["ProjectsResource", "AsyncProjectsResource"]
diff --git a/tests/api_resources/devboxes/test_logs.py b/tests/api_resources/devboxes/test_logs.py
@@ -20,14 +20,14 @@ class TestLogs:
     @parametrize
     def test_method_list(self, client: Runloop) -> None:
         log = client.devboxes.logs.list(
-            "string",
+            "id",
         )
         assert_matches_type(DevboxLogsListView, log, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Runloop) -> None:
         response = client.devboxes.logs.with_raw_response.list(
-            "string",
+            "id",
         )
 
         assert response.is_closed is True
@@ -38,7 +38,7 @@ def test_raw_response_list(self, client: Runloop) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Runloop) -> None:
         with client.devboxes.logs.with_streaming_response.list(
-            "string",
+            "id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -62,14 +62,14 @@ class TestAsyncLogs:
     @parametrize
     async def test_method_list(self, async_client: AsyncRunloop) -> None:
         log = await async_client.devboxes.logs.list(
-            "string",
+            "id",
         )
         assert_matches_type(DevboxLogsListView, log, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncRunloop) -> None:
         response = await async_client.devboxes.logs.with_raw_response.list(
-            "string",
+            "id",
         )
 
         assert response.is_closed is True
@@ -80,7 +80,7 @@ async def test_raw_response_list(self, async_client: AsyncRunloop) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncRunloop) -> None:
         async with async_client.devboxes.logs.with_streaming_response.list(
-            "string",
+            "id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
diff --git a/tests/api_resources/functions/test_invocations.py b/tests/api_resources/functions/test_invocations.py
@@ -21,14 +21,14 @@ class TestInvocations:
     @parametrize
     def test_method_retrieve(self, client: Runloop) -> None:
         invocation = client.functions.invocations.retrieve(
-            "string",
+            "invocationId",
         )
         assert_matches_type(FunctionInvocationDetailView, invocation, path=["response"])
 
     @parametrize
     def test_raw_response_retrieve(self, client: Runloop) -> None:
         response = client.functions.invocations.with_raw_response.retrieve(
-            "string",
+            "invocationId",
         )
 
         assert response.is_closed is True
@@ -39,7 +39,7 @@ def test_raw_response_retrieve(self, client: Runloop) -> None:
     @parametrize
     def test_streaming_response_retrieve(self, client: Runloop) -> None:
         with client.functions.invocations.with_streaming_response.retrieve(
-            "string",
+            "invocationId",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -84,14 +84,14 @@ def test_streaming_response_list(self, client: Runloop) -> None:
     @parametrize
     def test_method_kill(self, client: Runloop) -> None:
         invocation = client.functions.invocations.kill(
-            "string",
+            "invocationId",
         )
         assert_matches_type(object, invocation, path=["response"])
 
     @parametrize
     def test_raw_response_kill(self, client: Runloop) -> None:
         response = client.functions.invocations.with_raw_response.kill(
-            "string",
+            "invocationId",
         )
 
         assert response.is_closed is True
@@ -102,7 +102,7 @@ def test_raw_response_kill(self, client: Runloop) -> None:
     @parametrize
     def test_streaming_response_kill(self, client: Runloop) -> None:
         with client.functions.invocations.with_streaming_response.kill(
-            "string",
+            "invocationId",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -126,14 +126,14 @@ class TestAsyncInvocations:
     @parametrize
     async def test_method_retrieve(self, async_client: AsyncRunloop) -> None:
         invocation = await async_client.functions.invocations.retrieve(
-            "string",
+            "invocationId",
         )
         assert_matches_type(FunctionInvocationDetailView, invocation, path=["response"])
 
     @parametrize
     async def test_raw_response_retrieve(self, async_client: AsyncRunloop) -> None:
         response = await async_client.functions.invocations.with_raw_response.retrieve(
-            "string",
+            "invocationId",
         )
 
         assert response.is_closed is True
@@ -144,7 +144,7 @@ async def test_raw_response_retrieve(self, async_client: AsyncRunloop) -> None:
     @parametrize
     async def test_streaming_response_retrieve(self, async_client: AsyncRunloop) -> None:
         async with async_client.functions.invocations.with_streaming_response.retrieve(
-            "string",
+            "invocationId",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -189,14 +189,14 @@ async def test_streaming_response_list(self, async_client: AsyncRunloop) -> None
     @parametrize
     async def test_method_kill(self, async_client: AsyncRunloop) -> None:
         invocation = await async_client.functions.invocations.kill(
-            "string",
+            "invocationId",
         )
         assert_matches_type(object, invocation, path=["response"])
 
     @parametrize
     async def test_raw_response_kill(self, async_client: AsyncRunloop) -> None:
         response = await async_client.functions.invocations.with_raw_response.kill(
-            "string",
+            "invocationId",
         )
 
         assert response.is_closed is True
@@ -207,7 +207,7 @@ async def test_raw_response_kill(self, async_client: AsyncRunloop) -> None:
     @parametrize
     async def test_streaming_response_kill(self, async_client: AsyncRunloop) -> None:
         async with async_client.functions.invocations.with_streaming_response.kill(
-            "string",
+            "invocationId",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
diff --git a/tests/api_resources/projects/test_logs.py b/tests/api_resources/projects/test_logs.py
diff --git a/tests/api_resources/test_devboxes.py b/tests/api_resources/test_devboxes.py
diff --git a/tests/api_resources/test_functions.py b/tests/api_resources/test_functions.py
