feat: handle dict annotations in PydanticJSONMixin

Generated-by: aiautocommit

activemodel/mixins/pydantic_json.py

@@ -17,6 +17,11 @@ def init_on_load(self):
 
             annotation = field_info.annotation
             origin = get_origin(annotation)
+
+            # e.g. `dict` or `dict[str, str]`, we don't want to do anything with these
+            if origin is dict:
+                continue
+
             annotation_args = get_args(annotation)
             is_top_level_list = origin is list
 

test/serialization_test.py

@@ -19,10 +19,12 @@ class ExampleWithJSON(
     BaseModel, PydanticJSONMixin, TypeIDMixin("json_test"), table=True
 ):
     list_field: list[SubObject] = Field(sa_type=JSONB())
+    # list_with_generator: list[SubObject] = Field(sa_type=JSONB())
     optional_list_field: list[SubObject] | None = Field(sa_type=JSONB(), default=None)
     generic_list_field: list[dict] = Field(sa_type=JSONB())
     object_field: SubObject = Field(sa_type=JSONB())
     unstructured_field: dict = Field(sa_type=JSONB())
+    semi_structured_field: dict[str, str] = Field(sa_type=JSONB())
     optional_object_field: SubObject | None = Field(sa_type=JSONB(), default=None)
 
     normal_field: str | None = Field(default=None)
@@ -32,11 +34,13 @@ def test_json_serialization(create_and_wipe_database):
     sub_object = SubObject(name="test", value=1)
     example = ExampleWithJSON(
         list_field=[sub_object],
+        # list_with_generator=(x for x in [sub_object]),
         generic_list_field=[{"one": "two", "three": 3, "four": [1, 2, 3]}],
         optional_list_field=[sub_object],
         object_field=sub_object,
         unstructured_field={"one": "two", "three": 3, "four": [1, 2, 3]},
         normal_field="test",
+        semi_structured_field={"one": "two", "three": "three"},
         optional_object_field=sub_object,
     ).save()