[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AntonDeMeester wants to merge 1 commit into from
Closed

[WIP] Upgrade to Pydantic 2 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions docs_src/tutorial/many_to_many/tutorial003.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
team_id: Optional[int] = Field(
default=None, foreign_key="team.id", primary_key=True
)
hero_id: Optional[int] = Field(
default=None, foreign_key="hero.id", primary_key=True
)
is_training: bool = False

team: "Team" = Relationship(back_populates="hero_links")
hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
id: Optional[int] = Field(default=None, primary_key=True)
name: str = Field(index=True)
headquarters: str

hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
secret_name: str
age: Optional[int] = Field(default=None, index=True)

team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
team_id: Optional[int] = Field(
default=None, foreign_key="team.id", primary_key=True
)
hero_id: Optional[int] = Field(
default=None, foreign_key="hero.id", primary_key=True
)
is_training: bool = False

team: "Team" = Relationship(back_populates="hero_links")
hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down
30 changes: 15 additions & 15 deletions docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
id: Optional[int] = Field(default=None, primary_key=True)
name: str = Field(index=True)
secret_name: str
age: Optional[int] = Field(default=None, index=True)

team_id: Optional[int] = Field(default=None, foreign_key="team.id")
team: Optional["Team"] = Relationship(back_populates="heroes")

weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
weapon: Optional["Weapon"] = Relationship(back_populates="hero")

powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
id: Optional[int] = Field(default=None, primary_key=True)
name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
id: Optional[int] = Field(default=None, primary_key=True)
name: str = Field(index=True)
secret_name: str
age: Optional[int] = Field(default=None, index=True)

team_id: Optional[int] = Field(default=None, foreign_key="team.id")
team: Optional[Team] = Relationship(back_populates="heroes")

weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
weapon: Optional[Weapon] = Relationship(back_populates="hero")

powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down
2 changes: 0 additions & 2 deletions sqlmodel/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down
1 change: 1 addition & 0 deletions sqlmodel/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
__sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
__name__: ClassVar[str]
metadata: ClassVar[MetaData]
__allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

class Config:
orm_mode = True
Expand Down
38 changes: 5 additions & 33 deletions sqlmodel/sql/expression.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
entity_0: _TScalar_0,
entity_1: _TScalar_1,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
entity_0: _TScalar_0,
entity_1: Type[_TModel_1],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: _TScalar_1,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: Type[_TModel_1],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
entity_0: _TScalar_0,
entity_1: _TScalar_1,
entity_2: _TScalar_2,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
entity_0: _TScalar_0,
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
entity_0: _TScalar_0,
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
entity_0: _TScalar_0,
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: _TScalar_1,
entity_2: _TScalar_2,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
entity_0: Type[_TModel_0],
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: _TScalar_2,
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: _TScalar_2,
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: _TScalar_2,
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: _TScalar_2,
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
entity_1: _TScalar_1,
entity_2: Type[_TModel_2],
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: _TScalar_2,
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
entity_3: _TScalar_3,
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
entity_1: Type[_TModel_1],
entity_2: Type[_TModel_2],
entity_3: Type[_TModel_3],
**kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
if len(entities) == 1:
return SelectOfScalar._create(*entities, **kw) # type: ignore
return Select._create(*entities, **kw) # type: ignore
return SelectOfScalar(*entities) # type: ignore
return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[WIP] Upgrade to Pydantic 2#632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

AntonDeMeester
wants to merge
1
commit into

from

 Closed


[WIP] Upgrade to Pydantic 2
#632
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 15 additions & 15 deletions
docs_src/tutorial/many_to_many/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,12 @@
from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


class Team(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 headquarters: str

 hero_links: List[HeroTeamLink] = Relationship(back_populates="team")
 hero_links: List["HeroTeamLink"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
Expand All@@ -30,7 +17,20 @@ class Hero(SQLModel, table=True):
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_links: List[HeroTeamLink] = Relationship(back_populates="hero")
 team_links: List["HeroTeamLink"] = Relationship(back_populates="hero")


class HeroTeamLink(SQLModel, table=True):
 team_id: Optional[int] = Field(
 default=None, foreign_key="team.id", primary_key=True
 )
 hero_id: Optional[int] = Field(
 default=None, foreign_key="hero.id", primary_key=True
 )
 is_training: bool = False

 team: "Team" = Relationship(back_populates="hero_links")
 hero: "Hero" = Relationship(back_populates="team_links")


sqlite_file_name = "database.db"
Expand Down

30 changes: 15 additions & 15 deletions
docs_src/tutorial/relationship_attributes/back_populates/tutorial003.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,21 @@
from sqlmodel import Field, Relationship, SQLModel, create_engine


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional["Team"] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional["Weapon"] = Relationship(back_populates="hero")

 powers: List["Power"] = Relationship(back_populates="hero")


class Weapon(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
Expand All@@ -26,21 +41,6 @@ class Team(SQLModel, table=True):
 heroes: List["Hero"] = Relationship(back_populates="team")


class Hero(SQLModel, table=True):
 id: Optional[int] = Field(default=None, primary_key=True)
 name: str = Field(index=True)
 secret_name: str
 age: Optional[int] = Field(default=None, index=True)

 team_id: Optional[int] = Field(default=None, foreign_key="team.id")
 team: Optional[Team] = Relationship(back_populates="heroes")

 weapon_id: Optional[int] = Field(default=None, foreign_key="weapon.id")
 weapon: Optional[Weapon] = Relationship(back_populates="hero")

 powers: List[Power] = Relationship(back_populates="hero")


sqlite_file_name = "database.db"
sqlite_url = f"sqlite:///{sqlite_file_name}"

Expand Down

2 changes: 0 additions & 2 deletions
sqlmodel/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from sqlalchemy.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
from sqlalchemy.schema import Sequence as Sequence
from sqlalchemy.schema import Table as Table
from sqlalchemy.schema import ThreadLocalMetaData as ThreadLocalMetaData
from sqlalchemy.schema import UniqueConstraint as UniqueConstraint
from sqlalchemy.sql import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT
from sqlalchemy.sql import (
Expand DownExpand Up@@ -71,7 +70,6 @@
from sqlalchemy.sql import outerjoin as outerjoin
from sqlalchemy.sql import outparam as outparam
from sqlalchemy.sql import over as over
from sqlalchemy.sql import subquery as subquery
from sqlalchemy.sql import table as table
from sqlalchemy.sql import tablesample as tablesample
from sqlalchemy.sql import text as text
Expand Down

1 change: 1 addition & 0 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -642,6 +642,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
 __sqlmodel_relationships__: ClassVar[Dict[str, RelationshipProperty]] # type: ignore
 __name__: ClassVar[str]
 metadata: ClassVar[MetaData]
 __allow_unmapped__ = True # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six

 class Config:
 orm_mode = True
Expand Down

38 changes: 5 additions & 33 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,12 +117,12 @@ class SelectOfScalar(_Select, Generic[_TSelect]):


@overload
def select(entity_0: _TScalar_0, **kw: Any) -> SelectOfScalar[_TScalar_0]: # type: ignore
def select(entity_0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
 ...


@overload
def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]: # type: ignore
def select(entity_0: Type[_TModel_0]) -> SelectOfScalar[_TModel_0]: # type: ignore
 ...


Expand All@@ -133,7 +133,6 @@ def select(entity_0: Type[_TModel_0], **kw: Any) -> SelectOfScalar[_TModel_0]:
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
 ...

Expand All@@ -142,7 +141,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1]]:
 ...

Expand All@@ -151,7 +149,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1]]:
 ...

Expand All@@ -160,7 +157,6 @@ def select( # type: ignore
def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1]]:
 ...

Expand All@@ -170,7 +166,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -180,7 +175,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -190,7 +184,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -200,7 +193,6 @@ def select( # type: ignore
 entity_0: _TScalar_0,
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -210,7 +202,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2]]:
 ...

Expand All@@ -220,7 +211,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2]]:
 ...

Expand All@@ -230,7 +220,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2]]:
 ...

Expand All@@ -240,7 +229,6 @@ def select( # type: ignore
 entity_0: Type[_TModel_0],
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2]]:
 ...

Expand All@@ -251,7 +239,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -262,7 +249,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -273,7 +259,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -284,7 +269,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -295,7 +279,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -306,7 +289,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -317,7 +299,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -328,7 +309,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TScalar_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -339,7 +319,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -350,7 +329,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -361,7 +339,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -372,7 +349,6 @@ def select( # type: ignore
 entity_1: _TScalar_1,
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TScalar_1, _TModel_2, _TModel_3]]:
 ...

Expand All@@ -383,7 +359,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TScalar_3]]:
 ...

Expand All@@ -394,7 +369,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: _TScalar_2,
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TScalar_2, _TModel_3]]:
 ...

Expand All@@ -405,7 +379,6 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: _TScalar_3,
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TScalar_3]]:
 ...

Expand All@@ -416,18 +389,17 @@ def select( # type: ignore
 entity_1: Type[_TModel_1],
 entity_2: Type[_TModel_2],
 entity_3: Type[_TModel_3],
 **kw: Any,
) -> Select[Tuple[_TModel_0, _TModel_1, _TModel_2, _TModel_3]]:
 ...


# Generated overloads end


def select(*entities: Any, **kw: Any) -> Union[Select, SelectOfScalar]: # type: ignore
def select(*entities: Any) -> Union[Select, SelectOfScalar]: # type: ignore
 if len(entities) == 1:
 return SelectOfScalar._create(*entities, **kw) # type: ignore
 return Select._create(*entities, **kw) # type: ignore
 return SelectOfScalar(*entities) # type: ignore
 return Select(*entities) # type: ignore


# TODO: add several @overload from Python types to SQLAlchemy equivalents
Expand Down