mirror/AudioBookRequest
1
0
Fork 0
mirror of https://github.com/markbeep/AudioBookRequest.git synced 2026-05-04 15:29:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from markbeep/add-dependencies-locally

Browse Source 
load js dependencies into docker image
This commit is contained in:
Mark
2025-04-04 15:13:56 +02:00
committed by GitHub
parent be8b6749ac 9e5e21746a
commit 74491719a1
12 changed files with 186 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/nix-build.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
name: Build and Deploy Dockerfile
name: Build Nix Docker Image
on:
push:
Dockerfile
+2
View File
@@ -34,6 +34,8 @@ COPY templates/ templates/
COPY app/ app/
RUN /bin/tailwindcss -i static/tw.css -o static/globals.css -m
# Fetch all the required js files
RUN uv run python /app/app/util/fetch_js.py
ENV ABR_APP__PORT=8000
ARG VERSION
app/main.py
+6 -1
View File
@@ -22,6 +22,7 @@ from app.routers import auth, root, search, settings, wishlist
from app.util.db import open_session
from app.util.templates import templates
from app.util.toast import ToastException
from app.util.fetch_js import fetch_scripts
logger = logging.getLogger(__name__)
logging.getLogger("uvicorn").handlers.clear()
@@ -33,6 +34,9 @@ logging.basicConfig(
handlers=[file_handler, stream_handler],
)
# intialize js dependencies or throw an error if not in debug mode
fetch_scripts(Settings().app.debug)
with open_session() as session:
auth_secret = auth_config.get_auth_secret(session)
@@ -107,7 +111,8 @@ async def redirect_to_init(request: Request, call_next: Any):
global user_exists
if (
not user_exists
and request.url.path not in ["/init", "/globals.css"]
and request.url.path != "/init"
and not request.url.path.startswith("/static")
and request.method == "GET"
):
with open_session() as session:
app/routers/root.py
+35 -16
View File
@@ -1,3 +1,4 @@
from pathlib import Path
from typing import Annotated
from urllib.parse import urlencode
@@ -19,46 +20,64 @@ from app.util.templates import templates
router = APIRouter()
@router.get("/globals.css")
root = Path("static")
@router.get("/static/globals.css")
def read_globals_css():
return FileResponse("static/globals.css", media_type="text/css")
return FileResponse(root / "globals.css", media_type="text/css")
@router.get("/nouislider.css")
@router.get("/static/nouislider.css")
def read_nouislider_css():
return FileResponse("static/nouislider.min.css", media_type="text/css")
return FileResponse(root / "nouislider.min.css", media_type="text/css")
@router.get("/nouislider.js")
@router.get("/static/nouislider.js")
def read_nouislider_js():
return FileResponse("static/nouislider.min.js", media_type="text/javascript")
return FileResponse(root / "nouislider.min.js", media_type="text/javascript")
@router.get("/apple-touch-icon.png")
@router.get("/static/apple-touch-icon.png")
def read_apple_touch_icon():
return FileResponse("static/apple-touch-icon.png", media_type="image/png")
return FileResponse(root / "apple-touch-icon.png", media_type="image/png")
@router.get("/favicon-32x32.png")
@router.get("/static/favicon-32x32.png")
def read_favicon_32():
return FileResponse("static/favicon-32x32.png", media_type="image/png")
return FileResponse(root / "favicon-32x32.png", media_type="image/png")
@router.get("/favicon-16x16.png")
@router.get("/static/favicon-16x16.png")
def read_favicon_16():
return FileResponse("static/favicon-16x16.png", media_type="image/png")
return FileResponse(root / "favicon-16x16.png", media_type="image/png")
@router.get("/site.webmanifest")
@router.get("/static/site.webmanifest")
def read_site_webmanifest():
return FileResponse(
"static/site.webmanifest", media_type="application/manifest+json"
root / "site.webmanifest", media_type="application/manifest+json"
)
@router.get("/favicon.svg")
@router.get("/static/htmx.js")
def read_htmx():
return FileResponse(root / "htmx.js", media_type="application/javascript")
@router.get("/static/htmx-preload.js")
def read_htmx_preload():
return FileResponse(root / "htmx-preload.js", media_type="application/javascript")
@router.get("/static/alpine.js")
def read_alpinejs():
return FileResponse(root / "alpine.js", media_type="application/javascript")
@router.get("/static/favicon.svg")
def read_favicon_svg():
return FileResponse("static/favicon.svg", media_type="image/svg+xml")
return FileResponse(root / "favicon.svg", media_type="image/svg+xml")
@router.get("/")
app/util/fetch_js.py
+40
View File
@@ -0,0 +1,40 @@
"""
To fetch javascript files for local development
"""
import requests
from pathlib import Path
files = {
"htmx-preload.js": "https://unpkg.com/htmx-ext-preload@2.1.0/preload.js",
"htmx.js": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js",
"alpine.js": "https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js",
}
def fetch_scripts(debug: bool) -> None:
root = Path("static")
if debug:
if all((root / file_name).exists() for file_name in files.keys()):
return
for file_name, url in files.items():
response = requests.get(url)
if not response.ok:
raise Exception(
f"Failed to fetch {file_name} from {url}. Status code: {response.status_code}"
)
with open(root / file_name, "w") as f:
f.write(response.text)
else:
for file_name in files.keys():
if not (root / file_name).exists():
raise FileNotFoundError(
f"{file_name} must be present in static directory for production. This is most likely an error with the docker image."
)
if __name__ == "__main__":
fetch_scripts(True)
flake.nix
+16
View File
@@ -81,6 +81,18 @@
exec ${default}/bin/fastapi run --port $ABR_APP__PORT
'';
gitignore = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
htmx-preload = builtins.fetchurl {
url = "https://unpkg.com/htmx-ext-preload@2.1.0/preload.js";
sha256 = "sha256:1bfkr60i20aj16vbwz2nv1q5fmmmzmc52i2aqn5cx6xihbmwy7nd";
};
htmx = builtins.fetchurl {
url = "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js";
sha256 = "sha256:0ixlixv36rrfzj97g2w0q6jxbg0x1rswgvvd2vrpjm13r2jxs2g2";
};
alpinejs = builtins.fetchurl {
url = "https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js";
sha256 = "sha256:1lqa3v5p7pwz3599xnxf5bwxf17bbmqxcqz3cpgj32a8ab9fxl9y";
};
in
pkgs.dockerTools.buildImage {
@@ -97,6 +109,10 @@
cp -r ${gitignore}/templates $out/app/templates
cp -r ${gitignore}/static/* $out/app/static
cp -r ${gitignore}/app $out/app/app
cp ${htmx-preload} $out/app/static/htmx-preload.js
cp ${htmx} $out/app/static/htmx.js
cp ${alpinejs} $out/app/static/alpine.js
'';
};
pyproject.toml
+1
View File
@@ -24,6 +24,7 @@ dependencies = [
"urllib3==2.3.0",
"rapidfuzz>=3.12.2",
"python-multipart>=0.0.20",
"requests>=2.32.3",
]
# setuptools by default expects a "src" folder structure
static/.gitignore
+3
View File
@@ -0,0 +1,3 @@
alpine.js
htmx.js
htmx-preload.js
templates/base.html
+27 -15
View File
@@ -5,16 +5,9 @@
{% block head %}
<title>AudioBookRequest</title>
{% endblock %}
<link rel="stylesheet" href="/globals.css" />
<script
src="https://unpkg.com/htmx.org@2.0.4"
integrity="sha384-HGfztofotfshcF7+8n44JQL2oJmowVChPTg48S+jvZoztPfvwD79OC/LTtG6dMp+"
crossorigin="anonymous"
></script>
<script
src="https://unpkg.com/htmx-ext-preload@2.1.0"
crossorigin="anonymous"
></script>
<link rel="stylesheet" href="/static/globals.css" />
<script src="/static/htmx.js"></script>
<script defer src="/static/htmx-preload.js"></script>
<script>
const setTheme = theme => {
if (!theme) {
@@ -46,11 +39,30 @@
</script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" sizes="any" type="image/svg+xml" href="/favicon.svg" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/site.webmanifest" />
<link
rel="apple-touch-icon"
sizes="180x180"
href="/static/apple-touch-icon.png"
/>
<link
rel="icon"
sizes="any"
type="image/svg+xml"
href="/static/favicon.svg"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/static/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/static/favicon-16x16.png"
/>
<link rel="manifest" href="/static/site.webmanifest" />
{% include 'scripts/toast.html' %}
</head>
templates/scripts/alpinejs.html
+1 -4
View File
@@ -1,4 +1 @@
<script
defer
src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"
></script>
<script defer src="/static/alpine.js"></script>
templates/settings_page/download.html
+2 -2
View File
@@ -1,7 +1,7 @@
{% extends "settings_page/base.html" %} {% block head %}
<title>Settings - Download</title>
<link href="/nouislider.css" rel="stylesheet" />
<script src="/nouislider.js"></script>
<link href="/static/nouislider.css" rel="stylesheet" />
<script src="/static/nouislider.js"></script>
<script>
const createSlider = (sliderId, fromId, toId, start, stop) => {
const slider = document.getElementById(sliderId);
uv.lock
Generated
+52
View File
@@ -171,6 +171,7 @@ dependencies = [
{ name = "pytailwindcss" },
{ name = "python-multipart" },
{ name = "rapidfuzz" },
{ name = "requests" },
{ name = "sqlmodel" },
{ name = "terminaltables" },
{ name = "torrent-parser" },
@@ -201,6 +202,7 @@ requires-dist = [
{ name = "pytailwindcss", specifier = "==0.2.0" },
{ name = "python-multipart", specifier = ">=0.0.20" },
{ name = "rapidfuzz", specifier = ">=3.12.2" },
{ name = "requests", specifier = ">=2.32.3" },
{ name = "sqlmodel", specifier = "==0.0.23" },
{ name = "terminaltables", specifier = "==3.1.10" },
{ name = "torrent-parser", specifier = "==0.4.1" },
@@ -280,6 +282,41 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/7c/fc/6a8cb64e5f0324877d503c854da15d76c1e50eb722e320b15345c4d0c6de/cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a", size = 182009 },
]
[[package]]
name = "charset-normalizer"
version = "3.4.1"
source = { registry = "https://pypi.org/simple" }
sdist = { url = "https://files.pythonhosted.org/packages/16/b0/572805e227f01586461c80e0fd25d65a2115599cc9dad142fee4b747c357/charset_normalizer-3.4.1.tar.gz", hash = "sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3", size = 123188 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/0a/9a/dd1e1cdceb841925b7798369a09279bd1cf183cef0f9ddf15a3a6502ee45/charset_normalizer-3.4.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545", size = 196105 },
{ url = "https://files.pythonhosted.org/packages/d3/8c/90bfabf8c4809ecb648f39794cf2a84ff2e7d2a6cf159fe68d9a26160467/charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7", size = 140404 },
{ url = "https://files.pythonhosted.org/packages/ad/8f/e410d57c721945ea3b4f1a04b74f70ce8fa800d393d72899f0a40526401f/charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757", size = 150423 },
{ url = "https://files.pythonhosted.org/packages/f0/b8/e6825e25deb691ff98cf5c9072ee0605dc2acfca98af70c2d1b1bc75190d/charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa", size = 143184 },
{ url = "https://files.pythonhosted.org/packages/3e/a2/513f6cbe752421f16d969e32f3583762bfd583848b763913ddab8d9bfd4f/charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d", size = 145268 },
{ url = "https://files.pythonhosted.org/packages/74/94/8a5277664f27c3c438546f3eb53b33f5b19568eb7424736bdc440a88a31f/charset_normalizer-3.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616", size = 147601 },
{ url = "https://files.pythonhosted.org/packages/7c/5f/6d352c51ee763623a98e31194823518e09bfa48be2a7e8383cf691bbb3d0/charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b", size = 141098 },
{ url = "https://files.pythonhosted.org/packages/78/d4/f5704cb629ba5ab16d1d3d741396aec6dc3ca2b67757c45b0599bb010478/charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d", size = 149520 },
{ url = "https://files.pythonhosted.org/packages/c5/96/64120b1d02b81785f222b976c0fb79a35875457fa9bb40827678e54d1bc8/charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a", size = 152852 },
{ url = "https://files.pythonhosted.org/packages/84/c9/98e3732278a99f47d487fd3468bc60b882920cef29d1fa6ca460a1fdf4e6/charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9", size = 150488 },
{ url = "https://files.pythonhosted.org/packages/13/0e/9c8d4cb99c98c1007cc11eda969ebfe837bbbd0acdb4736d228ccaabcd22/charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1", size = 146192 },
{ url = "https://files.pythonhosted.org/packages/b2/21/2b6b5b860781a0b49427309cb8670785aa543fb2178de875b87b9cc97746/charset_normalizer-3.4.1-cp312-cp312-win32.whl", hash = "sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35", size = 95550 },
{ url = "https://files.pythonhosted.org/packages/21/5b/1b390b03b1d16c7e382b561c5329f83cc06623916aab983e8ab9239c7d5c/charset_normalizer-3.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f", size = 102785 },
{ url = "https://files.pythonhosted.org/packages/38/94/ce8e6f63d18049672c76d07d119304e1e2d7c6098f0841b51c666e9f44a0/charset_normalizer-3.4.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda", size = 195698 },
{ url = "https://files.pythonhosted.org/packages/24/2e/dfdd9770664aae179a96561cc6952ff08f9a8cd09a908f259a9dfa063568/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313", size = 140162 },
{ url = "https://files.pythonhosted.org/packages/24/4e/f646b9093cff8fc86f2d60af2de4dc17c759de9d554f130b140ea4738ca6/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9", size = 150263 },
{ url = "https://files.pythonhosted.org/packages/5e/67/2937f8d548c3ef6e2f9aab0f6e21001056f692d43282b165e7c56023e6dd/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b", size = 142966 },
{ url = "https://files.pythonhosted.org/packages/52/ed/b7f4f07de100bdb95c1756d3a4d17b90c1a3c53715c1a476f8738058e0fa/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11", size = 144992 },
{ url = "https://files.pythonhosted.org/packages/96/2c/d49710a6dbcd3776265f4c923bb73ebe83933dfbaa841c5da850fe0fd20b/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f", size = 147162 },
{ url = "https://files.pythonhosted.org/packages/b4/41/35ff1f9a6bd380303dea55e44c4933b4cc3c4850988927d4082ada230273/charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd", size = 140972 },
{ url = "https://files.pythonhosted.org/packages/fb/43/c6a0b685fe6910d08ba971f62cd9c3e862a85770395ba5d9cad4fede33ab/charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2", size = 149095 },
{ url = "https://files.pythonhosted.org/packages/4c/ff/a9a504662452e2d2878512115638966e75633519ec11f25fca3d2049a94a/charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886", size = 152668 },
{ url = "https://files.pythonhosted.org/packages/6c/71/189996b6d9a4b932564701628af5cee6716733e9165af1d5e1b285c530ed/charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601", size = 150073 },
{ url = "https://files.pythonhosted.org/packages/e4/93/946a86ce20790e11312c87c75ba68d5f6ad2208cfb52b2d6a2c32840d922/charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd", size = 145732 },
{ url = "https://files.pythonhosted.org/packages/cd/e5/131d2fb1b0dddafc37be4f3a2fa79aa4c037368be9423061dccadfd90091/charset_normalizer-3.4.1-cp313-cp313-win32.whl", hash = "sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407", size = 95391 },
{ url = "https://files.pythonhosted.org/packages/27/f2/4f9a69cc7712b9b5ad8fdb87039fd89abba997ad5cbe690d1835d40405b0/charset_normalizer-3.4.1-cp313-cp313-win_amd64.whl", hash = "sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971", size = 102702 },
{ url = "https://files.pythonhosted.org/packages/0e/f6/65ecc6878a89bb1c23a086ea335ad4bf21a588990c3f535a227b9eea9108/charset_normalizer-3.4.1-py3-none-any.whl", hash = "sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85", size = 49767 },
]
[[package]]
name = "click"
version = "8.1.8"
@@ -963,6 +1000,21 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/4b/43/ca3d1018b392f49131843648e10b08ace23afe8dad3bee5f136e4346b7cd/rapidfuzz-3.12.2-cp313-cp313-win_arm64.whl", hash = "sha256:69f6ecdf1452139f2b947d0c169a605de578efdb72cbb2373cb0a94edca1fd34", size = 863535 },
]
[[package]]
name = "requests"
version = "2.32.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "certifi" },
{ name = "charset-normalizer" },
{ name = "idna" },
{ name = "urllib3" },
]
sdist = { url = "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", size = 131218 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6", size = 64928 },
]
[[package]]
name = "rich"
version = "13.9.4"