Skip to content

Commit 7766c48

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore(internal): bump ruff version (#336)
1 parent f495225 commit 7766c48

14 files changed

+68
-126
lines changed

‎pyproject.toml

+7-5
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ format = { chain = [
7777
"check:ruff",
7878
"typecheck",
7979
]}
80-
"check:ruff" = "ruff ."
81-
"fix:ruff" = "ruff --fix ."
80+
"check:ruff" = "ruff check ."
81+
"fix:ruff" = "ruff check --fix ."
8282

8383
typecheck = { chain = [
8484
"typecheck:pyright",
@@ -162,6 +162,11 @@ reportPrivateUsage = false
162162
line-length = 120
163163
output-format = "grouped"
164164
target-version = "py37"
165+
166+
[tool.ruff.format]
167+
docstring-code-format = true
168+
169+
[tool.ruff.lint]
165170
select = [
166171
# isort
167172
"I",
@@ -192,9 +197,6 @@ unfixable = [
192197
]
193198
ignore-init-module-imports = true
194199

195-
[tool.ruff.format]
196-
docstring-code-format = true
197-
198200
[tool.ruff.lint.flake8-tidy-imports.banned-api]
199201
"functools.lru_cache".msg = "This function does not retain type information for the wrapped function's arguments; The `lru_cache` function from `_utils` should be used instead"
200202

‎requirements-dev.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pytz==2023.3.post1
8080
# via dirty-equals
8181
respx==0.20.2
8282
rich==13.7.1
83-
ruff==0.1.9
83+
ruff==0.5.6
8484
setuptools==68.2.2
8585
# via nodeenv
8686
six==1.16.0

‎src/orb/_base_client.py

+21-42
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,14 @@ def __init__(
125125
self,
126126
*,
127127
url: URL,
128-
) -> None:
129-
...
128+
) -> None: ...
130129

131130
@overload
132131
def __init__(
133132
self,
134133
*,
135134
params: Query,
136-
) -> None:
137-
...
135+
) -> None: ...
138136

139137
def __init__(
140138
self,
@@ -167,8 +165,7 @@ def has_next_page(self) -> bool:
167165
return False
168166
return self.next_page_info() is not None
169167

170-
def next_page_info(self) -> Optional[PageInfo]:
171-
...
168+
def next_page_info(self) -> Optional[PageInfo]: ...
172169

173170
def _get_page_items(self) -> Iterable[_T]: # type: ignore[empty-body]
174171
...
@@ -904,8 +901,7 @@ def request(
904901
*,
905902
stream: Literal[True],
906903
stream_cls: Type[_StreamT],
907-
) -> _StreamT:
908-
...
904+
) -> _StreamT: ...
909905

910906
@overload
911907
def request(
@@ -915,8 +911,7 @@ def request(
915911
remaining_retries: Optional[int] = None,
916912
*,
917913
stream: Literal[False] = False,
918-
) -> ResponseT:
919-
...
914+
) -> ResponseT: ...
920915

921916
@overload
922917
def request(
@@ -927,8 +922,7 @@ def request(
927922
*,
928923
stream: bool = False,
929924
stream_cls: Type[_StreamT] | None = None,
930-
) -> ResponseT | _StreamT:
931-
...
925+
) -> ResponseT | _StreamT: ...
932926

933927
def request(
934928
self,
@@ -1171,8 +1165,7 @@ def get(
11711165
cast_to: Type[ResponseT],
11721166
options: RequestOptions = {},
11731167
stream: Literal[False] = False,
1174-
) -> ResponseT:
1175-
...
1168+
) -> ResponseT: ...
11761169

11771170
@overload
11781171
def get(
@@ -1183,8 +1176,7 @@ def get(
11831176
options: RequestOptions = {},
11841177
stream: Literal[True],
11851178
stream_cls: type[_StreamT],
1186-
) -> _StreamT:
1187-
...
1179+
) -> _StreamT: ...
11881180

11891181
@overload
11901182
def get(
@@ -1195,8 +1187,7 @@ def get(
11951187
options: RequestOptions = {},
11961188
stream: bool,
11971189
stream_cls: type[_StreamT] | None = None,
1198-
) -> ResponseT | _StreamT:
1199-
...
1190+
) -> ResponseT | _StreamT: ...
12001191

12011192
def get(
12021193
self,
@@ -1222,8 +1213,7 @@ def post(
12221213
options: RequestOptions = {},
12231214
files: RequestFiles | None = None,
12241215
stream: Literal[False] = False,
1225-
) -> ResponseT:
1226-
...
1216+
) -> ResponseT: ...
12271217

12281218
@overload
12291219
def post(
@@ -1236,8 +1226,7 @@ def post(
12361226
files: RequestFiles | None = None,
12371227
stream: Literal[True],
12381228
stream_cls: type[_StreamT],
1239-
) -> _StreamT:
1240-
...
1229+
) -> _StreamT: ...
12411230

12421231
@overload
12431232
def post(
@@ -1250,8 +1239,7 @@ def post(
12501239
files: RequestFiles | None = None,
12511240
stream: bool,
12521241
stream_cls: type[_StreamT] | None = None,
1253-
) -> ResponseT | _StreamT:
1254-
...
1242+
) -> ResponseT | _StreamT: ...
12551243

12561244
def post(
12571245
self,
@@ -1484,8 +1472,7 @@ async def request(
14841472
*,
14851473
stream: Literal[False] = False,
14861474
remaining_retries: Optional[int] = None,
1487-
) -> ResponseT:
1488-
...
1475+
) -> ResponseT: ...
14891476

14901477
@overload
14911478
async def request(
@@ -1496,8 +1483,7 @@ async def request(
14961483
stream: Literal[True],
14971484
stream_cls: type[_AsyncStreamT],
14981485
remaining_retries: Optional[int] = None,
1499-
) -> _AsyncStreamT:
1500-
...
1486+
) -> _AsyncStreamT: ...
15011487

15021488
@overload
15031489
async def request(
@@ -1508,8 +1494,7 @@ async def request(
15081494
stream: bool,
15091495
stream_cls: type[_AsyncStreamT] | None = None,
15101496
remaining_retries: Optional[int] = None,
1511-
) -> ResponseT | _AsyncStreamT:
1512-
...
1497+
) -> ResponseT | _AsyncStreamT: ...
15131498

15141499
async def request(
15151500
self,
@@ -1738,8 +1723,7 @@ async def get(
17381723
cast_to: Type[ResponseT],
17391724
options: RequestOptions = {},
17401725
stream: Literal[False] = False,
1741-
) -> ResponseT:
1742-
...
1726+
) -> ResponseT: ...
17431727

17441728
@overload
17451729
async def get(
@@ -1750,8 +1734,7 @@ async def get(
17501734
options: RequestOptions = {},
17511735
stream: Literal[True],
17521736
stream_cls: type[_AsyncStreamT],
1753-
) -> _AsyncStreamT:
1754-
...
1737+
) -> _AsyncStreamT: ...
17551738

17561739
@overload
17571740
async def get(
@@ -1762,8 +1745,7 @@ async def get(
17621745
options: RequestOptions = {},
17631746
stream: bool,
17641747
stream_cls: type[_AsyncStreamT] | None = None,
1765-
) -> ResponseT | _AsyncStreamT:
1766-
...
1748+
) -> ResponseT | _AsyncStreamT: ...
17671749

17681750
async def get(
17691751
self,
@@ -1787,8 +1769,7 @@ async def post(
17871769
files: RequestFiles | None = None,
17881770
options: RequestOptions = {},
17891771
stream: Literal[False] = False,
1790-
) -> ResponseT:
1791-
...
1772+
) -> ResponseT: ...
17921773

17931774
@overload
17941775
async def post(
@@ -1801,8 +1782,7 @@ async def post(
18011782
options: RequestOptions = {},
18021783
stream: Literal[True],
18031784
stream_cls: type[_AsyncStreamT],
1804-
) -> _AsyncStreamT:
1805-
...
1785+
) -> _AsyncStreamT: ...
18061786

18071787
@overload
18081788
async def post(
@@ -1815,8 +1795,7 @@ async def post(
18151795
options: RequestOptions = {},
18161796
stream: bool,
18171797
stream_cls: type[_AsyncStreamT] | None = None,
1818-
) -> ResponseT | _AsyncStreamT:
1819-
...
1798+
) -> ResponseT | _AsyncStreamT: ...
18201799

18211800
async def post(
18221801
self,

‎src/orb/_compat.py

+8-16
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,19 @@ def model_parse(model: type[_ModelT], data: Any) -> _ModelT:
159159
# generic models
160160
if TYPE_CHECKING:
161161

162-
class GenericModel(pydantic.BaseModel):
163-
...
162+
class GenericModel(pydantic.BaseModel): ...
164163

165164
else:
166165
if PYDANTIC_V2:
167166
# there no longer needs to be a distinction in v2 but
168167
# we still have to create our own subclass to avoid
169168
# inconsistent MRO ordering errors
170-
class GenericModel(pydantic.BaseModel):
171-
...
169+
class GenericModel(pydantic.BaseModel): ...
172170

173171
else:
174172
import pydantic.generics
175173

176-
class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel):
177-
...
174+
class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel): ...
178175

179176

180177
# cached properties
@@ -193,26 +190,21 @@ class typed_cached_property(Generic[_T]):
193190
func: Callable[[Any], _T]
194191
attrname: str | None
195192

196-
def __init__(self, func: Callable[[Any], _T]) -> None:
197-
...
193+
def __init__(self, func: Callable[[Any], _T]) -> None: ...
198194

199195
@overload
200-
def __get__(self, instance: None, owner: type[Any] | None = None) -> Self:
201-
...
196+
def __get__(self, instance: None, owner: type[Any] | None = None) -> Self: ...
202197

203198
@overload
204-
def __get__(self, instance: object, owner: type[Any] | None = None) -> _T:
205-
...
199+
def __get__(self, instance: object, owner: type[Any] | None = None) -> _T: ...
206200

207201
def __get__(self, instance: object, owner: type[Any] | None = None) -> _T | Self:
208202
raise NotImplementedError()
209203

210-
def __set_name__(self, owner: type[Any], name: str) -> None:
211-
...
204+
def __set_name__(self, owner: type[Any], name: str) -> None: ...
212205

213206
# __set__ is not defined at runtime, but @cached_property is designed to be settable
214-
def __set__(self, instance: object, value: _T) -> None:
215-
...
207+
def __set__(self, instance: object, value: _T) -> None: ...
216208
else:
217209
try:
218210
from functools import cached_property as cached_property

‎src/orb/_files.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@ def assert_is_file_content(obj: object, *, key: str | None = None) -> None:
3939

4040

4141
@overload
42-
def to_httpx_files(files: None) -> None:
43-
...
42+
def to_httpx_files(files: None) -> None: ...
4443

4544

4645
@overload
47-
def to_httpx_files(files: RequestFiles) -> HttpxRequestFiles:
48-
...
46+
def to_httpx_files(files: RequestFiles) -> HttpxRequestFiles: ...
4947

5048

5149
def to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles | None:
@@ -83,13 +81,11 @@ def _read_file_content(file: FileContent) -> HttpxFileContent:
8381

8482

8583
@overload
86-
async def async_to_httpx_files(files: None) -> None:
87-
...
84+
async def async_to_httpx_files(files: None) -> None: ...
8885

8986

9087
@overload
91-
async def async_to_httpx_files(files: RequestFiles) -> HttpxRequestFiles:
92-
...
88+
async def async_to_httpx_files(files: RequestFiles) -> HttpxRequestFiles: ...
9389

9490

9591
async def async_to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles | None:

‎src/orb/_legacy_response.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,10 @@ def __init__(
8888
self.retries_taken = retries_taken
8989

9090
@overload
91-
def parse(self, *, to: type[_T]) -> _T:
92-
...
91+
def parse(self, *, to: type[_T]) -> _T: ...
9392

9493
@overload
95-
def parse(self) -> R:
96-
...
94+
def parse(self) -> R: ...
9795

9896
def parse(self, *, to: type[_T] | None = None) -> R | _T:
9997
"""Returns the rich python representation of this response's data.

‎src/orb/_response.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,10 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
264264

265265
class APIResponse(BaseAPIResponse[R]):
266266
@overload
267-
def parse(self, *, to: type[_T]) -> _T:
268-
...
267+
def parse(self, *, to: type[_T]) -> _T: ...
269268

270269
@overload
271-
def parse(self) -> R:
272-
...
270+
def parse(self) -> R: ...
273271

274272
def parse(self, *, to: type[_T] | None = None) -> R | _T:
275273
"""Returns the rich python representation of this response's data.
@@ -368,12 +366,10 @@ def iter_lines(self) -> Iterator[str]:
368366

369367
class AsyncAPIResponse(BaseAPIResponse[R]):
370368
@overload
371-
async def parse(self, *, to: type[_T]) -> _T:
372-
...
369+
async def parse(self, *, to: type[_T]) -> _T: ...
373370

374371
@overload
375-
async def parse(self) -> R:
376-
...
372+
async def parse(self) -> R: ...
377373

378374
async def parse(self, *, to: type[_T] | None = None) -> R | _T:
379375
"""Returns the rich python representation of this response's data.

0 commit comments

Comments
 (0)