Skip to content

Commit

Permalink
Use proto descriptor for typename (#5346)
Browse files Browse the repository at this point in the history
Closes #5302
  • Loading branch information
jackgerrits authored Feb 4, 2025
1 parent 6454e3f commit 40d74a3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@ class UnknownPayload:


def _type_name(cls: type[Any] | Any) -> str:
# If cls is a protobuf, then we need to determine the descriptor
if isinstance(cls, type):
if issubclass(cls, Message):
return cast(str, cls.DESCRIPTOR.full_name)
elif isinstance(cls, Message):
return cast(str, cls.DESCRIPTOR.full_name)

if isinstance(cls, type):
return cls.__name__
else:
Expand Down
16 changes: 15 additions & 1 deletion python/packages/autogen-core/tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def test_proto() -> None:
message = ProtoMessage(message="hello")
name = serde.type_name(message)
data = serde.serialize(message, type_name=name, data_content_type=PROTOBUF_DATA_CONTENT_TYPE)
assert name == "ProtoMessage"
assert name == "agents.ProtoMessage"
deserialized = serde.deserialize(data, type_name=name, data_content_type=PROTOBUF_DATA_CONTENT_TYPE)
assert deserialized.message == message.message

Expand Down Expand Up @@ -186,3 +186,17 @@ class PydanticImageMessage(BaseModel):
assert deserialized.image.image.size == (100, 100)
assert deserialized.image.image.mode == "RGB"
assert deserialized.image.image == image.image


def test_type_name_for_protos() -> None:
type_name = SerializationRegistry().type_name(ProtoMessage())
assert type_name == "agents.ProtoMessage"

type_name = SerializationRegistry().type_name(ProtoMessage)
assert type_name == "agents.ProtoMessage"

type_name = SerializationRegistry().type_name(NestingProtoMessage())
assert type_name == "agents.NestingProtoMessage"

type_name = SerializationRegistry().type_name(NestingProtoMessage)
assert type_name == "agents.NestingProtoMessage"

0 comments on commit 40d74a3

Please sign in to comment.