Merge branch 'main' into main

tiangolo · web-flow · commit bfb6d4f0820b · 2026-02-01T10:09:51.000-08:00
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -18,6 +18,7 @@ internal:
         - .pre-commit-config.yaml
         - pdm_build.py
         - requirements*.txt
+        - uv.lock
       - all-globs-to-all-files:
         - '!docs/**'
         - '!sqlmodel/**'
diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
@@ -41,11 +41,15 @@ jobs:
                 "message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR.",
                 "reminder": {
                     "before": "P3D",
-                    "message": "Heads-up: this will be closed in 3 days unless there’s new activity."
+                    "message": "Heads-up: this will be closed in 3 days unless there's new activity."
                 }
               },
               "invalid": {
                 "delay": 0,
                 "message": "This was marked as invalid and will be closed now. If this is an error, please provide additional details."
+              },
+              "maybe-ai": {
+                "delay": 0,
+                "message": "This was marked as potentially AI generated and will be closed now. If this is an error, please provide additional details, make sure to read the docs about contributing and AI."
               }
             }
diff --git a/docs/contributing.md b/docs/contributing.md
@@ -158,3 +158,39 @@ This helps to make sure that:
 * The documentation is up-to-date.
 * The documentation examples can be run as is.
 * Most of the features are covered by the documentation, ensured by test coverage.
+
+## Automated Code and AI
+
+You are encouraged to use all the tools you want to do your work and contribute as efficiently as possible, this includes AI (LLM) tools, etc. Nevertheless, contributions should have meaningful human intervention, judgement, context, etc.
+
+If the **human effort** put in a PR, e.g. writing LLM prompts, is **less** than the **effort we would need to put** to **review it**, please **don't** submit the PR.
+
+Think of it this way: we can already write LLM prompts or run automated tools ourselves, and that would be faster than reviewing external PRs.
+
+### Closing Automated and AI PRs
+
+If we see PRs that seem AI generated or automated in similar ways, we'll flag them and close them.
+
+The same applies to comments and descriptions, please don't copy paste the content generated by an LLM.
+
+### Human Effort Denial of Service
+
+Using automated tools and AI to submit PRs or comments that we have to carefully review and handle would be the equivalent of a <a href="https://en.wikipedia.org/wiki/Denial-of-service_attack" class="external-link" target="_blank">Denial-of-service attack</a> on our human effort.
+
+It would be very little effort from the person submitting the PR (an LLM prompt) that generates a large amount of effort on our side (carefully reviewing code).
+
+Please don't do that.
+
+We'll need to block accounts that spam us with repeated automated PRs or comments.
+
+### Use Tools Wisely
+
+As Uncle Ben said:
+
+<blockquote>
+With great <strike>power</strike> <strong>tools</strong> comes great responsibility.
+</blockquote>
+
+Avoid inadvertently doing harm.
+
+You have amazing tools at hand, use them wisely to help effectively.
diff --git a/docs/js/custom.js b/docs/js/custom.js
@@ -81,8 +81,11 @@ function setupTermynal() {
                     }
                 }
                 saveBuffer();
+                const inputCommands = useLines.filter(line => line.type === "input").map(line => line.value).join("\n");
+                node.textContent = inputCommands;
                 const div = document.createElement("div");
-                node.replaceWith(div);
+                node.style.display = "none";
+                node.after(div);
                 const termynal = new Termynal(div, {
                     lineData: useLines,
                     noInit: true,
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -2,12 +2,26 @@
 
 ## Latest Changes
 
+### Refactors
+
+* ♻️ Import `Literal` from the `typing` module directly. PR [#1699](https://github.com/fastapi/sqlmodel/pull/1699) by [@svlandeg](https://github.com/svlandeg).
+
 ### Docs
 
+* 📝 Add contribution instructions about LLM generated code and comments and automated tools for PRs. PR [#1712](https://github.com/fastapi/sqlmodel/pull/1712) by [@alejsdev](https://github.com/alejsdev).
+* 🐛 Fix copy button in `custom.js`. PR [#1711](https://github.com/fastapi/sqlmodel/pull/1711) by [@alejsdev](https://github.com/alejsdev).
 * 📝 Remove duplicated word in `read-relationships.md`. PR [#1705](https://github.com/fastapi/sqlmodel/pull/1705) by [@stefmolin](https://github.com/stefmolin).
 
 ### Internal
 
+* ⬆ Bump ruff from 0.14.13 to 0.14.14. PR [#1721](https://github.com/fastapi/sqlmodel/pull/1721) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.2.30 to 0.3.0. PR [#1720](https://github.com/fastapi/sqlmodel/pull/1720) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* 🔧 Ensure that an edit to `uv.lock` gets the `internal` label. PR [#1719](https://github.com/fastapi/sqlmodel/pull/1719) by [@svlandeg](https://github.com/svlandeg).
+* ⬆ Bump sqlalchemy from 2.0.45 to 2.0.46. PR [#1717](https://github.com/fastapi/sqlmodel/pull/1717) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump typer from 0.21.0 to 0.21.1. PR [#1715](https://github.com/fastapi/sqlmodel/pull/1715) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.14.10 to 0.14.13. PR [#1714](https://github.com/fastapi/sqlmodel/pull/1714) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.2.25 to 0.2.30. PR [#1716](https://github.com/fastapi/sqlmodel/pull/1716) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆️ Update FastAPI version pin to `>=0.103.2` in tests. PR [#1709](https://github.com/fastapi/sqlmodel/pull/1709) by [@YuriiMotov](https://github.com/YuriiMotov).
 * 📌 Pin development Python version to 3.10, for `deploy_docs_status.py`. PR [#1707](https://github.com/fastapi/sqlmodel/pull/1707) by [@tiangolo](https://github.com/tiangolo).
 * ⬆️  Migrate to uv. PR [#1688](https://github.com/fastapi/sqlmodel/pull/1688) by [@DoctorJohn](https://github.com/DoctorJohn).
 * ⬆ Update fastapi requirement from >=0.103.2,<0.126.0 to >=0.103.2,<0.129.0. PR [#1703](https://github.com/fastapi/sqlmodel/pull/1703) by [@dependabot[bot]](https://github.com/apps/dependabot).
diff --git a/pyproject.toml b/pyproject.toml
@@ -66,7 +66,7 @@ docs = [
     "mkdocstrings[python]==0.30.1",
     "pillow==11.3.0",
     "pyyaml>=5.3.1,<7.0.0",
-    "typer==0.21.0",
+    "typer==0.21.1",
 ]
 github-actions = [
     "httpx>=0.27.0,<0.29.0",
@@ -79,13 +79,13 @@ tests = [
     "black>=22.10",
     "coverage[toml]>=6.2,<8.0",
     "dirty-equals==0.11",
-    "fastapi>=0.103.2,<0.129.0",
+    "fastapi>=0.103.2",
     "httpx==0.28.1",
     "jinja2==3.1.6",
     "mypy==1.19.1",
     "pre-commit>=2.17.0,<5.0.0",
     "pytest>=7.0.1,<9.0.0",
-    "ruff==0.14.10",
+    "ruff==0.14.14",
     "typing-extensions==4.15.0",
 ]
 
diff --git a/sqlmodel/main.py b/sqlmodel/main.py
@@ -15,6 +15,7 @@
     Any,
     Callable,
     ClassVar,
+    Literal,
     Optional,
     TypeVar,
     Union,
@@ -49,7 +50,7 @@
 from sqlalchemy.orm.instrumentation import is_instrumented
 from sqlalchemy.sql.schema import MetaData
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
-from typing_extensions import Literal, TypeAlias, deprecated, get_origin
+from typing_extensions import TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     PYDANTIC_MINOR_VERSION,
diff --git a/sqlmodel/sql/expression.py b/sqlmodel/sql/expression.py
@@ -1,6 +1,7 @@
 from collections.abc import Iterable, Mapping, Sequence
 from typing import (
     Any,
+    Literal,
     Optional,
     TypeVar,
     Union,
@@ -34,7 +35,6 @@
     UnaryExpression,
 )
 from sqlalchemy.sql.type_api import TypeEngine
-from typing_extensions import Literal
 
 from ._expression_select_cls import Select as Select
 from ._expression_select_cls import SelectOfScalar as SelectOfScalar
diff --git a/tests/test_pydantic/test_field.py b/tests/test_pydantic/test_field.py
@@ -1,10 +1,9 @@
 from decimal import Decimal
-from typing import Optional, Union
+from typing import Literal, Optional, Union
 
 import pytest
 from pydantic import ValidationError
 from sqlmodel import Field, SQLModel
-from typing_extensions import Literal
 
 
 def test_decimal():
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,15 @@ jobs:`
`41`	`41`	`"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR.",`
`42`	`42`	`"reminder": {`
`43`	`43`	`"before": "P3D",`
`44`		`- "message": "Heads-up: this will be closed in 3 days unless there’s new activity."`
	`44`	`+ "message": "Heads-up: this will be closed in 3 days unless there's new activity."`
`45`	`45`	`}`
`46`	`46`	`},`
`47`	`47`	`"invalid": {`
`48`	`48`	`"delay": 0,`
`49`	`49`	`"message": "This was marked as invalid and will be closed now. If this is an error, please provide additional details."`
	`50`	`+ },`
	`51`	`+ "maybe-ai": {`
	`52`	`+ "delay": 0,`
	`53`	`+ "message": "This was marked as potentially AI generated and will be closed now. If this is an error, please provide additional details, make sure to read the docs about contributing and AI."`
`50`	`54`	`}`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,11 @@ function setupTermynal() {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`saveBuffer();`
	`84`	`+ const inputCommands = useLines.filter(line => line.type === "input").map(line => line.value).join("\n");`
	`85`	`+ node.textContent = inputCommands;`
`84`	`86`	`const div = document.createElement("div");`
`85`		`- node.replaceWith(div);`
	`87`	`+ node.style.display = "none";`
	`88`	`+ node.after(div);`
`86`	`89`	`const termynal = new Termynal(div, {`
`87`	`90`	`lineData: useLines,`
`88`	`91`	`noInit: true,`