diff --git a/.gitignore b/.gitignore index 590228b..b22aa1f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ __pycache__ instance .env -run.fcgi diff --git a/station_announcer/__init__.py b/station_announcer/__init__.py index 49f5339..c942b0a 100644 --- a/station_announcer/__init__.py +++ b/station_announcer/__init__.py @@ -1,17 +1,14 @@ """Package initialization for the alt text generator app.""" -import sys from pathlib import Path from flask import Flask -sys.path.append("/home/edward/src/2024/UniAuth") # isort:skip - from .cache import AltTextCache from .config import load_settings from .immich import ImmichClient -from .mastodon import MastodonClient from .openai_client import AltTextGenerator +from .mastodon import MastodonClient def create_app() -> Flask: @@ -29,16 +26,17 @@ def create_app() -> Flask: secret_key = app.config.get("SECRET_KEY") or "dev-secret-key" app.config["SECRET_KEY"] = secret_key - app.config["UNIAUTH_URL"] = "https://edwardbetts.com/UniAuth" - app.config["REQUIRE_AUTH"] = True - app.config["AUTH_CALLBACK_ENDPOINT"] = "main.auth_callback" instance_dir = Path(app.instance_path) instance_dir.mkdir(parents=True, exist_ok=True) db_path = app.config.get("STATION_DB") if not db_path: - db_path = str(instance_dir / "station_announcer.db") + old_db = instance_dir / "alt_text_cache.db" + new_db = instance_dir / "station_announcer.db" + if old_db.exists() and not new_db.exists(): + old_db.rename(new_db) + db_path = str(new_db) app.config["STATION_DB"] = db_path app.immich_client = ImmichClient( diff --git a/station_announcer/routes.py b/station_announcer/routes.py index 0c92e73..c99ffa4 100644 --- a/station_announcer/routes.py +++ b/station_announcer/routes.py @@ -5,7 +5,6 @@ from __future__ import annotations import base64 from datetime import datetime -import UniAuth.auth from flask import ( Blueprint, Response, @@ -106,15 +105,6 @@ def _unique_asset_ids(values: list[str]) -> list[str]: MAX_MEDIA_ATTACHMENTS = 4 -bp.before_request(UniAuth.auth.require_authentication) - - -@bp.route("/callback") -def auth_callback(): - """Process the authentication callback.""" - return UniAuth.auth.auth_callback() - - @bp.route("/") def index(): return redirect(url_for("main.compose_select"))