diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4557576..a5d56fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,14 @@ name: CI on: push: - branches-ignore: - - 'generated' - - 'codegen/**' - - 'integrated/**' - - 'stl-preview-head/**' - - 'stl-preview-base/**' + branches: + - '**' + - '!integrated/**' + - '!stl-preview-head/**' + - '!stl-preview-base/**' + - '!generated' + - '!codegen/**' + - 'codegen/stl/**' pull_request: branches-ignore: - 'stl-preview-head/**' @@ -17,7 +19,7 @@ jobs: timeout-minutes: 10 name: lint runs-on: ${{ github.repository == 'stainless-sdks/dedalus-sdk-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }} - if: github.event_name == 'push' || github.event.pull_request.head.repo.fork + if: (github.event_name == 'push' || github.event.pull_request.head.repo.fork) && (github.event_name != 'push' || github.event.head_commit.message != 'codegen metadata') steps: - uses: actions/checkout@v6 @@ -33,7 +35,7 @@ jobs: run: ./scripts/lint build: - if: github.event_name == 'push' || github.event.pull_request.head.repo.fork + if: (github.event_name == 'push' || github.event.pull_request.head.repo.fork) && (github.event_name != 'push' || github.event.head_commit.message != 'codegen metadata') timeout-minutes: 10 name: build permissions: @@ -55,14 +57,18 @@ jobs: run: uv build - name: Get GitHub OIDC Token - if: github.repository == 'stainless-sdks/dedalus-sdk-python' + if: |- + github.repository == 'stainless-sdks/dedalus-sdk-python' && + !startsWith(github.ref, 'refs/heads/stl/') id: github-oidc uses: actions/github-script@v8 with: script: core.setOutput('github_token', await core.getIDToken()); - name: Upload tarball - if: github.repository == 'stainless-sdks/dedalus-sdk-python' + if: |- + github.repository == 'stainless-sdks/dedalus-sdk-python' && + !startsWith(github.ref, 'refs/heads/stl/') env: URL: https://pkg.stainless.com/s AUTH: ${{ steps.github-oidc.outputs.github_token }} diff --git a/.github/workflows/release-doctor.yml b/.github/workflows/release-doctor.yml deleted file mode 100644 index 86f7f56..0000000 --- a/.github/workflows/release-doctor.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Release Doctor -on: - push: - branches: - - main - workflow_dispatch: - -jobs: - release_doctor: - name: release doctor - runs-on: ubuntu-latest - environment: production - if: github.repository == 'dedalus-labs/dedalus-sdk-python' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || startsWith(github.head_ref, 'release-please') || github.head_ref == 'next') - - steps: - - uses: actions/checkout@v6 - - - name: Check release environment - run: | - bash ./bin/check-release-environment - env: - PYPI_TOKEN: ${{ secrets.DEDALUS_PYPI_TOKEN || secrets.PYPI_TOKEN }} diff --git a/.gitignore b/.gitignore index 95ceb18..3824f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .prism.log +.stdy.log _dev __pycache__ diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 6b7b74c..da59f99 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.3.0" + ".": "0.4.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 06bcc8b..c1ff027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,49 @@ # Changelog +## 0.4.0 (2026-04-22) + +Full Changelog: [v0.3.0...v0.4.0](https://github.com/dedalus-labs/dedalus-sdk-python/compare/v0.3.0...v0.4.0) + +### Features + +* **internal:** implement indices array format for query and form serialization ([04ba964](https://github.com/dedalus-labs/dedalus-sdk-python/commit/04ba9644e8c73b3eff7b8ad01211d90e354a889d)) + + +### Bug Fixes + +* **client:** preserve hardcoded query params when merging with user params ([80f3981](https://github.com/dedalus-labs/dedalus-sdk-python/commit/80f3981cb6e10bd7a9dbe39412abbd6277b0ab64)) +* **deps:** bump minimum typing-extensions version ([23ea212](https://github.com/dedalus-labs/dedalus-sdk-python/commit/23ea21291b2cf443c594661acfc6e19e95077162)) +* ensure file data are only sent as 1 parameter ([721e574](https://github.com/dedalus-labs/dedalus-sdk-python/commit/721e5748d4843fe0f6dbf07c34766550d09ab05e)) +* **pydantic:** do not pass `by_alias` unless set ([b098b05](https://github.com/dedalus-labs/dedalus-sdk-python/commit/b098b05e30ec6487a6467bd928ce3c725d3f2aa0)) +* sanitize endpoint path params ([e385e21](https://github.com/dedalus-labs/dedalus-sdk-python/commit/e385e215a38c3141ff675a58799511a306d2c879)) + + +### Performance Improvements + +* **client:** optimize file structure copying in multipart requests ([43970d6](https://github.com/dedalus-labs/dedalus-sdk-python/commit/43970d6a440ff547be0c90130b75b7483ad7711e)) + + +### Chores + +* **ci:** remove release-doctor workflow ([5903593](https://github.com/dedalus-labs/dedalus-sdk-python/commit/5903593748f7cf140310fb0fe057879323e12d67)) +* **ci:** skip lint on metadata-only changes ([e11e58f](https://github.com/dedalus-labs/dedalus-sdk-python/commit/e11e58faac2c22be4f6e642b7313d09286b4a651)) +* **ci:** skip uploading artifacts on stainless-internal branches ([e3ed836](https://github.com/dedalus-labs/dedalus-sdk-python/commit/e3ed83614aa445a6af6d48fbab67edd96d651123)) +* **internal:** more robust bootstrap script ([a84687b](https://github.com/dedalus-labs/dedalus-sdk-python/commit/a84687b42b2b794198e05bb48f61d163fa3ed2c2)) +* **internal:** tweak CI branches ([1fc1ee4](https://github.com/dedalus-labs/dedalus-sdk-python/commit/1fc1ee460877941fb648448a415b37f868093058)) +* **internal:** update gitignore ([97672af](https://github.com/dedalus-labs/dedalus-sdk-python/commit/97672afab610a2fa4dcc7224dbad013b10553089)) +* update placeholder string ([3a623d4](https://github.com/dedalus-labs/dedalus-sdk-python/commit/3a623d4779430378efe9ceb6540ba6fddbc70041)) + + +### Documentation + +* improve examples ([5207295](https://github.com/dedalus-labs/dedalus-sdk-python/commit/5207295286986023ba1afbf6219a88dab046b439)) +* update examples ([62a7347](https://github.com/dedalus-labs/dedalus-sdk-python/commit/62a7347483733a1cdf57454a38af1f521f13ef4d)) + + +### Refactors + +* **types:** use `extra_items` from PEP 728 ([de6e4e4](https://github.com/dedalus-labs/dedalus-sdk-python/commit/de6e4e466ad9e9f40be8d8d4f7ea6208c076267e)) + ## 0.3.0 (2026-02-28) Full Changelog: [v0.2.0...v0.3.0](https://github.com/dedalus-labs/dedalus-sdk-python/compare/v0.2.0...v0.3.0) diff --git a/README.md b/README.md index a1ef63c..e82cefb 100644 --- a/README.md +++ b/README.md @@ -219,8 +219,8 @@ client = Dedalus() chat_completion = client.chat.completions.create( model="openai/gpt-5", audio={ - "format": "wav", - "voice": "string", + "format": "mp3", + "voice": "alloy", }, ) print(chat_completion.audio) diff --git a/bin/check-release-environment b/bin/check-release-environment deleted file mode 100644 index b845b0f..0000000 --- a/bin/check-release-environment +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -errors=() - -if [ -z "${PYPI_TOKEN}" ]; then - errors+=("The PYPI_TOKEN secret has not been set. Please set it in either this repository's secrets or your organization secrets.") -fi - -lenErrors=${#errors[@]} - -if [[ lenErrors -gt 0 ]]; then - echo -e "Found the following errors in the release environment:\n" - - for error in "${errors[@]}"; do - echo -e "- $error\n" - done - - exit 1 -fi - -echo "The environment is ready to push releases!" diff --git a/pyproject.toml b/pyproject.toml index c409c14..e94a7fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dedalus_labs" -version = "0.3.0" +version = "0.4.0" description = "The official Python library for the Dedalus API" dynamic = ["readme"] license = "MIT" @@ -11,7 +11,7 @@ authors = [ dependencies = [ "httpx>=0.23.0, <1", "pydantic>=1.9.0, <3", - "typing-extensions>=4.10, <5", + "typing-extensions>=4.14, <5", "anyio>=3.5.0, <5", "distro>=1.7.0, <2", "sniffio", diff --git a/scripts/bootstrap b/scripts/bootstrap index 4638ec6..5a23841 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")/.." -if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ] && [ "$SKIP_BREW" != "1" ] && [ -t 0 ]; then +if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ] && [ "${SKIP_BREW:-}" != "1" ] && [ -t 0 ]; then brew bundle check >/dev/null 2>&1 || { echo -n "==> Install Homebrew dependencies? (y/N): " read -r response diff --git a/src/dedalus_labs/_base_client.py b/src/dedalus_labs/_base_client.py index fc60f6c..d847e9f 100644 --- a/src/dedalus_labs/_base_client.py +++ b/src/dedalus_labs/_base_client.py @@ -540,6 +540,10 @@ def _build_request( files = cast(HttpxRequestFiles, ForceMultipartDict()) prepared_url = self._prepare_url(options.url) + # preserve hard-coded query params from the url + if params and prepared_url.query: + params = {**dict(prepared_url.params.items()), **params} + prepared_url = prepared_url.copy_with(raw_path=prepared_url.raw_path.split(b"?", 1)[0]) if "_" in prepared_url.host: # work around https://github.com/encode/httpx/discussions/2880 kwargs["extensions"] = {"sni_hostname": prepared_url.host.replace("_", "-")} diff --git a/src/dedalus_labs/_compat.py b/src/dedalus_labs/_compat.py index 76d017b..6d465dc 100644 --- a/src/dedalus_labs/_compat.py +++ b/src/dedalus_labs/_compat.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Any, Union, Generic, TypeVar, Callable, cast, overload from datetime import date, datetime -from typing_extensions import Self, Literal +from typing_extensions import Self, Literal, TypedDict import pydantic from pydantic.fields import FieldInfo @@ -131,6 +131,10 @@ def model_json(model: pydantic.BaseModel, *, indent: int | None = None) -> str: return model.model_dump_json(indent=indent) +class _ModelDumpKwargs(TypedDict, total=False): + by_alias: bool + + def model_dump( model: pydantic.BaseModel, *, @@ -142,6 +146,9 @@ def model_dump( by_alias: bool | None = None, ) -> dict[str, Any]: if (not PYDANTIC_V1) or hasattr(model, "model_dump"): + kwargs: _ModelDumpKwargs = {} + if by_alias is not None: + kwargs["by_alias"] = by_alias return model.model_dump( mode=mode, exclude=exclude, @@ -149,7 +156,7 @@ def model_dump( exclude_defaults=exclude_defaults, # warnings are not supported in Pydantic v1 warnings=True if PYDANTIC_V1 else warnings, - by_alias=by_alias, + **kwargs, ) return cast( "dict[str, Any]", diff --git a/src/dedalus_labs/_files.py b/src/dedalus_labs/_files.py index 64adb90..5058e84 100644 --- a/src/dedalus_labs/_files.py +++ b/src/dedalus_labs/_files.py @@ -3,8 +3,8 @@ import io import os import pathlib -from typing import overload -from typing_extensions import TypeGuard +from typing import Sequence, cast, overload +from typing_extensions import TypeVar, TypeGuard import anyio @@ -17,7 +17,9 @@ HttpxFileContent, HttpxRequestFiles, ) -from ._utils import is_tuple_t, is_mapping_t, is_sequence_t +from ._utils import is_list, is_mapping, is_tuple_t, is_mapping_t, is_sequence_t + +_T = TypeVar("_T") def is_base64_file_input(obj: object) -> TypeGuard[Base64FileInput]: @@ -121,3 +123,51 @@ async def async_read_file_content(file: FileContent) -> HttpxFileContent: return await anyio.Path(file).read_bytes() return file + + +def deepcopy_with_paths(item: _T, paths: Sequence[Sequence[str]]) -> _T: + """Copy only the containers along the given paths. + + Used to guard against mutation by extract_files without copying the entire structure. + Only dicts and lists that lie on a path are copied; everything else + is returned by reference. + + For example, given paths=[["foo", "files", "file"]] and the structure: + { + "foo": { + "bar": {"baz": {}}, + "files": {"file": } + } + } + The root dict, "foo", and "files" are copied (they lie on the path). + "bar" and "baz" are returned by reference (off the path). + """ + return _deepcopy_with_paths(item, paths, 0) + + +def _deepcopy_with_paths(item: _T, paths: Sequence[Sequence[str]], index: int) -> _T: + if not paths: + return item + if is_mapping(item): + key_to_paths: dict[str, list[Sequence[str]]] = {} + for path in paths: + if index < len(path): + key_to_paths.setdefault(path[index], []).append(path) + + # if no path continues through this mapping, it won't be mutated and copying it is redundant + if not key_to_paths: + return item + + result = dict(item) + for key, subpaths in key_to_paths.items(): + if key in result: + result[key] = _deepcopy_with_paths(result[key], subpaths, index + 1) + return cast(_T, result) + if is_list(item): + array_paths = [path for path in paths if index < len(path) and path[index] == ""] + + # if no path expects a list here, nothing will be mutated inside it - return by reference + if not array_paths: + return cast(_T, item) + return cast(_T, [_deepcopy_with_paths(entry, array_paths, index + 1) for entry in item]) + return item diff --git a/src/dedalus_labs/_qs.py b/src/dedalus_labs/_qs.py index ada6fd3..de8c99b 100644 --- a/src/dedalus_labs/_qs.py +++ b/src/dedalus_labs/_qs.py @@ -101,7 +101,10 @@ def _stringify_item( items.extend(self._stringify_item(key, item, opts)) return items elif array_format == "indices": - raise NotImplementedError("The array indices format is not supported yet") + items = [] + for i, item in enumerate(value): + items.extend(self._stringify_item(f"{key}[{i}]", item, opts)) + return items elif array_format == "brackets": items = [] key = key + "[]" diff --git a/src/dedalus_labs/_utils/__init__.py b/src/dedalus_labs/_utils/__init__.py index dc64e29..1c090e5 100644 --- a/src/dedalus_labs/_utils/__init__.py +++ b/src/dedalus_labs/_utils/__init__.py @@ -1,3 +1,4 @@ +from ._path import path_template as path_template from ._sync import asyncify as asyncify from ._proxy import LazyProxy as LazyProxy from ._utils import ( @@ -23,7 +24,6 @@ coerce_integer as coerce_integer, file_from_path as file_from_path, strip_not_given as strip_not_given, - deepcopy_minimal as deepcopy_minimal, get_async_library as get_async_library, maybe_coerce_float as maybe_coerce_float, get_required_header as get_required_header, diff --git a/src/dedalus_labs/_utils/_path.py b/src/dedalus_labs/_utils/_path.py new file mode 100644 index 0000000..4d6e1e4 --- /dev/null +++ b/src/dedalus_labs/_utils/_path.py @@ -0,0 +1,127 @@ +from __future__ import annotations + +import re +from typing import ( + Any, + Mapping, + Callable, +) +from urllib.parse import quote + +# Matches '.' or '..' where each dot is either literal or percent-encoded (%2e / %2E). +_DOT_SEGMENT_RE = re.compile(r"^(?:\.|%2[eE]){1,2}$") + +_PLACEHOLDER_RE = re.compile(r"\{(\w+)\}") + + +def _quote_path_segment_part(value: str) -> str: + """Percent-encode `value` for use in a URI path segment. + + Considers characters not in `pchar` set from RFC 3986 §3.3 to be unsafe. + https://datatracker.ietf.org/doc/html/rfc3986#section-3.3 + """ + # quote() already treats unreserved characters (letters, digits, and -._~) + # as safe, so we only need to add sub-delims, ':', and '@'. + # Notably, unlike the default `safe` for quote(), / is unsafe and must be quoted. + return quote(value, safe="!$&'()*+,;=:@") + + +def _quote_query_part(value: str) -> str: + """Percent-encode `value` for use in a URI query string. + + Considers &, = and characters not in `query` set from RFC 3986 §3.4 to be unsafe. + https://datatracker.ietf.org/doc/html/rfc3986#section-3.4 + """ + return quote(value, safe="!$'()*+,;:@/?") + + +def _quote_fragment_part(value: str) -> str: + """Percent-encode `value` for use in a URI fragment. + + Considers characters not in `fragment` set from RFC 3986 §3.5 to be unsafe. + https://datatracker.ietf.org/doc/html/rfc3986#section-3.5 + """ + return quote(value, safe="!$&'()*+,;=:@/?") + + +def _interpolate( + template: str, + values: Mapping[str, Any], + quoter: Callable[[str], str], +) -> str: + """Replace {name} placeholders in `template`, quoting each value with `quoter`. + + Placeholder names are looked up in `values`. + + Raises: + KeyError: If a placeholder is not found in `values`. + """ + # re.split with a capturing group returns alternating + # [text, name, text, name, ..., text] elements. + parts = _PLACEHOLDER_RE.split(template) + + for i in range(1, len(parts), 2): + name = parts[i] + if name not in values: + raise KeyError(f"a value for placeholder {{{name}}} was not provided") + val = values[name] + if val is None: + parts[i] = "null" + elif isinstance(val, bool): + parts[i] = "true" if val else "false" + else: + parts[i] = quoter(str(values[name])) + + return "".join(parts) + + +def path_template(template: str, /, **kwargs: Any) -> str: + """Interpolate {name} placeholders in `template` from keyword arguments. + + Args: + template: The template string containing {name} placeholders. + **kwargs: Keyword arguments to interpolate into the template. + + Returns: + The template with placeholders interpolated and percent-encoded. + + Safe characters for percent-encoding are dependent on the URI component. + Placeholders in path and fragment portions are percent-encoded where the `segment` + and `fragment` sets from RFC 3986 respectively are considered safe. + Placeholders in the query portion are percent-encoded where the `query` set from + RFC 3986 §3.3 is considered safe except for = and & characters. + + Raises: + KeyError: If a placeholder is not found in `kwargs`. + ValueError: If resulting path contains /./ or /../ segments (including percent-encoded dot-segments). + """ + # Split the template into path, query, and fragment portions. + fragment_template: str | None = None + query_template: str | None = None + + rest = template + if "#" in rest: + rest, fragment_template = rest.split("#", 1) + if "?" in rest: + rest, query_template = rest.split("?", 1) + path_template = rest + + # Interpolate each portion with the appropriate quoting rules. + path_result = _interpolate(path_template, kwargs, _quote_path_segment_part) + + # Reject dot-segments (. and ..) in the final assembled path. The check + # runs after interpolation so that adjacent placeholders or a mix of static + # text and placeholders that together form a dot-segment are caught. + # Also reject percent-encoded dot-segments to protect against incorrectly + # implemented normalization in servers/proxies. + for segment in path_result.split("/"): + if _DOT_SEGMENT_RE.match(segment): + raise ValueError(f"Constructed path {path_result!r} contains dot-segment {segment!r} which is not allowed") + + result = path_result + if query_template is not None: + result += "?" + _interpolate(query_template, kwargs, _quote_query_part) + if fragment_template is not None: + result += "#" + _interpolate(fragment_template, kwargs, _quote_fragment_part) + + return result diff --git a/src/dedalus_labs/_utils/_utils.py b/src/dedalus_labs/_utils/_utils.py index eec7f4a..771859f 100644 --- a/src/dedalus_labs/_utils/_utils.py +++ b/src/dedalus_labs/_utils/_utils.py @@ -86,8 +86,9 @@ def _extract_items( index += 1 if is_dict(obj): try: - # We are at the last entry in the path so we must remove the field - if (len(path)) == index: + # Remove the field if there are no more dict keys in the path, + # only "" traversal markers or end. + if all(p == "" for p in path[index:]): item = obj.pop(key) else: item = obj[key] @@ -176,21 +177,6 @@ def is_iterable(obj: object) -> TypeGuard[Iterable[object]]: return isinstance(obj, Iterable) -def deepcopy_minimal(item: _T) -> _T: - """Minimal reimplementation of copy.deepcopy() that will only copy certain object types: - - - mappings, e.g. `dict` - - list - - This is done for performance reasons. - """ - if is_mapping(item): - return cast(_T, {k: deepcopy_minimal(v) for k, v in item.items()}) - if is_list(item): - return cast(_T, [deepcopy_minimal(entry) for entry in item]) - return item - - # copied from https://github.com/Rapptz/RoboDanny def human_join(seq: Sequence[str], *, delim: str = ", ", final: str = "or") -> str: size = len(seq) diff --git a/src/dedalus_labs/_version.py b/src/dedalus_labs/_version.py index 9329938..72a23a5 100644 --- a/src/dedalus_labs/_version.py +++ b/src/dedalus_labs/_version.py @@ -1,4 +1,4 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. __title__ = "dedalus_labs" -__version__ = "0.3.0" # x-release-please-version +__version__ = "0.4.0" # x-release-please-version diff --git a/src/dedalus_labs/resources/audio/transcriptions.py b/src/dedalus_labs/resources/audio/transcriptions.py index 8d011e7..fb4c670 100644 --- a/src/dedalus_labs/resources/audio/transcriptions.py +++ b/src/dedalus_labs/resources/audio/transcriptions.py @@ -6,8 +6,9 @@ import httpx +from ..._files import deepcopy_with_paths from ..._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given -from ..._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform +from ..._utils import extract_files, maybe_transform, async_maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import ( @@ -86,7 +87,7 @@ def create( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "file": file, "model": model, @@ -94,7 +95,8 @@ def create( "prompt": prompt, "response_format": response_format, "temperature": temperature, - } + }, + [["file"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["file"]]) # It should be noted that the actual Content-Type header that will be @@ -184,7 +186,7 @@ async def create( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "file": file, "model": model, @@ -192,7 +194,8 @@ async def create( "prompt": prompt, "response_format": response_format, "temperature": temperature, - } + }, + [["file"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["file"]]) # It should be noted that the actual Content-Type header that will be diff --git a/src/dedalus_labs/resources/audio/translations.py b/src/dedalus_labs/resources/audio/translations.py index 75eab35..faedfda 100644 --- a/src/dedalus_labs/resources/audio/translations.py +++ b/src/dedalus_labs/resources/audio/translations.py @@ -6,8 +6,9 @@ import httpx +from ..._files import deepcopy_with_paths from ..._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given -from ..._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform +from ..._utils import extract_files, maybe_transform, async_maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import ( @@ -84,14 +85,15 @@ def create( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "file": file, "model": model, "prompt": prompt, "response_format": response_format, "temperature": temperature, - } + }, + [["file"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["file"]]) # It should be noted that the actual Content-Type header that will be @@ -179,14 +181,15 @@ async def create( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "file": file, "model": model, "prompt": prompt, "response_format": response_format, "temperature": temperature, - } + }, + [["file"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["file"]]) # It should be noted that the actual Content-Type header that will be diff --git a/src/dedalus_labs/resources/images.py b/src/dedalus_labs/resources/images.py index ff710c0..72d4d29 100644 --- a/src/dedalus_labs/resources/images.py +++ b/src/dedalus_labs/resources/images.py @@ -8,8 +8,9 @@ import httpx from ..types import image_edit_params, image_generate_params, image_create_variation_params +from .._files import deepcopy_with_paths from .._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given -from .._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform +from .._utils import extract_files, maybe_transform, async_maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource from .._response import ( @@ -78,7 +79,7 @@ def create_variation( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "image": image, "model": model, @@ -86,7 +87,8 @@ def create_variation( "response_format": response_format, "size": size, "user": user, - } + }, + [["image"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["image"]]) # It should be noted that the actual Content-Type header that will be @@ -144,7 +146,7 @@ def edit( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "image": image, "prompt": prompt, @@ -154,7 +156,8 @@ def edit( "response_format": response_format, "size": size, "user": user, - } + }, + [["image"], ["mask"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["image"], ["mask"]]) # It should be noted that the actual Content-Type header that will be @@ -373,7 +376,7 @@ async def create_variation( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "image": image, "model": model, @@ -381,7 +384,8 @@ async def create_variation( "response_format": response_format, "size": size, "user": user, - } + }, + [["image"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["image"]]) # It should be noted that the actual Content-Type header that will be @@ -439,7 +443,7 @@ async def edit( idempotency_key: Specify a custom idempotency key for this request """ - body = deepcopy_minimal( + body = deepcopy_with_paths( { "image": image, "prompt": prompt, @@ -449,7 +453,8 @@ async def edit( "response_format": response_format, "size": size, "user": user, - } + }, + [["image"], ["mask"]], ) files = extract_files(cast(Mapping[str, object], body), paths=[["image"], ["mask"]]) # It should be noted that the actual Content-Type header that will be diff --git a/src/dedalus_labs/resources/models.py b/src/dedalus_labs/resources/models.py index c56a5e7..a47aff8 100644 --- a/src/dedalus_labs/resources/models.py +++ b/src/dedalus_labs/resources/models.py @@ -5,6 +5,7 @@ import httpx from .._types import Body, Query, Headers, NotGiven, not_given +from .._utils import path_template from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource from .._response import ( @@ -99,7 +100,7 @@ def retrieve( if not model_id: raise ValueError(f"Expected a non-empty value for `model_id` but received {model_id!r}") return self._get( - f"/v1/models/{model_id}", + path_template("/v1/models/{model_id}", model_id=model_id), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -213,7 +214,7 @@ async def retrieve( if not model_id: raise ValueError(f"Expected a non-empty value for `model_id` but received {model_id!r}") return await self._get( - f"/v1/models/{model_id}", + path_template("/v1/models/{model_id}", model_id=model_id), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/dedalus_labs/types/shared_params/reasoning.py b/src/dedalus_labs/types/shared_params/reasoning.py index ea0bb7c..dfe11f2 100644 --- a/src/dedalus_labs/types/shared_params/reasoning.py +++ b/src/dedalus_labs/types/shared_params/reasoning.py @@ -2,13 +2,13 @@ from __future__ import annotations -from typing import Dict, Union, Optional -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Optional +from typing_extensions import Literal, TypedDict __all__ = ["Reasoning"] -class ReasoningTyped(TypedDict, total=False): +class Reasoning(TypedDict, total=False, extra_items=object): # type: ignore[call-arg] """**gpt-5 and o-series models only** Configuration options for @@ -20,6 +20,3 @@ class ReasoningTyped(TypedDict, total=False): generate_summary: Optional[Literal["auto", "concise", "detailed"]] summary: Optional[Literal["auto", "concise", "detailed"]] - - -Reasoning: TypeAlias = Union[ReasoningTyped, Dict[str, object]] diff --git a/tests/api_resources/audio/test_speech.py b/tests/api_resources/audio/test_speech.py index b85b94e..77df9fd 100644 --- a/tests/api_resources/audio/test_speech.py +++ b/tests/api_resources/audio/test_speech.py @@ -29,8 +29,8 @@ def test_method_create(self, client: Dedalus, respx_mock: MockRouter) -> None: respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) speech = client.audio.speech.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) assert speech.is_closed assert speech.json() == {"foo": "bar"} @@ -43,8 +43,8 @@ def test_method_create_with_all_params(self, client: Dedalus, respx_mock: MockRo respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) speech = client.audio.speech.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", instructions="instructions", response_format="mp3", speed=0.25, @@ -62,8 +62,8 @@ def test_raw_response_create(self, client: Dedalus, respx_mock: MockRouter) -> N speech = client.audio.speech.with_raw_response.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) assert speech.is_closed is True @@ -77,8 +77,8 @@ def test_streaming_response_create(self, client: Dedalus, respx_mock: MockRouter respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) with client.audio.speech.with_streaming_response.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) as speech: assert not speech.is_closed assert speech.http_request.headers.get("X-Stainless-Lang") == "python" @@ -101,8 +101,8 @@ async def test_method_create(self, async_client: AsyncDedalus, respx_mock: MockR respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) speech = await async_client.audio.speech.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) assert speech.is_closed assert await speech.json() == {"foo": "bar"} @@ -115,8 +115,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncDedalus, r respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) speech = await async_client.audio.speech.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", instructions="instructions", response_format="mp3", speed=0.25, @@ -134,8 +134,8 @@ async def test_raw_response_create(self, async_client: AsyncDedalus, respx_mock: speech = await async_client.audio.speech.with_raw_response.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) assert speech.is_closed is True @@ -149,8 +149,8 @@ async def test_streaming_response_create(self, async_client: AsyncDedalus, respx respx_mock.post("/v1/audio/speech").mock(return_value=httpx.Response(200, json={"foo": "bar"})) async with async_client.audio.speech.with_streaming_response.create( input="input", - model="string", - voice="string", + model="tts-1", + voice="alloy", ) as speech: assert not speech.is_closed assert speech.http_request.headers.get("X-Stainless-Lang") == "python" diff --git a/tests/api_resources/audio/test_transcriptions.py b/tests/api_resources/audio/test_transcriptions.py index d15a157..ccb9930 100644 --- a/tests/api_resources/audio/test_transcriptions.py +++ b/tests/api_resources/audio/test_transcriptions.py @@ -21,7 +21,7 @@ class TestTranscriptions: @parametrize def test_method_create(self, client: Dedalus) -> None: transcription = client.audio.transcriptions.create( - file=b"raw file contents", + file=b"Example data", model="model", ) assert_matches_type(TranscriptionCreateResponse, transcription, path=["response"]) @@ -30,7 +30,7 @@ def test_method_create(self, client: Dedalus) -> None: @parametrize def test_method_create_with_all_params(self, client: Dedalus) -> None: transcription = client.audio.transcriptions.create( - file=b"raw file contents", + file=b"Example data", model="model", language="language", prompt="prompt", @@ -43,7 +43,7 @@ def test_method_create_with_all_params(self, client: Dedalus) -> None: @parametrize def test_raw_response_create(self, client: Dedalus) -> None: response = client.audio.transcriptions.with_raw_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) @@ -56,7 +56,7 @@ def test_raw_response_create(self, client: Dedalus) -> None: @parametrize def test_streaming_response_create(self, client: Dedalus) -> None: with client.audio.transcriptions.with_streaming_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) as response: assert not response.is_closed @@ -77,7 +77,7 @@ class TestAsyncTranscriptions: @parametrize async def test_method_create(self, async_client: AsyncDedalus) -> None: transcription = await async_client.audio.transcriptions.create( - file=b"raw file contents", + file=b"Example data", model="model", ) assert_matches_type(TranscriptionCreateResponse, transcription, path=["response"]) @@ -86,7 +86,7 @@ async def test_method_create(self, async_client: AsyncDedalus) -> None: @parametrize async def test_method_create_with_all_params(self, async_client: AsyncDedalus) -> None: transcription = await async_client.audio.transcriptions.create( - file=b"raw file contents", + file=b"Example data", model="model", language="language", prompt="prompt", @@ -99,7 +99,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncDedalus) - @parametrize async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: response = await async_client.audio.transcriptions.with_raw_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) @@ -112,7 +112,7 @@ async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: @parametrize async def test_streaming_response_create(self, async_client: AsyncDedalus) -> None: async with async_client.audio.transcriptions.with_streaming_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) as response: assert not response.is_closed diff --git a/tests/api_resources/audio/test_translations.py b/tests/api_resources/audio/test_translations.py index b005e5c..a3dce3d 100644 --- a/tests/api_resources/audio/test_translations.py +++ b/tests/api_resources/audio/test_translations.py @@ -21,7 +21,7 @@ class TestTranslations: @parametrize def test_method_create(self, client: Dedalus) -> None: translation = client.audio.translations.create( - file=b"raw file contents", + file=b"Example data", model="model", ) assert_matches_type(TranslationCreateResponse, translation, path=["response"]) @@ -30,7 +30,7 @@ def test_method_create(self, client: Dedalus) -> None: @parametrize def test_method_create_with_all_params(self, client: Dedalus) -> None: translation = client.audio.translations.create( - file=b"raw file contents", + file=b"Example data", model="model", prompt="prompt", response_format="response_format", @@ -42,7 +42,7 @@ def test_method_create_with_all_params(self, client: Dedalus) -> None: @parametrize def test_raw_response_create(self, client: Dedalus) -> None: response = client.audio.translations.with_raw_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) @@ -55,7 +55,7 @@ def test_raw_response_create(self, client: Dedalus) -> None: @parametrize def test_streaming_response_create(self, client: Dedalus) -> None: with client.audio.translations.with_streaming_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) as response: assert not response.is_closed @@ -76,7 +76,7 @@ class TestAsyncTranslations: @parametrize async def test_method_create(self, async_client: AsyncDedalus) -> None: translation = await async_client.audio.translations.create( - file=b"raw file contents", + file=b"Example data", model="model", ) assert_matches_type(TranslationCreateResponse, translation, path=["response"]) @@ -85,7 +85,7 @@ async def test_method_create(self, async_client: AsyncDedalus) -> None: @parametrize async def test_method_create_with_all_params(self, async_client: AsyncDedalus) -> None: translation = await async_client.audio.translations.create( - file=b"raw file contents", + file=b"Example data", model="model", prompt="prompt", response_format="response_format", @@ -97,7 +97,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncDedalus) - @parametrize async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: response = await async_client.audio.translations.with_raw_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) @@ -110,7 +110,7 @@ async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: @parametrize async def test_streaming_response_create(self, async_client: AsyncDedalus) -> None: async with async_client.audio.translations.with_streaming_response.create( - file=b"raw file contents", + file=b"Example data", model="model", ) as response: assert not response.is_closed diff --git a/tests/api_resources/chat/test_completions.py b/tests/api_resources/chat/test_completions.py index 20eca3a..02e2f24 100644 --- a/tests/api_resources/chat/test_completions.py +++ b/tests/api_resources/chat/test_completions.py @@ -37,8 +37,8 @@ def test_method_create_with_all_params_overload_1(self, client: Dedalus) -> None "complexity": 0.8, }, audio={ - "format": "wav", - "voice": "string", + "format": "mp3", + "voice": "alloy", }, automatic_tool_execution=True, cached_content="cached_content", @@ -191,8 +191,8 @@ def test_method_create_with_all_params_overload_2(self, client: Dedalus) -> None "complexity": 0.8, }, audio={ - "format": "wav", - "voice": "string", + "format": "mp3", + "voice": "alloy", }, automatic_tool_execution=True, cached_content="cached_content", @@ -349,8 +349,8 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn "complexity": 0.8, }, audio={ - "format": "wav", - "voice": "string", + "format": "mp3", + "voice": "alloy", }, automatic_tool_execution=True, cached_content="cached_content", @@ -503,8 +503,8 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn "complexity": 0.8, }, audio={ - "format": "wav", - "voice": "string", + "format": "mp3", + "voice": "alloy", }, automatic_tool_execution=True, cached_content="cached_content", diff --git a/tests/api_resources/test_embeddings.py b/tests/api_resources/test_embeddings.py index b63963b..1e5e4e2 100644 --- a/tests/api_resources/test_embeddings.py +++ b/tests/api_resources/test_embeddings.py @@ -22,7 +22,7 @@ class TestEmbeddings: def test_method_create(self, client: Dedalus) -> None: embedding = client.embeddings.create( input="string", - model="string", + model="text-embedding-ada-002", ) assert_matches_type(CreateEmbeddingResponse, embedding, path=["response"]) @@ -31,7 +31,7 @@ def test_method_create(self, client: Dedalus) -> None: def test_method_create_with_all_params(self, client: Dedalus) -> None: embedding = client.embeddings.create( input="string", - model="string", + model="text-embedding-ada-002", dimensions=1, encoding_format="float", user="user", @@ -43,7 +43,7 @@ def test_method_create_with_all_params(self, client: Dedalus) -> None: def test_raw_response_create(self, client: Dedalus) -> None: response = client.embeddings.with_raw_response.create( input="string", - model="string", + model="text-embedding-ada-002", ) assert response.is_closed is True @@ -56,7 +56,7 @@ def test_raw_response_create(self, client: Dedalus) -> None: def test_streaming_response_create(self, client: Dedalus) -> None: with client.embeddings.with_streaming_response.create( input="string", - model="string", + model="text-embedding-ada-002", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -77,7 +77,7 @@ class TestAsyncEmbeddings: async def test_method_create(self, async_client: AsyncDedalus) -> None: embedding = await async_client.embeddings.create( input="string", - model="string", + model="text-embedding-ada-002", ) assert_matches_type(CreateEmbeddingResponse, embedding, path=["response"]) @@ -86,7 +86,7 @@ async def test_method_create(self, async_client: AsyncDedalus) -> None: async def test_method_create_with_all_params(self, async_client: AsyncDedalus) -> None: embedding = await async_client.embeddings.create( input="string", - model="string", + model="text-embedding-ada-002", dimensions=1, encoding_format="float", user="user", @@ -98,7 +98,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncDedalus) - async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: response = await async_client.embeddings.with_raw_response.create( input="string", - model="string", + model="text-embedding-ada-002", ) assert response.is_closed is True @@ -111,7 +111,7 @@ async def test_raw_response_create(self, async_client: AsyncDedalus) -> None: async def test_streaming_response_create(self, async_client: AsyncDedalus) -> None: async with async_client.embeddings.with_streaming_response.create( input="string", - model="string", + model="text-embedding-ada-002", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" diff --git a/tests/api_resources/test_images.py b/tests/api_resources/test_images.py index b797e15..35b7f9c 100644 --- a/tests/api_resources/test_images.py +++ b/tests/api_resources/test_images.py @@ -21,7 +21,7 @@ class TestImages: @parametrize def test_method_create_variation(self, client: Dedalus) -> None: image = client.images.create_variation( - image=b"raw file contents", + image=b"Example data", ) assert_matches_type(ImagesResponse, image, path=["response"]) @@ -29,7 +29,7 @@ def test_method_create_variation(self, client: Dedalus) -> None: @parametrize def test_method_create_variation_with_all_params(self, client: Dedalus) -> None: image = client.images.create_variation( - image=b"raw file contents", + image=b"Example data", model="model", n=0, response_format="response_format", @@ -42,7 +42,7 @@ def test_method_create_variation_with_all_params(self, client: Dedalus) -> None: @parametrize def test_raw_response_create_variation(self, client: Dedalus) -> None: response = client.images.with_raw_response.create_variation( - image=b"raw file contents", + image=b"Example data", ) assert response.is_closed is True @@ -54,7 +54,7 @@ def test_raw_response_create_variation(self, client: Dedalus) -> None: @parametrize def test_streaming_response_create_variation(self, client: Dedalus) -> None: with client.images.with_streaming_response.create_variation( - image=b"raw file contents", + image=b"Example data", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -68,7 +68,7 @@ def test_streaming_response_create_variation(self, client: Dedalus) -> None: @parametrize def test_method_edit(self, client: Dedalus) -> None: image = client.images.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) assert_matches_type(ImagesResponse, image, path=["response"]) @@ -77,9 +77,9 @@ def test_method_edit(self, client: Dedalus) -> None: @parametrize def test_method_edit_with_all_params(self, client: Dedalus) -> None: image = client.images.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", - mask=b"raw file contents", + mask=b"Example data", model="model", n=0, response_format="response_format", @@ -92,7 +92,7 @@ def test_method_edit_with_all_params(self, client: Dedalus) -> None: @parametrize def test_raw_response_edit(self, client: Dedalus) -> None: response = client.images.with_raw_response.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) @@ -105,7 +105,7 @@ def test_raw_response_edit(self, client: Dedalus) -> None: @parametrize def test_streaming_response_edit(self, client: Dedalus) -> None: with client.images.with_streaming_response.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) as response: assert not response.is_closed @@ -181,7 +181,7 @@ class TestAsyncImages: @parametrize async def test_method_create_variation(self, async_client: AsyncDedalus) -> None: image = await async_client.images.create_variation( - image=b"raw file contents", + image=b"Example data", ) assert_matches_type(ImagesResponse, image, path=["response"]) @@ -189,7 +189,7 @@ async def test_method_create_variation(self, async_client: AsyncDedalus) -> None @parametrize async def test_method_create_variation_with_all_params(self, async_client: AsyncDedalus) -> None: image = await async_client.images.create_variation( - image=b"raw file contents", + image=b"Example data", model="model", n=0, response_format="response_format", @@ -202,7 +202,7 @@ async def test_method_create_variation_with_all_params(self, async_client: Async @parametrize async def test_raw_response_create_variation(self, async_client: AsyncDedalus) -> None: response = await async_client.images.with_raw_response.create_variation( - image=b"raw file contents", + image=b"Example data", ) assert response.is_closed is True @@ -214,7 +214,7 @@ async def test_raw_response_create_variation(self, async_client: AsyncDedalus) - @parametrize async def test_streaming_response_create_variation(self, async_client: AsyncDedalus) -> None: async with async_client.images.with_streaming_response.create_variation( - image=b"raw file contents", + image=b"Example data", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -228,7 +228,7 @@ async def test_streaming_response_create_variation(self, async_client: AsyncDeda @parametrize async def test_method_edit(self, async_client: AsyncDedalus) -> None: image = await async_client.images.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) assert_matches_type(ImagesResponse, image, path=["response"]) @@ -237,9 +237,9 @@ async def test_method_edit(self, async_client: AsyncDedalus) -> None: @parametrize async def test_method_edit_with_all_params(self, async_client: AsyncDedalus) -> None: image = await async_client.images.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", - mask=b"raw file contents", + mask=b"Example data", model="model", n=0, response_format="response_format", @@ -252,7 +252,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncDedalus) -> @parametrize async def test_raw_response_edit(self, async_client: AsyncDedalus) -> None: response = await async_client.images.with_raw_response.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) @@ -265,7 +265,7 @@ async def test_raw_response_edit(self, async_client: AsyncDedalus) -> None: @parametrize async def test_streaming_response_edit(self, async_client: AsyncDedalus) -> None: async with async_client.images.with_streaming_response.edit( - image=b"raw file contents", + image=b"Example data", prompt="prompt", ) as response: assert not response.is_closed diff --git a/tests/api_resources/test_responses.py b/tests/api_resources/test_responses.py index b9786c0..0eea652 100644 --- a/tests/api_resources/test_responses.py +++ b/tests/api_resources/test_responses.py @@ -56,9 +56,9 @@ def test_method_create_with_all_params(self, client: Dedalus) -> None: service_tier="auto", store=True, stream=True, - stream_options={"foo": "string"}, + stream_options={"include_usage": True}, temperature=0, - text={"foo": "string"}, + text={"type": "text"}, tool_choice="auto", tools=[ { @@ -144,9 +144,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncDedalus) - service_tier="auto", store=True, stream=True, - stream_options={"foo": "string"}, + stream_options={"include_usage": True}, temperature=0, - text={"foo": "string"}, + text={"type": "text"}, tool_choice="auto", tools=[ { diff --git a/tests/test_client.py b/tests/test_client.py index 90b0e47..9ee0bda 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -437,6 +437,30 @@ def test_default_query_option(self) -> None: client.close() + def test_hardcoded_query_params_in_url(self, client: Dedalus) -> None: + request = client._build_request(FinalRequestOptions(method="get", url="/foo?beta=true")) + url = httpx.URL(request.url) + assert dict(url.params) == {"beta": "true"} + + request = client._build_request( + FinalRequestOptions( + method="get", + url="/foo?beta=true", + params={"limit": "10", "page": "abc"}, + ) + ) + url = httpx.URL(request.url) + assert dict(url.params) == {"beta": "true", "limit": "10", "page": "abc"} + + request = client._build_request( + FinalRequestOptions( + method="get", + url="/files/a%2Fb?beta=true", + params={"limit": "10"}, + ) + ) + assert request.url.raw_path == b"/files/a%2Fb?beta=true&limit=10" + def test_request_extra_json(self, client: Dedalus) -> None: request = client._build_request( FinalRequestOptions( @@ -1393,6 +1417,30 @@ async def test_default_query_option(self) -> None: await client.close() + async def test_hardcoded_query_params_in_url(self, async_client: AsyncDedalus) -> None: + request = async_client._build_request(FinalRequestOptions(method="get", url="/foo?beta=true")) + url = httpx.URL(request.url) + assert dict(url.params) == {"beta": "true"} + + request = async_client._build_request( + FinalRequestOptions( + method="get", + url="/foo?beta=true", + params={"limit": "10", "page": "abc"}, + ) + ) + url = httpx.URL(request.url) + assert dict(url.params) == {"beta": "true", "limit": "10", "page": "abc"} + + request = async_client._build_request( + FinalRequestOptions( + method="get", + url="/files/a%2Fb?beta=true", + params={"limit": "10"}, + ) + ) + assert request.url.raw_path == b"/files/a%2Fb?beta=true&limit=10" + def test_request_extra_json(self, client: Dedalus) -> None: request = client._build_request( FinalRequestOptions( diff --git a/tests/test_deepcopy.py b/tests/test_deepcopy.py deleted file mode 100644 index 20d1de2..0000000 --- a/tests/test_deepcopy.py +++ /dev/null @@ -1,58 +0,0 @@ -from dedalus_labs._utils import deepcopy_minimal - - -def assert_different_identities(obj1: object, obj2: object) -> None: - assert obj1 == obj2 - assert id(obj1) != id(obj2) - - -def test_simple_dict() -> None: - obj1 = {"foo": "bar"} - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - - -def test_nested_dict() -> None: - obj1 = {"foo": {"bar": True}} - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - assert_different_identities(obj1["foo"], obj2["foo"]) - - -def test_complex_nested_dict() -> None: - obj1 = {"foo": {"bar": [{"hello": "world"}]}} - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - assert_different_identities(obj1["foo"], obj2["foo"]) - assert_different_identities(obj1["foo"]["bar"], obj2["foo"]["bar"]) - assert_different_identities(obj1["foo"]["bar"][0], obj2["foo"]["bar"][0]) - - -def test_simple_list() -> None: - obj1 = ["a", "b", "c"] - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - - -def test_nested_list() -> None: - obj1 = ["a", [1, 2, 3]] - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - assert_different_identities(obj1[1], obj2[1]) - - -class MyObject: ... - - -def test_ignores_other_types() -> None: - # custom classes - my_obj = MyObject() - obj1 = {"foo": my_obj} - obj2 = deepcopy_minimal(obj1) - assert_different_identities(obj1, obj2) - assert obj1["foo"] is my_obj - - # tuples - obj3 = ("a", "b") - obj4 = deepcopy_minimal(obj3) - assert obj3 is obj4 diff --git a/tests/test_extract_files.py b/tests/test_extract_files.py index 3c8780d..f4d3b38 100644 --- a/tests/test_extract_files.py +++ b/tests/test_extract_files.py @@ -35,6 +35,15 @@ def test_multiple_files() -> None: assert query == {"documents": [{}, {}]} +def test_top_level_file_array() -> None: + query = {"files": [b"file one", b"file two"], "title": "hello"} + assert extract_files(query, paths=[["files", ""]]) == [ + ("files[]", b"file one"), + ("files[]", b"file two"), + ] + assert query == {"title": "hello"} + + @pytest.mark.parametrize( "query,paths,expected", [ diff --git a/tests/test_files.py b/tests/test_files.py index 3e7c35c..2a7c649 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -4,7 +4,8 @@ import pytest from dirty_equals import IsDict, IsList, IsBytes, IsTuple -from dedalus_labs._files import to_httpx_files, async_to_httpx_files +from dedalus_labs._files import to_httpx_files, deepcopy_with_paths, async_to_httpx_files +from dedalus_labs._utils import extract_files readme_path = Path(__file__).parent.parent.joinpath("README.md") @@ -49,3 +50,99 @@ def test_string_not_allowed() -> None: "file": "foo", # type: ignore } ) + + +def assert_different_identities(obj1: object, obj2: object) -> None: + assert obj1 == obj2 + assert obj1 is not obj2 + + +class TestDeepcopyWithPaths: + def test_copies_top_level_dict(self) -> None: + original = {"file": b"data", "other": "value"} + result = deepcopy_with_paths(original, [["file"]]) + assert_different_identities(result, original) + + def test_file_value_is_same_reference(self) -> None: + file_bytes = b"contents" + original = {"file": file_bytes} + result = deepcopy_with_paths(original, [["file"]]) + assert_different_identities(result, original) + assert result["file"] is file_bytes + + def test_list_popped_wholesale(self) -> None: + files = [b"f1", b"f2"] + original = {"files": files, "title": "t"} + result = deepcopy_with_paths(original, [["files", ""]]) + assert_different_identities(result, original) + result_files = result["files"] + assert isinstance(result_files, list) + assert_different_identities(result_files, files) + + def test_nested_array_path_copies_list_and_elements(self) -> None: + elem1 = {"file": b"f1", "extra": 1} + elem2 = {"file": b"f2", "extra": 2} + original = {"items": [elem1, elem2]} + result = deepcopy_with_paths(original, [["items", "", "file"]]) + assert_different_identities(result, original) + result_items = result["items"] + assert isinstance(result_items, list) + assert_different_identities(result_items, original["items"]) + assert_different_identities(result_items[0], elem1) + assert_different_identities(result_items[1], elem2) + + def test_empty_paths_returns_same_object(self) -> None: + original = {"foo": "bar"} + result = deepcopy_with_paths(original, []) + assert result is original + + def test_multiple_paths(self) -> None: + f1 = b"file1" + f2 = b"file2" + original = {"a": f1, "b": f2, "c": "unchanged"} + result = deepcopy_with_paths(original, [["a"], ["b"]]) + assert_different_identities(result, original) + assert result["a"] is f1 + assert result["b"] is f2 + assert result["c"] is original["c"] + + def test_extract_files_does_not_mutate_original_top_level(self) -> None: + file_bytes = b"contents" + original = {"file": file_bytes, "other": "value"} + + copied = deepcopy_with_paths(original, [["file"]]) + extracted = extract_files(copied, paths=[["file"]]) + + assert extracted == [("file", file_bytes)] + assert original == {"file": file_bytes, "other": "value"} + assert copied == {"other": "value"} + + def test_extract_files_does_not_mutate_original_nested_array_path(self) -> None: + file1 = b"f1" + file2 = b"f2" + original = { + "items": [ + {"file": file1, "extra": 1}, + {"file": file2, "extra": 2}, + ], + "title": "example", + } + + copied = deepcopy_with_paths(original, [["items", "", "file"]]) + extracted = extract_files(copied, paths=[["items", "", "file"]]) + + assert extracted == [("items[][file]", file1), ("items[][file]", file2)] + assert original == { + "items": [ + {"file": file1, "extra": 1}, + {"file": file2, "extra": 2}, + ], + "title": "example", + } + assert copied == { + "items": [ + {"extra": 1}, + {"extra": 2}, + ], + "title": "example", + } diff --git a/tests/test_utils/test_path.py b/tests/test_utils/test_path.py new file mode 100644 index 0000000..c8eb92a --- /dev/null +++ b/tests/test_utils/test_path.py @@ -0,0 +1,89 @@ +from __future__ import annotations + +from typing import Any + +import pytest + +from dedalus_labs._utils._path import path_template + + +@pytest.mark.parametrize( + "template, kwargs, expected", + [ + ("/v1/{id}", dict(id="abc"), "/v1/abc"), + ("/v1/{a}/{b}", dict(a="x", b="y"), "/v1/x/y"), + ("/v1/{a}{b}/path/{c}?val={d}#{e}", dict(a="x", b="y", c="z", d="u", e="v"), "/v1/xy/path/z?val=u#v"), + ("/{w}/{w}", dict(w="echo"), "/echo/echo"), + ("/v1/static", {}, "/v1/static"), + ("", {}, ""), + ("/v1/?q={n}&count=10", dict(n=42), "/v1/?q=42&count=10"), + ("/v1/{v}", dict(v=None), "/v1/null"), + ("/v1/{v}", dict(v=True), "/v1/true"), + ("/v1/{v}", dict(v=False), "/v1/false"), + ("/v1/{v}", dict(v=".hidden"), "/v1/.hidden"), # dot prefix ok + ("/v1/{v}", dict(v="file.txt"), "/v1/file.txt"), # dot in middle ok + ("/v1/{v}", dict(v="..."), "/v1/..."), # triple dot ok + ("/v1/{a}{b}", dict(a=".", b="txt"), "/v1/.txt"), # dot var combining with adjacent to be ok + ("/items?q={v}#{f}", dict(v=".", f=".."), "/items?q=.#.."), # dots in query/fragment are fine + ( + "/v1/{a}?query={b}", + dict(a="../../other/endpoint", b="a&bad=true"), + "/v1/..%2F..%2Fother%2Fendpoint?query=a%26bad%3Dtrue", + ), + ("/v1/{val}", dict(val="a/b/c"), "/v1/a%2Fb%2Fc"), + ("/v1/{val}", dict(val="a/b/c?query=value"), "/v1/a%2Fb%2Fc%3Fquery=value"), + ("/v1/{val}", dict(val="a/b/c?query=value&bad=true"), "/v1/a%2Fb%2Fc%3Fquery=value&bad=true"), + ("/v1/{val}", dict(val="%20"), "/v1/%2520"), # escapes escape sequences in input + # Query: slash and ? are safe, # is not + ("/items?q={v}", dict(v="a/b"), "/items?q=a/b"), + ("/items?q={v}", dict(v="a?b"), "/items?q=a?b"), + ("/items?q={v}", dict(v="a#b"), "/items?q=a%23b"), + ("/items?q={v}", dict(v="a b"), "/items?q=a%20b"), + # Fragment: slash and ? are safe + ("/docs#{v}", dict(v="a/b"), "/docs#a/b"), + ("/docs#{v}", dict(v="a?b"), "/docs#a?b"), + # Path: slash, ? and # are all encoded + ("/v1/{v}", dict(v="a/b"), "/v1/a%2Fb"), + ("/v1/{v}", dict(v="a?b"), "/v1/a%3Fb"), + ("/v1/{v}", dict(v="a#b"), "/v1/a%23b"), + # same var encoded differently by component + ( + "/v1/{v}?q={v}#{v}", + dict(v="a/b?c#d"), + "/v1/a%2Fb%3Fc%23d?q=a/b?c%23d#a/b?c%23d", + ), + ("/v1/{val}", dict(val="x?admin=true"), "/v1/x%3Fadmin=true"), # query injection + ("/v1/{val}", dict(val="x#admin"), "/v1/x%23admin"), # fragment injection + ], +) +def test_interpolation(template: str, kwargs: dict[str, Any], expected: str) -> None: + assert path_template(template, **kwargs) == expected + + +def test_missing_kwarg_raises_key_error() -> None: + with pytest.raises(KeyError, match="org_id"): + path_template("/v1/{org_id}") + + +@pytest.mark.parametrize( + "template, kwargs", + [ + ("{a}/path", dict(a=".")), + ("{a}/path", dict(a="..")), + ("/v1/{a}", dict(a=".")), + ("/v1/{a}", dict(a="..")), + ("/v1/{a}/path", dict(a=".")), + ("/v1/{a}/path", dict(a="..")), + ("/v1/{a}{b}", dict(a=".", b=".")), # adjacent vars → ".." + ("/v1/{a}.", dict(a=".")), # var + static → ".." + ("/v1/{a}{b}", dict(a="", b=".")), # empty + dot → "." + ("/v1/%2e/{x}", dict(x="ok")), # encoded dot in static text + ("/v1/%2e./{x}", dict(x="ok")), # mixed encoded ".." in static + ("/v1/.%2E/{x}", dict(x="ok")), # mixed encoded ".." in static + ("/v1/{v}?q=1", dict(v="..")), + ("/v1/{v}#frag", dict(v="..")), + ], +) +def test_dot_segment_rejected(template: str, kwargs: dict[str, Any]) -> None: + with pytest.raises(ValueError, match="dot-segment"): + path_template(template, **kwargs) diff --git a/uv.lock b/uv.lock index fb6d812..723b067 100644 --- a/uv.lock +++ b/uv.lock @@ -456,7 +456,7 @@ requires-dist = [ { name = "pydantic", specifier = ">=1.9.0,<3" }, { name = "pyjwt", extras = ["crypto"], marker = "extra == 'auth'", specifier = ">=2.10.1" }, { name = "sniffio" }, - { name = "typing-extensions", specifier = ">=4.10,<5" }, + { name = "typing-extensions", specifier = ">=4.14,<5" }, ] provides-extras = ["aiohttp", "auth"]