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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: feature
packages:
- "@typespec/http-client-python"
---

Support enum type for array encode
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,14 @@ def _deserialize_multiple_sequence(
return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers))


def _is_array_encoded_deserializer(deserializer: functools.partial) -> bool:
return (
isinstance(deserializer, functools.partial)
and isinstance(deserializer.args[0], functools.partial)
and deserializer.args[0].func == _deserialize_array_encoded # pylint: disable=comparison-with-callable
)


def _deserialize_sequence(
deserializer: typing.Optional[typing.Callable],
module: typing.Optional[str],
Expand All @@ -857,17 +865,19 @@ def _deserialize_sequence(
return obj
if isinstance(obj, ET.Element):
obj = list(obj)
try:
if (
isinstance(obj, str)
and isinstance(deserializer, functools.partial)
and isinstance(deserializer.args[0], functools.partial)
and deserializer.args[0].func == _deserialize_array_encoded # pylint: disable=comparison-with-callable
):
# encoded string may be deserialized to sequence

# encoded string may be deserialized to sequence
if isinstance(obj, str) and isinstance(deserializer, functools.partial):
# for list[str]
if _is_array_encoded_deserializer(deserializer):
return deserializer(obj)
except: # pylint: disable=bare-except
pass

# for list[Union[...]]
if isinstance(deserializer.args[0], list):
for sub_deserializer in deserializer.args[0]:
if _is_array_encoded_deserializer(sub_deserializer):
return sub_deserializer(obj)

return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,99 @@ async def test_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedArrayProperty(value=["blue", "red", "green"])
result = await client.property.newline_delimited(body)
assert result.value == ["blue", "red", "green"]


@pytest.mark.asyncio
async def test_enum_comma_delimited(client: ArrayClient):
body = models.CommaDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = await client.property.enum_comma_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


@pytest.mark.asyncio
async def test_enum_space_delimited(client: ArrayClient):
body = models.SpaceDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = await client.property.enum_space_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


@pytest.mark.asyncio
async def test_enum_pipe_delimited(client: ArrayClient):
body = models.PipeDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = await client.property.enum_pipe_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


@pytest.mark.asyncio
async def test_enum_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = await client.property.enum_newline_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


@pytest.mark.asyncio
async def test_extensible_enum_comma_delimited(client: ArrayClient):
body = models.CommaDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = await client.property.extensible_enum_comma_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


@pytest.mark.asyncio
async def test_extensible_enum_space_delimited(client: ArrayClient):
body = models.SpaceDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = await client.property.extensible_enum_space_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


@pytest.mark.asyncio
async def test_extensible_enum_pipe_delimited(client: ArrayClient):
body = models.PipeDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = await client.property.extensible_enum_pipe_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


@pytest.mark.asyncio
async def test_extensible_enum_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = await client.property.extensible_enum_newline_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,91 @@ def test_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedArrayProperty(value=["blue", "red", "green"])
result = client.property.newline_delimited(body)
assert result.value == ["blue", "red", "green"]


def test_enum_comma_delimited(client: ArrayClient):
body = models.CommaDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = client.property.enum_comma_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


def test_enum_space_delimited(client: ArrayClient):
body = models.SpaceDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = client.property.enum_space_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


def test_enum_pipe_delimited(client: ArrayClient):
body = models.PipeDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = client.property.enum_pipe_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


def test_enum_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedEnumArrayProperty(value=[models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN])
result = client.property.enum_newline_delimited(body)
assert result.value == [models.Colors.BLUE, models.Colors.RED, models.Colors.GREEN]


def test_extensible_enum_comma_delimited(client: ArrayClient):
body = models.CommaDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = client.property.extensible_enum_comma_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


def test_extensible_enum_space_delimited(client: ArrayClient):
body = models.SpaceDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = client.property.extensible_enum_space_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


def test_extensible_enum_pipe_delimited(client: ArrayClient):
body = models.PipeDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = client.property.extensible_enum_pipe_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]


def test_extensible_enum_newline_delimited(client: ArrayClient):
body = models.NewlineDelimitedExtensibleEnumArrayProperty(
value=[
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
)
result = client.property.extensible_enum_newline_delimited(body)
assert result.value == [
models.ColorsExtensibleEnum.BLUE,
models.ColorsExtensibleEnum.RED,
models.ColorsExtensibleEnum.GREEN,
]
18 changes: 9 additions & 9 deletions packages/http-client-python/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/http-client-python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@typespec/sse": "~0.78.0",
"@typespec/streams": "~0.78.0",
"@typespec/xml": "~0.78.0",
"@typespec/http-specs": "0.1.0-alpha.31",
"@typespec/http-specs": "0.1.0-alpha.32-dev.1",
"@types/js-yaml": "~4.0.5",
"@types/node": "~24.1.0",
"@types/semver": "7.5.8",
Expand Down
Loading