mirror of
https://github.com/kevinveenbirkenbach/homepage.veen.world.git
synced 2026-05-19 19:44:14 +00:00
Kevin Veen-Birkenbach
3f30621630
Probe-first asset resolution (regression fix)
---------------------------------------------
cache_manager.cache_file() returned either a relative cache path
(success) or None (failure). The previous app.py fallback
asset['cache'] = cached or asset['source'] mixed both types into
one field, which the template wrapped in url_for('static', ...)
regardless — producing broken
/static/https://file.infinito.nexus/.../logo.png URLs whenever the
source couldn't be downloaded.
- New app/utils/asset_resolver.py: HEAD-probes the URL (3 s
timeout, image/* content type). On hit, embed directly via a
new external_url field — no download required. On miss, fall
back to cache_manager.cache_file. If that also fails, expose
the source URL via external_url so the browser shows the alt
text instead of an empty src.
- app.py exposes an asset_src(asset) context processor that
picks external_url first, then url_for('static', cache),
so the template never wraps an absolute URL in a static prefix.
- Templates (base, navigation, card) switch to asset_src(...) and
gate the card image branch on cache or external_url.
- 16 unit tests cover every probe/cache/fallback branch; one live
integration test exercises the canonical
https://file.infinito.nexus/assets/img/logo.png to prove the
probe-first path works end-to-end (cache dir stays empty).
- config.sample.yaml: new Infinito.Nexus card driven by the same
canonical asset URL.
Single source of truth for IMAGE_NAME and PORT
----------------------------------------------
- env.example is now the only place the literal values live.
- Makefile and docker-compose.yml reference \$(IMAGE_NAME) /
\${IMAGE_NAME:?…} (same for PORT); no defaults, no silent
fallbacks.
- New make env / make config bootstrap .env / app/config.yaml
from their checked-in templates. Idempotent.
- All container-using targets depend on the two bootstrap targets
so a fresh checkout runs in a single invocation.
- Recipes source .env at recipe-execution time so they pick up a
freshly bootstrapped .env in the same make invocation.
README
------
- Screenshot added under the title.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
86 lines
3.0 KiB
Python
86 lines
3.0 KiB
Python
"""Live network verification of the probe-first asset resolution path.
|
|
|
|
The unit tests in ``tests/unit/test_asset_resolver.py`` cover every
|
|
branch with mocks. This integration test exercises the real
|
|
``https://file.infinito.nexus/assets/img/logo.png`` endpoint that
|
|
``app/config.sample.yaml`` references for the Infinito.Nexus card. A
|
|
green run proves the production resolver behaviour end-to-end:
|
|
|
|
* probe (HEAD ``image/*``) succeeds against the canonical Infinito.Nexus
|
|
asset host, so ``external_url`` is populated directly and **no**
|
|
download is performed (the cache directory stays empty).
|
|
|
|
The download-fallback branch (probe fails → ``cache_manager.cache_file``
|
|
serves the asset locally) is intentionally not exercised against a live
|
|
endpoint here — it is covered by mocked unit tests because every
|
|
candidate "HEAD-fails, GET-succeeds" public URL we tried was flaky
|
|
(Nextcloud's ``/download`` endpoint sporadically times out on HEAD even
|
|
when GET works), which would make this guard test non-deterministic.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import sys
|
|
import unittest
|
|
from tempfile import TemporaryDirectory
|
|
from urllib.parse import urlparse
|
|
|
|
import requests
|
|
|
|
from app.utils.asset_resolver import resolve_asset_cache
|
|
from app.utils.cache_manager import CacheManager
|
|
|
|
INFINITO_LOGO_URL = "https://file.infinito.nexus/assets/img/logo.png"
|
|
|
|
_SKIP_LIVE_NETWORK = os.environ.get("PORTFOLIO_SKIP_LIVE_NETWORK_TESTS") == "1"
|
|
|
|
|
|
def _reachable(url: str) -> bool:
|
|
try:
|
|
return requests.head(url, allow_redirects=True, timeout=5).ok
|
|
except requests.RequestException:
|
|
return False
|
|
|
|
|
|
@unittest.skipIf(
|
|
_SKIP_LIVE_NETWORK,
|
|
"PORTFOLIO_SKIP_LIVE_NETWORK_TESTS=1 — skipping live network tests",
|
|
)
|
|
class TestAssetResolverLive(unittest.TestCase):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
if not _reachable(INFINITO_LOGO_URL):
|
|
raise unittest.SkipTest(
|
|
f"{urlparse(INFINITO_LOGO_URL).netloc} unreachable from this runner"
|
|
)
|
|
|
|
def test_infinito_nexus_logo_resolves_via_external_url_without_download(self):
|
|
with TemporaryDirectory() as tmp:
|
|
cache_dir = os.path.join(tmp, "cache")
|
|
cache_manager = CacheManager(cache_dir)
|
|
asset = {"source": INFINITO_LOGO_URL}
|
|
|
|
resolve_asset_cache(asset, cache_manager)
|
|
|
|
self.assertIsNone(
|
|
asset["cache"],
|
|
f"Expected probe-first path to skip download for {INFINITO_LOGO_URL}",
|
|
)
|
|
self.assertEqual(
|
|
asset["external_url"],
|
|
INFINITO_LOGO_URL,
|
|
"Probe-success URL must land in external_url so the template "
|
|
"embeds it directly instead of routing through /static/.",
|
|
)
|
|
self.assertEqual(
|
|
os.listdir(cache_dir),
|
|
[],
|
|
"Cache directory must stay empty when probe succeeds — "
|
|
"downloading would waste bandwidth.",
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|