WIP - Pydantic v2 support (#1238)
* WIP * WIP - make test_model_definition tests pass * WIP - make test_model_methods pass * WIP - make whole test suit at least run - failing 49/443 tests * WIP fix part of the getting pydantic tests as types of fields are now kept in core schema and not on fieldsinfo * WIP fix validation in update by creating individual fields validators, failing 36/443 * WIP fix __pydantic_extra__ in intializing model, fix test related to pydantic config checks, failing 32/442 * WIP - fix enum schema in model_json_schema, failing 31/442 * WIP - fix copying through model, fix setting pydantic fields on through, fix default config and inheriting from it, failing 26/442 * WIP fix tests checking pydantic schema, fix excluding parent fields, failing 21/442 * WIP some missed files * WIP - fix validators inheritance and fix validators in generated pydantic, failing 17/442 * WIP - fix through models setting - only on reverse side of relation, but always on reverse side, failing 15/442 * WIP - fix through models setting - only on reverse side of relation, but always on reverse side, failing 15/442 * WIP - working on proper populating __dict__ for relations for new schema dumping, some work on openapi docs, failing 13/442 * WIP - remove property fields as pydantic has now computed_field on its own, failing 9/442 * WIP - fixes in docs, failing 8/442 * WIP - fix tests for largebinary schema, wrapped bytes fields fail in pydantic, will be fixed in pydantic-core, remaining is circural schema for related models, failing 6/442 * WIP - fix to pk only models in schemas * Getting test suites to pass (#1249) * wip, fixing tests * iteration, fixing some more tests * iteration, fixing some more tests * adhere to comments * adhere to comments * remove unnecessary dict call, re-add getattribute for testing * todo for reverse relationship * adhere to comments, remove prints * solve circular refs * all tests pass 🎉 * remove 3.7 from tests * add lint and type check jobs * reforat with ruff, fix jobs * rename jobs * fix imports * fix evaluate in py3.8 * partially fix coverage * fix coverage, add more tests * fix test ids * fix test ids * fix lint, fix docs, make docs fully working scripts, add test docs job * fix pyproject * pin py ver in test docs * change dir in test docs * fix pydantic warning hack * rm poetry call in test_docs * switch to pathlib in test docs * remove coverage req test docs * fix type check tests, fix part of types * fix/skip next part of types * fix next part of types * fix next part of types * fix coverage * fix coverage * fix type (bit dirty 🤷) * fix some code smells * change pre-commit * tweak workflows * remove no root from tests * switch to full python path by passing sys.executable * some small refactor in new base model, one sample test, change makefile * small refactors to reduce complexity of methods * temp add tests for prs against pydantic_v2 * remove all references to __fields__ * remove all references to construct, deprecate the method and update model_construct to be in line with pydantic * deprecate dict and add model_dump, todo switch to model_dict in calls * fix tests * change to union * change to union * change to model_dump and model_dump_json from dict and json deprecated methods, deprecate them in ormar too * finish switching dict() -> model_dump() * finish switching json() -> model_dump_json() * remove fully pydantic_only * switch to extra for payment card, change missed json calls * fix coverage - no more warnings internal * fix coverage - no more warnings internal - part 2 * split model_construct into own and pydantic parts * split determine pydantic field type * change to new field validators * fix benchmarks, add codspeed instead of pytest-benchmark, add action and gh workflow * restore pytest-benchmark * remove codspeed * pin pydantic version, restore codspeed * change on push to pydantic_v2 to trigger first one * Use lifespan function instead of event (#1259) * check return types * fix imports order, set warnings=False on json that passes the dict, fix unnecessary loop in one of the test * remove references to model's meta as it's now ormar config, rename related methods too * filter out pydantic serializer warnings * remove choices leftovers * remove leftovers after property_fields, keep only enough to exclude them in initialization * add migration guide * fix meta references * downgrade databases for now * Change line numbers in documentation (#1265) * proofread and fix the docs, part 1 * proofread and fix the docs for models * proofread and fix the docs for fields * proofread and fix the docs for relations * proofread and fix rest of the docs, add release notes for 0.20 * create tables in new docs src * cleanup old deps, uncomment docs publish on tag * fix import reorder --------- Co-authored-by: TouwaStar <30479449+TouwaStar@users.noreply.github.com> Co-authored-by: Goran Mekić <meka@tilda.center>
This commit is contained in:
collerek
@ -1,40 +1,19 @@
|
||||
import datetime
|
||||
from typing import List, Optional
|
||||
from typing import List, Optional, Union
|
||||
|
||||
import databases
|
||||
import ormar
|
||||
import pydantic
|
||||
import pytest
|
||||
import sqlalchemy
|
||||
from asgi_lifespan import LifespanManager
|
||||
from fastapi import FastAPI
|
||||
from httpx import AsyncClient
|
||||
from pydantic import Field
|
||||
|
||||
import ormar
|
||||
from tests.settings import DATABASE_URL
|
||||
from tests.lifespan import init_tests, lifespan
|
||||
from tests.settings import create_config
|
||||
|
||||
app = FastAPI()
|
||||
metadata = sqlalchemy.MetaData()
|
||||
database = databases.Database(DATABASE_URL, force_rollback=True)
|
||||
app.state.database = database
|
||||
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup() -> None:
|
||||
database_ = app.state.database
|
||||
if not database_.is_connected:
|
||||
await database_.connect()
|
||||
|
||||
|
||||
@app.on_event("shutdown")
|
||||
async def shutdown() -> None:
|
||||
database_ = app.state.database
|
||||
if database_.is_connected:
|
||||
await database_.disconnect()
|
||||
|
||||
|
||||
class LocalMeta:
|
||||
metadata = metadata
|
||||
database = database
|
||||
base_ormar_config = create_config()
|
||||
app = FastAPI(lifespan=lifespan(base_ormar_config))
|
||||
|
||||
|
||||
class PTestA(pydantic.BaseModel):
|
||||
@ -49,35 +28,31 @@ class PTestP(pydantic.BaseModel):
|
||||
|
||||
|
||||
class Category(ormar.Model):
|
||||
class Meta(LocalMeta):
|
||||
tablename = "categories"
|
||||
ormar_config = base_ormar_config.copy(tablename="categories")
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
name: str = ormar.String(max_length=100)
|
||||
|
||||
|
||||
class Item(ormar.Model):
|
||||
class Meta(LocalMeta):
|
||||
pass
|
||||
ormar_config = base_ormar_config.copy()
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
name: str = ormar.String(max_length=100)
|
||||
pydantic_int: Optional[int]
|
||||
test_P: Optional[List[PTestP]]
|
||||
pydantic_int: Optional[int] = None
|
||||
test_P: List[PTestP] = Field(default_factory=list)
|
||||
test_P_or_A: Union[int, str, None] = None
|
||||
categories = ormar.ManyToMany(Category)
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True, scope="module")
|
||||
def create_test_database():
|
||||
engine = sqlalchemy.create_engine(DATABASE_URL)
|
||||
metadata.create_all(engine)
|
||||
yield
|
||||
metadata.drop_all(engine)
|
||||
create_test_database = init_tests(base_ormar_config)
|
||||
|
||||
|
||||
@app.get("/items/", response_model=List[Item])
|
||||
async def get_items():
|
||||
items = await Item.objects.select_related("categories").all()
|
||||
for item in items:
|
||||
item.test_P_or_A = 2
|
||||
return items
|
||||
|
||||
|
||||
@ -104,26 +79,35 @@ async def test_all_endpoints():
|
||||
client = AsyncClient(app=app, base_url="http://testserver")
|
||||
async with client as client, LifespanManager(app):
|
||||
response = await client.post("/categories/", json={"name": "test cat"})
|
||||
assert response.status_code == 200
|
||||
category = response.json()
|
||||
response = await client.post("/categories/", json={"name": "test cat2"})
|
||||
assert response.status_code == 200
|
||||
category2 = response.json()
|
||||
|
||||
response = await client.post("/items/", json={"name": "test", "id": 1})
|
||||
response = await client.post(
|
||||
"/items/", json={"name": "test", "id": 1, "test_P_or_A": 0}
|
||||
)
|
||||
assert response.status_code == 200
|
||||
item = Item(**response.json())
|
||||
assert item.pk is not None
|
||||
|
||||
response = await client.post(
|
||||
"/items/add_category/", json={"item": item.dict(), "category": category}
|
||||
"/items/add_category/",
|
||||
json={"item": item.model_dump(), "category": category},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
item = Item(**response.json())
|
||||
assert len(item.categories) == 1
|
||||
assert item.categories[0].name == "test cat"
|
||||
|
||||
await client.post(
|
||||
"/items/add_category/", json={"item": item.dict(), "category": category2}
|
||||
"/items/add_category/",
|
||||
json={"item": item.model_dump(), "category": category2},
|
||||
)
|
||||
|
||||
response = await client.get("/items/")
|
||||
assert response.status_code == 200
|
||||
items = [Item(**item) for item in response.json()]
|
||||
assert items[0] == item
|
||||
assert len(items[0].categories) == 2
|
||||
@ -136,7 +120,7 @@ async def test_all_endpoints():
|
||||
|
||||
|
||||
def test_schema_modification():
|
||||
schema = Item.schema()
|
||||
schema = Item.model_json_schema()
|
||||
assert any(
|
||||
x.get("type") == "array" for x in schema["properties"]["categories"]["anyOf"]
|
||||
)
|
||||
@ -147,10 +131,11 @@ def test_schema_modification():
|
||||
"name": "string",
|
||||
"pydantic_int": 0,
|
||||
"test_P": [{"a": 0, "b": {"c": "string", "d": "string", "e": "string"}}],
|
||||
"test_P_or_A": (0, "string"),
|
||||
}
|
||||
|
||||
schema = Category.schema()
|
||||
assert schema["example"] == {
|
||||
schema = Category.model_json_schema()
|
||||
assert schema["$defs"]["Category"]["example"] == {
|
||||
"id": 0,
|
||||
"name": "string",
|
||||
"items": [
|
||||
@ -161,6 +146,7 @@ def test_schema_modification():
|
||||
"test_P": [
|
||||
{"a": 0, "b": {"c": "string", "d": "string", "e": "string"}}
|
||||
],
|
||||
"test_P_or_A": (0, "string"),
|
||||
}
|
||||
],
|
||||
}
|
||||
@ -169,4 +155,6 @@ def test_schema_modification():
|
||||
def test_schema_gen():
|
||||
schema = app.openapi()
|
||||
assert "Category" in schema["components"]["schemas"]
|
||||
assert "Item" in schema["components"]["schemas"]
|
||||
subschemas = [x.split("__")[-1] for x in schema["components"]["schemas"]]
|
||||
assert "Item-Input" in subschemas
|
||||
assert "Item-Output" in subschemas
|
||||
|
||||
Reference in New Issue
Block a user