-
Notifications
You must be signed in to change notification settings - Fork 20
Sphinx - Aleida Vieyra & Vlada Rapaport #17
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?
Changes from all commits
b1c8a92
1f4faf4
2a30a29
c219d7f
8184fbb
62f63a3
a26e770
984e0dd
7ab88f0
83d91c1
11d0ec9
4acea17
0b1eff0
48ae495
87195b4
79a070e
a86a6d0
5fe3dea
fab9221
4c6c569
d0832a2
696dd56
8d377e0
1d04545
6668986
0c2712d
23335e3
c13d35f
9b1a3f3
7d245f4
712a776
f62681b
b1fcd3e
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 |
|---|---|---|
| @@ -1,7 +1,22 @@ | ||
| from flask import Flask | ||
| from .routes.db import db, migrate | ||
| from .models import planet | ||
| from .routes.planet_routes import planets_bp | ||
| import os | ||
|
|
||
|
|
||
| def create_app(test_config=None): | ||
| def create_app(config=None): | ||
| app = Flask(__name__) | ||
|
|
||
| app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False | ||
| app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') | ||
|
|
||
| if config: | ||
| app.config.update(config) | ||
|
|
||
| db.init_app(app) | ||
| migrate.init_app(app, db) | ||
|
|
||
| # Register Blueprints here | ||
| app.register_blueprint(planets_bp) | ||
|
|
||
| return app |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| from sqlalchemy.orm import DeclarativeBase | ||
|
|
||
| class Base(DeclarativeBase): | ||
| pass |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| from sqlalchemy.orm import Mapped, mapped_column | ||
| from app.routes.db import db | ||
|
|
||
| class Planet(db.Model): | ||
| id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) | ||
| name: Mapped[str] | ||
| description: Mapped[str] | ||
| distance_from_sun: Mapped[int] | ||
|
|
||
| def to_dict(self): | ||
| return dict( | ||
| id=self.id, | ||
| name=self.name, | ||
| description=self.description, | ||
| distance_from_sun=self.distance_from_sun, | ||
| ) | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| from flask_sqlalchemy import SQLAlchemy | ||
| from flask_migrate import Migrate | ||
| from ..models.base import Base | ||
|
|
||
| db = SQLAlchemy(model_class=Base) | ||
| migrate = Migrate() | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| from flask import Blueprint, abort, make_response, request, Response | ||
| from app.routes.db import db | ||
| from app.models.planet import Planet | ||
|
|
||
|
|
||
| planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") | ||
|
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. Convention is to name this from app.routes.planet_routes.py import bp as planets_bp |
||
|
|
||
|
|
||
| @planets_bp.post("") | ||
| def create_planet(): | ||
|
|
||
| request_body = request.get_json() | ||
| name = request_body["name"] | ||
| description = request_body["description"] | ||
| distance_from_sun = request_body["distance_from_sun"] | ||
|
|
||
| new_planet = Planet( | ||
| name=name, description=description, distance_from_sun=distance_from_sun | ||
| ) | ||
| db.session.add(new_planet) | ||
| db.session.commit() | ||
|
|
||
| response = new_planet.to_dict() | ||
|
|
||
| return response, 201 | ||
|
Comment on lines
+12
to
+25
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. We could move all of this logic into a function like |
||
|
|
||
| @planets_bp.get("") | ||
| def get_all_planets(): | ||
| query = db.select(Planet) | ||
| name_param = request.args.get("name") | ||
|
|
||
| if name_param: | ||
| query = query.where(Planet.name == name_param) | ||
|
|
||
| description_param = request.args.get("description") | ||
| if description_param: | ||
| query = query.where(Planet.description.ilike(f"%{description_param}%")) | ||
|
|
||
| distance_from_sun_param = request.args.get("distance_from_sun") | ||
| if distance_from_sun_param: | ||
| query = query.where(Planet.distance_from_sun.ilike(f"%{distance_from_sun_param}%")) | ||
|
|
||
| query = query.order_by(Planet.id) | ||
|
|
||
| planets = db.session.scalars(query) | ||
|
|
||
| planets_response = [planet.to_dict() for planet in planets] | ||
| return planets_response | ||
|
Comment on lines
+32
to
+48
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. Like |
||
|
|
||
| @planets_bp.get("/<planet_id>") | ||
| def get_one_planet(planet_id): | ||
| planet = validate_planet(planet_id) | ||
|
|
||
| response = planet.to_dict() | ||
|
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. I think I would be okay with returning this on a single line since we aren't doing anything extra here. |
||
|
|
||
| return response | ||
|
|
||
|
|
||
| @planets_bp.put("/<planet_id>") | ||
| def update_planet(planet_id): | ||
| planet = validate_planet(planet_id) | ||
| request_body = request.get_json() | ||
|
|
||
| planet.name = request_body["name"] | ||
| planet.description = request_body["description"] | ||
| planet.distance_from_sun = request_body["distance_from_sun"] | ||
| db.session.commit() | ||
|
Comment on lines
+62
to
+67
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. Could we move this into a helper function? How would it look based off what we learned during refactoring? |
||
|
|
||
| return Response(status=204, mimetype="application/json") | ||
|
|
||
|
|
||
| @planets_bp.delete("/<planet_id>") | ||
| def delete_planet(planet_id): | ||
| planet = validate_planet(planet_id) | ||
| db.session.delete(planet) | ||
| db.session.commit() | ||
| return Response(status=204, mimetype="application/json") | ||
|
|
||
|
|
||
| def validate_planet(planet_id): | ||
| try: | ||
| planet_id = int(planet_id) | ||
| except: | ||
| response = {"message": f"planet {planet_id} invalid"} | ||
| abort(make_response(response, 400)) | ||
|
|
||
| query = db.select(Planet).where(Planet.id == planet_id) | ||
| planet = db.session.scalar(query) | ||
|
|
||
| if not planet: | ||
| response = {"message": f"planet {planet_id} not found"} | ||
| abort(make_response(response, 404)) | ||
|
|
||
| return planet | ||
|
Comment on lines
+80
to
+94
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. Where could this function live to better organize our code? |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Single-database configuration for Flask. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| # A generic, single database configuration. | ||
|
|
||
| [alembic] | ||
| # template used to generate migration files | ||
| # file_template = %%(rev)s_%%(slug)s | ||
|
|
||
| # set to 'true' to run the environment during | ||
| # the 'revision' command, regardless of autogenerate | ||
| # revision_environment = false | ||
|
|
||
|
|
||
| # Logging configuration | ||
| [loggers] | ||
| keys = root,sqlalchemy,alembic,flask_migrate | ||
|
|
||
| [handlers] | ||
| keys = console | ||
|
|
||
| [formatters] | ||
| keys = generic | ||
|
|
||
| [logger_root] | ||
| level = WARN | ||
| handlers = console | ||
| qualname = | ||
|
|
||
| [logger_sqlalchemy] | ||
| level = WARN | ||
| handlers = | ||
| qualname = sqlalchemy.engine | ||
|
|
||
| [logger_alembic] | ||
| level = INFO | ||
| handlers = | ||
| qualname = alembic | ||
|
|
||
| [logger_flask_migrate] | ||
| level = INFO | ||
| handlers = | ||
| qualname = flask_migrate | ||
|
|
||
| [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,113 @@ | ||
| import logging | ||
| from logging.config import fileConfig | ||
|
|
||
| from flask import current_app | ||
|
|
||
| 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. | ||
| fileConfig(config.config_file_name) | ||
| logger = logging.getLogger('alembic.env') | ||
|
|
||
|
|
||
| def get_engine(): | ||
| try: | ||
| # this works with Flask-SQLAlchemy<3 and Alchemical | ||
| return current_app.extensions['migrate'].db.get_engine() | ||
| except (TypeError, AttributeError): | ||
| # this works with Flask-SQLAlchemy>=3 | ||
| return current_app.extensions['migrate'].db.engine | ||
|
|
||
|
|
||
| def get_engine_url(): | ||
| try: | ||
| return get_engine().url.render_as_string(hide_password=False).replace( | ||
| '%', '%%') | ||
| except AttributeError: | ||
| return str(get_engine().url).replace('%', '%%') | ||
|
|
||
|
|
||
| # add your model's MetaData object here | ||
| # for 'autogenerate' support | ||
| # from myapp import mymodel | ||
| # target_metadata = mymodel.Base.metadata | ||
| config.set_main_option('sqlalchemy.url', get_engine_url()) | ||
| target_db = current_app.extensions['migrate'].db | ||
|
|
||
| # 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 get_metadata(): | ||
| if hasattr(target_db, 'metadatas'): | ||
| return target_db.metadatas[None] | ||
| return target_db.metadata | ||
|
|
||
|
|
||
| def run_migrations_offline(): | ||
| """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=get_metadata(), literal_binds=True | ||
| ) | ||
|
|
||
| with context.begin_transaction(): | ||
| context.run_migrations() | ||
|
|
||
|
|
||
| def run_migrations_online(): | ||
| """Run migrations in 'online' mode. | ||
| In this scenario we need to create an Engine | ||
| and associate a connection with the context. | ||
| """ | ||
|
|
||
| # this callback is used to prevent an auto-migration from being generated | ||
| # when there are no changes to the schema | ||
| # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html | ||
| def process_revision_directives(context, revision, directives): | ||
| if getattr(config.cmd_opts, 'autogenerate', False): | ||
| script = directives[0] | ||
| if script.upgrade_ops.is_empty(): | ||
| directives[:] = [] | ||
| logger.info('No changes in schema detected.') | ||
|
|
||
| conf_args = current_app.extensions['migrate'].configure_args | ||
| if conf_args.get("process_revision_directives") is None: | ||
| conf_args["process_revision_directives"] = process_revision_directives | ||
|
|
||
| connectable = get_engine() | ||
|
|
||
| with connectable.connect() as connection: | ||
| context.configure( | ||
| connection=connection, | ||
| target_metadata=get_metadata(), | ||
| **conf_args | ||
| ) | ||
|
|
||
| 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,24 @@ | ||
| """${message} | ||
|
|
||
| Revision ID: ${up_revision} | ||
| Revises: ${down_revision | comma,n} | ||
| Create Date: ${create_date} | ||
|
|
||
| """ | ||
| from alembic import op | ||
| import sqlalchemy as sa | ||
| ${imports if imports else ""} | ||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = ${repr(up_revision)} | ||
| down_revision = ${repr(down_revision)} | ||
| branch_labels = ${repr(branch_labels)} | ||
| depends_on = ${repr(depends_on)} | ||
|
|
||
|
|
||
| def upgrade(): | ||
| ${upgrades if upgrades else "pass"} | ||
|
|
||
|
|
||
| def downgrade(): | ||
| ${downgrades if downgrades else "pass"} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| """adds Planet model | ||
|
|
||
| Revision ID: 578fcb6c6536 | ||
| Revises: | ||
| Create Date: 2024-10-28 16:24:28.316505 | ||
|
|
||
| """ | ||
| from alembic import op | ||
| import sqlalchemy as sa | ||
|
|
||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = '578fcb6c6536' | ||
| down_revision = None | ||
| branch_labels = None | ||
| depends_on = None | ||
|
|
||
|
|
||
| def upgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.create_table('planet', | ||
| sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), | ||
| sa.Column('name', sa.String(), nullable=False), | ||
| sa.Column('description', sa.String(), nullable=False), | ||
| sa.Column('distance_from_sun', sa.Integer(), nullable=False), | ||
| sa.PrimaryKeyConstraint('id') | ||
| ) | ||
| # ### end Alembic commands ### | ||
|
|
||
|
|
||
| def downgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.drop_table('planet') | ||
| # ### end Alembic commands ### |
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.
We could also have a
from_dictclass method that we could use to construct our plant instances.