some type checking fixes to satisfy sqlalchemy2-stubs, README additions

Author: pyb4430

README.md

@@ -4,6 +4,8 @@
 
 Generate a backend and frontend stack using Python, including interactive API documentation.
 
+** This is a fork of [tiangolo/full-stack-fastapi-postgresql](https://github.com/tiangolo/full-stack-fastapi-postgresql), which hasn't seen an update in a while **
+
 ### Interactive API documentation
 
 [![API docs](img/docs.png)](https://github.com/tiangolo/full-stack-fastapi-postgresql)
@@ -143,7 +145,17 @@ After using this generator, your new project (the directory created) will contai
 
 ## Release Notes
 
-### Latest Changes
+### 0.6.0
+
+* Updated to python 3.10
+* Updated backend dependencies
+* Updated frontend dependencies where possible
+* Refactored frontend to support Vuetify 2 and Vee-Validate 3, using [165](https://github.com/tiangolo/full-stack-fastapi-postgresql/pull/165) as a guide (also included the eslint and prettier additions)
+* Incorporated the steps in [tiangolo/uvicorn-gunicorn-docker](https://github.com/tiangolo/uvicorn-gunicorn-docker) into `backend.dockerfile`, so that the update to python 3.10 was possible. `start.sh`, `start-reload.sh`, and `gunicorn_conf.py` from that repo were added to backend
+* Updated the base image for the build stage in the frontend `Dockerfile` to `node:18`, no longer the outdated [tiangolo/node-frontend](https://github.com/tiangolo/node-frontend)
+* A handfuls of issue fixes
+
+### Below changes are from tiangolo/full-stack-fastapi-postgresql
 
 * Update issue-manager. PR [#211](https://github.com/tiangolo/full-stack-fastapi-postgresql/pull/211).
 * Add [GitHub Sponsors](https://github.com/sponsors/tiangolo) button. PR [#201](https://github.com/tiangolo/full-stack-fastapi-postgresql/pull/201).

{{cookiecutter.project_slug}}/backend/app/app/backend_pre_start.py

@@ -1,5 +1,6 @@
 import logging
 
+from sqlalchemy import text
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
 from app.db.session import SessionLocal
@@ -21,7 +22,7 @@ def init() -> None:
     try:
         db = SessionLocal()
         # Try to create session to check if DB is awake
-        db.execute("SELECT 1")
+        db.execute(text("SELECT 1"))
     except Exception as e:
         logger.error(e)
         raise e

{{cookiecutter.project_slug}}/backend/app/app/celeryworker_pre_start.py

@@ -1,5 +1,6 @@
 import logging
 
+from sqlalchemy import text
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
 from app.db.session import SessionLocal
@@ -21,7 +22,7 @@ def init() -> None:
     try:
         # Try to create session to check if DB is awake
         db = SessionLocal()
-        db.execute("SELECT 1")
+        db.execute(text("SELECT 1"))
     except Exception as e:
         logger.error(e)
         raise e

{{cookiecutter.project_slug}}/backend/app/app/crud/base.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Generic, List, Optional, Type, TypeVar, Union
+from typing import Any, Dict, Generic, List, Optional, Type, TypeVar, Union, cast
 
 from fastapi.encoders import jsonable_encoder
 from pydantic import BaseModel
@@ -60,7 +60,8 @@ def update(
         return db_obj
 
     def remove(self, db: Session, *, id: int) -> ModelType:
-        obj = db.query(self.model).get(id)
+        obj = db.get(self.model, id)
+        assert obj is not None
         db.delete(obj)
         db.commit()
-        return obj
+        return cast(ModelType, obj)

{{cookiecutter.project_slug}}/backend/app/app/db/session.py

@@ -3,5 +3,5 @@
 
 from app.core.config import settings
 
-engine = create_engine(settings.SQLALCHEMY_DATABASE_URI, pool_pre_ping=True)
+engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI), pool_pre_ping=True)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)

{{cookiecutter.project_slug}}/backend/app/app/models/item.py

@@ -10,8 +10,8 @@
 
 
 class Item(Base):
-    id = Column(Integer, primary_key=True, index=True)
+    id: int = Column(Integer, primary_key=True, index=True)
     title = Column(String, index=True)
     description = Column(String, index=True)
     owner_id = Column(Integer, ForeignKey("user.id"))
-    owner = relationship("User", back_populates="items")
+    owner: User = relationship("User", back_populates="items")

{{cookiecutter.project_slug}}/backend/app/app/models/user.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, List
 
 from sqlalchemy import Boolean, Column, Integer, String
 from sqlalchemy.orm import relationship
@@ -10,10 +10,10 @@
 
 
 class User(Base):
-    id = Column(Integer, primary_key=True, index=True)
+    id: int = Column(Integer, primary_key=True, index=True)
     full_name = Column(String, index=True)
-    email = Column(String, unique=True, index=True, nullable=False)
-    hashed_password = Column(String, nullable=False)
-    is_active = Column(Boolean(), default=True)
-    is_superuser = Column(Boolean(), default=False)
-    items = relationship("Item", back_populates="owner")
+    email: str = Column(String, unique=True, index=True, nullable=False)
+    hashed_password: str = Column(String, nullable=False)
+    is_active: bool = Column(Boolean(), default=True)
+    is_superuser: bool = Column(Boolean(), default=False)
+    items: List[Item] = relationship("Item", back_populates="owner")

{{cookiecutter.project_slug}}/backend/app/app/tests_pre_start.py

@@ -1,5 +1,6 @@
 import logging
 
+from sqlalchemy import text
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
 from app.db.session import SessionLocal
@@ -21,7 +22,7 @@ def init() -> None:
     try:
         # Try to create session to check if DB is awake
         db = SessionLocal()
-        db.execute("SELECT 1")
+        db.execute(text("SELECT 1"))
     except Exception as e:
         logger.error(e)
         raise e