From bb53fe41c8798111f83db37611b4396fcb19c3ea Mon Sep 17 00:00:00 2001 From: dni Date: Mon, 6 Jul 2026 15:23:10 +0200 Subject: [PATCH] remove uppgrade_hash --- lnbits/app.py | 14 +++++------- lnbits/commands.py | 5 ----- lnbits/core/models/extensions.py | 12 ---------- lnbits/core/services/extensions.py | 31 +++++++++++++------------- lnbits/settings.py | 11 --------- tests/unit/test_services_extensions.py | 2 -- tests/unit/test_settings.py | 7 +----- 7 files changed, 22 insertions(+), 60 deletions(-) diff --git a/lnbits/app.py b/lnbits/app.py index 279c813e1..bb0c4c8da 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -2,7 +2,6 @@ import asyncio import glob import importlib import os -import shutil import sys import time from collections.abc import Callable @@ -383,11 +382,6 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension): def register_custom_extensions_path(): - upgrades_dir = settings.lnbits_extensions_upgrade_path - shutil.rmtree(upgrades_dir, True) - Path(upgrades_dir).mkdir(parents=True, exist_ok=True) - sys.path.append(str(upgrades_dir)) - if settings.has_default_extension_path: return default_ext_path = os.path.join("lnbits", "extensions") @@ -441,7 +435,11 @@ def register_ext_tasks(ext: Extension) -> None: def register_ext_routes(app: FastAPI, ext: Extension) -> None: """Register FastAPI routes for extension.""" - ext_module = importlib.import_module(ext.module_name) + module_name = ext.module_name + if module_name in sys.modules: + ext_module = importlib.reload(sys.modules[module_name]) + else: + ext_module = importlib.import_module(module_name) ext_route = getattr(ext_module, f"{ext.code}_ext") @@ -451,7 +449,7 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None: else [] ) - settings.activate_extension_paths(ext.code, ext.upgrade_hash, ext_redirects) + settings.activate_extension_paths(ext.code, ext_redirects) # Remove existing routes for this extension before re-registering so that # an upgraded extension replaces the old one at the same paths (no prefix). diff --git a/lnbits/commands.py b/lnbits/commands.py index 87c8ddff9..6070a003e 100644 --- a/lnbits/commands.py +++ b/lnbits/commands.py @@ -1,6 +1,5 @@ import asyncio import importlib -import sys import time from functools import wraps from getpass import getpass @@ -377,10 +376,6 @@ async def extensions_update( # noqa: C901 if not await _can_run_operation(url): return - upgrades_dir = settings.lnbits_extensions_upgrade_path - Path(upgrades_dir).mkdir(parents=True, exist_ok=True) - sys.path.append(str(upgrades_dir)) - if extension: await update_extension(extension, repo_index, source_repo, url, admin_user) return diff --git a/lnbits/core/models/extensions.py b/lnbits/core/models/extensions.py index 79e93e6fd..d155c1e9f 100644 --- a/lnbits/core/models/extensions.py +++ b/lnbits/core/models/extensions.py @@ -147,21 +147,13 @@ class Extension(BaseModel): name: str | None = None short_description: str | None = None tile: str | None = None - upgrade_hash: str | None = "" @property def module_name(self) -> str: - if self.is_upgrade_extension: - return f"{self.code}-{self.upgrade_hash}" - if settings.has_default_extension_path: return f"lnbits.extensions.{self.code}" return self.code - @property - def is_upgrade_extension(self) -> bool: - return self.upgrade_hash != "" - @classmethod def from_installable_ext(cls, ext_info: InstallableExtension) -> Extension: return Extension( @@ -170,7 +162,6 @@ class Extension(BaseModel): name=ext_info.name, short_description=ext_info.short_description, tile=ext_info.icon, - upgrade_hash=ext_info.hash if ext_info.ext_upgrade_dir.is_dir() else "", ) @@ -375,9 +366,6 @@ class InstallableExtension(BaseModel): @property def module_name(self) -> str: - if self.ext_upgrade_dir.is_dir(): - return f"{self.id}-{self.hash}" - if settings.has_default_extension_path: return f"lnbits.extensions.{self.id}" return self.id diff --git a/lnbits/core/services/extensions.py b/lnbits/core/services/extensions.py index 411ed6cb5..25db384f1 100644 --- a/lnbits/core/services/extensions.py +++ b/lnbits/core/services/extensions.py @@ -56,11 +56,10 @@ async def install_extension( else: await update_installed_extension(ext_info) - extension = Extension.from_installable_ext(ext_info) - if extension.is_upgrade_extension: - # call stop while the old routes are still active + if installed_ext: await stop_extension_background_work(ext_info.id) + extension = Extension.from_installable_ext(ext_info) await start_extension_background_work(ext_info.id) return extension @@ -103,16 +102,16 @@ async def stop_extension_background_work(ext_id: str) -> bool: Stop background work for extension (like asyncio.Tasks, WebSockets, etc). Extension must expose a `myextension_stop()` function if it is starting tasks. """ - upgrade_hash = settings.extension_upgrade_hash(ext_id) - ext = Extension(code=ext_id, is_valid=True, upgrade_hash=upgrade_hash) + ext = Extension(code=ext_id, is_valid=True) + module_name = ext.module_name try: - logger.info(f"Stopping background work for extension '{ext.module_name}'.") - old_module = importlib.import_module(ext.module_name) + logger.info(f"Stopping background work for extension '{module_name}'.") + old_module = importlib.import_module(module_name) stop_fn_name = f"{ext_id}_stop" if not hasattr(old_module, stop_fn_name): - raise ValueError(f"No stop function found for '{ext.module_name}'.") + raise ValueError(f"No stop function found for '{module_name}'.") stop_fn = getattr(old_module, stop_fn_name) if stop_fn: @@ -120,9 +119,9 @@ async def stop_extension_background_work(ext_id: str) -> bool: await stop_fn() else: stop_fn() - logger.info(f"Stopped background work for extension '{ext.module_name}'.") + logger.info(f"Stopped background work for extension '{module_name}'.") except Exception as ex: - logger.warning(f"Failed to stop background work for '{ext.module_name}'.") + logger.warning(f"Failed to stop background work for '{module_name}'.") logger.warning(ex) return False @@ -135,12 +134,12 @@ async def start_extension_background_work(ext_id: str) -> bool: Extension CAN expose a `myextension_start()` function if it is starting tasks. Extension MUST expose a `myextension_stop()` in that case. """ - upgrade_hash = settings.extension_upgrade_hash(ext_id) - ext = Extension(code=ext_id, is_valid=True, upgrade_hash=upgrade_hash) + ext = Extension(code=ext_id, is_valid=True) + module_name = ext.module_name try: - logger.info(f"Starting background work for extension '{ext.module_name}'.") - new_module = importlib.import_module(ext.module_name) + logger.info(f"Starting background work for extension '{module_name}'.") + new_module = importlib.import_module(module_name) start_fn_name = f"{ext_id}_start" # start function is optional, return False if not found @@ -153,10 +152,10 @@ async def start_extension_background_work(ext_id: str) -> bool: await start_fn() else: start_fn() - logger.info(f"Started background work for extension '{ext.module_name}'.") + logger.info(f"Started background work for extension '{module_name}'.") return True except Exception as ex: - logger.warning(f"Failed to start background work for '{ext.module_name}'.") + logger.warning(f"Failed to start background work for '{module_name}'.") logger.warning(ex) return False diff --git a/lnbits/settings.py b/lnbits/settings.py index 911cc41e5..83126cf2a 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -166,8 +166,6 @@ class ExchangeRateProvider(BaseModel): class InstalledExtensionsSettings(LNbitsSettings): # installed extensions that have been deactivated lnbits_deactivated_extensions: set[str] = Field(default=set()) - # upgraded extensions that require API redirects - lnbits_upgraded_extensions: dict[str, str] = Field(default={}) # list of redirects that extensions want to perform lnbits_extensions_redirects: list[RedirectPath] = Field(default=[]) @@ -190,16 +188,10 @@ class InstalledExtensionsSettings(LNbitsSettings): def activate_extension_paths( self, ext_id: str, - upgrade_hash: str | None = None, ext_redirects: list[dict] | None = None, ): self.lnbits_deactivated_extensions.discard(ext_id) - # Track upgrade hashes so that module names can be resolved for - # background-task start/stop (the module lives in the upgrades dir). - if upgrade_hash: - self.lnbits_upgraded_extensions[ext_id] = upgrade_hash - if ext_redirects: self._activate_extension_redirects(ext_id, ext_redirects) @@ -209,9 +201,6 @@ class InstalledExtensionsSettings(LNbitsSettings): self.lnbits_deactivated_extensions.add(ext_id) self._remove_extension_redirects(ext_id) - def extension_upgrade_hash(self, ext_id: str) -> str: - return settings.lnbits_upgraded_extensions.get(ext_id, "") - def _activate_extension_redirects(self, ext_id: str, ext_redirects: list[dict]): ext_redirect_paths = [ RedirectPath(**{"ext_id": ext_id, **er}) for er in ext_redirects diff --git a/tests/unit/test_services_extensions.py b/tests/unit/test_services_extensions.py index df6cb2d6d..b2b638e7a 100644 --- a/tests/unit/test_services_extensions.py +++ b/tests/unit/test_services_extensions.py @@ -124,7 +124,6 @@ async def test_install_extension_updates_existing_upgrade_and_preserves_payments settings.lnbits_data_folder = str(tmp_path / "data") settings.lnbits_extensions_path = str(tmp_path / "code") await create_installed_extension(existing_ext) - updated_ext.ext_upgrade_dir.mkdir(parents=True, exist_ok=True) extension = await install_extension(updated_ext, skip_download=True) stored = await get_installed_extension(ext_id) @@ -134,7 +133,6 @@ async def test_install_extension_updates_existing_upgrade_and_preserves_payments settings.lnbits_extensions_path = original_extensions_path assert extension.code == ext_id - assert extension.is_upgrade_extension is True assert stored is not None assert stored.meta is not None assert stored.meta.payments == [existing_payment] diff --git a/tests/unit/test_settings.py b/tests/unit/test_settings.py index d1fecc856..c3654368b 100644 --- a/tests/unit/test_settings.py +++ b/tests/unit/test_settings.py @@ -216,16 +216,11 @@ def test_installed_extensions_settings_activate_and_deactivate_paths(): } ] - installed.activate_extension_paths( - "lnurlp", - upgrade_hash="hash123", - ext_redirects=redirects, - ) + installed.activate_extension_paths("lnurlp", ext_redirects=redirects) redirect = installed.find_extension_redirect("/.well-known/lnurlp", []) assert redirect is not None assert redirect.ext_id == "lnurlp" - assert installed.lnbits_upgraded_extensions["lnurlp"] == "hash123" assert "lnurlp" in installed.lnbits_installed_extensions_ids installed.deactivate_extension_paths("lnurlp")