-
Notifications
You must be signed in to change notification settings - Fork 425
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
C22_Phoenix_Amber & Sphinx_Rong #64
base: main
Are you sure you want to change the base?
Changes from all commits
8840a99
e56b918
88c9305
fa76c7b
69ab28b
ad1fa32
71b77dc
ca5874b
3c14446
0c11bce
cfabdda
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,23 @@ | ||
from flask import Flask | ||
from .db import db, migrate | ||
from .models.planet import Planet | ||
from app.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,6 @@ | ||
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,4 @@ | ||
from sqlalchemy.orm import DeclarativeBase | ||
|
||
class Base(DeclarativeBase): | ||
pass |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
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] | ||
description: Mapped[str] | ||
size: Mapped[str] | ||
moons: Mapped[int] | ||
has_flag: Mapped[bool] | ||
|
||
|
||
def to_dict(self): | ||
return { | ||
"id" : self.id, | ||
"name" : self.name, | ||
"description" : self.description, | ||
"size" : self.size, | ||
"moons" :self.moons, | ||
"has_flag" : self.has_flag | ||
} |
This file was deleted.
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,121 @@ | ||||||
from flask import Blueprint, abort, make_response, request, Response | ||||||
from app.models.planet import Planet | ||||||
from app.db import db | ||||||
from sqlalchemy import desc | ||||||
|
||||||
planets_bp = Blueprint("planets_bp", __name__, url_prefix=("/planets")) | ||||||
|
||||||
|
||||||
ORDER_BY_MAP = { | ||||||
'id': Planet.id, | ||||||
'name': Planet.name, | ||||||
'description': Planet.description, | ||||||
'moons': Planet.moons, | ||||||
"size": Planet.size, | ||||||
"has_flag": Planet.has_flag | ||||||
} | ||||||
|
||||||
|
||||||
|
||||||
@planets_bp.post("") | ||||||
def create_planet(): | ||||||
request_body = request.get_json() | ||||||
name = request_body['name'] | ||||||
description = request_body['description'] | ||||||
size = request_body['size'] | ||||||
moons = request_body['moons'] | ||||||
has_flag = request_body['has_flag'] | ||||||
|
||||||
new_planet = Planet(name=name, description=description, size = size, moons = moons, has_flag = has_flag) | ||||||
db.session.add(new_planet) | ||||||
db.session.commit() | ||||||
|
||||||
response_body = new_planet.to_dict() | ||||||
|
||||||
return response_body, 201 | ||||||
|
||||||
@planets_bp.get("") | ||||||
def get_all_planets(): | ||||||
all_params = request.args | ||||||
query = db.select(Planet) | ||||||
|
||||||
if all_params.get("name"): | ||||||
query = query.where(Planet.name.ilike(f"%{all_params.get("name")}%")) | ||||||
|
||||||
if all_params.get("description"): | ||||||
query = query.where(Planet.description.ilike(f"%{all_params.get("description")}%")) | ||||||
|
||||||
if all_params.get("size"): | ||||||
query = query.where(Planet.size.ilike(f"%{all_params.get("size")}%")) | ||||||
|
||||||
if all_params.get("moons"): | ||||||
# query = query.where(Planet.moons == all_params.get("moons")) | ||||||
query = query.filter(Planet.moons >= all_params.get("moons")) | ||||||
|
||||||
if all_params.get("has_flag"): | ||||||
query =query.where(Planet.has_flag == all_params.get("has_flag")) | ||||||
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.
Suggested change
|
||||||
|
||||||
if all_params.get("order_by"): | ||||||
attribute = all_params.get("order_by") | ||||||
if all_params.get("dir") == "desc": | ||||||
query = query.order_by(desc(ORDER_BY_MAP[attribute])) | ||||||
else: | ||||||
query = query.order_by(ORDER_BY_MAP[attribute]) | ||||||
else: | ||||||
query = query.order_by(Planet.id) | ||||||
|
||||||
planets = db.session.scalars(query) | ||||||
|
||||||
response_body=[] | ||||||
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.
Suggested change
|
||||||
for planet in planets: | ||||||
response_body.append(planet.to_dict()) | ||||||
|
||||||
return response_body, 200 | ||||||
|
||||||
# all of the query param logic needs validation | ||||||
|
||||||
|
||||||
@planets_bp.get("/<planet_id>") | ||||||
def get_one_planet(planet_id): | ||||||
planet = validate_planet_id(planet_id) | ||||||
|
||||||
return planet.to_dict(), 200 | ||||||
|
||||||
|
||||||
|
||||||
@planets_bp.put("/<planet_id>") | ||||||
def update_planet(planet_id): | ||||||
planet = validate_planet_id(planet_id) | ||||||
request_body = request.get_json() | ||||||
|
||||||
planet.name = request_body['name'] | ||||||
planet.description = request_body['description'] | ||||||
Comment on lines
+91
to
+92
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. Since this is a PUT route, I'd expect to see a way to update the rest of this model's attributes (size, moons, has_flag) |
||||||
db.session.commit() | ||||||
|
||||||
return Response(status=204, mimetype="application/json") | ||||||
|
||||||
@planets_bp.delete("/<planet_id>") | ||||||
def delete_planet(planet_id): | ||||||
planet = validate_planet_id(planet_id) | ||||||
db.session.delete(planet) | ||||||
db.session.commit() | ||||||
|
||||||
return Response(status=204, mimetype="application/json") | ||||||
|
||||||
|
||||||
# Helper Functions | ||||||
def validate_planet_id(planet_id): | ||||||
try: | ||||||
planet_id = int(planet_id) | ||||||
except: | ||||||
response = {"msg": f"Planet id {planet_id} is invalid."} | ||||||
abort(make_response(response,400)) | ||||||
|
||||||
query = db.select(Planet).where(Planet.id == planet_id) | ||||||
planet = db.session.scalar(query) | ||||||
|
||||||
if not planet: | ||||||
response = {"msg": f"Planet id {planet_id} not found."} | ||||||
abort(make_response(response,404)) | ||||||
|
||||||
return planet |
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"} |
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.
Could also call
all_params
something likequery_params