chore: add generateapikey endpoint, use loguru imports for logging

src/main.py

@@ -15,7 +15,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.requests import Request
 from utils.cli import handle_args
-from utils.logger import logger
+from loguru import logger
 
 
 class LoguruMiddleware(BaseHTTPMiddleware):

src/program/content/listrr.py

@@ -6,7 +6,7 @@
 from program.indexers.trakt import get_imdbid_from_tmdb
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.request import get, ping
 
 

src/program/content/mdblist.py

@@ -4,7 +4,7 @@
 
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/content/overseerr.py

@@ -8,7 +8,7 @@
 from program.indexers.trakt import get_imdbid_from_tmdb
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.request import delete, get, ping, post
 
 

src/program/content/plex_watchlist.py

@@ -7,7 +7,7 @@
 
 from program.media.item import Episode, MediaItem, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.request import get, ping
 
 

src/program/content/trakt.py

@@ -8,7 +8,7 @@
 
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter
 from utils.request import get, post
 

src/program/db/db.py

@@ -8,7 +8,7 @@
 
 from program.settings.manager import settings_manager
 from utils import data_dir_path
-from utils.logger import logger
+from loguru import logger
 
 engine_options = {
     "pool_size": 25, # Prom: Set to 1 when debugging sql queries

src/program/db/db_functions.py

@@ -11,7 +11,7 @@
 from program.media.stream import Stream, StreamBlacklistRelation, StreamRelation
 from program.settings.manager import settings_manager
 from utils import alembic_dir
-from utils.logger import logger
+from loguru import logger
 
 from .db import alembic, db
 

src/program/downloaders/torbox.py

@@ -14,7 +14,7 @@
 from program.media.state import States
 from program.media.stream import Stream
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.request import get, post
 
 API_URL = "https://api.torbox.app/v1/api"

src/program/indexers/tmdb.py

@@ -3,7 +3,7 @@
 from typing import Generic, Literal, Optional, TypeVar
 
 from pydantic import BaseModel
-from utils.logger import logger
+from loguru import logger
 from utils.request import get
 
 TMDB_READ_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJlNTkxMmVmOWFhM2IxNzg2Zjk3ZTE1NWY1YmQ3ZjY1MSIsInN1YiI6IjY1M2NjNWUyZTg5NGE2MDBmZjE2N2FmYyIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.xrIXsMFJpI1o1j5g2QpQcFP1X3AfRjFA5FlBFO5Naw8"  # noqa: S105

src/program/indexers/trakt.py

@@ -7,7 +7,7 @@
 from program.db.db import db
 from program.media.item import Episode, MediaItem, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.request import get
 
 CLIENT_ID = "0183a05ad97098d87287fe46da4ae286f434f32e8e951caad4cc147c947d79a3"

src/program/libraries/symlink.py

@@ -10,7 +10,7 @@
 from program.db.db import db
 from program.media.subtitle import Subtitle
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 
 if TYPE_CHECKING:
     from program.media.item import Episode, MediaItem, Movie, Show

src/program/media/item.py

@@ -13,7 +13,7 @@
 from program.db.db import db
 from program.media.state import States
 from program.media.subtitle import Subtitle
-from utils.logger import logger
+from loguru import logger
 
 from ..db.db_functions import blacklist_stream, reset_streams
 from .stream import Stream

src/program/media/stream.py

@@ -6,7 +6,7 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from program.db.db import db
-from utils.logger import logger
+from loguru import logger
 
 if TYPE_CHECKING:
     from program.media.item import MediaItem

src/program/program.py

@@ -25,7 +25,7 @@
 from program.updaters import Updater
 from utils import data_dir_path
 from utils.event_manager import EventManager
-from utils.logger import create_progress_bar, log_cleaner, logger
+from utils.logging import create_progress_bar, log_cleaner, logger
 
 from .state_transition import process_event
 from .symlink import Symlinker

src/program/scrapers/__init__.py

@@ -17,7 +17,7 @@
 from program.scrapers.torrentio import Torrentio
 from program.scrapers.zilean import Zilean
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 
 
 class Scraping:

src/program/scrapers/annatar.py

@@ -7,7 +7,7 @@
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
 from program.scrapers.shared import _get_stremio_identifier
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get
 

src/program/scrapers/comet.py

@@ -10,7 +10,7 @@
 from program.media.item import MediaItem, Show
 from program.settings.manager import settings_manager
 from program.scrapers.shared import _get_stremio_identifier
-from utils.logger import logger
+from loguru import logger
 from utils.request import RateLimiter, RateLimitExceeded, get, ping
 
 

src/program/scrapers/jackett.py

@@ -12,7 +12,7 @@
 
 from program.media.item import Episode, MediaItem, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 
 

src/program/scrapers/knightcrawler.py

@@ -7,7 +7,7 @@
 from program.media.item import Episode, MediaItem
 from program.scrapers.shared import _get_stremio_identifier
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/scrapers/mediafusion.py

@@ -10,7 +10,7 @@
 from program.scrapers.shared import _get_stremio_identifier
 from program.settings.manager import settings_manager
 from program.settings.models import AppModel
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/scrapers/orionoid.py

@@ -3,7 +3,7 @@
 
 from program.media.item import MediaItem
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get
 

src/program/scrapers/prowlarr.py

@@ -13,7 +13,7 @@
 
 from program.media.item import Episode, MediaItem, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 
 

src/program/scrapers/shared.py

@@ -9,7 +9,7 @@
 from program.media.stream import Stream
 from program.settings.manager import settings_manager
 from program.settings.versions import models
-from utils.logger import logger
+from loguru import logger
 
 enable_aliases = settings_manager.settings.scraping.enable_aliases
 settings_model = settings_manager.settings.ranking

src/program/scrapers/torbox.py

@@ -5,7 +5,7 @@
 
 from program.media.item import Episode, MediaItem, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/scrapers/torrentio.py

@@ -8,7 +8,7 @@
 from program.settings.manager import settings_manager
 from program.settings.models import TorrentioConfig
 from program.scrapers.shared import _get_stremio_identifier
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/scrapers/zilean.py

@@ -8,7 +8,7 @@
 from program.media.item import Episode, MediaItem, Season, Show
 from program.settings.manager import settings_manager
 from program.settings.models import AppModel
-from utils.logger import logger
+from loguru import logger
 from utils.ratelimiter import RateLimiter, RateLimitExceeded
 from utils.request import get, ping
 

src/program/settings/versions.py

@@ -1,6 +1,6 @@
 from RTN.models import BaseRankingModel, BestRanking, DefaultRanking
 
-from utils.logger import logger
+from loguru import logger
 
 
 class RankModels:

src/program/state_transition.py

@@ -11,7 +11,7 @@
 from program.symlink import Symlinker
 from program.types import ProcessedEvent, Service
 from program.updaters import Updater
-from utils.logger import logger
+from loguru import logger
 
 
 def process_event(existing_item: MediaItem | None, emitted_by: Service, item: MediaItem) -> ProcessedEvent:

src/program/symlink.py

@@ -15,7 +15,7 @@
 from program.media.state import States
 from program.media.stream import Stream
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 
 
 class Symlinker:

src/program/updaters/__init__.py

@@ -3,7 +3,7 @@
 from program.updaters.plex import PlexUpdater
 from program.updaters.jellyfin import JellyfinUpdater
 from program.updaters.emby import EmbyUpdater
-from utils.logger import logger
+from loguru import logger
 
 
 class Updater:

src/program/updaters/emby.py

@@ -5,7 +5,7 @@
 from program.settings.manager import settings_manager
 from program.media.item import MediaItem
 from utils.request import get, post
-from utils.logger import logger
+from loguru import logger
 
 
 class EmbyUpdater:

src/program/updaters/jellyfin.py

@@ -5,7 +5,7 @@
 from program.settings.manager import settings_manager
 from program.media.item import MediaItem
 from utils.request import get, post
-from utils.logger import logger
+from loguru import logger
 
 
 class JellyfinUpdater:

src/program/updaters/plex.py

@@ -10,7 +10,7 @@
 
 from program.media.item import Episode, Movie, Season, Show
 from program.settings.manager import settings_manager
-from utils.logger import logger
+from loguru import logger
 
 
 class PlexUpdater:

src/routers/secure/default.py

@@ -11,6 +11,7 @@
 from pydantic import BaseModel, Field
 from sqlalchemy import func, select
 from utils.event_manager import EventUpdate
+from utils import generate_api_key
 
 from ..models.shared import MessageResponse
 
@@ -60,6 +61,13 @@ async def get_rd_user() -> RDUser:
 
     return response.json()
 
+@router.post("/generateapikey", operation_id="generateapikey")
+async def generate_apikey() -> MessageResponse:
+    new_key = generate_api_key()
+    settings_manager.settings.api_key = new_key
+    settings_manager.save()
+    return { "message": new_key}
+
 
 @router.get("/torbox", operation_id="torbox")
 async def get_torbox_user():

src/routers/secure/items.py

@@ -25,7 +25,7 @@
 from RTN import Torrent
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.exc import NoResultFound
-from utils.logger import logger
+from loguru import logger
 
 from ..models.shared import MessageResponse
 

src/routers/secure/webhooks.py

@@ -7,7 +7,7 @@
 from program.indexers.trakt import get_imdbid_from_tmdb, get_imdbid_from_tvdb
 from program.media.item import MediaItem
 from requests import RequestException
-from utils.logger import logger
+from loguru import logger
 
 from ..models.overseerr import OverseerrWebhook
 

src/tests/test_symlink_creation.py

@@ -16,7 +16,7 @@
 from sqlalchemy.engine import URL
 from sqlalchemy.orm import declarative_base, relationship, sessionmaker
 
-from utils.logger import logger
+from loguru import logger
 
 logger.disable("program")  # Suppress
 

src/utils/cli.py

@@ -3,7 +3,7 @@
 from program.db.db_functions import hard_reset_database, resolve_duplicates
 from program.libraries.symlink import fix_broken_symlinks
 from program.settings.manager import settings_manager
-from utils.logger import log_cleaner, logger
+from utils.logging import log_cleaner, logger
 
 
 def handle_args():