fix: #366: Fix Union[str, List[str]]

.pre-commit-config.yaml

@@ -22,12 +22,12 @@ repos:
     hooks:
       - id: pdm-lock-check
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.286"
+    rev: "v0.0.290"
     hooks:
       - id: ruff
         args: ["--fix"]
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
       - id: black
         args: [--config=./pyproject.toml]
@@ -59,7 +59,7 @@ repos:
             sqlalchemy>=2,
           ]
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.324
+    rev: v1.1.327
     hooks:
       - id: pyright
         exclude: "tests"

polyfactory/factories/base.py

@@ -669,12 +669,12 @@ def get_field_value(  # noqa: C901, PLR0911, PLR0912
             batch_size = cls.__random__.randint(cls.__min_collection_length__, cls.__max_collection_length__)
             return factory.batch(size=batch_size)
 
-        if (origin := get_type_origin(unwrapped_annotation)) and issubclass(origin, Collection):
-            return handle_collection_type(field_meta, origin, cls)
-
         if is_union(field_meta.annotation) and field_meta.children:
             return cls.get_field_value(cls.__random__.choice(field_meta.children))
 
+        if (origin := get_type_origin(unwrapped_annotation)) and issubclass(origin, Collection):
+            return handle_collection_type(field_meta, origin, cls)
+
         if is_any(unwrapped_annotation) or isinstance(unwrapped_annotation, TypeVar):
             return create_random_string(cls.__random__, min_length=1, max_length=10)
 

tests/test_pydantic_factory.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Optional
+from typing import List, Optional, Union
 
 import pytest
 from pydantic import VERSION, BaseModel, Field, Json
@@ -78,3 +78,16 @@ class BFactory(ModelFactory[B]):
         __model__ = B
 
     assert isinstance(BFactory.build(), B)
+
+
+def test_union_str_and_list() -> None:
+    class A(BaseModel):
+        a: Union[str, List[str]]
+
+    class AFactory(ModelFactory[A]):
+        __model__ = A
+
+    for _ in range(1000):
+        a = AFactory.process_kwargs()
+        if isinstance(a["a"], list):
+            assert len(a) == 1