assertical 0.2.0__tar.gz → 0.3.0__tar.gz

{assertical-0.2.0/src/assertical.egg-info → assertical-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: assertical
-Version: 0.2.0
+Version: 0.3.0
 Summary: Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects
 Author: Battery Storage and Grid Integration Program
 Project-URL: Homepage, https://github.com/bsgip/assertical
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -45,6 +46,7 @@ Requires-Dist: psycopg; extra == "postgres"
 Requires-Dist: sqlalchemy>=2.0.0; extra == "postgres"
 Provides-Extra: xml
 Requires-Dist: pydantic_xml[lxml]; extra == "xml"
+Dynamic: license-file
 
 # Assertical (assertical)
 

{assertical-0.2.0 → assertical-0.3.0}/pyproject.toml

@@ -30,7 +30,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assertical"
-version = "0.2.0"
+version = "0.3.0"
 description = "Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects"
 authors = [{ name = "Battery Storage and Grid Integration Program" }]
 readme = "README.md"
@@ -52,6 +52,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 
 [project.urls]

{assertical-0.2.0 → assertical-0.3.0}/src/assertical/fake/generator.py

@@ -1,5 +1,5 @@
-import sys
 import inspect
+import sys
 from dataclasses import dataclass, fields, is_dataclass
 from datetime import datetime, time, timedelta, timezone
 from decimal import Decimal
@@ -9,6 +9,7 @@ from typing import (
     Callable,
     Generator,
     Optional,
+    TypeVar,
     Union,
     cast,
     get_args,
@@ -21,6 +22,12 @@ try:
 except ImportError:
     NoneType = type(None)  # type: ignore
 
+
+try:
+    from types import UnionType
+except ImportError:
+    UnionType = type(None)  # type: ignore
+
 try:
     from pydantic import BaseModel
 except ImportError:
@@ -84,6 +91,9 @@ class _PlaceholderDataclassBase:
     """Dataclass has no base class - instead we fall back to using this as a placeholder"""
 
 
+AnyType = TypeVar("AnyType")
+
+
 def safe_is_subclass(class_to_check: Optional[type], parent_class: type) -> bool:
     if class_to_check is None:
         return False
@@ -123,7 +133,8 @@ def get_enum_type(t: Optional[type], include_optional: bool) -> Optional[type]:
         inner_enum_type = get_optional_type_argument(t)
         assert inner_enum_type is not None
 
-    is_union = get_origin(t) == Union and len([a for a in get_args(t) if a is not NoneType]) > 1
+    t_origin = get_origin(t)
+    is_union = (t_origin == Union or t_origin == UnionType) and len([a for a in get_args(t) if a is not NoneType]) > 1
     if is_union:
         for union_arg in get_args(t):
             arg_enum = get_enum_type(union_arg, include_optional)
@@ -197,7 +208,7 @@ def get_first_generatable_primitive(t: type, include_optional: bool) -> Optional
     # extract the type
     origin_type = get_origin(t)
     include_optional_type = include_optional and is_optional_type(t)
-    if origin_type == Union:
+    if origin_type == Union or origin_type == UnionType:
         for union_arg in get_args(t):
             prim_type = get_first_generatable_primitive(union_arg, include_optional=False)
             if prim_type is not None:
@@ -257,7 +268,8 @@ def get_optional_type_argument(t: type) -> Optional[type]:
 
     If None is returned then t is NOT an optional type"""
     target_type = remove_passthrough_type(t)
-    if get_origin(target_type) != Union:
+    target_type_origin = get_origin(target_type)
+    if target_type_origin != Union and target_type_origin != UnionType:
         return None
 
     # is this an Optional union?
@@ -365,13 +377,13 @@ def enumerate_class_properties(t: type) -> Generator[PropertyGenerationDetails,
 
 
 def generate_class_instance(  # noqa: C901
-    t: type,
+    t: type[AnyType],
     seed: int = 1,
     optional_is_none: bool = False,
     generate_relationships: bool = False,
     _visited_type_stack: Optional[list[type]] = None,
     **kwargs: Any,
-) -> Any:
+) -> AnyType:
     """Given a child class of a key to CLASS_INSTANCE_GENERATORS - generate an instance of that class
     with all properties being assigned unique values based off of seed. The values will match type hints
 
@@ -395,7 +407,7 @@ def generate_class_instance(  # noqa: C901
     if _visited_type_stack is None:
         _visited_type_stack = []
     if t in _visited_type_stack:
-        return None
+        return None  # type: ignore # This only happens in recursion - the top level object will never be None
     _visited_type_stack.append(t)
 
     # We can only generate class instances of classes that inherit from a known base
@@ -483,7 +495,7 @@ def generate_class_instance(  # noqa: C901
     return CLASS_INSTANCE_GENERATORS[t_generatable_base](t, values)
 
 
-def clone_class_instance(obj: Any, ignored_properties: Optional[set[str]] = None) -> Any:
+def clone_class_instance(obj: AnyType, ignored_properties: Optional[set[str]] = None) -> AnyType:
     """Given an instance of a child class of a key to CLASS_INSTANCE_GENERATORS - generate a new instance of that class
     using references to the values in the current public properties in obj (i.e. a shallow clone).
 

{assertical-0.2.0 → assertical-0.3.0/src/assertical.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: assertical
-Version: 0.2.0
+Version: 0.3.0
 Summary: Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects
 Author: Battery Storage and Grid Integration Program
 Project-URL: Homepage, https://github.com/bsgip/assertical
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -45,6 +46,7 @@ Requires-Dist: psycopg; extra == "postgres"
 Requires-Dist: sqlalchemy>=2.0.0; extra == "postgres"
 Provides-Extra: xml
 Requires-Dist: pydantic_xml[lxml]; extra == "xml"
+Dynamic: license-file
 
 # Assertical (assertical)