Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
from flask import Flask
from .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)

app.register_blueprint(planets_bp)

return app
6 changes: 6 additions & 0 deletions app/db.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate
from .models.base import Base

db = SQLAlchemy(model_class=Base)
migrate = Migrate()
Empty file added app/models/__init__.py
Empty file.
4 changes: 4 additions & 0 deletions app/models/base.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from sqlalchemy.orm import DeclarativeBase

class Base(DeclarativeBase):
pass
30 changes: 30 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from sqlalchemy.orm import Mapped, mapped_column
from ..db import db

class Planet(db.Model):
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
name: Mapped[str]
surface_area: Mapped[int]
moons: Mapped[int]
distance_from_sun: Mapped[int]
namesake: Mapped[str]

def to_dict(self):
return dict(
id=self.id,
name=self.name,
surface_area=self.surface_area,
moons=self.moons,
distance_from_sun=self.distance_from_sun,
namesake=self.namesake
)

@classmethod
def from_dict(cls, planet_data):
return cls(
name=planet_data["name"],
surface_area=planet_data["surface_area"],
moons=planet_data["moons"],
distance_from_sun=planet_data["distance_from_sun"],
namesake=planet_data["namesake"]
)
2 changes: 0 additions & 2 deletions app/routes.py

This file was deleted.

Empty file added app/routes/__init__.py
Empty file.
80 changes: 80 additions & 0 deletions app/routes/planet_routes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
from flask import Blueprint, abort, make_response, request, Response
from ..models.planet import Planet
from ..db import db
from sqlalchemy import asc, desc
from .routes_utilities import validate_model

planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets")

@planets_bp.post("")
def create_planet():
request_body = request.get_json()

try:
new_planet = Planet.from_dict(request_body)
except KeyError as e:
response = {
"message": f"Invalid request: missing {e.args[0]}"
}
abort(make_response(response, 400))
db.session.add(new_planet)
db.session.commit()

response = new_planet.to_dict()
return response, 201

@planets_bp.get("")
def get_all_planets():
sort_param = request.args.get("sort")
order_param = request.args.get("order", "asc") # Default to ascending if not specified

query = db.select(Planet)

if sort_param:
sort_column = getattr(Planet, sort_param, None)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice solution for flexibility on what folks can sort by!

if sort_column:
query = query.order_by(asc(sort_column) if order_param == "asc" else desc(sort_column))
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How could we break up this line for length?


namesake_param = request.args.get("namesake")
if namesake_param:
query = query.where(Planet.namesake.ilike(f"%{namesake_param}%"))

distance_from_sun_param = request.args.get("distance_from_sun")
if distance_from_sun_param:
query = query.where(Planet.distance_from_sun <= distance_from_sun_param)
query = query.order_by(Planet.id)

planets = db.session.scalars(query)
Comment on lines +42 to +47
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since adding the order_by isn't tightly related to filtering by distance_from_sun_param, I'd consider adding space between those statements:

    distance_from_sun_param = request.args.get("distance_from_sun")
    if distance_from_sun_param:
        query = query.where(Planet.distance_from_sun <= 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

@planets_bp.get("/<planet_id>")
def get_one_planet(planet_id):
planet = validate_model(Planet, planet_id)
planet_response = planet.to_dict()
return planet_response

@planets_bp.put("/<planet_id>")
def update_one_planet(planet_id):
planet = validate_model(Planet, planet_id)
response_body = request.get_json()

planet.name = response_body["name"]
planet.surface_area = response_body["surface_area"]
planet.moons = response_body["moons"]
planet.distance_from_sun = response_body["distance_from_sun"]
planet.namesake = response_body["namesake"]

db.session.commit()

return Response(status=204, mimetype="application/json")

@planets_bp.delete("/<planet_id>")
def delete_one_planet(planet_id):
planet = validate_model(Planet, planet_id)

db.session.delete(planet)
db.session.commit()

return Response(status=204, mimetype="application/json")
16 changes: 16 additions & 0 deletions app/routes/routes_utilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from flask import abort, make_response
from ..db import db

def validate_model(cls, model_id):
try:
model_id = int(model_id)
except ValueError:
abort(make_response({"message": f"{cls.__name__} with {model_id} is invalid"}, 400))

query = db.select(cls).where(cls.id == model_id)
model = db.session.scalar(query)

if not model:
abort(make_response({"message": f"{cls.__name__} with {model_id} is not found"}, 404))

return model
4 changes: 2 additions & 2 deletions coworking_agreement.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Talk through each section with your partner. Add notes on what you discussed and
*Other co-working agreements that were not captured in the above sections.*

## Signatures
______________ _______________
Date: _________
Kristina Nguyen _______________
Date: 10/21/2024
1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Single-database configuration for Flask.
50 changes: 50 additions & 0 deletions migrations/alembic.ini
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
113 changes: 113 additions & 0 deletions migrations/env.py
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()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
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"}
Loading