✨ Add support for Pydantic v2 (while keeping support for v1 if v2 is not available), including initial work by AntonDeMeester

.github/workflows/test.yml

@@ -27,6 +27,9 @@ jobs:
  - "3.10"
  - "3.11"
  - "3.12"
+ pydantic-version:
+ - pydantic-v1
+ - pydantic-v2
  fail-fast: false
 
  steps:
@@ -57,9 +60,15 @@ jobs:
  - name: Install Dependencies
  if: steps.cache.outputs.cache-hit != 'true'
  run: python -m poetry install
+ - name: Install Pydantic v1
+ if: matrix.pydantic-version == 'pydantic-v1'
+ run: pip install "pydantic>=1.10.0,<2.0.0"
+ - name: Install Pydantic v2
+ if: matrix.pydantic-version == 'pydantic-v2'
+ run: pip install "pydantic>=2.0.2,<3.0.0"
  - name: Lint
  # Do not run on Python 3.7 as mypy behaves differently
- if: matrix.python-version != '3.7'
+ if: matrix.python-version != '3.7' && matrix.pydantic-version == 'pydantic-v2'
  run: python -m poetry run bash scripts/lint.sh
  - run: mkdir coverage
  - name: Test

docs/tutorial/fastapi/multiple-models.md

@@ -175,15 +175,17 @@ Now we use the type annotation `HeroCreate` for the request JSON data in the `he
 # Code below omitted 👇
 ```
 
-Then we create a new `Hero` (this is the actual **table** model that saves things to the database) using `Hero.from_orm()`.
+Then we create a new `Hero` (this is the actual **table** model that saves things to the database) using `Hero.model_validate()`.
 
-The method `.from_orm()` reads data from another object with attributes and creates a new instance of this class, in this case `Hero`.
+The method `.model_validate()` reads data from another object with attributes (or a dict) and creates a new instance of this class, in this case `Hero`.
 
-The alternative is `Hero.parse_obj()` that reads data from a dictionary.
+In this case, we have a `HeroCreate` instance in the `hero` variable. This is an object with attributes, so we use `.model_validate()` to read those attributes.
 
-But as in this case, we have a `HeroCreate` instance in the `hero` variable. This is an object with attributes, so we use `.from_orm()` to read those attributes.
+/// tip
+In versions of **SQLModel** before `0.0.14` you would use the method `.from_orm()`, but it is now deprecated and you should use `.model_validate()` instead.
+///
 
-With this, we create a new `Hero` instance (the one for the database) and put it in the variable `db_hero` from the data in the `hero` variable that is the `HeroCreate` instance we received from the request.
+We can now create a new `Hero` instance (the one for the database) and put it in the variable `db_hero` from the data in the `hero` variable that is the `HeroCreate` instance we received from the request.
 
 ```Python hl_lines="3"
 # Code above omitted 👆

docs/tutorial/fastapi/update.md

@@ -90,7 +90,7 @@ So, we need to read the hero from the database, with the **same logic** we used
 
 The `HeroUpdate` model has all the fields with **default values**, because they all have defaults, they are all optional, which is what we want.
 
-But that also means that if we just call `hero.dict()` we will get a dictionary that could potentially have several or all of those values with their defaults, for example:
+But that also means that if we just call `hero.model_dump()` we will get a dictionary that could potentially have several or all of those values with their defaults, for example:
 
 ```Python
 {
@@ -102,7 +102,7 @@ But that also means that if we just call `hero.dict()` we will get a dictionary
 
 And then, if we update the hero in the database with this data, we would be removing any existing values, and that's probably **not what the client intended**.
 
-But fortunately Pydantic models (and so SQLModel models) have a parameter we can pass to the `.dict()` method for that: `exclude_unset=True`.
+But fortunately Pydantic models (and so SQLModel models) have a parameter we can pass to the `.model_dump()` method for that: `exclude_unset=True`.
 
 This tells Pydantic to **not include** the values that were **not sent** by the client. Saying it another way, it would **only** include the values that were **sent by the client**.
 
@@ -112,7 +112,7 @@ So, if the client sent a JSON with no values:
 {}
 ```
 
-Then the dictionary we would get in Python using `hero.dict(exclude_unset=True)` would be:
+Then the dictionary we would get in Python using `hero.model_dump(exclude_unset=True)` would be:
 
 ```Python
 {}
@@ -126,7 +126,7 @@ But if the client sent a JSON with:
 }
 ```
 
-Then the dictionary we would get in Python using `hero.dict(exclude_unset=True)` would be:
+Then the dictionary we would get in Python using `hero.model_dump(exclude_unset=True)` would be:
 
 ```Python
 {
@@ -152,6 +152,9 @@ Then we use that to get the data that was actually sent by the client:
 
 ///
 
+/// tip
+Before SQLModel 0.0.14, the method was called `hero.dict(exclude_unset=True)`, but it was renamed to `hero.model_dump(exclude_unset=True)` to be consistent with Pydantic v2.
+
 ## Update the Hero in the Database
 
 Now that we have a **dictionary with the data sent by the client**, we can iterate for each one of the keys and the values, and then we set them in the database hero model `db_hero` using `setattr()`.
@@ -208,7 +211,7 @@ So, if the client wanted to intentionally remove the `age` of a hero, they could
 }
 ```
 
-And when getting the data with `hero.dict(exclude_unset=True)`, we would get:
+And when getting the data with `hero.model_dump(exclude_unset=True)`, we would get:
 
 ```Python
 {
@@ -226,4 +229,4 @@ These are some of the advantages of Pydantic, that we can use with SQLModel. 
 
 ## Recap
 
-Using `.dict(exclude_unset=True)` in SQLModel models (and Pydantic models) we can easily update data **correctly**, even in the **edge cases**. 😎
+Using `.model_dump(exclude_unset=True)` in SQLModel models (and Pydantic models) we can easily update data **correctly**, even in the **edge cases**. 😎

docs/tutorial/index.md

@@ -82,8 +82,8 @@ There's a chance that you have multiple Python versions installed.
 
 You might want to try with the specific versions, for example with:
 
-* `python3.11`
 * `python3.12`
+* `python3.11`
 * `python3.10`
 * `python3.9`
 

docs_src/tutorial/fastapi/app_testing/tutorial001/main.py

@@ -54,7 +54,7 @@ def on_startup():
 
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(*, session: Session = Depends(get_session), hero: HeroCreate):
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -87,7 +87,7 @@ def update_hero(
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/app_testing/tutorial001_py310/main.py

@@ -52,7 +52,7 @@ def on_startup():
 
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(*, session: Session = Depends(get_session), hero: HeroCreate):
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -85,7 +85,7 @@ def update_hero(
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/app_testing/tutorial001_py39/main.py

@@ -54,7 +54,7 @@ def on_startup():
 
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(*, session: Session = Depends(get_session), hero: HeroCreate):
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -87,7 +87,7 @@ def update_hero(
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/delete/tutorial001.py

@@ -50,7 +50,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -79,7 +79,7 @@ def update_hero(hero_id: int, hero: HeroUpdate):
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/delete/tutorial001_py310.py

@@ -48,7 +48,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -77,7 +77,7 @@ def update_hero(hero_id: int, hero: HeroUpdate):
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/delete/tutorial001_py39.py

@@ -50,7 +50,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -79,7 +79,7 @@ def update_hero(hero_id: int, hero: HeroUpdate):
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)

docs_src/tutorial/fastapi/limit_and_offset/tutorial001.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/limit_and_offset/tutorial001_py310.py

@@ -42,7 +42,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/limit_and_offset/tutorial001_py39.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial001.py

@@ -46,7 +46,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial001_py310.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial001_py39.py

@@ -46,7 +46,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial002.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial002_py310.py

@@ -42,7 +42,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/multiple_models/tutorial002_py39.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/read_one/tutorial001.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/read_one/tutorial001_py310.py

@@ -42,7 +42,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/read_one/tutorial001_py39.py

@@ -44,7 +44,7 @@ def on_startup():
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(hero: HeroCreate):
  with Session(engine) as session:
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)

docs_src/tutorial/fastapi/relationships/tutorial001.py

@@ -92,7 +92,7 @@ def on_startup():
 
 @app.post("/heroes/", response_model=HeroRead)
 def create_hero(*, session: Session = Depends(get_session), hero: HeroCreate):
- db_hero = Hero.from_orm(hero)
+ db_hero = Hero.model_validate(hero)
  session.add(db_hero)
  session.commit()
  session.refresh(db_hero)
@@ -125,7 +125,7 @@ def update_hero(
  db_hero = session.get(Hero, hero_id)
  if not db_hero:
  raise HTTPException(status_code=404, detail="Hero not found")
- hero_data = hero.dict(exclude_unset=True)
+ hero_data = hero.model_dump(exclude_unset=True)
  for key, value in hero_data.items():
  setattr(db_hero, key, value)
  session.add(db_hero)
@@ -146,7 +146,7 @@ def delete_hero(*, session: Session = Depends(get_session), hero_id: int):
 
 @app.post("/teams/", response_model=TeamRead)
 def create_team(*, session: Session = Depends(get_session), team: TeamCreate):
- db_team = Team.from_orm(team)
+ db_team = Team.model_validate(team)
  session.add(db_team)
  session.commit()
  session.refresh(db_team)
@@ -182,7 +182,7 @@ def update_team(
  db_team = session.get(Team, team_id)
  if not db_team:
  raise HTTPException(status_code=404, detail="Team not found")
- team_data = team.dict(exclude_unset=True)
+ team_data = team.model_dump(exclude_unset=True)
  for key, value in team_data.items():
  setattr(db_team, key, value)
  session.add(db_team)