-
Notifications
You must be signed in to change notification settings - Fork 671
Solution #640
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.
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
base: main
Are you sure you want to change the base?
Solution #640
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| # A generic, single database configuration. | ||
|
|
||
| [alembic] | ||
| # path to migration scripts. | ||
| # this is typically a path given in POSIX (e.g. forward slashes) | ||
| # format, relative to the token %(here)s which refers to the location of this | ||
| # ini file | ||
| script_location = %(here)s/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 | ||
| # Or organize into date-based subdirectories (requires recursive_version_locations = true) | ||
| # file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s | ||
|
|
||
| # sys.path path, will be prepended to sys.path if present. | ||
| # defaults to the current working directory. for multiple paths, the path separator | ||
| # is defined by "path_separator" below. | ||
| prepend_sys_path = . | ||
|
|
||
|
|
||
| # timezone to use when rendering the date within the migration file | ||
| # as well as the filename. | ||
| # If specified, requires the tzdata library which can be 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 <script_location>/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 "path_separator" | ||
| # below. | ||
| # version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions | ||
|
|
||
| # path_separator; This indicates what character is used to split lists of file | ||
| # paths, including version_locations and prepend_sys_path within configparser | ||
| # files such as alembic.ini. | ||
| # The default rendered in new alembic.ini files is "os", which uses os.pathsep | ||
| # to provide os-dependent path splitting. | ||
| # | ||
| # Note that in order to support legacy alembic.ini files, this default does NOT | ||
| # take place if path_separator is not present in alembic.ini. If this | ||
| # option is omitted entirely, fallback logic is as follows: | ||
| # | ||
| # 1. Parsing of the version_locations option falls back to using the legacy | ||
| # "version_path_separator" key, which if absent then falls back to the legacy | ||
| # behavior of splitting on spaces and/or commas. | ||
| # 2. Parsing of the prepend_sys_path option falls back to the legacy | ||
| # behavior of splitting on spaces, commas, or colons. | ||
| # | ||
| # Valid values for path_separator are: | ||
| # | ||
| # path_separator = : | ||
| # path_separator = ; | ||
| # path_separator = space | ||
| # path_separator = newline | ||
| # | ||
| # Use os.pathsep. Default configuration used for new projects. | ||
| path_separator = os | ||
|
|
||
| # 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 | ||
|
|
||
| # database URL. This is consumed by the user-maintained env.py script only. | ||
| # other means of configuring database URLs may be customized within the env.py | ||
| # file. | ||
| sqlalchemy.url = sqlite:///database.db | ||
|
|
||
|
|
||
| [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 module runner, against the "ruff" module | ||
| # hooks = ruff | ||
| # ruff.type = module | ||
| # ruff.module = ruff | ||
| # ruff.options = check --fix REVISION_SCRIPT_FILENAME | ||
|
|
||
| # Alternatively, use the exec runner to execute a binary found on your PATH | ||
| # hooks = ruff | ||
| # ruff.type = exec | ||
| # ruff.executable = ruff | ||
| # ruff.options = check --fix REVISION_SCRIPT_FILENAME | ||
|
|
||
| # Logging configuration. This is also consumed by the user-maintained | ||
| # env.py script only. | ||
| [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 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Generic single-database configuration. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| from logging.config import fileConfig | ||
|
|
||
| from sqlalchemy import engine_from_config | ||
| from sqlalchemy import pool | ||
|
|
||
| from alembic import context | ||
|
|
||
| from db.models import Base | ||
|
|
||
| # 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 = [Base.metadata] | ||
|
|
||
| # 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, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The task requirements specify that the API must support filtering books by author ID, but this endpoint only accepts |
||
| 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() | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| """${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, Sequence[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: | ||
| """Upgrade schema.""" | ||
| ${upgrades if upgrades else "pass"} | ||
|
|
||
|
|
||
| def downgrade() -> None: | ||
| """Downgrade schema.""" | ||
| ${downgrades if downgrades else "pass"} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| """Initialize database | ||
|
|
||
| Revision ID: ba4bf6c70b03 | ||
| Revises: | ||
| Create Date: 2026-04-23 16:31:12.206287 | ||
|
|
||
| """ | ||
| from typing import Sequence, Union | ||
|
|
||
| from alembic import op | ||
| import sqlalchemy as sa | ||
|
|
||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision: str = 'ba4bf6c70b03' | ||
| down_revision: Union[str, Sequence[str], None] = None | ||
| branch_labels: Union[str, Sequence[str], None] = None | ||
| depends_on: Union[str, Sequence[str], None] = None | ||
|
|
||
|
|
||
| def upgrade() -> None: | ||
| """Upgrade schema.""" | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.create_table('authors', | ||
| sa.Column('id', sa.Integer(), nullable=False), | ||
| sa.Column('name', sa.String(length=255), nullable=False), | ||
| sa.Column('bio', sa.Text(), nullable=False), | ||
| sa.PrimaryKeyConstraint('id') | ||
| ) | ||
| op.create_index(op.f('ix_authors_id'), 'authors', ['id'], unique=False) | ||
| op.create_index(op.f('ix_authors_name'), 'authors', ['name'], unique=True) | ||
| op.create_table('books', | ||
| sa.Column('id', sa.Integer(), nullable=False), | ||
| sa.Column('title', sa.String(length=255), nullable=False), | ||
| sa.Column('summary', sa.Text(), nullable=False), | ||
| sa.Column('publication_date', sa.Date(), nullable=False), | ||
| sa.Column('author_id', sa.Integer(), nullable=False), | ||
| sa.ForeignKeyConstraint(['author_id'], ['authors.id'], ), | ||
| sa.PrimaryKeyConstraint('id') | ||
| ) | ||
| op.create_index(op.f('ix_books_author_id'), 'books', ['author_id'], unique=False) | ||
| op.create_index(op.f('ix_books_id'), 'books', ['id'], unique=False) | ||
| op.create_index(op.f('ix_books_title'), 'books', ['title'], unique=False) | ||
| # ### end Alembic commands ### | ||
|
|
||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The task requirement states: 'Filter books by author ID'. This endpoint accepts skip/limit parameters but does not support filtering by author_id. Consider adding an optional author_id query parameter to filter books by a specific author. |
||
| def downgrade() -> None: | ||
| """Downgrade schema.""" | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.drop_index(op.f('ix_books_title'), table_name='books') | ||
| op.drop_index(op.f('ix_books_id'), table_name='books') | ||
| op.drop_index(op.f('ix_books_author_id'), table_name='books') | ||
| op.drop_table('books') | ||
| op.drop_index(op.f('ix_authors_name'), table_name='authors') | ||
| op.drop_index(op.f('ix_authors_id'), table_name='authors') | ||
| op.drop_table('authors') | ||
| # ### end Alembic commands ### | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| from sqlalchemy import select | ||
| from sqlalchemy.orm import Session | ||
|
|
||
| from db.models import Author, Book | ||
| from db.schemas import AuthorCreate, BookCreate | ||
|
|
||
|
|
||
| def get_all_authors_by_skip_and_limit(db: Session, skip: int, limit: int): | ||
| authors = db.scalars(select(Author)).all() | ||
| return authors[skip:skip + limit] | ||
|
|
||
| def create_new_author(db: Session, author: AuthorCreate): | ||
| db_author = Author(name=author.name, bio=author.bio) | ||
|
|
||
| db.add(db_author) | ||
| db.commit() | ||
| db.refresh(db_author) | ||
|
|
||
| return db_author | ||
|
|
||
| def get_author_by_id(db: Session, item_id: int): | ||
| stmt = select(Author).where(Author.id == item_id) | ||
|
|
||
| result = db.execute(stmt) | ||
| return result.scalars().first() | ||
|
|
||
| def create_book_for_author(db: Session, book: BookCreate): | ||
| db_book = Book( | ||
| title=book.title, | ||
| summary=book.summary, | ||
| publication_date=book.publication_date, | ||
| author_id=book.author_id | ||
| ) | ||
|
|
||
| db.add(db_book) | ||
| db.commit() | ||
|
|
||
| db.refresh(db_book) | ||
|
|
||
| return db_book | ||
|
|
||
|
|
||
| def get_books_by_skip_limit(db: Session, skip: int, limit: int): | ||
| db_books = db.scalars(select(Book)).all() | ||
| return db_books[skip:skip + limit] | ||
|
|
||
|
Comment on lines
+51
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The task requirements explicitly state 'Filter books by author ID' as an API endpoint requirement, but this functionality is not implemented. There's no query parameter on GET /books to filter by author_id, nor a dedicated endpoint like GET /books?author_id=X. |
||
|
|
||
| def retrieve_book_by_id(db: Session, item_id: int): | ||
| stmt = select(Book).where(Book.id == item_id) | ||
|
|
||
| result = db.execute(stmt) | ||
| return result.scalars().first() | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| from sqlalchemy import create_engine | ||
| from sqlalchemy.orm import sessionmaker | ||
| from sqlalchemy.ext.declarative import declarative_base | ||
|
|
||
|
|
||
| sqlite_file_name = "database.db" | ||
| sqlite_url = f"sqlite:///{sqlite_file_name}" | ||
|
|
||
| connect_args = {"check_same_thread": False} | ||
| engine = create_engine(sqlite_url, connect_args=connect_args) | ||
|
|
||
| SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) | ||
|
|
||
| Base = declarative_base() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The task explicitly requires creating database tables using the SQLAlchemy models at application startup. The
Base.metadata.create_all(bind=engine)call is missing.