fix: python versions were defined incorrectly and remove 3.9 (#3006)

* chore: update requirements to python3.10
* chore: format RUF007 rule for py310
* wrongly specified python version
python3.13 there is a greenlet build error

lnbits/core/models/audit.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta, timezone
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -10,16 +9,16 @@ from lnbits.settings import settings
 
 
 class AuditEntry(BaseModel):
-    component: Optional[str] = None
-    ip_address: Optional[str] = None
-    user_id: Optional[str] = None
-    path: Optional[str] = None
-    request_type: Optional[str] = None
-    request_method: Optional[str] = None
-    request_details: Optional[str] = None
-    response_code: Optional[str] = None
+    component: str | None = None
+    ip_address: str | None = None
+    user_id: str | None = None
+    path: str | None = None
+    request_type: str | None = None
+    request_method: str | None = None
+    request_details: str | None = None
+    response_code: str | None = None
     duration: float
-    delete_at: Optional[datetime] = None
+    delete_at: datetime | None = None
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
     def __init__(self, **data):
@@ -42,12 +41,12 @@ class AuditFilters(FilterModel):
         "duration",
     ]
 
-    ip_address: Optional[str] = None
-    user_id: Optional[str] = None
-    path: Optional[str] = None
-    request_method: Optional[str] = None
-    response_code: Optional[str] = None
-    component: Optional[str] = None
+    ip_address: str | None = None
+    user_id: str | None = None
+    path: str | None = None
+    request_method: str | None = None
+    response_code: str | None = None
+    component: str | None = None
 
 
 class AuditCountStat(BaseModel):

lnbits/core/models/extensions.py

@@ -7,7 +7,7 @@ import os
 import shutil
 import zipfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import httpx
 from loguru import logger
@@ -29,17 +29,17 @@ class ExplicitRelease(BaseModel):
     archive: str
     hash: str
     dependencies: list[str] = []
-    repo: Optional[str]
-    icon: Optional[str]
-    short_description: Optional[str]
-    min_lnbits_version: Optional[str]
-    max_lnbits_version: Optional[str]
-    html_url: Optional[str]  # todo: release_url
-    warning: Optional[str]
-    info_notification: Optional[str]
-    critical_notification: Optional[str]
-    details_link: Optional[str]
-    pay_link: Optional[str]
+    repo: str | None
+    icon: str | None
+    short_description: str | None
+    min_lnbits_version: str | None
+    max_lnbits_version: str | None
+    html_url: str | None  # todo: release_url
+    warning: str | None
+    info_notification: str | None
+    critical_notification: str | None
+    details_link: str | None
+    pay_link: str | None
 
     def is_version_compatible(self):
         return is_lnbits_version_ok(self.min_lnbits_version, self.max_lnbits_version)
@@ -77,9 +77,9 @@ class ExtensionConfig(BaseModel):
     name: str
     short_description: str
     tile: str = ""
-    warning: Optional[str] = ""
-    min_lnbits_version: Optional[str]
-    max_lnbits_version: Optional[str]
+    warning: str | None = ""
+    min_lnbits_version: str | None
+    max_lnbits_version: str | None
 
     def is_version_compatible(self) -> bool:
         return is_lnbits_version_ok(self.min_lnbits_version, self.max_lnbits_version)
@@ -87,7 +87,7 @@ class ExtensionConfig(BaseModel):
     @classmethod
     async def fetch_github_release_config(
         cls, org: str, repo: str, tag_name: str
-    ) -> Optional[ExtensionConfig]:
+    ) -> ExtensionConfig | None:
         config_url = (
             f"https://raw.githubusercontent.com/{org}/{repo}/{tag_name}/config.json"
         )
@@ -97,28 +97,28 @@ class ExtensionConfig(BaseModel):
 
 
 class ReleasePaymentInfo(BaseModel):
-    amount: Optional[int] = None
-    pay_link: Optional[str] = None
-    payment_hash: Optional[str] = None
-    payment_request: Optional[str] = None
+    amount: int | None = None
+    pay_link: str | None = None
+    payment_hash: str | None = None
+    payment_request: str | None = None
 
 
 class PayToEnableInfo(BaseModel):
     amount: int = 0
     required: bool = False
-    wallet: Optional[str] = None
+    wallet: str | None = None
 
 
 class UserExtensionInfo(BaseModel):
-    paid_to_enable: Optional[bool] = False
-    payment_hash_to_enable: Optional[str] = None
+    paid_to_enable: bool | None = False
+    payment_hash_to_enable: str | None = None
 
 
 class UserExtension(BaseModel):
     user: str
     extension: str
     active: bool
-    extra: Optional[UserExtensionInfo] = None
+    extra: UserExtensionInfo | None = None
 
     @property
     def is_paid(self) -> bool:
@@ -140,10 +140,10 @@ class UserExtension(BaseModel):
 class Extension(BaseModel):
     code: str
     is_valid: bool
-    name: Optional[str] = None
-    short_description: Optional[str] = None
-    tile: Optional[str] = None
-    upgrade_hash: Optional[str] = ""
+    name: str | None = None
+    short_description: str | None = None
+    tile: str | None = None
+    upgrade_hash: str | None = ""
 
     @property
     def module_name(self) -> str:
@@ -176,21 +176,21 @@ class ExtensionRelease(BaseModel):
     archive: str
     source_repo: str
     is_github_release: bool = False
-    hash: Optional[str] = None
-    min_lnbits_version: Optional[str] = None
-    max_lnbits_version: Optional[str] = None
-    is_version_compatible: Optional[bool] = True
-    html_url: Optional[str] = None
-    description: Optional[str] = None
-    warning: Optional[str] = None
-    repo: Optional[str] = None
-    icon: Optional[str] = None
-    details_link: Optional[str] = None
+    hash: str | None = None
+    min_lnbits_version: str | None = None
+    max_lnbits_version: str | None = None
+    is_version_compatible: bool | None = True
+    html_url: str | None = None
+    description: str | None = None
+    warning: str | None = None
+    repo: str | None = None
+    icon: str | None = None
+    details_link: str | None = None
 
-    pay_link: Optional[str] = None
-    cost_sats: Optional[int] = None
-    paid_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None
+    pay_link: str | None = None
+    cost_sats: int | None = None
+    paid_sats: int | None = 0
+    payment_hash: str | None = None
 
     @property
     def archive_url(self) -> str:
@@ -208,8 +208,8 @@ class ExtensionRelease(BaseModel):
         self.cost_sats = payment_info.amount if payment_info else None
 
     async def fetch_release_payment_info(
-        self, amount: Optional[int] = None
-    ) -> Optional[ReleasePaymentInfo]:
+        self, amount: int | None = None
+    ) -> ReleasePaymentInfo | None:
         url = f"{self.pay_link}?amount={amount}" if amount else self.pay_link
         assert url, "Missing URL for payment info."
         try:
@@ -281,7 +281,7 @@ class ExtensionRelease(BaseModel):
         return [GitHubRepoRelease.parse_obj(r) for r in releases]
 
     @classmethod
-    async def fetch_release_details(cls, details_link: str) -> Optional[dict]:
+    async def fetch_release_details(cls, details_link: str) -> dict | None:
 
         try:
             async with httpx.AsyncClient() as client:
@@ -300,12 +300,12 @@ class ExtensionRelease(BaseModel):
 
 
 class ExtensionMeta(BaseModel):
-    installed_release: Optional[ExtensionRelease] = None
-    latest_release: Optional[ExtensionRelease] = None
-    pay_to_enable: Optional[PayToEnableInfo] = None
+    installed_release: ExtensionRelease | None = None
+    latest_release: ExtensionRelease | None = None
+    pay_to_enable: PayToEnableInfo | None = None
     payments: list[ReleasePaymentInfo] = []
     dependencies: list[str] = []
-    archive: Optional[str] = None
+    archive: str | None = None
     featured: bool = False
 
 
@@ -313,11 +313,11 @@ class InstallableExtension(BaseModel):
     id: str
     name: str
     version: str
-    active: Optional[bool] = False
-    short_description: Optional[str] = None
-    icon: Optional[str] = None
+    active: bool | None = False
+    short_description: str | None = None
+    icon: str | None = None
     stars: int = 0
-    meta: Optional[ExtensionMeta] = None
+    meta: ExtensionMeta | None = None
 
     @property
     def hash(self) -> str:
@@ -452,7 +452,7 @@ class InstallableExtension(BaseModel):
 
         shutil.rmtree(self.ext_upgrade_dir, True)
 
-    def check_latest_version(self, release: Optional[ExtensionRelease]):
+    def check_latest_version(self, release: ExtensionRelease | None):
         if not release:
             return
         if not self.meta or not self.meta.latest_release:
@@ -465,9 +465,7 @@ class InstallableExtension(BaseModel):
         ):
             self.meta.latest_release = release
 
-    def find_existing_payment(
-        self, pay_link: Optional[str]
-    ) -> Optional[ReleasePaymentInfo]:
+    def find_existing_payment(self, pay_link: str | None) -> ReleasePaymentInfo | None:
         if not pay_link or not self.meta or not self.meta.payments:
             return None
         return next(
@@ -507,7 +505,7 @@ class InstallableExtension(BaseModel):
     @classmethod
     async def from_github_release(
         cls, github_release: GitHubRelease
-    ) -> Optional[InstallableExtension]:
+    ) -> InstallableExtension | None:
         try:
             repo, latest_release, config = await cls.fetch_github_repo_info(
                 github_release.organisation, github_release.repository
@@ -546,7 +544,7 @@ class InstallableExtension(BaseModel):
         )
 
     @classmethod
-    def from_ext_dir(cls, ext_id: str) -> Optional[InstallableExtension]:
+    def from_ext_dir(cls, ext_id: str) -> InstallableExtension | None:
         try:
             conf_path = Path(
                 settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
@@ -657,7 +655,7 @@ class InstallableExtension(BaseModel):
     @classmethod
     async def get_extension_release(
         cls, ext_id: str, source_repo: str, archive: str, version: str
-    ) -> Optional[ExtensionRelease]:
+    ) -> ExtensionRelease | None:
         all_releases: list[ExtensionRelease] = (
             await InstallableExtension.get_extension_releases(ext_id)
         )
@@ -708,8 +706,8 @@ class CreateExtension(BaseModel):
     archive: str
     source_repo: str
     version: str
-    cost_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None
+    cost_sats: int | None = 0
+    payment_hash: str | None = None
 
 
 class ExtensionDetailsRequest(BaseModel):
@@ -718,7 +716,7 @@ class ExtensionDetailsRequest(BaseModel):
     version: str
 
 
-async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
+async def github_api_get(url: str, error_msg: str | None) -> Any:
     headers = {"User-Agent": settings.user_agent}
     if settings.lnbits_ext_github_token:
         headers["Authorization"] = f"Bearer {settings.lnbits_ext_github_token}"
@@ -730,7 +728,7 @@ async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
         return resp.json()
 
 
-def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
+def icon_to_github_url(source_repo: str, path: str | None) -> str:
     if not path:
         return ""
     _, _, *rest = path.split("/")

lnbits/core/models/payments.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import datetime, timezone
 from enum import Enum
-from typing import Literal, Optional
+from typing import Literal
 
 from fastapi import Query
 from pydantic import BaseModel, Field, validator
@@ -28,16 +28,16 @@ class PaymentState(str, Enum):
 
 
 class PaymentExtra(BaseModel):
-    comment: Optional[str] = None
-    success_action: Optional[str] = None
-    lnurl_response: Optional[str] = None
+    comment: str | None = None
+    success_action: str | None = None
+    lnurl_response: str | None = None
 
 
 class PayInvoice(BaseModel):
     payment_request: str
-    description: Optional[str] = None
-    max_sat: Optional[int] = None
-    extra: Optional[dict] = {}
+    description: str | None = None
+    max_sat: int | None = None
+    extra: dict | None = {}
 
 
 class CreatePayment(BaseModel):
@@ -46,10 +46,10 @@ class CreatePayment(BaseModel):
     bolt11: str
     amount_msat: int
     memo: str
-    extra: Optional[dict] = {}
-    preimage: Optional[str] = None
-    expiry: Optional[datetime] = None
-    webhook: Optional[str] = None
+    extra: dict | None = {}
+    preimage: str | None = None
+    expiry: datetime | None = None
+    webhook: str | None = None
     fee: int = 0
 
 
@@ -61,13 +61,13 @@ class Payment(BaseModel):
     fee: int
     bolt11: str
     status: str = PaymentState.PENDING
-    memo: Optional[str] = None
-    expiry: Optional[datetime] = None
-    webhook: Optional[str] = None
-    webhook_status: Optional[int] = None
-    preimage: Optional[str] = None
-    tag: Optional[str] = None
-    extension: Optional[str] = None
+    memo: str | None = None
+    expiry: datetime | None = None
+    webhook: str | None = None
+    webhook_status: int | None = None
+    preimage: str | None = None
+    tag: str | None = None
+    extension: str | None = None
     time: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -129,16 +129,16 @@ class PaymentFilters(FilterModel):
 
     __sort_fields__ = ["created_at", "amount", "fee", "memo", "time", "tag"]
 
-    status: Optional[str]
-    tag: Optional[str]
-    checking_id: Optional[str]
+    status: str | None
+    tag: str | None
+    checking_id: str | None
     amount: int
     fee: int
-    memo: Optional[str]
+    memo: str | None
     time: datetime
-    preimage: Optional[str]
-    payment_hash: Optional[str]
-    wallet_id: Optional[str]
+    preimage: str | None
+    payment_hash: str | None
+    wallet_id: str | None
 
 
 class PaymentDataPoint(BaseModel):
@@ -173,11 +173,11 @@ class PaymentWalletStats(BaseModel):
 class PaymentDailyStats(BaseModel):
     date: datetime
     balance: float = 0
-    balance_in: Optional[float] = 0
-    balance_out: Optional[float] = 0
+    balance_in: float | None = 0
+    balance_out: float | None = 0
     payments_count: int = 0
-    count_in: Optional[int] = 0
-    count_out: Optional[int] = 0
+    count_in: int | None = 0
+    count_out: int | None = 0
     fee: float = 0
 
 
@@ -190,7 +190,7 @@ class PaymentHistoryPoint(BaseModel):
 
 class DecodePayment(BaseModel):
     data: str
-    filter_fields: Optional[list[str]] = []
+    filter_fields: list[str] | None = []
 
 
 class CreateInvoice(BaseModel):
@@ -198,14 +198,14 @@ class CreateInvoice(BaseModel):
     internal: bool = False
     out: bool = True
     amount: float = Query(None, ge=0)
-    memo: Optional[str] = None
-    description_hash: Optional[str] = None
-    unhashed_description: Optional[str] = None
-    expiry: Optional[int] = None
-    extra: Optional[dict] = None
-    webhook: Optional[str] = None
-    bolt11: Optional[str] = None
-    lnurl_callback: Optional[str] = None
+    memo: str | None = None
+    description_hash: str | None = None
+    unhashed_description: str | None = None
+    expiry: int | None = None
+    extra: dict | None = None
+    webhook: str | None = None
+    bolt11: str | None = None
+    lnurl_callback: str | None = None
 
     @validator("unit")
     @classmethod

lnbits/core/models/users.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime, timezone
-from typing import Optional
 from uuid import UUID
 
 from fastapi import Query
@@ -17,16 +16,16 @@ from .wallets import Wallet
 
 
 class UserExtra(BaseModel):
-    email_verified: Optional[bool] = False
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    display_name: Optional[str] = None
-    picture: Optional[str] = None
+    email_verified: bool | None = False
+    first_name: str | None = None
+    last_name: str | None = None
+    display_name: str | None = None
+    picture: str | None = None
     # Auth provider, possible values:
     # - "env": the user was created automatically by the system
     # - "lnbits": the user was created via register form (username/pass or user_id only)
     # - "google | github | ...": the user was created using an SSO provider
-    provider: Optional[str] = "lnbits"  # auth provider
+    provider: str | None = "lnbits"  # auth provider
 
 
 class EndpointAccess(BaseModel):
@@ -50,13 +49,13 @@ class AccessControlList(BaseModel):
     endpoints: list[EndpointAccess] = []
     token_id_list: list[SimpleItem] = []
 
-    def get_endpoint(self, path: str) -> Optional[EndpointAccess]:
+    def get_endpoint(self, path: str) -> EndpointAccess | None:
         for e in self.endpoints:
             if e.path == path:
                 return e
         return None
 
-    def get_token_by_id(self, token_id: str) -> Optional[SimpleItem]:
+    def get_token_by_id(self, token_id: str) -> SimpleItem | None:
         for t in self.token_id_list:
             if t.id == token_id:
                 return t
@@ -71,7 +70,7 @@ class UserAcls(BaseModel):
     access_control_list: list[AccessControlList] = []
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
-    def get_acl_by_id(self, acl_id: str) -> Optional[AccessControlList]:
+    def get_acl_by_id(self, acl_id: str) -> AccessControlList | None:
         for acl in self.access_control_list:
             if acl.id == acl_id:
                 return acl
@@ -82,7 +81,7 @@ class UserAcls(BaseModel):
             acl for acl in self.access_control_list if acl.id != acl_id
         ]
 
-    def get_acl_by_token_id(self, token_id: str) -> Optional[AccessControlList]:
+    def get_acl_by_token_id(self, token_id: str) -> AccessControlList | None:
         for acl in self.access_control_list:
             if acl.get_token_by_id(token_id):
                 return acl
@@ -91,10 +90,10 @@ class UserAcls(BaseModel):
 
 class Account(BaseModel):
     id: str
-    username: Optional[str] = None
-    password_hash: Optional[str] = None
-    pubkey: Optional[str] = None
-    email: Optional[str] = None
+    username: str | None = None
+    password_hash: str | None = None
+    pubkey: str | None = None
+    email: str | None = None
     extra: UserExtra = UserExtra()
 
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -134,10 +133,10 @@ class Account(BaseModel):
 
 
 class AccountOverview(Account):
-    transaction_count: Optional[int] = 0
-    wallet_count: Optional[int] = 0
-    balance_msat: Optional[int] = 0
-    last_payment: Optional[datetime] = None
+    transaction_count: int | None = 0
+    wallet_count: int | None = 0
+    balance_msat: int | None = 0
+    last_payment: datetime | None = None
 
 
 class AccountFilters(FilterModel):
@@ -151,20 +150,20 @@ class AccountFilters(FilterModel):
         "last_payment",
     ]
 
-    email: Optional[str] = None
-    user: Optional[str] = None
-    username: Optional[str] = None
-    pubkey: Optional[str] = None
-    wallet_id: Optional[str] = None
+    email: str | None = None
+    user: str | None = None
+    username: str | None = None
+    pubkey: str | None = None
+    wallet_id: str | None = None
 
 
 class User(BaseModel):
     id: str
     created_at: datetime
     updated_at: datetime
-    email: Optional[str] = None
-    username: Optional[str] = None
-    pubkey: Optional[str] = None
+    email: str | None = None
+    username: str | None = None
+    pubkey: str | None = None
     extensions: list[str] = []
     wallets: list[Wallet] = []
     admin: bool = False
@@ -176,7 +175,7 @@ class User(BaseModel):
     def wallet_ids(self) -> list[str]:
         return [wallet.id for wallet in self.wallets]
 
-    def get_wallet(self, wallet_id: str) -> Optional[Wallet]:
+    def get_wallet(self, wallet_id: str) -> Wallet | None:
         w = [wallet for wallet in self.wallets if wallet.id == wallet_id]
         return w[0] if w else None
 
@@ -192,33 +191,33 @@ class User(BaseModel):
 
 
 class RegisterUser(BaseModel):
-    email: Optional[str] = Query(default=None)
+    email: str | None = Query(default=None)
     username: str = Query(default=..., min_length=2, max_length=20)
     password: str = Query(default=..., min_length=8, max_length=50)
     password_repeat: str = Query(default=..., min_length=8, max_length=50)
 
 
 class CreateUser(BaseModel):
-    id: Optional[str] = Query(default=None)
-    email: Optional[str] = Query(default=None)
-    username: Optional[str] = Query(default=None, min_length=2, max_length=20)
-    password: Optional[str] = Query(default=None, min_length=8, max_length=50)
-    password_repeat: Optional[str] = Query(default=None, min_length=8, max_length=50)
+    id: str | None = Query(default=None)
+    email: str | None = Query(default=None)
+    username: str | None = Query(default=None, min_length=2, max_length=20)
+    password: str | None = Query(default=None, min_length=8, max_length=50)
+    password_repeat: str | None = Query(default=None, min_length=8, max_length=50)
     pubkey: str = Query(default=None, max_length=64)
-    extensions: Optional[list[str]] = None
-    extra: Optional[UserExtra] = None
+    extensions: list[str] | None = None
+    extra: UserExtra | None = None
 
 
 class UpdateUser(BaseModel):
     user_id: str
-    email: Optional[str] = Query(default=None)
-    username: Optional[str] = Query(default=..., min_length=2, max_length=20)
-    extra: Optional[UserExtra] = None
+    email: str | None = Query(default=None)
+    username: str | None = Query(default=..., min_length=2, max_length=20)
+    extra: UserExtra | None = None
 
 
 class UpdateUserPassword(BaseModel):
     user_id: str
-    password_old: Optional[str] = None
+    password_old: str | None = None
     password: str = Query(default=..., min_length=8, max_length=50)
     password_repeat: str = Query(default=..., min_length=8, max_length=50)
     username: str = Query(default=..., min_length=2, max_length=20)
@@ -252,10 +251,10 @@ class LoginUsernamePassword(BaseModel):
 
 class AccessTokenPayload(BaseModel):
     sub: str
-    usr: Optional[str] = None
-    email: Optional[str] = None
-    auth_time: Optional[int] = 0
-    api_token_id: Optional[str] = None
+    usr: str | None = None
+    email: str | None = None
+    auth_time: int | None = 0
+    api_token_id: str | None = None
 
 
 class UpdateBalance(BaseModel):

lnbits/core/models/wallets.py

@@ -5,7 +5,6 @@ import hmac
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
-from typing import Optional
 
 from ecdsa import SECP256k1, SigningKey
 from pydantic import BaseModel, Field
@@ -37,7 +36,7 @@ class Wallet(BaseModel):
     deleted: bool = False
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    currency: Optional[str] = None
+    currency: str | None = None
     balance_msat: int = Field(default=0, no_database=True)
     extra: WalletExtra = WalletExtra()
 
@@ -67,7 +66,7 @@ class Wallet(BaseModel):
 
 
 class CreateWallet(BaseModel):
-    name: Optional[str] = None
+    name: str | None = None
 
 
 class KeyType(Enum):