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
18 changes: 10 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
nixpkgs.url = "github:cachix/devenv-nixpkgs/rolling";
flake-utils.url = "github:numtide/flake-utils";
};

Expand Down
18 changes: 17 additions & 1 deletion src/crowdstrike_aidr/_transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
from __future__ import annotations

from collections.abc import Mapping
from typing import cast

from pydantic import BaseModel

from ._utils import is_given, is_mapping
from ._utils import is_given, is_iterable, is_list, is_mapping, is_sequence


def _transform_typeddict(data: Mapping[str, object]) -> dict[str, object]:
Expand Down Expand Up @@ -38,4 +39,19 @@ def transform(data: object) -> object:
if isinstance(data, BaseModel):
return data.model_dump(exclude_unset=True, mode="json")

if (
# list[T]
is_list(data)
# Iterable[T]
or (is_iterable(data) and not isinstance(data, str))
# Sequence[T]
or (is_sequence(data) and not isinstance(data, str))
):
# dicts are iterable, but it's an iterable on the keys, so it doesn't
# get transformed here.
if isinstance(data, dict):
return cast(object, data)

return [transform(d) for d in data]

return data
14 changes: 13 additions & 1 deletion src/crowdstrike_aidr/_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

import typing
from collections.abc import Mapping
from collections.abc import Iterable, Mapping, Sequence
from typing import Annotated, Any, TypeGuard, Union, cast, get_args, get_origin, overload

import typing_extensions
Expand Down Expand Up @@ -64,3 +64,15 @@ def is_annotated_type(typ: type) -> bool:

def is_type_alias_type(tp: Any, /) -> TypeIs[typing_extensions.TypeAliasType]:
return isinstance(tp, (typing_extensions.TypeAliasType, typing.TypeAliasType))


def is_list(obj: object) -> TypeGuard[list[object]]:
return isinstance(obj, list)


def is_iterable(obj: object) -> TypeGuard[Iterable[object]]:
return isinstance(obj, Iterable)


def is_sequence(obj: object) -> TypeGuard[Sequence[object]]:
return isinstance(obj, Sequence)
17 changes: 17 additions & 0 deletions tests/test_transform.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from __future__ import annotations

from pydantic import BaseModel, ConfigDict

from crowdstrike_aidr._transform import transform


class Foo(BaseModel):
model_config = ConfigDict(extra="forbid")

role: str | None = None
content: str


def test_pydantic_list() -> None:
result = transform({"things": [Foo(role="user", content="foo"), Foo(role="user", content="bar")]})
assert result == {"things": [{"role": "user", "content": "foo"}, {"role": "user", "content": "bar"}]}