Unit3DwebUp 0.0.26__tar.gz → 0.0.27__tar.gz

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3DwebUp
-Version: 0.0.26
+Version: 0.0.27
 Summary: A Unit3D uploader with a web interface
 Author: Parzival
 License-Expression: GPL-3.0-only
@@ -9,6 +9,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp==3.13.3
 Requires-Dist: fastapi==0.129.0
+Requires-Dist: slowapi==0.1.9
 Requires-Dist: guessit==3.8.0
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pathvalidate==3.3.1

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/Unit3DwebUp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3DwebUp
-Version: 0.0.26
+Version: 0.0.27
 Summary: A Unit3D uploader with a web interface
 Author: Parzival
 License-Expression: GPL-3.0-only
@@ -9,6 +9,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp==3.13.3
 Requires-Dist: fastapi==0.129.0
+Requires-Dist: slowapi==0.1.9
 Requires-Dist: guessit==3.8.0
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pathvalidate==3.3.1

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/Unit3DwebUp.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ unit3dwup/config/api_data.py
 unit3dwup/config/constants.py
 unit3dwup/config/host_data.py
 unit3dwup/config/itt.py
+unit3dwup/config/limiter.py
 unit3dwup/config/logger.py
 unit3dwup/config/settings.py
 unit3dwup/config/sis.py
@@ -40,6 +41,7 @@ unit3dwup/repositories/interfaces.py
 unit3dwup/repositories/job_repos.py
 unit3dwup/repositories/media_info_factory.py
 unit3dwup/routers/__init__.py
+unit3dwup/routers/dependencies.py
 unit3dwup/routers/jobs.py
 unit3dwup/routers/posters.py
 unit3dwup/routers/process.py

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/Unit3DwebUp.egg-info/requires.txt

@@ -1,5 +1,6 @@
 aiohttp==3.13.3
 fastapi==0.129.0
+slowapi==0.1.9
 guessit==3.8.0
 numpy==2.4.2
 pathvalidate==3.3.1

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/pyproject.toml

@@ -7,6 +7,7 @@ dynamic = []
 dependencies = [
     "aiohttp==3.13.3",
     "fastapi==0.129.0",
+    "slowapi==0.1.9",
     "guessit==3.8.0",
     "numpy==2.4.2",
     "pathvalidate==3.3.1",
@@ -24,7 +25,7 @@ dependencies = [
     "uvicorn[standard]==0.40.0"
 ]
 name = "Unit3DwebUp"
-version = "0.0.26"
+version = "0.0.27"
 
 description = "A Unit3D uploader with a web interface"
 readme = { file = "README.md", content-type = "text/markdown" }

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/config/__init__.py

@@ -3,8 +3,8 @@ from .sis import sis_data
 
 tracker_list = {'ITT': itt_data, 'SIS': sis_data}
 
-from .settings import get_settings
+from .settings import get_settings,Settings
 from .constants import MediaStatus
 from .logger import get_logger
 
-__version__ = "0.0.26"
+__version__ = "0.0.27"

unit3dwebup-0.0.27/unit3dwup/config/limiter.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+from slowapi import Limiter
+from slowapi.util import get_remote_address
+
+limiter = Limiter(key_func=get_remote_address)

unit3dwebup-0.0.27/unit3dwup/routers/dependencies.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from fastapi import Request
+
+from unit3dwup.config.settings import Settings
+from unit3dwup.external.websocket import WebSocketManager
+from unit3dwup.repositories.job_repos import JobRedisRepo
+
+
+def load_settings(request: Request) -> Settings:
+    return request.app.state.settings
+
+
+def get_job_repo(request: Request) -> JobRedisRepo:
+    return request.app.state.job
+
+
+def get_ws_manager(request: Request) -> WebSocketManager:
+    return request.app.state.ws_manager
+
+
+def get_restart_docker(request: Request) -> bool:
+    return request.app.state.restart_docker

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/jobs.py

@@ -2,17 +2,28 @@
 import inspect
 import json
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Depends, Request
 
 from unit3dwup.config import get_logger
+from unit3dwup.config.limiter import limiter
 
 from unit3dwup.schemas import ClearJobListRequest
 
+from unit3dwup.external.websocket import WebSocketManager
+from unit3dwup.routers.dependencies import (
+    get_job_repo,
+    get_ws_manager,
+)
+
 router = APIRouter()
 
 
 @router.post("/cjoblist")
-async def clear_job_list_id(payload: ClearJobListRequest, request: Request):
+@limiter.limit("5/minute")
+async def clear_job_list_id(payload: ClearJobListRequest, request: Request,
+                            job_repo=Depends(get_job_repo),
+                            ws_manager: WebSocketManager = Depends(get_ws_manager),
+                            ):
     """
         This endpoint deletes a job list and all related posters
 
@@ -23,12 +34,10 @@ async def clear_job_list_id(payload: ClearJobListRequest, request: Request):
         - status: operation result
         """
 
-    app = request.app
-
     # Load the job list
     # Carica la joblist per ottenere il percorso e inviarlo a log. Mi sembra troppo per una stampa
-    job_list = await app.state.job.get_job_list(job_id=payload.job_list_id)
-    results = [json.loads(await app.state.job.get_job(job_id)) for job_id in job_list]
+    job_list = await job_repo.job.get_job_list(job_id=payload.job_list_id)
+    results = [json.loads(await job_repo.get_job(job_id)) for job_id in job_list]
 
     # Logger
     frame = inspect.currentframe()
@@ -36,17 +45,17 @@ async def clear_job_list_id(payload: ClearJobListRequest, request: Request):
 
     # Delete the job list
     # TODO: delete all job ids
-    await app.state.job.delete_job_list(job_id=payload.job_list_id)
+    await job_repo.delete_job_list(job_id=payload.job_list_id)
 
     if results:
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "success",
             "message": f"Clear JobList {payload.job_list_id} {results[0]['folder']}",
         })
         logger.info(f"-> Clear JobList ID° {payload.job_list_id} {results[0]['folder']}\n")
     else:
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "error",
             "message": f"Clear JobList : JobList id not found",

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/posters.py

@@ -5,6 +5,7 @@ from fastapi import APIRouter, Request
 
 from unit3dwup.config import MediaStatus
 from unit3dwup.config import get_logger
+from unit3dwup.config.limiter import limiter
 
 from unit3dwup.schemas import UpdatePosterRequest
 
@@ -34,6 +35,7 @@ async def update_poster(app, msg: str, job_id: str, field_id: str, new_id: str):
 
 
 @router.post("/settmdbid")
+@limiter.limit("5/minute")
 async def set_poster_id(payload: UpdatePosterRequest, request: Request):
     """
     Set a Tmdb id for example when tmdb returns an empty result
@@ -49,6 +51,7 @@ async def set_poster_id(payload: UpdatePosterRequest, request: Request):
 
 
 @router.post("/settvdbid")
+@limiter.limit("5/minute")
 async def set_tvdb_id(payload: UpdatePosterRequest, request: Request):
     """
     Set a TVdb id for example when tvdb returns an empty result
@@ -64,6 +67,7 @@ async def set_tvdb_id(payload: UpdatePosterRequest, request: Request):
 
 
 @router.post("/setimdbid")
+@limiter.limit("5/minute")
 async def set_imdb_id(payload: UpdatePosterRequest, request: Request):
     """
     Set an Imdb id for example when the remote list of tvdb is empty
@@ -79,6 +83,7 @@ async def set_imdb_id(payload: UpdatePosterRequest, request: Request):
 
 
 @router.post("/setposterurl")
+@limiter.limit("5/minute")
 async def set_poster_url(payload: UpdatePosterRequest, request: Request):
     """
     Set a poster url for example when tmdb returns an empty result only for frontend
@@ -94,6 +99,7 @@ async def set_poster_url(payload: UpdatePosterRequest, request: Request):
 
 
 @router.post("/setposterdname")
+@limiter.limit("5/minute")
 async def set_poster_dname(payload: UpdatePosterRequest, request: Request):
     """
     Set a poster display name for example if you dont like it

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/process.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends
 from fastapi.responses import JSONResponse
 
+from unit3dwup.config import Settings
+from unit3dwup.config.limiter import limiter
+
 from unit3dwup.use_case.process_all_usecase import ProcessAllUseCase
 from unit3dwup.use_case.upload_usecase import UploadUseCase
 from unit3dwup.use_case.seed_usecase import SeedUseCase
@@ -9,11 +12,18 @@ from unit3dwup.use_case.make_torrent_usecase import MakeTorrentUseCase
 
 from unit3dwup.schemas import ProcessAllRequest, JobRequest
 
+from unit3dwup.routers.dependencies import (
+    load_settings,
+)
+
 router = APIRouter()
 
 
 @router.post("/processall")
-async def process_all(payload: ProcessAllRequest, request: Request):
+@limiter.limit("5/minute")
+async def process_all(payload: ProcessAllRequest, request: Request,
+                      settings: Settings = Depends(load_settings),
+                      ):
     """
     Start a chain load the joblist filter for existing torrent create torrent upload the complete joblist
 
@@ -30,11 +40,12 @@ async def process_all(payload: ProcessAllRequest, request: Request):
     app = request.app
 
     use_case = ProcessAllUseCase(app=app, job_list_id=payload.job_list_id,
-                                 torrent_client_name=app.state.settings.torrent.TORRENT_CLIENT)
+                                 torrent_client_name=settings.torrent.TORRENT_CLIENT)
     await use_case.execute()
 
 
 @router.post("/maketorrent")
+@limiter.limit("5/minute")
 async def make(payload: JobRequest, request: Request):
     """
     Create one or more torrent files
@@ -52,6 +63,7 @@ async def make(payload: JobRequest, request: Request):
 
 
 @router.post("/upload")
+@limiter.limit("5/minute")
 async def upload(payload: JobRequest, request: Request):
     """
     Upload a single torrent file
@@ -75,7 +87,10 @@ async def upload(payload: JobRequest, request: Request):
 
 
 @router.post("/seed")
-async def seed(payload: JobRequest, request: Request) -> JSONResponse:
+@limiter.limit("5/minute")
+async def seed(payload: JobRequest, request: Request,
+               settings: Settings = Depends(load_settings),
+               ) -> JSONResponse:
     """
     Required
     - job_id identifies each poster corresponds to Media.job_id
@@ -86,5 +101,5 @@ async def seed(payload: JobRequest, request: Request) -> JSONResponse:
 
     app = request.app
 
-    use_case = SeedUseCase(app=app, client=app.state.settings.torrent.TORRENT_CLIENT, job_id=payload.job_id)
+    use_case = SeedUseCase(app=app, client=settings.torrent.TORRENT_CLIENT, job_id=payload.job_id)
     return await use_case.execute()

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/scan.py

@@ -6,10 +6,11 @@ import time
 
 import aiohttp
 
-from fastapi import APIRouter, Request, status
+from fastapi import APIRouter, WebSocket, status, FastAPI, Request, Depends
 from fastapi.responses import JSONResponse
 
-from unit3dwup.config import get_logger
+from unit3dwup.config import get_logger, Settings
+from unit3dwup.config.limiter import limiter
 
 from unit3dwup.repositories.db_online import Tmdb, Tvdb
 
@@ -20,11 +21,23 @@ from unit3dwup.use_case.scan_media_usecase import ScanMediaUseCase
 
 from unit3dwup.schemas import ScanRequest
 
+from unit3dwup.external.websocket import WebSocketManager
+from unit3dwup.routers.dependencies import (
+    load_settings,
+    get_job_repo,
+    get_ws_manager,
+)
+
 router = APIRouter()
 
 
 @router.post("/scan")
-async def scan(payload: ScanRequest, request: Request) -> JSONResponse:
+@limiter.limit("5/minute")
+async def scan(payload: ScanRequest, request: Request,
+               settings: Settings = Depends(load_settings),
+               job_repo=Depends(get_job_repo),
+               ws_manager: WebSocketManager = Depends(get_ws_manager),
+               ) -> JSONResponse:
     """
     This endpoint scans the local files and creates a Media object for each associating it with its description
 
@@ -62,16 +75,16 @@ async def scan(payload: ScanRequest, request: Request) -> JSONResponse:
     start_time = time.perf_counter()
 
     # Get the id for the current path
-    job_list_id = hashlib.sha256(app.state.settings.prefs.SCAN_PATH.encode()).hexdigest()
-    logger.info(f"Current joblist_id {job_list_id} {app.state.settings.prefs.SCAN_PATH}")
+    job_list_id = hashlib.sha256(settings.prefs.SCAN_PATH.encode()).hexdigest()
+    logger.info(f"Current joblist_id {job_list_id} {settings.prefs.SCAN_PATH}")
 
     # Load the jobs list using the previous id
-    job_list = await app.state.job.get_job_list(job_id=job_list_id)
+    job_list = await job_repo.get_job_list(job_id=job_list_id)
 
     # Load Media for each job id from the job_list
     job_list_results = []
     for job_id in job_list:
-        job = await app.state.job.get_job(job_id)
+        job = await job_repo.get_job(job_id)
         if job:
             job_list_results.append(json.loads(job))
 
@@ -106,7 +119,7 @@ async def scan(payload: ScanRequest, request: Request) -> JSONResponse:
         results = await use_case.execute()
 
         # Send a message to the frontend by ws
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "success",
             "message": f"Scan completato in {time.perf_counter() - start_time:.2f} secondi",
@@ -131,7 +144,7 @@ async def scan(payload: ScanRequest, request: Request) -> JSONResponse:
 
         if new_job_list:
             # Save the new job_list
-            await app.state.job.create_job_list(
+            await job_repo.create_job_list(
                 job_id=job_list_id,
                 job_list=new_job_list
             )

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/search.py

@@ -6,6 +6,7 @@ from fastapi.responses import JSONResponse
 
 from unit3dwup.services.itt_tracker_service import ITTtrackerService
 from unit3dwup.services.interfaces import TrackerServiceInterface
+from unit3dwup.config.limiter import limiter
 
 from unit3dwup.schemas import FilterRequest
 
@@ -13,6 +14,7 @@ router = APIRouter()
 
 
 @router.post("/filter")
+@limiter.limit("5/minute")
 async def filter_search(payload: FilterRequest, request: Request):
     """
     Search words or title in the tracker

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/routers/settings.py

@@ -3,23 +3,34 @@ import inspect
 import json
 import os
 
-from fastapi import APIRouter, Request, status
+from fastapi import APIRouter, Request, status,  Depends
 from fastapi.responses import JSONResponse
 
 from dotenv import load_dotenv, dotenv_values
 
 from unit3dwup.config import get_settings
-from unit3dwup.config import get_logger
+from unit3dwup.config import get_logger, Settings
 
 from unit3dwup.services.lifespan_service import update_mounted_paths
 
 from unit3dwup.schemas import SetEnvRequest
 
-router = APIRouter()
 
+from unit3dwup.external.websocket import WebSocketManager
+from unit3dwup.routers.dependencies import (
+    load_settings,
+    get_job_repo,
+    get_ws_manager,
+)
+
+router = APIRouter()
 
 @router.post("/setting")
-async def configuration(request: Request):
+async def configuration(request: Request,
+                        settings: Settings = Depends(load_settings),
+                        job_repo=Depends(get_job_repo),
+                        ws_manager: WebSocketManager = Depends(get_ws_manager),
+                        ):
     """
     Load setting from the local configuration file
 
@@ -30,33 +41,32 @@ async def configuration(request: Request):
     - none
     """
 
-    app = request.app
-
     # Logger
     frame = inspect.currentframe()
     logger = get_logger(frame.f_code.co_name)
 
     # Load json settings and return it to the client
-    job_data = await app.state.job.get_job(job_id='0')
+    job_data = await job_repo.get_job(job_id='0')
+
 
     # /// Check main paths
-    if app.state.settings.prefs.SCAN_PATH == os.getcwd():
+    if settings.prefs.SCAN_PATH == os.getcwd():
         logger.warning("SCAN PATHS NO SET")
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "warn",
             "message": f"{frame.f_code.co_name} Scan Path not set",
         })
-    if app.state.settings.prefs.TORRENT_ARCHIVE_PATH == os.getcwd():
+    if settings.prefs.TORRENT_ARCHIVE_PATH == os.getcwd():
         logger.warning("TORRENT ARCHIVE PATH NOT SET")
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "warn",
             "message": f"{frame.f_code.co_name} Torrent archive path not set",
         })
-    if os.getcwd() in [app.state.settings.prefs.WATCHER_DESTINATION_PATH, app.state.settings.prefs.WATCHER_PATH]:
+    if os.getcwd() in [settings.prefs.WATCHER_DESTINATION_PATH, settings.prefs.WATCHER_PATH]:
         logger.warning("WATCHER PATHS NO SET")
-        await app.state.ws_manager.broadcast({
+        await ws_manager.broadcast({
             "type": "log",
             "level": "warn",
             "message": f"{frame.f_code.co_name} Watcher Paths not set",
@@ -72,7 +82,11 @@ async def configuration(request: Request):
 
 
 @router.post("/setenv")
-async def set_env(payload: SetEnvRequest, request: Request):
+async def set_env(payload: SetEnvRequest, request: Request,
+                  settings: Settings = Depends(load_settings),
+                  job_repo=Depends(get_job_repo),
+                  ws_manager: WebSocketManager = Depends(get_ws_manager),
+                  ):
     """
     Set the environment variables from the frontend
     User need to restart the docker
@@ -95,7 +109,7 @@ async def set_env(payload: SetEnvRequest, request: Request):
     # Permission denied when tries to create a temporary file but it fails because the container is not running as root
     # set_key(str(app.state.env_file), payload.key, payload.value)
 
-    # Current variabiles value
+    # Current variables value
     env_vars = dotenv_values(str(app.state.env_file))
     # update the key
     env_vars[payload.key] = payload.value
@@ -110,11 +124,8 @@ async def set_env(payload: SetEnvRequest, request: Request):
     # Clear cache and reload
     get_settings.cache_clear()
 
-    # Refresh the lru cache
-    settings = get_settings()
-
-    # Update the fast api app state
-    app.state.settings = settings
+    # Call and Refresh the lru cache
+    app.state.settings = get_settings()
 
     # This key requires a Docker restart
     if payload.key.upper() in ["PREFS__WATCHER_DESTINATION_PATH", "PREFS__WATCHER_PATH", "PREFS__TORRENT_ARCHIVE_PATH",
@@ -125,7 +136,8 @@ async def set_env(payload: SetEnvRequest, request: Request):
     await update_mounted_paths(app=app)
 
     # Ricreate profile (overwrite -> it uses hset command)
-    await app.state.job.create_profile(dict(settings.prefs))
+    await job_repo.create_profile(dict(settings.prefs))
+
 
     # Logger
     frame = inspect.currentframe()
@@ -135,7 +147,7 @@ async def set_env(payload: SetEnvRequest, request: Request):
     logger.info(f"-> Update {payload.key} value -> {payload.value}\n")
 
     # Send log to the client
-    await app.state.ws_manager.broadcast({
+    await ws_manager.broadcast({
         "type": "log",
         "level": "success",
         "message": f"-> Update {payload.key} value -> {payload.value}\n",

{unit3dwebup-0.0.26 → unit3dwebup-0.0.27}/unit3dwup/start.py

@@ -2,14 +2,24 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
+from slowapi.middleware import SlowAPIMiddleware
+from slowapi.errors import RateLimitExceeded
+from slowapi import _rate_limit_exceeded_handler
+
 from unit3dwup.lifespan import lifespan
 
 from unit3dwup.routers import scan, process, jobs, posters, settings, search, ws
 
+# Set a limiter
+from config.limiter import limiter
 
 # Initialize FastApi
 app = FastAPI(lifespan=lifespan)
 
+app.state.limiter = limiter
+app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
+app.add_middleware(SlowAPIMiddleware)
+
 # TODO middleware
 app.add_middleware(
     CORSMiddleware,