fix conflict

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
-    -   id: no-commit-to-branch  # prevent direct commits to main branch
+#    -   id: no-commit-to-branch  # prevent direct commits to main branch
     -   id: check-added-large-files
     -   id: check-toml
     -   id: check-yaml

appboot/models.py

@@ -7,7 +7,6 @@
 from pydantic import BaseModel
 from sqlalchemy import JSON, DateTime, TypeDecorator, func
 from sqlalchemy.orm import Mapped, declared_attr, mapped_column
-from sqlalchemy.sql.selectable import ForUpdateParameter
 from typing_extensions import Self
 
 from appboot import timezone
@@ -67,8 +66,8 @@ async def update(self, **values: dict[str, typing.Any]):
 
     async def refresh(
         self,
-        attribute_names: Optional[typing.Iterable[str]] = None,
-        with_for_update: ForUpdateParameter = None,
+        attribute_names=None,
+        with_for_update=None,
     ):
         await ScopedSession().refresh(self, attribute_names, with_for_update)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "appboot"
-version = "0.3.0"
+version = "0.3.1"
 description = "Use FastAPI like Django"
 authors = ["liyatao <liyatao001@gmail.com>"]
 readme = "README.md"
@@ -14,7 +14,7 @@ python-dotenv = ">=0.10.4"
 jinja2 = ">=2.11.2"
 typer = ">=0.8.0"
 typing_extensions = ">=4.2.0"
-uvicorn = { version = ">=0.21.0", extras = ["standard"] }
+uvicorn = { version = ">=0.17.0", extras = ["standard"] }
 sqlalchemy = { version = "^2.0.0", extras = ["asyncio"] }
 pydantic-settings = { version = "^2.0.0", optional = true }