Merge branch 'feature/enhance-445-optional-model' of github.com:Mityu…

…ha/polyfactory into feature/enhance-445-optional-model
litestar-org · Dec 9, 2023 · 8586074 · 8586074
2 parents 6f6c7b0 + 9a86dac
commit 8586074
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
@@ -46,7 +46,7 @@ jobs:
 
       - name: Set up python ${{ matrix.python-version }}
         id: checkout-python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -101,7 +101,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

diff --git a/polyfactory/factories/base.py b/polyfactory/factories/base.py
@@ -515,7 +515,7 @@ def create_factory(
         )
 
     @classmethod
-    def get_constrained_field_value(cls, annotation: Any, field_meta: FieldMeta) -> Any:  # noqa: C901, PLR0911
+    def get_constrained_field_value(cls, annotation: Any, field_meta: FieldMeta) -> Any:  # noqa: C901, PLR0911, PLR0912
         try:
             constraints = cast("Constraints", field_meta.constraints)
             if is_safe_subclass(annotation, float):
@@ -564,16 +564,18 @@ def get_constrained_field_value(cls, annotation: Any, field_meta: FieldMeta) ->
                     pattern=constraints.get("pattern"),
                 )
 
-            with suppress(ValueError):
+            try:
                 collection_type = get_collection_type(annotation)
+            except ValueError:
+                collection_type = None
+            if collection_type is not None:
                 if collection_type == dict:
                     return handle_constrained_mapping(
                         factory=cls,
                         field_meta=field_meta,
                         min_items=constraints.get("min_length"),
                         max_items=constraints.get("max_length"),
                     )
-
                 return handle_constrained_collection(
                     collection_type=collection_type,  # type: ignore[type-var]
                     factory=cls,