Fix exponent in minimum (#1664)

* Fix numerical field with an exponent in the minimum * Add unittest
koxudaxi · Nov 7, 2023 · ff63a98 · ff63a98
1 parent 4a244c4
commit ff63a98
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/datamodel_code_generator/types.py b/datamodel_code_generator/types.py
@@ -147,6 +147,17 @@ def validate(cls, v: Any) -> 'UnionIntFloat':
         if isinstance(v, UnionIntFloat):
             return v
         elif not isinstance(v, (int, float)):  # pragma: no cover
+            try:
+                int(v)
+                return cls(v)
+            except (TypeError, ValueError):
+                pass
+            try:
+                float(v)
+                return cls(v)
+            except (TypeError, ValueError):
+                pass
+
             raise TypeError(f'{v} is not int or float')
         return cls(v)
 

diff --git a/tests/data/expected/main/main_strict_types/output.py b/tests/data/expected/main/main_strict_types/output.py
@@ -18,5 +18,6 @@ class User(BaseModel):
     tel: Optional[constr(regex=r'^(\([0-9]{3}\))?[0-9]{3}-[0-9]{4}$')] = None
     height: Optional[confloat(ge=0.0)] = None
     weight: Optional[confloat(ge=0.0)] = None
+    score: Optional[confloat(ge=1e-08)] = None
     active: Optional[bool] = None
     photo: Optional[conbytes(min_length=100)] = None
diff --git a/tests/data/expected/main/main_strict_types_all/output.py b/tests/data/expected/main/main_strict_types_all/output.py
@@ -30,5 +30,6 @@ class User(BaseModel):
     ] = None
     height: Optional[confloat(ge=0.0, strict=True)] = None
     weight: Optional[confloat(ge=0.0, strict=True)] = None
+    score: Optional[confloat(ge=1e-08, strict=True)] = None
     active: Optional[StrictBool] = None
     photo: Optional[StrictBytes] = None
diff --git a/tests/data/expected/main/main_strict_types_all_field_constraints/output.py b/tests/data/expected/main/main_strict_types_all_field_constraints/output.py
@@ -26,5 +26,6 @@ class User(BaseModel):
     tel: Optional[StrictStr] = None
     height: Optional[StrictFloat] = None
     weight: Optional[StrictFloat] = None
+    score: Optional[StrictFloat] = None
     active: Optional[StrictBool] = None
     photo: Optional[StrictBytes] = None
diff --git a/tests/data/jsonschema/strict_types.json b/tests/data/jsonschema/strict_types.json
@@ -34,6 +34,10 @@
           "type": "number",
           "minimum": 0
         },
+        "score": {
+          "type": "number",
+          "minimum": 1e-08
+        },
         "active": {
           "type": "boolean"
         },
@@ -43,4 +47,4 @@
           "minLength": 100
         }
       }
-}
+}