Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/orb/_utils/_reflection.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def assert_signatures_in_sync(

if custom_param.annotation != source_param.annotation:
errors.append(
f"types for the `{name}` param are do not match; source={repr(source_param.annotation)} checking={repr(source_param.annotation)}"
f"types for the `{name}` param are do not match; source={repr(source_param.annotation)} checking={repr(custom_param.annotation)}"
)
continue

Expand Down
7 changes: 5 additions & 2 deletions tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from pydantic import ValidationError

from orb import Orb, AsyncOrb, APIResponseValidationError
from orb._types import Omit
from orb._models import BaseModel, FinalRequestOptions
from orb._constants import RAW_RESPONSE_HEADER
from orb._exceptions import OrbError, APIStatusError, APITimeoutError, APIResponseValidationError
Expand Down Expand Up @@ -319,7 +320,8 @@ def test_validate_headers(self) -> None:
assert request.headers.get("Authorization") == f"Bearer {api_key}"

with pytest.raises(OrbError):
client2 = Orb(base_url=base_url, api_key=None, _strict_response_validation=True)
with update_env(**{"ORB_API_KEY": Omit()}):
client2 = Orb(base_url=base_url, api_key=None, _strict_response_validation=True)
_ = client2

def test_default_query_option(self) -> None:
Expand Down Expand Up @@ -1076,7 +1078,8 @@ def test_validate_headers(self) -> None:
assert request.headers.get("Authorization") == f"Bearer {api_key}"

with pytest.raises(OrbError):
client2 = AsyncOrb(base_url=base_url, api_key=None, _strict_response_validation=True)
with update_env(**{"ORB_API_KEY": Omit()}):
client2 = AsyncOrb(base_url=base_url, api_key=None, _strict_response_validation=True)
_ = client2

def test_default_query_option(self) -> None:
Expand Down
10 changes: 7 additions & 3 deletions tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from datetime import date, datetime
from typing_extensions import Literal, get_args, get_origin, assert_type

from orb._types import NoneType
from orb._types import Omit, NoneType
from orb._utils import (
is_dict,
is_list,
Expand Down Expand Up @@ -139,11 +139,15 @@ def _assert_list_type(type_: type[object], value: object) -> None:


@contextlib.contextmanager
def update_env(**new_env: str) -> Iterator[None]:
def update_env(**new_env: str | Omit) -> Iterator[None]:
old = os.environ.copy()

try:
os.environ.update(new_env)
for name, value in new_env.items():
if isinstance(value, Omit):
os.environ.pop(name, None)
else:
os.environ[name] = value

yield None
finally:
Expand Down