experiments/bees-knees
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: experiments:9666f104a246d4ed0f5577a48c5a24e766832a25
Branches Tags
experiments:main
...
compare: experiments:c8d218a16fa4cdc8640967657de9bbc3ec46c0f0
Branches Tags
experiments:main

3 commits
9666f104a2 ... c8d218a16f

Author SHA1 Message Date
Marty Oehme
c8d218a16f
Move HTML response to view package 2025-06-06 14:53:24 +02:00
Marty Oehme
cfa026465c
Switch function of update and refresh functions 2025-06-06 14:53:24 +02:00
Marty Oehme
5c63c48b9d
Add static files path 2025-06-06 14:53:23 +02:00
4 changed files with 99 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

25
prophet/app.py
View file

@ -4,8 +4,10 @@ from datetime import datetime
import feedparser import feedparser
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from fastapi_utils.tasks import repeat_every from fastapi_utils.tasks import repeat_every
from prophet import view
from prophet.domain.improvement import Improvement from prophet.domain.improvement import Improvement
from prophet.domain.improvement_repo import IImprovementRepo from prophet.domain.improvement_repo import IImprovementRepo
from prophet.domain.original import Original from prophet.domain.original import Original
@ -63,7 +65,9 @@ def improve_originals(originals: list[Original]) -> list[Improvement]:
return improvements return improvements
def init() -> FastAPI:
app = FastAPI() app = FastAPI()
app.mount("/static", StaticFiles(directory="static"), name="static")
origins = [ origins = [
"http://localhost", "http://localhost",
@ -77,6 +81,11 @@ app.add_middleware(
allow_methods=["*"], allow_methods=["*"],
allow_headers=["*"], allow_headers=["*"],
) )
view.define_routes(app)
return app
app = init()
@app.get("/improve-title") @app.get("/improve-title")
@ -92,18 +101,20 @@ def improve_summary(original_title: str, new_title: str, original_summary: str):
return llm.rewrite_summary(o, new_title) return llm.rewrite_summary(o, new_title)
# TODO: Switch to lifecycle events to avoid deprecated method
@app.on_event("startup") @app.on_event("startup")
@repeat_every(seconds=REFRESH_PERIOD) @repeat_every(seconds=REFRESH_PERIOD)
def refresh_articles(): async def refresh_articles():
adding = keep_only_new_originals(grab_latest_originals()) _ = await fetch_update()
improved = improve_originals(adding)
repo.add_all(improved)
print(f"Updated articles. Added {len(improved)} new ones.")
@app.get("/update") @app.get("/update")
async def fetch_update(): async def fetch_update(debug_print: bool = True):
await refresh_articles() adding = keep_only_new_originals(grab_latest_originals())
improved = improve_originals(adding)
repo.add_all(improved)
if debug_print:
print(f"Updated articles. Added {len(improved)} new ones.")
return json.dumps(improved) return json.dumps(improved)

45
prophet/view.py
View file

@ -1,15 +1,16 @@
# pyright: reportUnusedFunction=false
from fastapi import FastAPI
from fastapi.responses import HTMLResponse from fastapi.responses import HTMLResponse
from prophet import app
from prophet.domain.improvement_repo import IImprovementRepo from prophet.domain.improvement_repo import IImprovementRepo
from prophet.infra.improvement_pickle_repo import ImprovementPickleRepo from prophet.infra.improvement_pickle_repo import ImprovementPickleRepo
repo: IImprovementRepo = ImprovementPickleRepo() repo: IImprovementRepo = ImprovementPickleRepo()
html_app = app.app
def define_routes(app: FastAPI):
@html_app.get("/improvements", response_class=HTMLResponse) @app.get("/improvements", response_class=HTMLResponse)
def list_improvements(): def list_improvements():
improved = repo.get_all() improved = repo.get_all()
return ( return (
@ -23,12 +24,13 @@ def list_improvements():
<div class="card-title">{item.title}</div> <div class="card-title">{item.title}</div>
<div class="card-summary">{item.summary}</div> <div class="card-summary">{item.summary}</div>
</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
)
) )
) )
@app.get("/originals", response_class=HTMLResponse)
@html_app.get("/originals", response_class=HTMLResponse)
def list_originals(): def list_originals():
improved = repo.get_all() improved = repo.get_all()
return ( return (
@ -42,38 +44,21 @@ def list_originals():
<div class="card-title">{item.original.title}</div> <div class="card-title">{item.original.title}</div>
<div class="card-summary">{item.original.summary}</div> <div class="card-summary">{item.original.summary}</div>
</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
)
) )
) )
@app.get("/", response_class=HTMLResponse)
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)
def root_route(): def root_route():
return f""" return """
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>The Pollen Prophet</title> <title>The Pollen Prophet</title>
<script src="https://unpkg.com/htmx.org@1.6.1"></script> <script src="https://unpkg.com/htmx.org@1.6.1"></script>
<style> <link href="static/style.css" rel="stylesheet"
{style}
</style>
</head> </head>
<body> <body>
<h1>The Pollen Prophet</h1> <h1>The Pollen Prophet</h1>

BIN
static/me.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 288 KiB

12
static/style.css Normal file
View 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;
}