feat(sqlfactory): support nested type in pg.array types and others

polyfactory/factories/sqlalchemy_factory.py

@@ -95,6 +95,9 @@ def get_sqlalchemy_types(cls) -> dict[Any, Callable[[], Any]]:
             postgresql.NUMRANGE: lambda: tuple(sorted([cls.__faker__.pyint(), cls.__faker__.pyint()])),
             postgresql.TSRANGE: lambda: (cls.__faker__.past_datetime(), datetime.now()),  # noqa: DTZ005
             postgresql.TSTZRANGE: lambda: (cls.__faker__.past_datetime(), datetime.now()),  # noqa: DTZ005
+            postgresql.HSTORE: lambda: cls.__faker__.pydict(),
+            postgresql.JSON: lambda: cls.__faker__.pydict(),
+            postgresql.JSONB: lambda: cls.__faker__.pydict(),
         }
 
     @classmethod
@@ -126,6 +129,11 @@ def get_type_from_column(cls, column: Column) -> type:
         column_type = type(column.type)
         if column_type in cls.get_sqlalchemy_types():
             annotation = column_type
+        elif issubclass(column_type, postgresql.ARRAY):
+            if type(column.type.item_type) in cls.get_sqlalchemy_types():  # type: ignore[attr-defined]
+                annotation = List[type(column.type.item_type)]  # type: ignore  # noqa: PGH003
+            else:
+                annotation = List[column.type.item_type.python_type]  # type: ignore[assignment,name-defined]
         elif issubclass(column_type, types.ARRAY):
             annotation = List[column.type.item_type.python_type]  # type: ignore[assignment,name-defined]
         else:

tests/sqlalchemy_factory/test_sqlalchemy_factory_v2.py

@@ -1,8 +1,12 @@
 from enum import Enum
-from typing import Any, List
+from ipaddress import ip_network
+from typing import Any, Dict, List
+from uuid import UUID
 
 import pytest
-from sqlalchemy import ForeignKey, __version__, orm, types
+from sqlalchemy import ForeignKey, Text, __version__, orm, types
+from sqlalchemy.dialects.postgresql import ARRAY, CIDR, HSTORE, INET, JSON, JSONB
+from sqlalchemy.ext.mutable import MutableDict, MutableList
 
 from polyfactory.factories.sqlalchemy_factory import SQLAlchemyFactory
 
@@ -64,6 +68,42 @@ class ModelFactory(SQLAlchemyFactory[Model]):
     assert isinstance(instance.str_array_type[0], str)
 
 
+def test_pg_dialect_types() -> None:
+    class Base(orm.DeclarativeBase): ...
+
+    class PgModel(Base):
+        __tablename__ = "pgmodel"
+        id: orm.Mapped[int] = orm.mapped_column(primary_key=True)
+        uuid_type: orm.Mapped[UUID] = orm.mapped_column(type_=types.UUID)
+        nested_array_inet: orm.Mapped[List[str]] = orm.mapped_column(type_=ARRAY(INET, dimensions=1))
+        nested_array_cidr: orm.Mapped[List[str]] = orm.mapped_column(type_=ARRAY(CIDR, dimensions=1))
+        hstore_type: orm.Mapped[Dict] = orm.mapped_column(type_=HSTORE)
+        pg_json_type: orm.Mapped[Dict] = orm.mapped_column(type_=JSON)
+        pg_jsonb_type: orm.Mapped[Dict] = orm.mapped_column(type_=JSONB)
+        mut_nested_arry_inet: orm.Mapped[List[str]] = orm.mapped_column(
+            type_=MutableList.as_mutable(ARRAY(INET, dimensions=1))
+        )
+        # ignore mypy type check: it's a known issue: https://github.com/sqlalchemy/sqlalchemy/discussions/9203
+        mut_pg_json_type: orm.Mapped[Dict] = orm.mapped_column(type_=MutableDict.as_mutable(JSON(astext_type=Text())))  # type: ignore[no-untyped-call]
+
+    class ModelFactory(SQLAlchemyFactory[PgModel]):
+        __model__ = PgModel
+
+    instance = ModelFactory.build()
+
+    assert isinstance(instance.nested_array_inet[0], str)
+    assert ip_network(instance.nested_array_inet[0])
+    assert isinstance(instance.nested_array_cidr[0], str)
+    assert ip_network(instance.nested_array_cidr[0])
+    assert isinstance(instance.hstore_type, dict)
+    assert isinstance(instance.pg_json_type, dict)
+    assert isinstance(instance.pg_json_type, dict)
+    assert isinstance(instance.uuid_type, UUID)
+    assert isinstance(instance.mut_nested_arry_inet[0], str)
+    assert ip_network(instance.mut_nested_arry_inet[0])
+    assert isinstance(instance.mut_pg_json_type, dict)
+
+
 @pytest.mark.parametrize(
     "type_",
     tuple(SQLAlchemyFactory.get_sqlalchemy_types().keys()),

tests/test_recursive_models.py

@@ -53,7 +53,7 @@ def test_recursive_pydantic_models(factory_use_construct: bool) -> None:
     factory = ModelFactory.create_factory(PydanticNode)
 
     result = factory.build(factory_use_construct)
-    assert result.child is _Sentinel, "Default is not used"
+    assert result.child is _Sentinel, "Default is not used"  # type: ignore[comparison-overlap]
     assert isinstance(result.union_child, int)
     assert result.optional_child is None
     assert result.list_child == []