diff --git a/package.json b/package.json index 74002b2407..14ae4b4490 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,6 @@ }, "devDependencies": { "@stdy/cli": "0.22.2", - "pyright": "1.1.399" + "pyright": "1.1.413" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6596484c44..35fd49ecae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: 0.22.2 version: 0.22.2 pyright: - specifier: 1.1.399 - version: 1.1.399 + specifier: 1.1.413 + version: 1.1.413 packages: @@ -52,8 +52,8 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - pyright@1.1.399: - resolution: {integrity: sha512-roYApcOUEraOc2gTZX052/cw/AZ5rQGkdG/2DtU1/KyhfP+C5zHDlvOT24qRgPXDDkh76AvFwq5quZ1SMahq7w==} + pyright@1.1.413: + resolution: {integrity: sha512-1lpxKrh0DHHpfAQOfciZo2ojua2jase3wwO9at8kldc+F/p1PBscxA5CQ3G1qg5lMOMhXo6ZaiMLMXEAqADIAg==} engines: {node: '>=14.0.0'} hasBin: true @@ -85,6 +85,6 @@ snapshots: fsevents@2.3.3: optional: true - pyright@1.1.399: + pyright@1.1.413: optionalDependencies: fsevents: 2.3.3 diff --git a/src/openai/_response.py b/src/openai/_response.py index acf31bdc4c..8b819ce812 100644 --- a/src/openai/_response.py +++ b/src/openai/_response.py @@ -243,7 +243,7 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T: # in the response, e.g. application/json; charset=utf-8 content_type, *_ = response.headers.get("content-type", "*").split(";") if not content_type.endswith("json"): - if is_basemodel(cast_to): + if is_basemodel(cast(type, cast_to)): try: data = response.json() except Exception as exc: diff --git a/tests/lib/test_bedrock_credential_chain.py b/tests/lib/test_bedrock_credential_chain.py index fec363aeb1..a2af4f5779 100644 --- a/tests/lib/test_bedrock_credential_chain.py +++ b/tests/lib/test_bedrock_credential_chain.py @@ -3,7 +3,7 @@ import sys import json import threading -from typing import Any, Iterator, cast +from typing import Any, Generator, cast from pathlib import Path from datetime import datetime, timezone, timedelta from contextlib import contextmanager @@ -102,7 +102,7 @@ def _assert_signed_with(request: httpx2.Request, name: str, *, region: str) -> N @contextmanager -def _metadata_server() -> Iterator[tuple[str, list[tuple[str, str, str | None]]]]: +def _metadata_server() -> Generator[tuple[str, list[tuple[str, str, str | None]]], None, None]: calls: list[tuple[str, str, str | None]] = [] class Handler(BaseHTTPRequestHandler): diff --git a/tests/node-tooling.test.cjs b/tests/node-tooling.test.cjs index d9f676fe13..df41cecf30 100644 --- a/tests/node-tooling.test.cjs +++ b/tests/node-tooling.test.cjs @@ -22,7 +22,7 @@ function fixture(t) { return root; } -function installFake(root, version = '1.1.399') { +function installFake(root, version = JSON.parse(fs.readFileSync(path.join(root, 'package.json'))).devDependencies.pyright) { const directory = path.join(root, 'node_modules/pyright'); fs.mkdirSync(directory, { recursive: true }); fs.writeFileSync(path.join(directory, 'package.json'), JSON.stringify({ version })); diff --git a/tests/test_module_client.py b/tests/test_module_client.py index 4ef7cf51b6..6b8076c6f6 100644 --- a/tests/test_module_client.py +++ b/tests/test_module_client.py @@ -101,14 +101,14 @@ def test_http_client_option() -> None: import contextlib -from typing import Iterator +from typing import Generator from openai.lib.azure import AzureOpenAI, MutuallyExclusiveAuthError from openai.lib.bedrock import BedrockOpenAI @contextlib.contextmanager -def fresh_env() -> Iterator[None]: +def fresh_env() -> Generator[None, None, None]: old = _os.environ.copy() try: diff --git a/tests/test_mtls_http_client.py b/tests/test_mtls_http_client.py index ae3318c741..7db8432b42 100644 --- a/tests/test_mtls_http_client.py +++ b/tests/test_mtls_http_client.py @@ -9,7 +9,7 @@ from pathlib import Path from contextlib import contextmanager from http.server import ThreadingHTTPServer, BaseHTTPRequestHandler -from collections.abc import Iterator +from collections.abc import Generator from typing_extensions import override import pytest @@ -45,7 +45,7 @@ def log_message(self, format: str, *args: object) -> None: @contextmanager -def _mtls_server() -> Iterator[ThreadingHTTPServer]: +def _mtls_server() -> Generator[ThreadingHTTPServer, None, None]: _Handler.peer_certificates = [] _Handler.request_paths = [] server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) diff --git a/tests/utils.py b/tests/utils.py index e03ed1a039..dafbe17519 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -5,7 +5,7 @@ import inspect import traceback import contextlib -from typing import Any, TypeVar, Iterator, Sequence, ForwardRef, cast +from typing import Any, TypeVar, Sequence, Generator, ForwardRef, cast from datetime import date, datetime from typing_extensions import Literal, get_args, get_origin, assert_type @@ -168,7 +168,7 @@ def rich_print_str(obj: object) -> str: @contextlib.contextmanager -def update_env(**new_env: str | Omit) -> Iterator[None]: +def update_env(**new_env: str | Omit) -> Generator[None, None, None]: old = os.environ.copy() try: