💚 Fix linting in CI#1340

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

Merged
tiangolo merged 11 commits into from
Apr 26, 2025
Merged

💚 Fix linting in CI #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8fda409
remove unused ignore statement
svlandeg Apr 9, 2025
902f3a1
fix signature of model_validate
svlandeg Apr 9, 2025
c8b6dec
add ignore statement
svlandeg Apr 9, 2025
54dbce5
fix signature of model_dump
svlandeg Apr 9, 2025
07f3269
prevent linting check on Python 3.8
svlandeg Apr 9, 2025
b23a457
add fallback arg for Pydantic 2.11 and above
svlandeg Apr 9, 2025
dbd8551
♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3
tiangolo Apr 26, 2025
2e8be82
♻️ Update model_fields, type them with compatibility for Pydantic v3
tiangolo Apr 26, 2025
6147c7d
♻️ Tweak method signatures optimizing for autocompletion and editor s…
tiangolo Apr 26, 2025
c8dadd5
🚨 Tweak type for older Pythons
tiangolo Apr 26, 2025
16bef83
♻️ Tweak by_alias for Pydantic < 2.11
tiangolo Apr 26, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
if: matrix.pydantic-version == 'pydantic-v2'
run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
- name: Lint
if: matrix.pydantic-version == 'pydantic-v2'
if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
run: bash scripts/lint.sh
- run: mkdir coverage
- name: Test
Expand Down
9 changes: 8 additions & 1 deletion sqlmodel/_compat.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
model.model_config[parameter] = value # type: ignore[literal-required]

def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
return model.model_fields
# TODO: refactor the usage of this function to always pass the class
# not the instance, and then remove this extra check
# this is for compatibility with Pydantic v3
if isinstance(model, type):
use_model = model
else:
use_model = model.__class__
return use_model.model_fields
Comment on lines +109 to +113

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).

I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.


def get_fields_set(
object: InstanceOrType["SQLModel"],
Expand Down
15 changes: 10 additions & 5 deletions sqlmodel/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
__sqlmodel_relationships__: Dict[str, RelationshipInfo]
model_config: SQLModelConfig
model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
model_fields: ClassVar[Dict[str, FieldInfo]]

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.

__config__: Type[SQLModelConfig]
__fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
return cls.__name__.lower()

@classmethod
def model_validate(
def model_validate( # type: ignore[override]

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.

Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔

Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...

But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.

cls: Type[_TSQLModel],
obj: Any,
*,
Expand All@@ -863,20 +863,25 @@ def model_dump(
mode: Union[Literal["json", "python"], str] = "python",
include: Union[IncEx, None] = None,
exclude: Union[IncEx, None] = None,
context: Union[Dict[str, Any], None] = None,
by_alias: bool = False,
context: Union[Any, None] = None,
by_alias: Union[bool, None] = None,

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.

exclude_unset: bool = False,
exclude_defaults: bool = False,
exclude_none: bool = False,
round_trip: bool = False,
warnings: Union[bool, Literal["none", "warn", "error"]] = True,
fallback: Union[Callable[[Any], Any], None] = None,
serialize_as_any: bool = False,
) -> Dict[str, Any]:
if PYDANTIC_MINOR_VERSION < (2, 11):
by_alias = by_alias or False

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.

if PYDANTIC_MINOR_VERSION >= (2, 7):
extra_kwargs: Dict[str, Any] = {
"context": context,
"serialize_as_any": serialize_as_any,
}
if PYDANTIC_MINOR_VERSION >= (2, 11):
extra_kwargs["fallback"] = fallback
else:
extra_kwargs = {}
if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
return super().dict(
include=include,
exclude=exclude,
by_alias=by_alias,
by_alias=by_alias or False,

@tiangolotiangoloApr 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅

exclude_unset=exclude_unset,
exclude_defaults=exclude_defaults,
exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
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
💚 Fix linting in CI#1340

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

 Merged

tiangolo
merged 11 commits into

from

Apr 26, 2025
 Merged


💚 Fix linting in CI
#1340
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8fda409

remove unused ignore statement


svlandeg Apr 9, 2025
902f3a1

fix signature of model_validate


svlandeg Apr 9, 2025
c8b6dec

add ignore statement


svlandeg Apr 9, 2025
54dbce5

fix signature of model_dump


svlandeg Apr 9, 2025
07f3269

prevent linting check on Python 3.8


svlandeg Apr 9, 2025
b23a457

add fallback arg for Pydantic 2.11 and above


svlandeg Apr 9, 2025
dbd8551

♻️ Tweak `sqlmodel/_compat.py` for compatibility with Pydantic v3


tiangolo Apr 26, 2025
2e8be82

♻️ Update model_fields, type them with compatibility for Pydantic v3


tiangolo Apr 26, 2025
6147c7d

♻️ Tweak method signatures optimizing for autocompletion and editor s…


tiangolo Apr 26, 2025
c8dadd5

🚨 Tweak type for older Pythons


tiangolo Apr 26, 2025
16bef83

♻️ Tweak by_alias for Pydantic < 2.11


tiangolo Apr 26, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 if: matrix.pydantic-version == 'pydantic-v2'
 run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
 - name: Lint
 if: matrix.pydantic-version == 'pydantic-v2'
 if: matrix.pydantic-version == 'pydantic-v2' && matrix.python-version != '3.8'
 run: bash scripts/lint.sh
 - run: mkdir coverage
 - name: Test
Expand Down

9 changes: 8 additions & 1 deletion
sqlmodel/_compat.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,14 @@ def set_config_value(
 model.model_config[parameter] = value # type: ignore[literal-required]

 def get_model_fields(model: InstanceOrType[BaseModel]) -> Dict[str, "FieldInfo"]:
 return model.model_fields
 # TODO: refactor the usage of this function to always pass the class
 # not the instance, and then remove this extra check
 # this is for compatibility with Pydantic v3
 if isinstance(model, type):
 use_model = model
 else:
 use_model = model.__class__
 return use_model.model_fields

Comment on lines

+109
 to 
+113

@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was checking the error from Pydantic and I saw that they will deprecate accessing the model_fields from the instance in Pydantic v3, they should be accessed from the class (which makes sense).
I updated this logic here to handle that future use case. In a subsequent PR we can refactor the internal usage of this function to only pass the class and not the instance.

 def get_fields_set(
 object: InstanceOrType["SQLModel"],
Expand Down

15 changes: 10 additions & 5 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,7 +477,7 @@ def Relationship(
class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
 __sqlmodel_relationships__: Dict[str, RelationshipInfo]
 model_config: SQLModelConfig
 model_fields: Dict[str, FieldInfo] # type: ignore[assignment]
 model_fields: ClassVar[Dict[str, FieldInfo]]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the idea is that this should now be only in the class and not instances, I think it's good to type it right away. It won't affect at runtime if people are using it, but will start warning them in their linters, so they can start preparing for this change in Pydantic v3.
 __config__: Type[SQLModelConfig]
 __fields__: Dict[str, ModelField] # type: ignore[assignment]

Expand DownExpand Up@@ -839,7 +839,7 @@ def __tablename__(cls) -> str:
 return cls.__name__.lower()

 @classmethod
 def model_validate(
 def model_validate( # type: ignore[override]
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to not use kwargs and instead ignore the type here, that way people will keep having autocompletion for the params, and kwargs won't swallow extra / invald params.
Seeing this, I realize it was probably not the best idea to include the extra update here. 🤔
Also, it's probably not needed for most use cases, maybe it would make sense to remove those docs, explain how to extend data to validate an object using just dicts, then deprecate using it, and finally at some point dropping the update...
But anyway, for now, it probably works to just # type: ignore and handle it on our side so that final users get the best developer experience / editor support.
 cls: Type[_TSQLModel],
 obj: Any,
 *,
Expand All@@ -863,20 +863,25 @@ def model_dump(
 mode: Union[Literal["json", "python"], str] = "python",
 include: Union[IncEx, None] = None,
 exclude: Union[IncEx, None] = None,
 context: Union[Dict[str, Any], None] = None,
 by_alias: bool = False,
 context: Union[Any, None] = None,
 by_alias: Union[bool, None] = None,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to keep the signature as close to the latest Pydantic, and then do the extra work internally to support the older versions, but this way people can get used to the new syntax and/or use it if they can already upgrade to the latest version.
 exclude_unset: bool = False,
 exclude_defaults: bool = False,
 exclude_none: bool = False,
 round_trip: bool = False,
 warnings: Union[bool, Literal["none", "warn", "error"]] = True,
 fallback: Union[Callable[[Any], Any], None] = None,
 serialize_as_any: bool = False,
 ) -> Dict[str, Any]:
 if PYDANTIC_MINOR_VERSION < (2, 11):
 by_alias = by_alias or False
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this we can handle older Pydantic versions but keep the most recent signature.
 if PYDANTIC_MINOR_VERSION >= (2, 7):
 extra_kwargs: Dict[str, Any] = {
 "context": context,
 "serialize_as_any": serialize_as_any,
 }
 if PYDANTIC_MINOR_VERSION >= (2, 11):
 extra_kwargs["fallback"] = fallback
 else:
 extra_kwargs = {}
 if IS_PYDANTIC_V2:
Expand All@@ -896,7 +901,7 @@ def model_dump(
 return super().dict(
 include=include,
 exclude=exclude,
 by_alias=by_alias,
 by_alias=by_alias or False,
@tiangolotiangoloApr 26, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this trick, we avoid the type when by_alias is None. 😅
 exclude_unset=exclude_unset,
 exclude_defaults=exclude_defaults,
 exclude_none=exclude_none,
Expand Down