diff --git a/alembic.ini b/alembic.ini deleted file mode 100644 index a14c8f5..0000000 --- a/alembic.ini +++ /dev/null @@ -1,117 +0,0 @@ -# A generic, single database configuration. - -[alembic] -# path to migration scripts -# Use forward slashes (/) also on windows to provide an os agnostic path -script_location = alembic - -# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s -# Uncomment the line below if you want the files to be prepended with date and time -# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file -# for all available tokens -# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s - -# sys.path path, will be prepended to sys.path if present. -# defaults to the current working directory. -prepend_sys_path = . - -# timezone to use when rendering the date within the migration file -# as well as the filename. -# If specified, requires the python>=3.9 or backports.zoneinfo library. -# Any required deps can installed by adding `alembic[tz]` to the pip requirements -# string value is passed to ZoneInfo() -# leave blank for localtime -# timezone = - -# max length of characters to apply to the "slug" field -# truncate_slug_length = 40 - -# set to 'true' to run the environment during -# the 'revision' command, regardless of autogenerate -# revision_environment = false - -# set to 'true' to allow .pyc and .pyo files without -# a source .py file to be detected as revisions in the -# versions/ directory -# sourceless = false - -# version location specification; This defaults -# to alembic/versions. When using multiple version -# directories, initial revisions must be specified with --version-path. -# The path separator used here should be the separator specified by "version_path_separator" below. -# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions - -# version path separator; As mentioned above, this is the character used to split -# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. -# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. -# Valid values for version_path_separator are: -# -# version_path_separator = : -# version_path_separator = ; -# version_path_separator = space -# version_path_separator = newline -version_path_separator = os # Use os.pathsep. Default configuration used for new projects. - -# set to 'true' to search source files recursively -# in each "version_locations" directory -# new in Alembic version 1.10 -# recursive_version_locations = false - -# the output encoding used when revision files -# are written from script.py.mako -# output_encoding = utf-8 - -sqlalchemy.url = mysql+pymysql://mooc:zXpPHKhE7A5x6X3A@localhost/mooc - - -[post_write_hooks] -# post_write_hooks defines scripts or Python functions that are run -# on newly generated revision scripts. See the documentation for further -# detail and examples - -# format using "black" - use the console_scripts runner, against the "black" entrypoint -# hooks = black -# black.type = console_scripts -# black.entrypoint = black -# black.options = -l 79 REVISION_SCRIPT_FILENAME - -# lint with attempts to fix using "ruff" - use the exec runner, execute a binary -# hooks = ruff -# ruff.type = exec -# ruff.executable = %(here)s/.venv/bin/ruff -# ruff.options = --fix REVISION_SCRIPT_FILENAME - -# Logging configuration -[loggers] -keys = root,sqlalchemy,alembic - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARNING -handlers = console -qualname = - -[logger_sqlalchemy] -level = WARNING -handlers = -qualname = sqlalchemy.engine - -[logger_alembic] -level = INFO -handlers = -qualname = alembic - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S diff --git a/alembic/README b/alembic/README deleted file mode 100644 index 98e4f9c..0000000 --- a/alembic/README +++ /dev/null @@ -1 +0,0 @@ -Generic single-database configuration. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py deleted file mode 100644 index 36112a3..0000000 --- a/alembic/env.py +++ /dev/null @@ -1,78 +0,0 @@ -from logging.config import fileConfig - -from sqlalchemy import engine_from_config -from sqlalchemy import pool - -from alembic import context - -# this is the Alembic Config object, which provides -# access to the values within the .ini file in use. -config = context.config - -# Interpret the config file for Python logging. -# This line sets up loggers basically. -if config.config_file_name is not None: - fileConfig(config.config_file_name) - -# add your model's MetaData object here -# for 'autogenerate' support -# from myapp import mymodel -# target_metadata = mymodel.Base.metadata -target_metadata = None - -# other values from the config, defined by the needs of env.py, -# can be acquired: -# my_important_option = config.get_main_option("my_important_option") -# ... etc. - - -def run_migrations_offline() -> None: - """Run migrations in 'offline' mode. - - This configures the context with just a URL - and not an Engine, though an Engine is acceptable - here as well. By skipping the Engine creation - we don't even need a DBAPI to be available. - - Calls to context.execute() here emit the given string to the - script output. - - """ - url = config.get_main_option("sqlalchemy.url") - context.configure( - url=url, - target_metadata=target_metadata, - literal_binds=True, - dialect_opts={"paramstyle": "named"}, - ) - - with context.begin_transaction(): - context.run_migrations() - - -def run_migrations_online() -> None: - """Run migrations in 'online' mode. - - In this scenario we need to create an Engine - and associate a connection with the context. - - """ - connectable = engine_from_config( - config.get_section(config.config_ini_section, {}), - prefix="sqlalchemy.", - poolclass=pool.NullPool, - ) - - with connectable.connect() as connection: - context.configure( - connection=connection, target_metadata=target_metadata - ) - - with context.begin_transaction(): - context.run_migrations() - - -if context.is_offline_mode(): - run_migrations_offline() -else: - run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako deleted file mode 100644 index fbc4b07..0000000 --- a/alembic/script.py.mako +++ /dev/null @@ -1,26 +0,0 @@ -"""${message} - -Revision ID: ${up_revision} -Revises: ${down_revision | comma,n} -Create Date: ${create_date} - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa -${imports if imports else ""} - -# revision identifiers, used by Alembic. -revision: str = ${repr(up_revision)} -down_revision: Union[str, None] = ${repr(down_revision)} -branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} -depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} - - -def upgrade() -> None: - ${upgrades if upgrades else "pass"} - - -def downgrade() -> None: - ${downgrades if downgrades else "pass"} diff --git a/mooc/api/deps.py b/mooc/api/deps.py index c7f9e44..d2cdaf6 100644 --- a/mooc/api/deps.py +++ b/mooc/api/deps.py @@ -1,6 +1,6 @@ from fastapi import Depends, HTTPException, status from sqlalchemy.orm import Session -from mooc.db.session import get_db +from mooc.db.database import get_db from fastapi.security import OAuth2PasswordBearer import jwt from mooc.core.config import settings diff --git a/mooc/core/config.py b/mooc/core/config.py index decd6ab..f7f5259 100644 --- a/mooc/core/config.py +++ b/mooc/core/config.py @@ -16,7 +16,7 @@ class Settings(BaseSettings): SQLALCHEMY_DATABASE_URI: Optional[str] = None SQLALCHEMY_ECHO: bool = True - SECRET_KEY: str = "your-secret-key-here" # ����ʹ�ø��ӵ�����ַ��� + SECRET_KEY: str = "your-secret-key-here" ALGORITHM: str = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES: int = 30 @@ -33,4 +33,4 @@ class Settings(BaseSettings): class Config: env_file = ".env" -settings = Settings() \ No newline at end of file +settings = Settings() diff --git a/mooc/db/database.py b/mooc/db/database.py index 70d1a47..d54b0e1 100644 --- a/mooc/db/database.py +++ b/mooc/db/database.py @@ -2,7 +2,7 @@ from sqlalchemy import create_engine from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker from mooc.core.config import settings - +from typing import Generator # 创建数据库引擎 engine = create_engine( settings.SQLALCHEMY_DATABASE_URI, @@ -20,10 +20,12 @@ def init_db(): """初始化数据库""" Base.metadata.create_all(bind=engine) -def get_db(): - """获取数据库会话""" - db = SessionLocal() +def get_db() -> Generator: + """ + 获取数据库会话的依赖项 + """ try: + db = SessionLocal() yield db finally: db.close() \ No newline at end of file diff --git a/mooc/db/session.py b/mooc/db/session.py index 322c84f..e4e2b0e 100644 --- a/mooc/db/session.py +++ b/mooc/db/session.py @@ -1,29 +1,29 @@ -from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker -from mooc.core.config import settings -from typing import Generator -from mooc.db.base import Base +# from sqlalchemy import create_engine +# from sqlalchemy.orm import sessionmaker +# from mooc.core.config import settings +# from typing import Generator +# from mooc.db.base import Base -# 创建数据库引擎 -engine = create_engine( - settings.SQLALCHEMY_DATABASE_URI, - pool_pre_ping=True, - echo=settings.SQLALCHEMY_ECHO -) +# # 创建数据库引擎 +# engine = create_engine( +# settings.SQLALCHEMY_DATABASE_URI, +# pool_pre_ping=True, +# echo=settings.SQLALCHEMY_ECHO +# ) -# 创建表 -def init_db(): - Base.metadata.create_all(bind=engine) +# # 创建表 +# def init_db(): +# Base.metadata.create_all(bind=engine) -# 创建会话工厂 -SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) +# # 创建会话工厂 +# SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) -def get_db() -> Generator: - """ - 获取数据库会话的依赖项 - """ - try: - db = SessionLocal() - yield db - finally: - db.close() \ No newline at end of file +# def get_db() -> Generator: +# """ +# 获取数据库会话的依赖项 +# """ +# try: +# db = SessionLocal() +# yield db +# finally: +# db.close() \ No newline at end of file diff --git a/mooc/models/account.py b/mooc/models/account.py index c6881b2..bb5bb9c 100644 --- a/mooc/models/account.py +++ b/mooc/models/account.py @@ -26,4 +26,4 @@ class AccountWechats(Base): auth_refresh_token = Column(String(255), nullable=False) class Config: - orm_mode = True \ No newline at end of file + from_attributes = True \ No newline at end of file diff --git a/mooc/models/admin.py b/mooc/models/admin.py index 138e155..ba28e99 100644 --- a/mooc/models/admin.py +++ b/mooc/models/admin.py @@ -20,7 +20,7 @@ class Admin(Base): relation_id = Column(Text, nullable=False, comment='关联试卷ID') class Config: - orm_mode = True + from_attributes = True class Account(Base): __tablename__ = "ims_account" @@ -36,7 +36,7 @@ class Account(Base): send_api_expire_status = Column(SmallInteger, nullable=False) class Config: - orm_mode = True + from_attributes = True @@ -48,4 +48,4 @@ class AccountWebapp(Base): name = Column(String(255)) class Config: - orm_mode = True \ No newline at end of file + from_attributes = True \ No newline at end of file diff --git a/mooc/schemas/account.py b/mooc/schemas/account.py index fff5168..b7e3cef 100644 --- a/mooc/schemas/account.py +++ b/mooc/schemas/account.py @@ -34,4 +34,4 @@ class AccountWechats(AccountWechatsBase): acid: int class Config: - orm_mode = True \ No newline at end of file + from_attributes = True \ No newline at end of file diff --git a/mooc/schemas/admin.py b/mooc/schemas/admin.py index 33f77a0..3efc276 100644 --- a/mooc/schemas/admin.py +++ b/mooc/schemas/admin.py @@ -32,7 +32,7 @@ class Admin(AdminBase): logintime: int class Config: - orm_mode = True + from_attributes = True class AccountBase(BaseModel): @@ -55,7 +55,7 @@ class Account(AccountBase): acid: int class Config: - orm_mode = True + from_attributes = True @@ -75,4 +75,4 @@ class AccountWebapp(AccountWebappBase): acid: int class Config: - orm_mode = True \ No newline at end of file + from_attributes = True \ No newline at end of file