Move HTML response to view package
This commit is contained in:
parent
c3b88979a8
commit
9666f104a2
3 changed files with 90 additions and 85 deletions
|
|
@ -7,6 +7,7 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi_utils.tasks import repeat_every
|
||||
|
||||
from prophet import view
|
||||
from prophet.domain.improvement import Improvement
|
||||
from prophet.domain.improvement_repo import IImprovementRepo
|
||||
from prophet.domain.original import Original
|
||||
|
|
@ -64,6 +65,7 @@ def improve_originals(originals: list[Original]) -> list[Improvement]:
|
|||
return improvements
|
||||
|
||||
|
||||
def init() -> FastAPI:
|
||||
app = FastAPI()
|
||||
app.mount("/static", StaticFiles(directory="static"), name="static")
|
||||
|
||||
|
|
@ -79,6 +81,11 @@ app.add_middleware(
|
|||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
view.define_routes(app)
|
||||
return app
|
||||
|
||||
|
||||
app = init()
|
||||
|
||||
|
||||
@app.get("/improve-title")
|
||||
|
|
@ -94,6 +101,7 @@ def improve_summary(original_title: str, new_title: str, original_summary: str):
|
|||
return llm.rewrite_summary(o, new_title)
|
||||
|
||||
|
||||
# TODO: Switch to lifecycle events to avoid deprecated method
|
||||
@app.on_event("startup")
|
||||
@repeat_every(seconds=REFRESH_PERIOD)
|
||||
async def refresh_articles():
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
# pyright: reportUnusedFunction=false
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.responses import HTMLResponse
|
||||
|
||||
from prophet import app
|
||||
from prophet.domain.improvement_repo import IImprovementRepo
|
||||
from prophet.infra.improvement_pickle_repo import ImprovementPickleRepo
|
||||
|
||||
repo: IImprovementRepo = ImprovementPickleRepo()
|
||||
|
||||
html_app = app.app
|
||||
|
||||
|
||||
@html_app.get("/improvements", response_class=HTMLResponse)
|
||||
def define_routes(app: FastAPI):
|
||||
@app.get("/improvements", response_class=HTMLResponse)
|
||||
def list_improvements():
|
||||
improved = repo.get_all()
|
||||
return (
|
||||
|
|
@ -23,12 +24,13 @@ def list_improvements():
|
|||
<div class="card-title">{item.title}</div>
|
||||
<div class="card-summary">{item.summary}</div>
|
||||
</div>"""
|
||||
for item in sorted(improved, key=lambda i: i.original.date, reverse=True)
|
||||
for item in sorted(
|
||||
improved, key=lambda i: i.original.date, reverse=True
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@html_app.get("/originals", response_class=HTMLResponse)
|
||||
@app.get("/originals", response_class=HTMLResponse)
|
||||
def list_originals():
|
||||
improved = repo.get_all()
|
||||
return (
|
||||
|
|
@ -42,38 +44,21 @@ def list_originals():
|
|||
<div class="card-title">{item.original.title}</div>
|
||||
<div class="card-summary">{item.original.summary}</div>
|
||||
</div>"""
|
||||
for item in sorted(improved, key=lambda i: i.original.date, reverse=True)
|
||||
for item in sorted(
|
||||
improved, key=lambda i: i.original.date, reverse=True
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
style = """
|
||||
.card {
|
||||
border: 1px solid #ccc;
|
||||
padding: 10px;
|
||||
margin: auto;
|
||||
margin-bottom: 40px;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.card-title {
|
||||
font-size: 24px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
"""
|
||||
|
||||
|
||||
@html_app.get("/", response_class=HTMLResponse)
|
||||
@app.get("/", response_class=HTMLResponse)
|
||||
def root_route():
|
||||
return f"""
|
||||
return """
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>The Pollen Prophet</title>
|
||||
<script src="https://unpkg.com/htmx.org@1.6.1"></script>
|
||||
<style>
|
||||
{style}
|
||||
</style>
|
||||
<link href="static/style.css" rel="stylesheet"
|
||||
</head>
|
||||
<body>
|
||||
<h1>The Pollen Prophet</h1>
|
||||
|
|
|
|||
12
static/style.css
Normal file
12
static/style.css
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
.card {
|
||||
border: 1px solid #ccc;
|
||||
padding: 10px;
|
||||
margin: auto;
|
||||
margin-bottom: 40px;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.card-title {
|
||||
font-size: 24px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue