What changed, and why it matters
This is a large dependency upgrade from Pydantic 1 to Pydantic 2 across the LNbits project. Most changes are mechanical renames (e.g., dict() to model_dump(), parse_obj() to model_validate()). A few small functional changes are mixed in: invoice creation now explicitly rejects missing amounts, daily withdrawal limit checks are paginated and abort on shutdown, JWT account lookup now checks usr before sub, and validation error responses no longer include raw user input. The commit does not describe itself as a security fix, but the upgrade removes a known Pydantic 1 validator cache workaround and may affect input validation behavior across the API.
Treat this as a high-risk dependency migration. Run the full test suite, add differential tests comparing Pydantic 1 and 2 validation outcomes for security-critical models (payments, invoices, auth payloads, onchain PSBTs, scheduler policies), and review any extension code not covered by the core diff. Pay special attention to the JWT claim ordering change and the new explicit amount checks to ensure no unintended access or business-logic regressions.
Security signals we found
Dependency major-version upgrade (Pydantic 1 -> 2) with broad validation behavior changes
Removal of Pydantic v1 duplicate-validator cache workaround in extension route registration
JWT account resolution reordered to prefer 'usr' claim over 'sub' claim
Validation error handler now strips raw user input from error responses to avoid leaking input data
Invoice creation now explicitly rejects missing amount, closing a potential Pydantic 2 coercion gap
Daily withdraw limit loop now aborts on shutdown instead of continuing with partial results
User cache clearing now includes inactive users (active_only=False change)
Evidence from the diff
The commit upgrades LNbits from Pydantic v1 to v2. It replaces deprecated v1 APIs throughout models, CRUD, services, views, and tests. Notable non-mechanical changes include: (1) CreateInvoice.amount changed from float = Query(None, ge=0) to float | None = Query(None, ge=0), with explicit ValueError raises in create_fiat_invoice and create_wallet_invoice when amount is None; (2) check_wallet_daily_withdraw_limit rewritten to paginate get_payments and break/raise PaymentError on shutdown; (3) _get_account_from_jwt_payload reordered to prefer payload.usr over payload.sub; (4) validation_exception_handler now strips raw ‘input’ from Pydantic errors before logging/responding; (5) removal of the Pydantic v1 _FUNCS cache clearing workaround in register_ext_routes; (6) clear_user_id_cache changed from active_only=True to active_only=False. The diff is too large to fully verify behavioral equivalence, and Pydantic 2 validation differences could introduce subtle regressions.
Changed components
lnbits/core/models/*lnbits/core/crud/*lnbits/core/services/*lnbits/core/views/*lnbits/core/wasm_ext/*lnbits/db.pylnbits/decorators.pylnbits/exceptions.pylnbits/settings.pylnbits/helpers.pylnbits/nodes/*lnbits/fiat/*lnbits/wallets/*Inspect captured patch +1548 / −753
### AGENTS.md
@@ -18,6 +18,7 @@ This file guides AI coding agents working on LNbits. Keep changes small, verifie
- Follow existing patterns in `lnbits/core`, `lnbits/wallets`, `lnbits/extensions`, and frontend code.
- Place private functions at the bottom of the file and private methods at the bottom of the class.
- Use existing CRUD, services, settings, and migration patterns.
+- Always use `while settings.lnbits_running:` instead of `while True:` for open-ended loops so they respect application shutdown. If shutdown interrupts a validation loop, reject the operation rather than accepting incomplete results.
- Do not edit generated files, bundled vendor files, or unrelated extension code.
## Security-Sensitive Areas
### docs/devs/extensions.md
@@ -45,6 +45,30 @@ For persistent background jobs, see the [core scheduler](scheduler.md).
... This document is a work-in-progress. Send pull requests if you get stuck, so others don't.
+## Pydantic 2
+
+LNbits uses Pydantic 2. Python extensions must use native Pydantic 2 models when
+passing models to LNbits database helpers or API routes. Existing extensions that
+depend on Pydantic 1 behavior need to be migrated and checked before upgrading.
+
+- Import models from `pydantic`; import `BaseSettings` from `pydantic_settings`.
+- Give optional fields explicit defaults: `memo: str | None = None`. Without a
+ default, Pydantic 2 requires the field even when its value can be `None`.
+- Replace `dict()`, `json()`, `parse_obj()`, and `copy()` with `model_dump()`,
+ `model_dump_json()`, `model_validate()`, and `model_copy()` respectively.
+- Replace `validator` / `root_validator` with `field_validator` / `model_validator`.
+ Use `mode="before"` instead of `pre=True`; after model validators receive `self`.
+- Replace `class Config` with `model_config = ConfigDict(...)`, `regex` with
+ `pattern`, and field introspection through `__fields__` with `model_fields`.
+- Mark fields excluded from database storage with
+ `Field(default=..., json_schema_extra={"no_database": True})`.
+- URL fields are URL objects. Use `str(url)` where a string is required, or
+ `model_dump(mode="json")` when preparing JSON-compatible data.
+
+See the [Pydantic migration guide](https://docs.pydantic.dev/2.12/migration/) for
+validation and serialization behavior changes. This upgrade does not change the
+WASM host interface or require a database schema migration.
+
## Adding new dependencies
DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are available in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others.
### lnbits/app.py
@@ -509,18 +509,6 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
]
for k in stale:
del sys.modules[k]
- if stale:
- # Pydantic v1 keeps a global _FUNCS set of validator qualnames to detect
- # duplicates. Clear the extension's entries so reimport doesn't raise
- # "duplicate validator" errors for validators with the same qualname.
- try:
- import pydantic.class_validators as _pydantic_cv
-
- _pydantic_cv._FUNCS = {
- f for f in _pydantic_cv._FUNCS if not f.startswith(f"{module_name}.")
- }
- except (ImportError, AttributeError):
- pass
ext_module = importlib.import_module(module_name)
ext_route = getattr(ext_module, f"{ext.code}_ext")
### lnbits/commands.py
@@ -742,7 +742,7 @@ def _admin_auth_headers(user_id: str) -> dict[str, str]:
account it could otherwise modify directly grants it nothing new.
"""
payload = AccessTokenPayload(sub="", usr=user_id, auth_time=int(time.time()))
- token = create_access_token(data=payload.dict(), token_expire_minutes=5)
+ token = create_access_token(data=payload.model_dump(), token_expire_minutes=5)
return {"Authorization": f"Bearer {token}"}
@@ -756,7 +756,7 @@ async def _call_install_extension(
async with httpx.AsyncClient() as client:
resp = await client.post(
f"{url}/api/v1/extension",
- json=data.dict(),
+ json=data.model_dump(),
headers=_admin_auth_headers(user_id),
timeout=40,
)
### lnbits/core/crud/onchain.py
@@ -7,7 +7,7 @@
from lnbits.helpers import urlsafe_short_hash
from lnbits.utils.onchain import derive_address
-ADDRESS_COLUMNS = ", ".join(Address.__fields__)
+ADDRESS_COLUMNS = ", ".join(Address.model_fields)
async def create_address(address: Address, conn: Connection | None = None) -> None:
### lnbits/core/crud/scheduler.py
@@ -30,7 +30,7 @@ async def save_scheduled_job(job: ScheduledJob) -> ScheduledJob:
AND (scheduled_jobs.user_id = excluded.user_id
OR (scheduled_jobs.user_id IS NULL AND excluded.user_id IS NULL))
""",
- job.dict(),
+ job.model_dump(),
)
if result.rowcount != 1:
raise PermissionError(
@@ -199,7 +199,7 @@ async def finish_scheduled_job(job: ScheduledJob, next_run: int | None) -> None:
lease_token = NULL, lease_until = 0
WHERE id = :id AND lease_token = :lease_token
""",
- {**job.dict(), "next_run": next_run},
+ {**job.model_dump(), "next_run": next_run},
)
@@ -226,7 +226,7 @@ async def create_scheduled_job_run(job: ScheduledJob, now: float) -> ScheduledJo
VALUES (:id, :job_id, :namespace, :handler, :scope, :timezone,
:scheduled_at, :started_at, :status, :lease_token, :user_id)
""",
- {**run.dict(), "lease_token": job.lease_token, "user_id": job.user_id},
+ {**run.model_dump(), "lease_token": job.lease_token, "user_id": job.user_id},
)
return run
### lnbits/core/crud/settings.py
@@ -18,7 +18,7 @@
"onchain_key",
"lnbits_webpush_pubkey",
"lnbits_webpush_privkey",
- *FundingSourcesSettings.__fields__,
+ *FundingSourcesSettings.model_fields,
)
@@ -52,7 +52,7 @@ async def update_admin_settings(
data: EditableSettings, tag: str | None = "core"
) -> None:
editable_settings = await get_settings_by_tag("core") or {}
- editable_settings.update(data.dict(exclude_unset=True))
+ editable_settings.update(data.model_dump(exclude_unset=True))
for key, value in editable_settings.items():
try:
await set_settings_field(key, value, tag)
### lnbits/core/crud/users.py
@@ -71,7 +71,7 @@ async def update_account_credentials(
"username": account.username,
"password_hash": account.password_hash,
"updated_at": account.updated_at.timestamp(),
- "two_factor": config.json(),
+ "two_factor": config.model_dump_json(),
},
)
@@ -314,7 +314,7 @@ async def get_user_access_control_lists(
async def clear_user_id_cache(user_id: str):
- user = await get_user(user_id, active_only=True)
+ user = await get_user(user_id, active_only=False)
if user:
clear_user_cache(user)
@@ -338,11 +338,11 @@ async def get_two_factor_config(
if not row:
raise ValueError("Account not found.")
raw = row["two_factor"]
- return TwoFactorConfig.parse_raw(raw) if raw else TwoFactorConfig()
+ return TwoFactorConfig.model_validate_json(raw) if raw else TwoFactorConfig()
async def save_two_factor_config(user_id: str, config: TwoFactorConfig) -> None:
await db.execute(
"UPDATE accounts SET two_factor = :value WHERE id = :id",
- {"id": user_id, "value": config.json()},
+ {"id": user_id, "value": config.model_dump_json()},
)
### lnbits/core/crud/wallets.py
@@ -384,7 +384,7 @@ async def init_onchain_wallet_state(
encrypted_seed: str | None = None,
conn: Connection | None = None,
) -> OnchainWallet:
- meta = wallet.onchain_meta.copy()
+ meta = wallet.onchain_meta.model_copy()
meta.backup_confirmed = False
meta.sync_checked_at = 0
meta.sync_failed_at = 0
@@ -402,7 +402,7 @@ async def init_onchain_wallet_state(
{
"id": wallet.id,
"title": wallet.name,
- "meta": meta.json(by_alias=True),
+ "meta": meta.model_dump_json(by_alias=True),
"network": wallet.onchain_network,
"kind": wallet.onchain_wallet_kind,
"seed": encrypted_seed,
@@ -476,7 +476,7 @@ async def update_onchain_backup_confirmation(
"""UPDATE wallets SET onchain_meta = :meta
WHERE id = :id AND wallet_type = 'onchain'
AND onchain_wallet_kind = 'hot'""",
- {"id": wallet.id, "meta": wallet.onchain_meta.json(by_alias=True)},
+ {"id": wallet.id, "meta": wallet.onchain_meta.model_dump_json(by_alias=True)},
)
updated = await get_onchain_wallet(wallet.id, conn=conn)
assert updated
@@ -520,7 +520,7 @@ async def update_onchain_wallet_config(
OR onchain_network = :network)""",
{
"id": wallet_id,
- "config": config.json(exclude={"network"}),
+ "config": config.model_dump_json(exclude={"network"}),
"network": network,
},
)
### lnbits/core/models/extensions.py
@@ -15,7 +15,7 @@
import httpx
from loguru import logger
-from pydantic import BaseModel, Field, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
from lnbits.helpers import (
download_url,
@@ -39,18 +39,18 @@ class ExplicitRelease(BaseModel):
archive: str
hash: str
dependencies: list[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
- paid_features: str | None
- pay_link: str | None
+ repo: str | None = None
+ icon: str | None = None
+ short_description: str | None = None
+ min_lnbits_version: str | None = None
+ max_lnbits_version: str | None = None
+ html_url: str | None = None # todo: release_url
+ warning: str | None = None
+ info_notification: str | None = None
+ critical_notification: str | None = None
+ details_link: str | None = None
+ paid_features: str | None = None
+ pay_link: str | None = None
extension_type: str | None = None
def is_version_compatible(self):
@@ -96,13 +96,12 @@ class ExtensionPermission(BaseModel):
description: StrictStr | None = None
policies: list[Any] | None = None
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
@staticmethod
def list_from_config(config_json: Mapping[str, Any]) -> list[ExtensionPermission]:
return [
- ExtensionPermission.parse_obj(permission)
+ ExtensionPermission.model_validate(permission)
for permission in config_json.get("permissions") or []
if isinstance(permission, dict) and permission.get("id")
]
@@ -113,8 +112,8 @@ class ExtensionConfig(BaseModel):
short_description: str
tile: str = ""
warning: str | None = ""
- min_lnbits_version: str | None
- max_lnbits_version: str | None
+ min_lnbits_version: str | None = None
+ max_lnbits_version: str | None = None
extension_type: str | None = None
permissions: list[ExtensionPermission] = []
@@ -125,7 +124,7 @@ def is_version_compatible(self) -> bool:
async def fetch_release_config(cls, url: str) -> ExtensionConfig:
error_msg = "Cannot fetch extension release config"
config = await extension_metadata_get(url, error_msg)
- return ExtensionConfig.parse_obj(config)
+ return ExtensionConfig.model_validate(config)
@classmethod
async def fetch_github_release_config(
@@ -136,7 +135,7 @@ async def fetch_github_release_config(
)
error_msg = "Cannot fetch extension release config"
config = await github_api_get(config_url, error_msg)
- return ExtensionConfig.parse_obj(config)
+ return ExtensionConfig.model_validate(config)
class ReleasePaymentInfo(BaseModel):
@@ -479,7 +478,7 @@ async def fetch_github_releases(
releases_url = f"https://api.github.com/repos/{org}/{repo}/releases"
error_msg = "Cannot fetch extension releases"
releases = await github_api_get(releases_url, error_msg)
- return [GitHubRepoRelease.parse_obj(r) for r in releases]
+ return [GitHubRepoRelease.model_validate(r) for r in releases]
@classmethod
async def fetch_release_details(cls, details_link: str) -> dict | None:
@@ -523,7 +522,9 @@ class InstallableExtension(BaseModel):
stars: int = 0
meta: ExtensionMeta | None = None
permissions: list[ExtensionPermission] = []
- wasm_runtime_limits: dict = Field(default_factory=dict, no_database=True)
+ wasm_runtime_limits: dict = Field(
+ default_factory=dict, json_schema_extra={"no_database": True}
+ )
@property
def hash(self) -> str:
@@ -1112,7 +1113,7 @@ async def fetch_github_repo_info(
repo_url = f"https://api.github.com/repos/{org}/{repository}"
error_msg = "Cannot fetch extension repo"
repo = await github_api_get(repo_url, error_msg)
- github_repo = GitHubRepo.parse_obj(repo)
+ github_repo = GitHubRepo.model_validate(repo)
lates_release_url = (
f"https://api.github.com/repos/{org}/{repository}/releases/latest"
@@ -1126,15 +1127,15 @@ async def fetch_github_repo_info(
return (
github_repo,
- GitHubRepoRelease.parse_obj(latest_release),
- ExtensionConfig.parse_obj(config),
+ GitHubRepoRelease.model_validate(latest_release),
+ ExtensionConfig.model_validate(config),
)
@classmethod
async def fetch_manifest(cls, url) -> Manifest:
error_msg = "Cannot fetch extensions manifest"
manifest = await extension_metadata_get(url, error_msg)
- return Manifest.parse_obj(manifest)
+ return Manifest.model_validate(manifest)
class CreateExtension(BaseModel):
### lnbits/core/models/extensions_builder.py
@@ -6,7 +6,7 @@
from datetime import datetime, timedelta, timezone
from typing import Any, Literal
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
from lnbits.helpers import (
camel_to_snake,
@@ -55,6 +55,8 @@ def field_to_py(self) -> str:
field_type += " | None"
if self.type == "currency":
field_type += ' = "sat"'
+ elif self.optional:
+ field_type += " = None"
return f"{field_name}: {field_type}"
def field_to_random_value(self) -> str:
@@ -141,15 +143,17 @@ def field_mock_value(self, index: int) -> Any:
else:
return f"{self.name} {index}"
- @validator("name")
+ @field_validator("name")
+ @classmethod
def validate_name(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Field name is required.")
if not is_snake_case(v):
raise ValueError(f"Field Name must be snake_case. Found: {v}")
return v
- @validator("type")
+ @field_validator("type")
+ @classmethod
def validate_type(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Owner Data type is required")
@@ -171,15 +175,17 @@ def validate_type(cls, v: str) -> str:
)
return v
- @validator("label")
+ @field_validator("label")
+ @classmethod
def validate_label(cls, v: str | None) -> str | None:
if v and '"' in v:
raise ValueError(
f'Field label cannot contain double quotes ("). Value: {v}'
)
return v
- @validator("hint")
+ @field_validator("hint")
+ @classmethod
def validate_hint(cls, v: str | None) -> str | None:
if v and '"' in v:
raise ValueError(f'Field hint cannot contain double quotes ("). Value: {v}')
@@ -210,7 +216,8 @@ def get_field_by_name(self, name: str | None) -> DataField | None:
return field
return None
- @validator("name")
+ @field_validator("name")
+ @classmethod
def validate_name(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Data fields name is required")
@@ -223,7 +230,8 @@ class SettingsFields(DataFields):
enabled: bool = False
type: str = "user"
- @validator("type")
+ @field_validator("type")
+ @classmethod
def validate_type(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Settings type is required")
@@ -277,7 +285,7 @@ def __init__(self, **data):
class ExtensionData(BaseModel):
id: str
name: str
- stub_version: str | None
+ stub_version: str | None = None
short_description: str | None = None
description: str | None = None
owner_data: DataFields
@@ -434,51 +442,58 @@ def _validate_client_data_fields(self) -> None:
f" Received: {paid_flag_field.type}."
)
- @validator("id")
+ @field_validator("id")
+ @classmethod
def validate_id(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Extension ID is required")
if not is_snake_case(v):
raise ValueError(f"Extension Id must be snake_case. Found: {v}")
return v
- @validator("name")
+ @field_validator("name")
+ @classmethod
def validate_name(cls, v: str) -> str:
if v.strip() == "":
raise ValueError("Extension name is required")
return v
- @validator("stub_version")
+ @field_validator("stub_version")
+ @classmethod
def validate_stub_version(cls, v: str | None) -> str | None:
if v and '"' in v:
raise ValueError(
f'Extension stub version cannot contain double quotes ("). Value: {v}'
)
return v
- @validator("short_description")
+ @field_validator("short_description")
+ @classmethod
def validate_short_description(cls, v: str | None) -> str | None:
if v and '"' in v:
raise ValueError(
f'Field short description cannot contain double quotes ("). Value: {v}'
)
return v
- @validator("description")
+ @field_validator("description")
+ @classmethod
def validate_description(cls, v: str | None) -> str | None:
if v and '"' in v:
raise ValueError(
f'Field description cannot contain double quotes ("). Value: {v}'
)
return v
- @validator("owner_data")
+ @field_validator("owner_data")
+ @classmethod
def validate_owner_data(cls, v: DataFields) -> DataFields:
if len(v.fields) == 0:
raise ValueError("At least one owner data field is required")
return v
- @validator("client_data")
+ @field_validator("client_data")
+ @classmethod
def validate_client_data(cls, v: DataFields) -> DataFields:
if len(v.fields) == 0:
raise ValueError("At least one client data field is required")
### lnbits/core/models/lnurl.py
@@ -1,12 +1,18 @@
from time import time
+from typing import Annotated
from lnurl import LnAddress, Lnurl, LnurlPayResponse
-from pydantic import BaseModel, Field
+from lnurl.exceptions import LnAddressError
+from pydantic import BaseModel, Field, ValidateAs
+
+LightningAddress = Annotated[
+ LnAddress, ValidateAs(str, lambda value: _validate_lightning_address(value))
+]
class CreateLnurlPayment(BaseModel):
res: LnurlPayResponse | None = None
- lnurl: Lnurl | LnAddress | None = None
+ lnurl: Lnurl | LightningAddress | None = None
amount: int
comment: str | None = None
unit: str | None = None
@@ -18,7 +24,7 @@ class CreateLnurlWithdraw(BaseModel):
class LnurlScan(BaseModel):
- lnurl: Lnurl | LnAddress
+ lnurl: Lnurl | LightningAddress
class StoredPayLink(BaseModel):
@@ -29,3 +35,10 @@ class StoredPayLink(BaseModel):
class StoredPayLinks(BaseModel):
links: list[StoredPayLink] = []
+
+
+def _validate_lightning_address(value: str) -> LnAddress:
+ try:
+ return LnAddress(value)
+ except LnAddressError as exc:
+ raise ValueError("Invalid Lightning address.") from exc
### lnbits/core/models/onchain.py
@@ -2,7 +2,7 @@
from typing import Literal
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
class Address(BaseModel):
@@ -43,8 +43,8 @@ class MasterPublicKey(BaseModel):
class CreatePsbt(BaseModel):
masterpubs: list[MasterPublicKey]
- inputs: list[TransactionInput] = Field(..., min_items=1, max_items=200)
- outputs: list[TransactionOutput] = Field(..., min_items=1, max_items=100)
+ inputs: list[TransactionInput] = Field(..., min_length=1, max_length=200)
+ outputs: list[TransactionOutput] = Field(..., min_length=1, max_length=100)
fee_rate: int
tx_size: int
@@ -62,8 +62,7 @@ class ExtractPsbt(BaseModel):
inputs: list[SerializedTransaction]
network: Literal["Mainnet", "Testnet", "Testnet4"] = "Mainnet"
- class Config:
- allow_population_by_field_name = True
+ model_config = ConfigDict(populate_by_name=True)
class ExtractTx(BaseModel):
@@ -72,15 +71,15 @@ class ExtractTx(BaseModel):
class SignedTransaction(BaseModel):
- tx_hex: str | None
- tx_json: str | None
+ tx_hex: str | None = None
+ tx_json: str | None = None
class HotWalletPayment(BaseModel):
transaction: CreatePsbt
max_fee_sat: int = Field(..., gt=0, le=10_000_000)
- @validator("transaction", pre=True)
+ @field_validator("transaction", mode="before")
@classmethod
def whole_satoshis(cls, value):
if isinstance(value, dict):
@@ -92,7 +91,7 @@ def whole_satoshis(cls, value):
class ScanCheckpoint(BaseModel):
height: int = Field(ge=0)
- block_hash: str = Field(regex=r"^[0-9a-f]{64}$")
+ block_hash: str = Field(pattern=r"^[0-9a-f]{64}$")
class Snapshot(BaseModel):
### lnbits/core/models/payments.py
@@ -7,7 +7,7 @@
from fastapi import Query
from lnurl import LnurlWithdrawResponse
from loguru import logger
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, Field, field_validator, model_validator
from lnbits.db import FilterModel
from lnbits.fiat.base import (
@@ -58,7 +58,7 @@ class ChangePaymentStatus(BaseModel):
send_payment_notifications: bool = True
fee_msat: int = Field(default=0, ge=0)
preimage: str | None = Field(
- default=None, min_length=64, max_length=64, regex=r"^[0-9a-fA-F]+$"
+ default=None, min_length=64, max_length=64, pattern=r"^[0-9a-fA-F]+$"
)
@@ -75,7 +75,7 @@ class ValidatedPaymentRequest(BaseModel):
payment_request: str
amount_msat: int
payment_hash: str
- expiry_date: datetime | None
+ expiry_date: datetime | None = None
description: str
is_offer: bool
@@ -95,7 +95,8 @@ class CreatePayment(BaseModel):
labels: list[str] | None = None
external_id: str | None = None
- @validator("external_id")
+ @field_validator("external_id")
+ @classmethod
def validate_external_id(cls, external_id):
return _validate_external_id(external_id)
@@ -107,7 +108,9 @@ class Payment(BaseModel):
amount: int
fee: int
bolt11: str
- payment_request: str | None = Field(default=None, no_database=True)
+ payment_request: str | None = Field(
+ default=None, json_schema_extra={"no_database": True}
+ )
fiat_provider: str | None = None
status: str = PaymentState.PENDING
memo: str | None = None
@@ -124,7 +127,8 @@ class Payment(BaseModel):
extra: dict = {}
external_id: str | None = None
- @validator("external_id")
+ @field_validator("external_id")
+ @classmethod
def validate_external_id(cls, external_id):
return _validate_external_id(external_id)
@@ -223,18 +227,18 @@ class PaymentFilters(FilterModel):
"external_id",
]
- status: str | None
- tag: str | None
- checking_id: str | None
- external_id: str | None
+ status: str | None = None
+ tag: str | None = None
+ checking_id: str | None = None
+ external_id: str | None = None
amount: int
fee: int
- memo: str | None
+ memo: str | None = None
time: datetime
- preimage: str | None
- payment_hash: str | None
- wallet_id: str | None
- labels: str | None
+ preimage: str | None = None
+ payment_hash: str | None = None
+ wallet_id: str | None = None
+ labels: str | None = None
class PaymentDataPoint(BaseModel):
@@ -300,7 +304,7 @@ class CreateInvoice(BaseModel):
unit: str = "sat"
internal: bool = False
out: bool = True
- amount: float = Query(None, ge=0)
+ amount: float | None = Query(None, ge=0)
memo: str | None = Query(None, max_length=640)
description_hash: str | None = None
unhashed_description: str | None = None
@@ -330,24 +334,27 @@ class CreateInvoice(BaseModel):
def is_fiat_subscription(self) -> bool:
return (self.extra or {}).get("fiat_method") == "subscription"
- @validator("payment_hash")
+ @field_validator("payment_hash")
+ @classmethod
def check_hex(cls, v):
if v:
_ = bytes.fromhex(v)
return v
- @validator("unit")
+ @field_validator("unit")
@classmethod
def unit_is_from_allowed_currencies(cls, v):
if v != "sat" and v not in allowed_currencies():
raise ValueError("The provided unit is not supported")
return v
- @validator("external_id")
+ @field_validator("external_id")
+ @classmethod
def validate_external_id(cls, external_id):
return _validate_external_id(external_id)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def _normalize_payment_request(cls, values: dict) -> dict:
payment_request = values.get("payment_request")
bolt11 = values.get("bolt11")
@@ -373,7 +380,8 @@ class SettleInvoice(BaseModel):
max_length=64,
)
- @validator("preimage")
+ @field_validator("preimage")
+ @classmethod
def check_hex(cls, v):
_ = bytes.fromhex(v)
return v
@@ -387,7 +395,8 @@ class CancelInvoice(BaseModel):
max_length=64,
)
- @validator("payment_hash")
+ @field_validator("payment_hash")
+ @classmethod
def check_hex(cls, v):
_ = bytes.fromhex(v)
return v
### lnbits/core/models/scheduler.py
@@ -3,7 +3,7 @@
from uuid import uuid4
from zoneinfo import ZoneInfo
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
from lnbits.db import FilterModel
from lnbits.utils.cron import normalize_cron
@@ -14,18 +14,19 @@
class SchedulePolicy(BaseModel):
- handler: str = Field(..., regex=r"^[A-Za-z0-9_-]{1,128}$")
+ handler: str = Field(..., pattern=r"^[A-Za-z0-9_-]{1,128}$")
cron_expression: str = Field(..., min_length=1, max_length=256)
timezone: str = Field(default="UTC", max_length=128)
- class Config:
- extra = "forbid"
+ model_config = ConfigDict(extra="forbid")
- @validator("cron_expression")
+ @field_validator("cron_expression")
+ @classmethod
def validate_cron(cls, expression: str) -> str:
return normalize_cron(expression)
- @validator("timezone")
+ @field_validator("timezone")
+ @classmethod
def validate_timezone(cls, zone: str) -> str:
try:
ZoneInfo(zone)
@@ -46,7 +47,7 @@ def parse_policies(
if not isinstance(policy, dict):
raise ValueError("Schedule policy must be an object.")
model = UserSchedulePolicy if user_scope else SchedulePolicy
- schedule = model.parse_obj(policy)
+ schedule = model.model_validate(policy)
if schedule.handler in parsed:
raise ValueError(
"Schedule policies must have unique handlers per scope."
@@ -58,7 +59,8 @@ def parse_policies(
class UserSchedulePolicy(SchedulePolicy):
max_jobs_per_user: int = Field(default=10, ge=1)
- @validator("max_jobs_per_user", pre=True)
+ @field_validator("max_jobs_per_user", mode="before")
+ @classmethod
def validate_job_limit(cls, value: Any) -> int:
if isinstance(value, bool) or not isinstance(value, int):
raise ValueError("Max jobs per user must be a positive integer.")
@@ -67,12 +69,13 @@ def validate_job_limit(cls, value: Any) -> int:
class ScheduleConfig(SchedulePolicy):
id: str = Field(
- default_factory=lambda: uuid4().hex, regex=r"^[A-Za-z0-9_.:-]{1,128}$"
+ default_factory=lambda: uuid4().hex, pattern=r"^[A-Za-z0-9_.:-]{1,128}$"
)
payload_json: str = Field(default="{}", max_length=8192)
enabled: bool = True
- @validator("payload_json")
+ @field_validator("payload_json")
+ @classmethod
def validate_payload(cls, value: str) -> str:
payload = json.loads(value)
if not isinstance(payload, dict):
@@ -95,7 +98,9 @@ class ScheduledJob(ScheduleConfig):
lease_until: int = 0
def public_data(self) -> dict:
- return self.dict(exclude={"namespace", "user_id", "lease_token", "lease_until"})
+ return self.model_dump(
+ exclude={"namespace", "user_id", "lease_token", "lease_until"}
+ )
class ScheduledJobRun(BaseModel):
### lnbits/core/models/users.py
@@ -5,7 +5,7 @@
from bcrypt import checkpw, gensalt, hashpw
from fastapi import Query
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, field_validator
from lnbits.core.models.misc import SimpleItem
from lnbits.db import FilterModel
@@ -38,10 +38,10 @@ class WalletInviteRequest(BaseModel):
class UserLabel(BaseModel):
- name: str = Field(regex=r"([A-Za-z0-9 ._-]{1,100}$)")
+ name: str = Field(pattern=r"^[A-Za-z0-9 ._-]{1,100}$")
description: str | None = Field(default=None, max_length=250)
color: str | None = Field(
- default=None, regex=r"^#[0-9A-Fa-f]{6}$"
+ default=None, pattern=r"^#[0-9A-Fa-f]{6}$"
) # e.g., "#RRGGBB"
@@ -193,9 +193,11 @@ class Account(AccountId):
created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
- is_super_user: bool = Field(default=False, no_database=True)
- is_admin: bool = Field(default=False, no_database=True)
- fiat_providers: list[str] = Field(default=[], no_database=True)
+ is_super_user: bool = Field(default=False, json_schema_extra={"no_database": True})
+ is_admin: bool = Field(default=False, json_schema_extra={"no_database": True})
+ fiat_providers: list[str] = Field(
+ default=[], json_schema_extra={"no_database": True}
+ )
def __init__(self, **data):
super().__init__(**data)
@@ -328,8 +330,8 @@ class CreateUser(BaseModel):
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)
- external_id: str = Query(default=None, max_length=256)
+ pubkey: str | None = Query(default=None, max_length=64)
+ external_id: str | None = Query(default=None, max_length=256)
extensions: list[str] | None = None
extra: UserExtra | None = None
@@ -394,7 +396,8 @@ class UpdateBalance(BaseModel):
amount: int
memo: str | None = Field(default=None, max_length=639)
- @validator("memo")
+ @field_validator("memo")
+ @classmethod
def memo_max_bytes(cls, value: str | None) -> str | None:
# bolt11 invoice descriptions are limited to 639 bytes
if value and len(value.encode("utf-8")) > 639:
### lnbits/core/models/wallets.py
@@ -7,7 +7,7 @@
from typing import Literal
from urllib.parse import urlsplit
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
from lnbits.core.models.lnurl import StoredPayLinks
from lnbits.core.models.onchain import ScanCheckpoint
@@ -134,19 +134,21 @@ class Wallet(BaseWallet):
currency: str | None = None
lightning_address: str | None = None
onchain_network: Literal["Mainnet", "Testnet", "Testnet4"] | None = None
- balance_msat: int = Field(default=0, no_database=True)
+ balance_msat: int = Field(default=0, json_schema_extra={"no_database": True})
extra: WalletExtra = WalletExtra()
stored_paylinks: StoredPayLinks = StoredPayLinks()
# What permission this wallet has when it's a shared wallet
- share_permissions: list[WalletPermission] = Field(default=[], no_database=True)
+ share_permissions: list[WalletPermission] = Field(
+ default=[], json_schema_extra={"no_database": True}
+ )
def __init__(self, **data):
super().__init__(**data)
self._validate_data()
def copy_with_keys(self, keep: bool = True) -> Wallet:
"""Return a wallet copy, masking its credentials when keep is False."""
- wallet = self.copy()
+ wallet = self.model_copy()
if not keep:
wallet.adminkey = "*" * 32
wallet.inkey = "*" * 32
@@ -283,10 +285,10 @@ class WalletsFilters(FilterModel):
"updated_at",
]
- id: str | None
- name: str | None
- currency: str | None
- lightning_address: str | None
+ id: str | None = None
+ name: str | None = None
+ currency: str | None = None
+ lightning_address: str | None = None
class OnchainMeta(BaseModel):
@@ -309,7 +311,7 @@ class OnchainConfig(BaseModel):
change_gap_limit: int = Field(default=5, ge=1, le=1000)
sats_denominated: bool = True
- @validator("mempool_endpoint")
+ @field_validator("mempool_endpoint")
@classmethod
def valid_endpoint(cls, value):
url = urlsplit(value)
@@ -359,7 +361,7 @@ class NewHotWallet(BaseModel):
script_type: Literal["p2pkh", "p2sh", "p2wpkh", "p2tr"] = "p2wpkh"
account_path: str | None = Field(None, min_length=1, max_length=3037)
- @validator("account_path")
+ @field_validator("account_path")
@classmethod
def valid_account_path(cls, value: str | None) -> str | None:
if value is None:
@@ -380,5 +382,4 @@ def valid_account_path(cls, value: str | None) -> str | None:
str(int(p.rstrip("'"))) + ("'" if p.endswith("'") else "") for p in parts
)
- class Config:
- extra = "forbid"
+ model_config = ConfigDict(extra="forbid")
### lnbits/core/services/extensions.py
@@ -55,7 +55,7 @@
)
_WASM_INVOCATION_CLEANUP_INTERVAL = timedelta(hours=1)
-WASM_RUNTIME_LIMIT_FIELDS = tuple(WasmRuntimeLimits.__fields__.keys())
+WASM_RUNTIME_LIMIT_FIELDS = tuple(WasmRuntimeLimits.model_fields.keys())
@dataclass
@@ -468,7 +468,7 @@ def get_current_wasm_invocations(
for handle in _wasm_invocation_handles.values():
if extension_id and handle.invocation.extension_id != extension_id:
continue
- invocation = handle.invocation.copy(deep=True)
+ invocation = handle.invocation.model_copy(deep=True)
if handle.stop_requested and invocation.status == "running":
invocation.status = "stopping"
invocation.stop_reason = handle.stop_reason
### lnbits/core/services/extensions_builder.py
@@ -97,7 +97,7 @@ def _transform_extension_builder_stub(data: ExtensionData, extension_dir: Path)
def _export_extension_data_json(data: ExtensionData, build_dir: Path):
json.dump(
- data.dict(),
+ data.model_dump(),
open(Path(build_dir, "builder.json"), "w", encoding="utf-8"),
indent=4,
)
@@ -133,7 +133,7 @@ async def _get_extension_stub_release(
logger.debug(f"Save release cache {stub_ext_id} ({stub_version}).")
with open(release_cache_file, "w", encoding="utf-8") as f:
- f.write(json.dumps(release.dict(), indent=4))
+ f.write(json.dumps(release.model_dump(), indent=4))
return release
@@ -290,7 +290,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
{
"extension_builder_stub_public_client_inputs": public_client_inputs,
"preview": data.preview_action,
- **data.public_page.action_fields.dict(),
+ **data.public_page.action_fields.model_dump(),
"cancel_comment": remove_line_marker,
},
)
### lnbits/core/services/lightning_address.py
@@ -11,7 +11,7 @@
LnurlPayResponse,
MilliSatoshi,
)
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
from lnbits.core.crud.wallets import (
get_wallet,
@@ -78,7 +78,7 @@ async def wallet_lightning_address_response(
)
identifier = _lightning_address_for_request(request, tagged_local_part)
return LnurlPayResponse(
- callback=parse_obj_as(CallbackUrl, str(callback)),
+ callback=TypeAdapter(CallbackUrl).validate_python(str(callback)),
minSendable=MilliSatoshi(1000),
maxSendable=MilliSatoshi(MAX_SENDABLE_MSAT),
metadata=LnurlPayMetadata(json.dumps(_metadata(identifier, tag))),
@@ -133,7 +133,9 @@ async def wallet_lightning_address_callback(
unhashed_description=metadata.encode(),
extra=extra,
)
- invoice = parse_obj_as(LightningInvoice, LightningInvoice(payment.bolt11))
+ invoice = TypeAdapter(LightningInvoice).validate_python(
+ LightningInvoice(payment.bolt11)
+ )
return LnurlPayActionResponse(pr=invoice, disposable=False)
### lnbits/core/services/lnurl.py
@@ -31,14 +31,15 @@
from lnurl.models import LnurlResponseModel
from lnurl.types import CallbackUrl
from loguru import logger
-from pydantic import ValidationError, parse_obj_as
+from pydantic import TypeAdapter, ValidationError
from lnbits.core.crud import update_wallet
from lnbits.core.models import CreateLnurlPayment, Wallet
from lnbits.core.models.lnurl import StoredPayLink
from lnbits.helpers import check_callback_url
from lnbits.settings import settings
from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
+from lnbits.utils.network import is_global_address
LNURL_MAX_REDIRECTS = 3
LNURL_MAX_RESPONSE_BYTES = 262_144
@@ -67,9 +68,9 @@ async def handle(
raise InvalidLnurl from exc
if parsed_lnurl.is_login:
- callback = parse_obj_as(CallbackUrl, parsed_lnurl.url)
+ callback = TypeAdapter(CallbackUrl).validate_python(parsed_lnurl.url)
return LnurlAuthResponse(
- callback=callback, k1=parsed_lnurl.url.query_params["k1"]
+ callback=callback, k1=dict(parsed_lnurl.url.query_params())["k1"]
)
return await _get(
@@ -159,7 +160,7 @@ async def perform_withdraw(lnurl: str, payment_request: str) -> None:
if not isinstance(res, LnurlWithdrawResponse):
raise LnurlResponseException("Invalid LNURL-withdraw response.")
try:
- check_callback_url(res.callback)
+ check_callback_url(str(res.callback))
except ValueError as exc:
raise LnurlResponseException(f"Invalid callback URL: {exc!s}") from exc
res2 = await execute_withdraw(
@@ -452,7 +453,7 @@ async def _validate_lnurl_request_url(
):
raise LnurlResponseException("LNURL request target is not allowed over HTTP.")
if not settings.lnbits_lnurl_allow_private_ips and any(
- not address.is_global for address in addresses
+ not is_global_address(address) for address in addresses
):
raise LnurlResponseException(
"LNURL request target resolves to a private or non-global IP address."
### lnbits/core/services/notifications.py
@@ -36,6 +36,7 @@
from lnbits.core.services.websockets import websocket_manager
from lnbits.helpers import check_callback_url, is_valid_email_address
from lnbits.settings import settings
+from lnbits.utils.network import is_global_address
from lnbits.utils.nostr import normalize_private_key
notifications_queue: asyncio.Queue[NotificationMessage] = asyncio.Queue()
@@ -348,15 +349,15 @@ async def send_notification_in_background(
async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
# TODO: websocket message should be a clean payment model
- # await websocket_manager.send(wallet.inkey, payment.json())
+ # await websocket_manager.send(wallet.inkey, payment.model_dump_json())
# TODO: figure out why we send the balance with the payment here.
# cleaner would be to have a separate message for the balance
# and send it with the id of the wallet so wallets can subscribe to it
payment_notification = json.dumps(
{
"wallet_balance": wallet.balance,
# use pydantic json serialization to get the correct datetime format
- "payment": json.loads(payment.json()),
+ "payment": json.loads(payment.model_dump_json()),
},
)
await websocket_manager.send(wallet.inkey, payment_notification)
@@ -490,7 +491,7 @@ async def _post_webhook(payment: Payment) -> int:
addresses = await _resolve_webhook_host(parsed.hostname, parsed.port)
if not settings.lnbits_callback_allow_private_ips and any(
- not address.is_global for address in addresses
+ not is_global_address(address) for address in addresses
):
raise ValueError("Webhook target IP address is not allowed.")
@@ -507,7 +508,7 @@ async def _post_webhook(payment: Payment) -> int:
request_url,
headers=headers,
extensions={"sni_hostname": parsed.hostname},
- json=payment.json(),
+ json=payment.model_dump_json(),
timeout=40,
)
response.raise_for_status()
### lnbits/core/services/onchain.py
@@ -230,7 +230,7 @@ def decrypt_wallet_mnemonic(encrypted: str, wallet: OnchainWallet) -> str:
def sign_payment( # noqa: C901
wallet: OnchainWallet, encrypted: str, payment: HotWalletPayment
) -> SignedTransaction:
- data = payment.transaction.copy(deep=True)
+ data = payment.transaction.model_copy(deep=True)
if not wallet.onchain_network:
raise ValueError("Onchain wallet network is not configured")
if not wallet.onchain_meta.backup_confirmed:
@@ -354,7 +354,7 @@ def scan_skip_reason(
) -> str | None:
if status.get("onchain_sync_lease_until", 0) > now:
return "another scan holds the wallet lease"
- meta = OnchainMeta.parse_raw(status.get("onchain_meta", "{}"))
+ meta = OnchainMeta.model_validate_json(status.get("onchain_meta", "{}"))
if meta.sync_error:
if now - meta.sync_failed_at < SCAN_RETRY_DELAY:
return f"retry cooldown is active ({SCAN_RETRY_DELAY}s)"
@@ -438,7 +438,7 @@ async def get_wallet_state(wallet_id: str) -> dict:
)
snapshots = await get_wallet_snapshots(wallet_id)
status = await get_onchain_sync_status(wallet_id)
- meta = OnchainMeta.parse_raw(status.get("onchain_meta", "{}"))
+ meta = OnchainMeta.model_validate_json(status.get("onchain_meta", "{}"))
balances: dict[str, int] = {}
for address in addresses:
balances[address.address] = max(
@@ -604,7 +604,7 @@ async def _finish_scan(
if error is None:
state["sync_checked_at"] = now
if checkpoint is not None:
- state["sync_checkpoint"] = checkpoint.dict()
+ state["sync_checkpoint"] = checkpoint.model_dump()
row = await get_onchain_scan_meta(wallet_id, lease, conn)
if not row:
return False
### lnbits/core/services/payments.py
@@ -163,6 +163,8 @@ async def create_payment_request(
async def create_fiat_invoice(
wallet_id: str, invoice_data: CreateInvoice, conn: Connection | None = None
) -> Payment:
+ if invoice_data.amount is None:
+ raise ValueError("Invoice amount is required.")
fiat_provider_name = invoice_data.fiat_provider
if not fiat_provider_name:
raise ValueError("Fiat provider is required for fiat invoices.")
@@ -232,6 +234,8 @@ async def create_fiat_invoice(
async def create_wallet_invoice(wallet_id: str, data: CreateInvoice) -> Payment:
+ if data.amount is None:
+ raise ValueError("Invoice amount is required.")
if data.webhook:
check_callback_url(data.webhook)
@@ -277,7 +281,7 @@ async def create_wallet_invoice(wallet_id: str, data: CreateInvoice) -> Payment:
if data.lnurl_withdraw:
try:
- check_callback_url(data.lnurl_withdraw.callback)
+ check_callback_url(str(data.lnurl_withdraw.callback))
await lnurl_withdraw(
data.lnurl_withdraw,
payment.bolt11,
@@ -639,18 +643,27 @@ async def check_wallet_daily_withdraw_limit(
if limit < 0:
raise ValueError("It is not allowed to spend funds from this server.")
- payments = await get_payments(
- since=daystart_timestamp(),
- outgoing=True,
- wallet_id=wallet_id,
- conn=conn,
- )
- if len(payments) == 0:
- return
-
total = 0
- for pay in payments:
- total += pay.amount
+ offset = 0
+ since = daystart_timestamp()
+ page_size = 1000
+ while settings.lnbits_running:
+ payments = await get_payments(
+ since=since,
+ outgoing=True,
+ wallet_id=wallet_id,
+ limit=page_size,
+ offset=offset,
+ conn=conn,
+ )
+ for pay in payments:
+ total += pay.amount
+ if len(payments) < page_size:
+ break
+ offset += len(payments)
+ else:
+ raise PaymentError("Server is shutting down.", status="failed")
+
total = total - amount_msat
if limit * 1000 + total < 0:
raise ValueError(
### lnbits/core/services/scheduler.py
@@ -170,7 +170,7 @@ async def save(
)
return await save_scheduled_job(
ScheduledJob(
- **config.dict(),
+ **config.model_dump(),
namespace=namespace,
user_id=user_id,
next_run_at=next_run,
### lnbits/core/services/settings.py
@@ -48,7 +48,7 @@ def update_cached_settings(sets_dict: dict):
for key in sets_dict.keys():
if key in readonly_variables:
continue
- if key not in settings.dict().keys():
+ if key not in settings.model_dump().keys():
continue
try:
value = getattr(editable_settings, key)
### lnbits/core/services/users.py
@@ -175,7 +175,7 @@ async def check_admin_settings():
# .env super_user overwrites DB super_user
settings_db = await update_super_user(settings.super_user)
- update_cached_settings(settings_db.dict())
+ update_cached_settings(settings_db.model_dump())
# saving superuser to {data_dir}/.super_user file
with open(Path(settings.lnbits_data_folder) / ".super_user", "w") as file:
@@ -210,8 +210,8 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:
await create_account(account)
await create_wallet(user_id=account.id)
- editable_settings = EditableSettings.from_dict(settings.dict())
- return await create_admin_settings(account.id, editable_settings.dict())
+ editable_settings = EditableSettings.from_dict(settings.model_dump())
+ return await create_admin_settings(account.id, editable_settings.model_dump())
async def check_register_activation_settings(data: RegisterUser):
### lnbits/core/views/admin_api.py
@@ -63,7 +63,7 @@ async def api_auditor():
balance = await get_balance_delta()
fiat_balance = await get_total_balance(fiat=True)
return {
- **balance.dict(),
+ **balance.model_dump(),
"lnbits_fiat_balance_sats": int(fiat_balance) // 1000,
}
@@ -111,7 +111,7 @@ async def api_update_settings(
payload: AccessTokenPayload = Depends(access_token_payload),
):
policy_changed = await validate_two_factor_policy(data, account.id, payload)
- if "lnbits_allow_onchain_payments" in data.__fields_set__:
+ if "lnbits_allow_onchain_payments" in data.model_fields_set:
enabled = data.lnbits_allow_onchain_payments
if (
enabled != settings.lnbits_allow_onchain_payments
@@ -135,7 +135,7 @@ async def api_update_settings(
admin_settings = await get_admin_settings(account.is_super_user)
if not admin_settings:
raise ValueError("Updated admin settings not found.")
- update_cached_settings(admin_settings.dict())
+ update_cached_settings(admin_settings.model_dump())
core_app_extra.register_new_ratelimiter()
if policy_changed:
from lnbits.core.views.auth_api import _auth_success_response
@@ -144,7 +144,7 @@ async def api_update_settings(
# Preserve the acting admin's fresh verification; all other sessions
# must satisfy the new policy on their next protected request.
response = _auth_success_response(
- payload=payload.copy(update={"mfa_policy": policy_revision})
+ payload=payload.model_copy(update={"mfa_policy": policy_revision})
)
return response
return {"status": "Success"}
@@ -231,7 +231,7 @@ async def api_update_settings_partial(
account: Account = Depends(check_admin),
payload: AccessTokenPayload = Depends(access_token_payload),
):
- updatable_settings = dict_to_settings({**settings.dict(), **data})
+ updatable_settings = dict_to_settings({**settings.model_dump(), **data})
return await api_update_settings(updatable_settings, account, payload)
@@ -241,7 +241,7 @@ async def api_update_settings_partial(
dependencies=[Depends(check_admin)],
)
async def api_reset_settings(field_name: str):
- if field_name not in UpdateSettings.__fields__:
+ if field_name not in UpdateSettings.model_fields:
raise HTTPException(
HTTPStatus.FORBIDDEN, "Only editable settings have public defaults."
)
### lnbits/core/views/auth_api.py
@@ -223,7 +223,7 @@ async def impersonate_user(
admin_payload = AccessTokenPayload(
**jwt.decode(cookie_access_token, settings.auth_secret_key, ["HS256"])
)
- impersonation = admin_payload.copy(
+ impersonation = admin_payload.model_copy(
update={
"sub": "",
"usr": account.id,
@@ -710,7 +710,7 @@ def _auth_success_response(
payload = payload or AccessTokenPayload(
sub=username or "", usr=user_id, email=email, auth_time=int(time())
)
- access_token = create_access_token(data=payload.dict())
+ access_token = create_access_token(data=payload.model_dump())
max_age = settings.auth_token_expire_minutes * 60
body: dict = {"access_token": access_token, "token_type": "bearer"}
if recovery_codes is not None:
@@ -743,7 +743,7 @@ def _auth_api_token_response(
sub=username, api_token_id=api_token_id, auth_time=int(time())
)
return create_access_token(
- data=payload.dict(), token_expire_minutes=token_expire_minutes
+ data=payload.model_dump(), token_expire_minutes=token_expire_minutes
)
@@ -858,7 +858,7 @@ async def _login_response(account: Account) -> JSONResponse:
config.secret or settings.lnbits_two_factor_mandatory
):
payload = await issue_challenge(account.id)
- token = create_access_token(payload.dict(), token_expire_minutes=5)
+ token = create_access_token(payload.model_dump(), token_expire_minutes=5)
response = JSONResponse(
{
"two_factor_required": True,
### lnbits/core/views/extension_api.py
@@ -451,7 +451,7 @@ async def api_grant_background_payment_permission(
for existing in permissions.get(WALLET_PAY_INVOICE_BACKGROUND_PERMISSION, [])
if isinstance(existing, dict) and existing.get("wallet_id") != grant.wallet_id
]
- background_grants.append(json.loads(grant.json()))
+ background_grants.append(json.loads(grant.model_dump_json()))
permissions[WALLET_PAY_INVOICE_BACKGROUND_PERMISSION] = background_grants
user_ext.permissions = permissions
await update_user_extension(user_ext)
@@ -503,7 +503,7 @@ async def api_grant_wallet_payments_watch_permission(
for existing in permissions.get(WALLET_PAYMENTS_WATCH_PERMISSION, [])
if isinstance(existing, dict) and existing.get("wallet_id") != grant.wallet_id
]
- watch_grants.append(json.loads(grant.json()))
+ watch_grants.append(json.loads(grant.model_dump_json()))
permissions[WALLET_PAYMENTS_WATCH_PERMISSION] = watch_grants
user_ext.permissions = permissions
await update_user_extension(user_ext)
@@ -1057,7 +1057,7 @@ async def create_extension_review(
) -> ExtensionReviewPaymentRequest:
async with httpx.AsyncClient() as client:
resp = await client.post(
- settings.lnbits_extensions_reviews_url + "/reviews", json=data.dict()
+ settings.lnbits_extensions_reviews_url + "/reviews", json=data.model_dump()
)
resp.raise_for_status()
payment_request = resp.json()
@@ -1146,7 +1146,7 @@ async def _check_background_payment_permission(
grant_data: dict,
) -> ExtensionPermissionCheckResult:
try:
- data = ExtensionBackgroundPaymentGrantRequest.parse_obj(grant_data)
+ data = ExtensionBackgroundPaymentGrantRequest.model_validate(grant_data)
except ValueError as exc:
raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
@@ -1180,7 +1180,7 @@ async def _check_background_payment_permission(
return ExtensionPermissionCheckResult(
id=WALLET_PAY_INVOICE_BACKGROUND_PERMISSION,
approved=covered,
- grant=json.loads(grant.json()),
+ grant=json.loads(grant.model_dump_json()),
)
@@ -1190,7 +1190,7 @@ async def _check_wallet_payments_watch_permission(
grant_data: dict,
) -> ExtensionPermissionCheckResult:
try:
- data = ExtensionWalletPaymentsWatchGrantRequest.parse_obj(grant_data)
+ data = ExtensionWalletPaymentsWatchGrantRequest.model_validate(grant_data)
except ValueError as exc:
raise HTTPException(HTTPStatus.BAD_REQUEST, str(exc)) from exc
@@ -1204,7 +1204,7 @@ async def _check_wallet_payments_watch_permission(
return ExtensionPermissionCheckResult(
id=WALLET_PAYMENTS_WATCH_PERMISSION,
approved=covered,
- grant=json.loads(grant.json()),
+ grant=json.loads(grant.model_dump_json()),
)
@@ -1218,7 +1218,7 @@ def _find_background_payment_grant(
if not isinstance(grant_data, dict):
continue
try:
- grant = ExtensionBackgroundPaymentGrant.parse_obj(grant_data)
+ grant = ExtensionBackgroundPaymentGrant.model_validate(grant_data)
except ValueError:
continue
if grant.wallet_id == wallet_id:
@@ -1236,7 +1236,7 @@ def _find_wallet_payments_watch_grant(
if not isinstance(grant_data, dict):
continue
try:
- grant = ExtensionWalletPaymentsWatchGrant.parse_obj(grant_data)
+ grant = ExtensionWalletPaymentsWatchGrant.model_validate(grant_data)
except ValueError:
continue
if grant.wallet_id == wallet_id:
### lnbits/core/views/fiat_api.py
@@ -2,7 +2,7 @@
from fastapi import APIRouter, Depends, HTTPException
from loguru import logger
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
from lnbits.core.crud.payments import update_payment
from lnbits.core.crud.settings import set_settings_field
@@ -26,8 +26,7 @@ class CreateCashPayment(BaseModel):
memo: str | None = Field(None, max_length=640)
internal_memo: str | None = Field(None, max_length=512)
- class Config:
- extra = "forbid"
+ model_config = ConfigDict(extra="forbid")
@fiat_router.post("/cash", status_code=HTTPStatus.CREATED)
### lnbits/core/views/generic.py
@@ -211,7 +211,7 @@ async def index(
request,
"base.html",
{
- "user": user.json(),
+ "user": user.model_dump_json(),
},
)
@@ -240,7 +240,7 @@ async def index_blockexplorer(
user: User = Depends(check_blockexplorer_access),
) -> HTMLResponse:
return template_renderer().TemplateResponse(
- request, "base.html", {"user": user.json()}
+ request, "base.html", {"user": user.model_dump_json()}
)
@@ -293,7 +293,7 @@ async def lnurlwallet(request: Request, lightning: str = ""):
status_code=HTTPStatus.BAD_REQUEST,
detail="Invalid lnurl. Expected maxWithdrawable",
)
- check_callback_url(withdraw.callback)
+ check_callback_url(str(withdraw.callback))
except (LnurlException, ValueError) as exc:
raise HTTPException(
status_code=HTTPStatus.BAD_REQUEST, detail=str(exc)
### lnbits/core/views/lnurl_api.py
@@ -101,7 +101,7 @@ async def _handle(lnurl: str) -> LnurlResponseModel:
async def api_lnurlscan(code: str) -> LnurlResponseModel:
res = await _handle(code)
if isinstance(res, LnurlPayResponse | LnurlWithdrawResponse | LnurlAuthResponse):
- check_callback_url(res.callback)
+ check_callback_url(str(res.callback))
return res
@@ -121,7 +121,7 @@ async def api_lnurlscan_post(scan: LnurlScan) -> LnurlResponseModel:
async def api_perform_lnurlauth(
data: LnurlAuthResponse, key_type: WalletTypeInfo = Depends(require_admin_key)
) -> LnurlResponseModel:
- check_callback_url(data.callback)
+ check_callback_url(str(data.callback))
try:
res = await lnurlauth(
res=data,
@@ -199,9 +199,9 @@ async def _check_extension_well_known(
response.raise_for_status()
response_data = response.json()
try:
- return LnurlPayResponse.parse_obj(response_data)
+ return LnurlPayResponse.model_validate(response_data)
except ValidationError:
- return LnurlErrorResponse.parse_obj(response_data)
+ return LnurlErrorResponse.model_validate(response_data)
except Exception as exc:
logger.warning(
f"Failed to fetch LNURL response Extension redirect {target_path}: {exc}"
### lnbits/core/views/node_api.py
@@ -3,7 +3,7 @@
import httpx
from fastapi import APIRouter, Body, Depends, HTTPException, Query
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, field_validator
from lnbits.decorators import check_admin, check_super_user, parse_filters
from lnbits.settings import settings
@@ -125,7 +125,8 @@ async def api_phoenixd_receive(
class PhoenixdFeeRequest(BaseModel):
fee_rate: int = Field(gt=0, le=1_000_000)
- @validator("fee_rate", pre=True)
+ @field_validator("fee_rate", mode="before")
+ @classmethod
def validate_fee_rate(cls, value):
if type(value) is not int:
raise ValueError("Fee rate must be a whole number of sat/vB")
@@ -136,7 +137,8 @@ class PhoenixdSendRequest(PhoenixdFeeRequest):
address: str = Field(min_length=14, max_length=128)
amount_sat: int = Field(gt=0, le=2_100_000_000_000_000)
- @validator("amount_sat", pre=True)
+ @field_validator("amount_sat", mode="before")
+ @classmethod
def validate_amount(cls, value):
if type(value) is not int:
raise ValueError("Amount must be a whole number of sats")
@@ -145,7 +147,7 @@ def validate_amount(cls, value):
class PhoenixdCloseRequest(PhoenixdFeeRequest):
address: str = Field(min_length=14, max_length=128)
- channel_id: str = Field(regex=r"^[0-9a-fA-F]{64}$")
+ channel_id: str = Field(pattern=r"^[0-9a-fA-F]{64}$")
@super_node_router.post("/phoenixd/close")
@@ -299,11 +301,11 @@ async def api_disconnect_peer(peer_id: str, node: Node = Depends(require_node)):
class NodeRank(BaseModel):
- capacity: int | None
- channelcount: int | None
- age: int | None
- growth: int | None
- availability: int | None
+ capacity: int | None = None
+ channelcount: int | None = None
+ age: int | None = None
+ growth: int | None = None
+ availability: int | None = None
# Same for public and private api
### lnbits/core/views/payment_api.py
@@ -541,7 +541,7 @@ async def api_payments_decode(data: DecodePayment) -> JSONResponse:
return JSONResponse({"domain": url})
if looks_like_bolt12_offer(payment_str):
offer = decode_bolt12_offer(payment_str)
- return JSONResponse({"type": "bolt12_offer", **offer.dict()})
+ return JSONResponse({"type": "bolt12_offer", **offer.model_dump()})
invoice = bolt11.decode(payment_str)
filtered_data = filter_dict_keys(invoice.data, data.filter_fields)
return JSONResponse(filtered_data)
### lnbits/core/views/wallet_api.py
@@ -355,7 +355,7 @@ async def api_update_config(
)
await update_onchain_wallet_config(data, wallet_id=auth.wallet_id, network=network)
request_scan(auth.wallet_id)
- response_data = data.dict()
+ response_data = data.model_dump()
response_data["explorer_provider"] = provider_name(data, network)
response_data["network"] = network
return OnchainWalletConfigResponse(
@@ -374,7 +374,7 @@ async def api_get_config(
raise HTTPException(HTTPStatus.NOT_FOUND, "Wallet does not exist.")
config = wallet.onchain_config
network = wallet.onchain_network or "Mainnet"
- data = config.dict()
+ data = config.model_dump()
data["explorer_provider"] = provider_name(config, network)
data["network"] = network
return OnchainWalletConfigResponse(
### lnbits/core/wasm_ext/api/background_payments.py
@@ -81,7 +81,7 @@ def _find_wallet_grant(
if not isinstance(grant_data, dict):
continue
try:
- grant = ExtensionBackgroundPaymentGrant.parse_obj(grant_data)
+ grant = ExtensionBackgroundPaymentGrant.model_validate(grant_data)
except ValueError:
continue
if grant.wallet_id == wallet_id:
### lnbits/core/wasm_ext/api/models.py
@@ -2,7 +2,7 @@
from dataclasses import dataclass
from typing import Any, Literal
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
@dataclass(frozen=True)
@@ -46,10 +46,10 @@ class SendUserNotificationRequest(BaseModel):
type: Literal["email", "nostr", "telegram"]
message: str = Field(..., min_length=1, max_length=4096)
- class Config:
- extra = "forbid"
+ model_config = ConfigDict(extra="forbid")
- @validator("message")
+ @field_validator("message")
+ @classmethod
def validate_message(cls, message: str) -> str:
if not message.strip():
raise ValueError("Notification message must contain text.")
@@ -73,7 +73,8 @@ class StorageSetRequest(BaseModel):
table: str = Field(..., min_length=1, max_length=128)
data: dict[str, Any] = Field(default_factory=dict)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def parse_data_json(cls, values: dict[str, Any]) -> dict[str, Any]:
data_json = values.get("data_json")
if data_json is not None and "data" not in values:
@@ -90,7 +91,8 @@ class StorageAppendPublicRequest(BaseModel):
source_id: str = Field(..., min_length=1, max_length=512)
data: dict[str, Any] = Field(default_factory=dict)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def parse_data_json(cls, values: dict[str, Any]) -> dict[str, Any]:
data_json = values.get("data_json")
if data_json is not None and "data" not in values:
@@ -112,7 +114,8 @@ class StoragePaginatedRequest(BaseModel):
limit: int = Field(25, ge=1, le=1000)
offset: int = Field(0, ge=0)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def parse_json_fields(cls, values: dict[str, Any]) -> dict[str, Any]:
filters_json = values.get("filters_json")
if filters_json is not None and "filters" not in values:
@@ -140,24 +143,24 @@ class WebsocketPublishRequest(BaseModel):
item_id: str = Field(..., min_length=1, max_length=128)
data: Any = Field(default_factory=dict)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def parse_data_json(cls, values: dict[str, Any]) -> dict[str, Any]:
data_json = values.get("data_json")
if data_json is not None and "data" not in values:
values["data"] = json.loads(data_json)
return values
- @root_validator
- def validate_data_size(cls, values: dict[str, Any]) -> dict[str, Any]:
- data = values.get("data")
+ @field_validator("data")
+ @classmethod
+ def validate_data_size(cls, data):
try:
encoded = json.dumps(data, separators=(",", ":"))
except TypeError as exc:
raise ValueError("websocket data must be JSON serializable.") from exc
if len(encoded.encode()) > 65536:
raise ValueError("websocket data must not exceed 65536 bytes.")
- values["data"] = data
- return values
+ return data
@property
def data_json(self) -> str:
@@ -198,17 +201,16 @@ class CreateInvoicePublicRequest(BaseModel):
memo: str = Field("", max_length=512)
extra: dict[str, Any] = Field(default_factory=dict)
- @root_validator
- def validate_extra_size(cls, values: dict[str, Any]) -> dict[str, Any]:
- extra = values.get("extra") or {}
+ @field_validator("extra")
+ @classmethod
+ def validate_extra_size(cls, extra):
try:
encoded = json.dumps(extra, separators=(",", ":"))
except TypeError as exc:
raise ValueError("extra must be JSON serializable.") from exc
if len(encoded.encode()) > 4096:
raise ValueError("extra must not exceed 4096 bytes.")
- values["extra"] = extra
- return values
+ return extra
class CreateInvoiceResponse(BaseModel):
@@ -283,23 +285,23 @@ class HttpRequest(BaseModel):
headers: dict[str, str] = Field(default_factory=dict)
body: str | None = Field(None, max_length=65536)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def normalize_method(cls, values: dict[str, Any]) -> dict[str, Any]:
method = values.get("method")
if isinstance(method, str):
values["method"] = method.upper()
return values
- @root_validator
- def validate_headers_size(cls, values: dict[str, Any]) -> dict[str, Any]:
- headers = values.get("headers") or {}
+ @field_validator("headers")
+ @classmethod
+ def validate_headers_size(cls, headers):
if len(headers) > 32:
raise ValueError("headers must not contain more than 32 entries.")
for key, value in headers.items():
if len(key) > 128 or len(value) > 4096:
raise ValueError("headers are too large.")
- values["headers"] = headers
- return values
+ return headers
class HttpResponse(BaseModel):
@@ -314,7 +316,8 @@ class ExtensionApiRequest(BaseModel):
path: str = Field(..., min_length=1, max_length=2048)
body: str | None = Field(None, max_length=65536)
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def normalize_method(cls, values: dict[str, Any]) -> dict[str, Any]:
method = values.get("method")
if isinstance(method, str):
@@ -340,8 +343,7 @@ class CurrencyConvertRequest(BaseModel):
from_currency: str = Field(..., alias="from", min_length=1, max_length=8)
to: str = Field(..., min_length=1, max_length=256)
- class Config:
- allow_population_by_field_name = True
+ model_config = ConfigDict(populate_by_name=True)
class CurrencyConvertResponse(BaseModel):
### lnbits/core/wasm_ext/api/permissions.py
@@ -43,7 +43,7 @@ def validate_extension_permissions(
unknown_ids.append(permission.id)
if strict:
continue
- normalized_permissions.append(permission.copy())
+ normalized_permissions.append(permission.model_copy())
if unknown_ids and strict:
raise ValueError(
@@ -110,7 +110,9 @@ def validate_wasm_extension_permissions(
f"permission '{permission_id}'."
)
effective_permissions.append(
- requested_permission.copy(update={"policies": granted_permission.policies})
+ requested_permission.model_copy(
+ update={"policies": granted_permission.policies}
+ )
)
_validate_automatic_schedules(config.schedules, effective_permissions)
@@ -469,9 +471,9 @@ def _schedule_grant_is_subset(
return False
for handler, policy in granted.items():
declared = requested.get(handler)
- if not declared or declared.dict(exclude={"max_jobs_per_user"}) != policy.dict(
+ if not declared or declared.model_dump(
exclude={"max_jobs_per_user"}
- ):
+ ) != policy.model_dump(exclude={"max_jobs_per_user"}):
return False
if (
isinstance(policy, UserSchedulePolicy)
### lnbits/core/wasm_ext/api/registry.py
@@ -138,11 +138,11 @@ def extension_api_contract(api_cls: type[Any] | None = None) -> dict[str, object
"description": method.description,
"required_permission": method.required_permission,
"require_auth": method.require_auth,
- "request_schema": method.request_model.schema(
- ref_template="#/definitions/{model}"
+ "request_schema": method.request_model.model_json_schema(
+ ref_template="#/$defs/{model}"
),
- "response_schema": method.response_model.schema(
- ref_template="#/definitions/{model}"
+ "response_schema": method.response_model.model_json_schema(
+ ref_template="#/$defs/{model}"
),
}
for method in list_extension_api_methods(api_cls)
### lnbits/core/wasm_ext/api/runtime.py
@@ -96,7 +96,7 @@ def _request_model(
if isinstance(payload, method.request_model):
return payload
if isinstance(payload, BaseModel):
- payload = payload.dict()
+ payload = payload.model_dump()
if payload is None:
payload = {}
if not isinstance(payload, Mapping):
@@ -108,16 +108,16 @@ def _request_model(
data["extra"] = dict(data["extra"])
if isinstance(data.get("headers"), list):
data["headers"] = dict(data["headers"])
- return method.request_model.parse_obj(data)
+ return method.request_model.model_validate(data)
@staticmethod
def _response_payload(
method: ExtensionAPIMethod,
response: Any,
) -> dict[str, Any]:
if not isinstance(response, method.response_model):
- response = method.response_model.parse_obj(response)
- payload = response.dict()
+ response = method.response_model.model_validate(response)
+ payload = response.model_dump()
if method.method_id in {"http.request", "extension.api.request"} and isinstance(
payload.get("headers"), Mapping
):
### lnbits/core/wasm_ext/api/scheduler.py
@@ -4,7 +4,7 @@
import re
from typing import TYPE_CHECKING, Literal
-from pydantic import BaseModel, Field, root_validator
+from pydantic import BaseModel, ConfigDict, Field, model_validator
from lnbits.core.crud.users import get_account
from lnbits.core.models.scheduler import ScheduleConfig
@@ -24,14 +24,14 @@
class ScheduleScopeRequest(BaseModel):
scope: Literal["user", "extension"] = "user"
- class Config:
- extra = "forbid"
+ model_config = ConfigDict(extra="forbid")
class ScheduleSetRequest(ScheduleConfig):
scope: Literal["user", "extension"] = "user"
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def omit_empty_id(cls, values: dict) -> dict:
# WIT represents an omitted ID as option<string> / None.
if values.get("id") is None:
@@ -93,14 +93,16 @@ async def set(self, request: ScheduleSetRequest) -> ScheduleResponse:
job_id = sha256s(
json.dumps([self.api.extension_id, owner, request.handler])
)
- if "id" in request.__fields_set__ and request.id != job_id:
+ if "id" in request.model_fields_set and request.id != job_id:
raise ValueError("Schedule ID does not match this handler and owner.")
elif re.fullmatch(r"[0-9a-f]{64}", job_id):
# IDs are global: reserve shared hashes across all handlers/extensions.
raise ValueError("Schedule ID is reserved for extension-wide schedules.")
job = await scheduler.save(
f"extension:{self.api.extension_id}",
- ScheduleConfig.parse_obj({**request.dict(exclude={"scope"}), "id": job_id}),
+ ScheduleConfig.model_validate(
+ {**request.model_dump(exclude={"scope"}), "id": job_id}
+ ),
user_id=owner,
)
return ScheduleResponse(schedule_json=json.dumps(job.public_data()))
### lnbits/core/wasm_ext/client/http.py
@@ -7,6 +7,8 @@
import httpx
+from lnbits.utils.network import is_global_address
+
from ..api.models import HttpRequest, HttpResponse
HTTP_REQUEST_TIMEOUT_SECONDS = 10.0
@@ -154,7 +156,7 @@ def resolve() -> list[ipaddress.IPv4Address | ipaddress.IPv6Address]:
def _reject_internal_address(
address: ipaddress.IPv4Address | ipaddress.IPv6Address,
) -> None:
- if not address.is_global:
+ if not is_global_address(address):
raise PermissionError("HTTP requests cannot target internal network addresses.")
### lnbits/core/wasm_ext/routes/ui.py
@@ -121,7 +121,7 @@ async def serve_private_wasm_extension_page(
request,
extension,
auth,
- user.json() if user else None,
+ user.model_dump_json() if user else None,
)
async def serve_public_wasm_extension_page(request: Request) -> Any:
### lnbits/core/wasm_ext/wasm/config.py
@@ -5,11 +5,12 @@
from pydantic import (
BaseModel,
+ ConfigDict,
Field,
StrictBool,
StrictStr,
ValidationError,
- root_validator,
+ model_validator,
)
from lnbits.core.models.extensions import ExtensionPermission
@@ -19,9 +20,7 @@
class _StrictWasmModel(BaseModel):
- class Config:
- extra = "ignore"
- allow_population_by_field_name = True
+ model_config = ConfigDict(extra="ignore", populate_by_name=True)
class WasmExtensionExport(_StrictWasmModel):
@@ -82,28 +81,28 @@ class WasmExtensionConfig(_StrictWasmModel):
extension_type: Literal["wasm"]
wasm: WasmRuntimeConfig
events: WasmEventsConfig = Field(
- default_factory=lambda: WasmEventsConfig.parse_obj({})
+ default_factory=lambda: WasmEventsConfig.model_validate({})
)
ui: WasmUIConfig | None = None
sdk: WasmSDKConfig | None = None
openapi: StrictStr | None = None
ui_routes: list[WasmUIRouteConfig] = Field(default_factory=list)
api_routes: list[WasmAPIRouteConfig] = Field(default_factory=list)
permissions: list[ExtensionPermission] = Field(default_factory=list)
- schedules: list[SchedulePolicy] = Field(default_factory=list, max_items=100)
+ schedules: list[SchedulePolicy] = Field(default_factory=list, max_length=100)
- @root_validator
- def validate_schedules(cls, values: dict[str, Any]) -> dict[str, Any]:
- schedules = values.get("schedules", [])
- wasm = values.get("wasm")
+ @model_validator(mode="after")
+ def validate_schedules(self):
+ schedules = self.schedules
+ wasm = self.wasm
handlers = [schedule.handler for schedule in schedules]
if len(set(handlers)) != len(handlers):
raise ValueError("Automatic schedules must have unique handlers.")
if wasm and not set(handlers).issubset(
export.name for export in wasm.exports if export.visibility == "event"
):
raise ValueError("Automatic schedule handlers must be event exports.")
- return values
+ return self
def parse_wasm_extension_config(
@@ -112,7 +111,7 @@ def parse_wasm_extension_config(
) -> WasmExtensionConfig:
validate_wasm_extension_config_id(ext_id, config)
try:
- return WasmExtensionConfig.parse_obj(config)
+ return WasmExtensionConfig.model_validate(config)
except ValidationError as exc:
raise ValueError(
f"Invalid WASM extension config for '{ext_id}': {exc}"
### lnbits/core/wasm_ext/wasm/events.py
@@ -142,7 +142,7 @@ def _has_wallet_watch_grant(user_extension: Any, wallet_id: str) -> bool:
if not isinstance(grant_data, dict):
continue
try:
- grant = ExtensionWalletPaymentsWatchGrant.parse_obj(grant_data)
+ grant = ExtensionWalletPaymentsWatchGrant.model_validate(grant_data)
except ValueError:
continue
if grant.enabled and grant.wallet_id == wallet_id:
@@ -252,5 +252,5 @@ def _wasm_invoice_paid_payload(payment: Any) -> dict[str, Any]:
"tag": payment.tag,
"extension": payment.extension,
"extra": payment.extra or {},
- "payment": json.loads(payment.json()),
+ "payment": json.loads(payment.model_dump_json()),
}
### lnbits/core/wasm_ext/wasm/scheduler.py
@@ -37,7 +37,7 @@ async def ensure_wasm_extension_schedules(ext_id: str) -> None:
await scheduler.save(
namespace,
ScheduleConfig(
- **policy.dict(),
+ **policy.model_dump(),
id=job_id,
enabled=existing.enabled if existing else True,
),
### lnbits/db.py
@@ -8,10 +8,20 @@
from contextlib import asynccontextmanager
from datetime import datetime, timezone
from enum import Enum
-from typing import Any, Generic, Literal, TypeVar, get_origin
+from types import UnionType
+from typing import (
+ Annotated,
+ Any,
+ Generic,
+ Literal,
+ TypeVar,
+ Union,
+ get_args,
+ get_origin,
+)
from loguru import logger
-from pydantic import BaseModel, ValidationError, root_validator
+from pydantic import BaseModel, TypeAdapter, model_validator
from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
from sqlalchemy.sql import text
@@ -462,7 +472,7 @@ class Filter(BaseModel, Generic[TFilterModel]):
table_name: str | None = None
field: str
op: Operator = Operator.EQ
- model: type[TFilterModel] | None
+ model: type[TFilterModel] | None = None
values: dict | None = None
@classmethod
@@ -484,16 +494,16 @@ def parse_query(
field = key
op = Operator("eq")
- if field in model.__fields__:
- compare_field = model.__fields__[field]
+ if field in model.model_fields:
+ compare_field = model.model_fields[field]
values: dict = {}
if op in {Operator.EVERY, Operator.ANY, Operator.INCLUDE, Operator.EXCLUDE}:
raw_values = [v for rv in raw_values for v in rv.split(",")]
for index, raw_value in enumerate(raw_values):
- validated, errors = compare_field.validate(raw_value, {}, loc="none")
- if errors:
- raise ValidationError(errors=[errors], model=model)
+ validated = TypeAdapter(
+ compare_field.rebuild_annotation()
+ ).validate_python(raw_value)
values[f"{field}__{i}_{index}"] = validated
else:
raise ValueError("Unknown filter field")
@@ -505,7 +515,11 @@ def statement(self) -> str:
prefix = f"{self.table_name}." if self.table_name else ""
stmt = []
for key in self.values.keys() if self.values else []:
- if self.model and self.model.__fields__[self.field].type_ == datetime:
+ if (
+ self.model
+ and _field_type(self.model.model_fields[self.field].annotation)
+ is datetime
+ ):
placeholder = compat_timestamp_placeholder(key)
else:
placeholder = f":{key}"
@@ -544,14 +558,15 @@ class Filters(BaseModel, Generic[TFilterModel]):
table_name: str | None = None
- @root_validator(pre=True)
+ @model_validator(mode="before")
+ @classmethod
def validate_sortby(cls, values):
sortby = values.get("sortby")
model = values.get("model")
if sortby and model:
model = values["model"]
# if no sort fields are specified explicitly all fields are allowed
- allowed = model.__sort_fields__ or model.__fields__
+ allowed = model.__sort_fields__ or model.model_fields
if sortby not in allowed:
raise ValueError("Invalid sort field")
return values
@@ -667,10 +682,11 @@ def model_to_dict(model: BaseModel) -> dict:
:param model: Pydantic model
"""
_dict: dict = {}
- for key, value in model.dict().items():
- type_ = model.__fields__[key].type_
- outertype_ = model.__fields__[key].outer_type_
- if model.__fields__[key].field_info.extra.get("no_database", False):
+ for key, value in model.model_dump().items():
+ field = type(model).model_fields[key]
+ type_ = _field_type(field.annotation)
+ extra = field.json_schema_extra
+ if isinstance(extra, dict) and extra.get("no_database", False):
continue
if isinstance(value, datetime):
if DB_TYPE == SQLITE:
@@ -681,9 +697,9 @@ def model_to_dict(model: BaseModel) -> dict:
_dict[key] = value.replace(tzinfo=None)
continue
if (
- type(type_) is type(BaseModel)
+ _is_subclass(type_, BaseModel)
or type_ is dict
- or get_origin(outertype_) is list
+ or get_origin(type_) in (list, dict)
):
_dict[key] = json.dumps(value, cls=DbJsonEncoder)
continue
@@ -713,20 +729,35 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel: # noqa: C901
"""
_dict: dict = {}
for key, value in _row.items():
- if key not in model.__fields__:
+ if key not in model.model_fields:
# Somethimes an SQL JOIN will create additional column
continue
+ annotation = model.model_fields[key].annotation
if value is None:
# keep None for Optional fields, otherwise let the default apply
- if model.__fields__[key].allow_none:
+ if (
+ annotation is Any
+ or annotation is type(None)
+ or (
+ get_origin(annotation) in (Union, UnionType)
+ and type(None) in get_args(annotation)
+ )
+ ):
_dict[key] = None
continue
- type_ = model.__fields__[key].type_
- outertype_ = model.__fields__[key].outer_type_
- if get_origin(outertype_) is list:
+ type_ = _field_type(annotation)
+ if get_origin(type_) is list:
+ item_type = _field_type(get_args(type_)[0])
_items = _safe_load_json(value) if isinstance(value, str) else value
+ if _items is None:
+ _dict[key] = None
+ continue
_dict[key] = [
- dict_to_submodel(type_, v) if _is_subclass(type_, BaseModel) else v
+ (
+ dict_to_submodel(item_type, v)
+ if _is_subclass(item_type, BaseModel)
+ else v
+ )
for v in _items
]
continue
@@ -744,15 +775,23 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel: # noqa: C901
continue
# TODO: remove this when all sub models are migrated to Pydantic
# NOTE: this is for type dict on BaseModel, (used in Payment class)
- if type_ is dict and value:
- _dict[key] = _safe_load_json(value)
+ if (type_ is dict or get_origin(type_) is dict) and value:
+ _dict[key] = _safe_load_json(value) if isinstance(value, str) else value
continue
_dict[key] = value
continue
- _model = model.construct(**_dict)
- if isinstance(_model, BaseModel):
- _model.__init__(**_dict) # type: ignore
- return _model
+ return model.model_validate(_dict)
+
+
+def _field_type(annotation: Any) -> Any:
+ """Unwrap nullable/annotated fields for the existing database encoding."""
+ if get_origin(annotation) is Annotated:
+ return _field_type(get_args(annotation)[0])
+ if get_origin(annotation) in (Union, UnionType):
+ types = [arg for arg in get_args(annotation) if arg is not type(None)]
+ if len(types) == 1:
+ return _field_type(types[0])
+ return annotation
def _safe_load_json(value: str) -> dict:
### lnbits/decorators.py
@@ -560,10 +560,10 @@ async def _get_account_from_jwt_payload(
payload: AccessTokenPayload, path: str, method: str, conn: Connection | None = None
) -> Account | None:
account = None
- if payload.sub:
- account = await get_account_by_username(payload.sub, conn=conn)
- elif payload.usr:
+ if payload.usr:
account = await get_account(payload.usr, conn=conn)
+ elif payload.sub:
+ account = await get_account_by_username(payload.sub, conn=conn)
elif payload.email:
account = await get_account_by_email(payload.email, conn=conn)
### lnbits/exceptions.py
@@ -3,6 +3,7 @@
from http import HTTPStatus
from fastapi import FastAPI, HTTPException, Request
+from fastapi.encoders import jsonable_encoder
from fastapi.exceptions import RequestValidationError
from fastapi.responses import JSONResponse, RedirectResponse, Response
from loguru import logger
@@ -118,10 +119,20 @@ async def value_error_handler(request: Request, exc: ValueError):
async def validation_exception_handler(
request: Request, exc: RequestValidationError
):
- logger.error(f"RequestValidationError: {exc!s}")
- return render_html_error(request, exc) or JSONResponse(
+ # Pydantic 2 includes raw inputs and exception objects in validation errors.
+ errors = jsonable_encoder(
+ [
+ {key: value for key, value in error.items() if key != "input"}
+ for error in exc.errors()
+ ],
+ custom_encoder={Exception: str},
+ )
+ logger.error(f"RequestValidationError: {errors}")
+ return render_html_error(
+ request, RequestValidationError(errors)
+ ) or JSONResponse(
status_code=HTTPStatus.BAD_REQUEST,
- content={"detail": [dict(e) for e in exc.errors()]},
+ content={"detail": errors},
)
@app.exception_handler(HTTPException)
### lnbits/fiat/paypal.py
@@ -6,7 +6,7 @@
import httpx
from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
from lnbits.settings import settings
@@ -28,25 +28,22 @@
class PayPalCheckoutOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
success_url: str | None = None
cancel_url: str | None = None
metadata: dict[str, Any] = Field(default_factory=dict)
class PayPalSubscriptionOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
checking_id: str | None = None
payment_request: str | None = None
class PayPalCreateInvoiceOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
fiat_method: FiatMethod = "checkout"
checkout: PayPalCheckoutOptions | None = None
@@ -366,7 +363,7 @@ def _parse_create_opts(
self, raw_opts: dict[str, Any]
) -> PayPalCreateInvoiceOptions | None:
try:
- return PayPalCreateInvoiceOptions.parse_obj(raw_opts)
+ return PayPalCreateInvoiceOptions.model_validate(raw_opts)
except ValidationError as e:
logger.warning(f"Invalid PayPal options: {e}")
return None
### lnbits/fiat/revolut.py
@@ -8,7 +8,7 @@
import httpx
from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
from lnbits.settings import settings
@@ -28,17 +28,15 @@
class RevolutCheckoutOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
success_url: str | None = None
metadata: dict[str, Any] = Field(default_factory=dict)
description: str | None = None
class RevolutCreateInvoiceOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
checkout: RevolutCheckoutOptions | None = None
@@ -580,15 +578,15 @@ def _parse_create_opts(
self, raw_opts: dict[str, Any]
) -> RevolutCreateInvoiceOptions | None:
try:
- return RevolutCreateInvoiceOptions.parse_obj(raw_opts)
+ return RevolutCreateInvoiceOptions.model_validate(raw_opts)
except ValidationError as e:
logger.warning(f"Invalid Revolut options: {e}")
return None
def _serialize_subscription_reference(
self, reference: RevolutSubscriptionReference
) -> str:
- payload = reference.dict(exclude_none=True)
+ payload = reference.model_dump(exclude_none=True)
serialized = json.dumps(payload, separators=(",", ":"))
if len(serialized) > 1024:
raise ValueError("Revolut subscription external_reference is too long.")
@@ -600,7 +598,7 @@ def deserialize_subscription_reference(
if not external_reference:
return None
try:
- return RevolutSubscriptionReference.parse_obj(
+ return RevolutSubscriptionReference.model_validate(
json.loads(external_reference)
)
except (json.JSONDecodeError, ValidationError) as exc:
### lnbits/fiat/square.py
@@ -5,7 +5,7 @@
import httpx
from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
from lnbits.settings import settings
@@ -27,25 +27,22 @@
class SquareCheckoutOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
success_url: str | None = None
metadata: dict[str, str] = Field(default_factory=dict)
line_item_name: str | None = None
class SquareSubscriptionOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
checking_id: str | None = None
payment_request: str | None = None
class SquareCreateInvoiceOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
fiat_method: FiatMethod = "checkout"
checkout: SquareCheckoutOptions | None = None
@@ -518,7 +515,7 @@ def _parse_create_opts(
self, raw_opts: dict[str, Any]
) -> SquareCreateInvoiceOptions | None:
try:
- return SquareCreateInvoiceOptions.parse_obj(raw_opts)
+ return SquareCreateInvoiceOptions.model_validate(raw_opts)
except ValidationError as e:
logger.warning(f"Invalid Square options: {e}")
return None
### lnbits/fiat/stripe.py
@@ -9,7 +9,7 @@
import httpx
from loguru import logger
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
from lnbits.helpers import normalize_endpoint, urlsafe_short_hash
from lnbits.settings import settings
@@ -51,34 +51,30 @@
class StripeTerminalOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
capture_method: Literal["automatic", "manual"] = "automatic"
metadata: dict[str, str] = Field(default_factory=dict)
reader_id: str | None = None
class StripeCheckoutOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
success_url: str | None = None
metadata: dict[str, str] = Field(default_factory=dict)
line_item_name: str | None = None
class StripeSubscriptionOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
checking_id: str | None = None
payment_request: str | None = None
class StripeCreateInvoiceOptions(BaseModel):
- class Config:
- extra = "ignore"
+ model_config = ConfigDict(extra="ignore")
fiat_method: FiatMethod = "checkout"
terminal: StripeTerminalOptions | None = None
@@ -195,7 +191,10 @@ async def create_subscription(
("line_items[0][price]", subscription_id),
("line_items[0][quantity]", f"{quantity}"),
]
- subscription_data = {**payment_options.dict(), "alan_action": "subscription"}
+ subscription_data = {
+ **payment_options.model_dump(),
+ "alan_action": "subscription",
+ }
subscription_data["extra"] = json.dumps(subscription_data.get("extra") or {})
form_data += self._encode_metadata(
@@ -615,7 +614,7 @@ def _parse_create_opts(
self, raw_opts: dict[str, Any]
) -> StripeCreateInvoiceOptions | None:
try:
- return StripeCreateInvoiceOptions.parse_obj(raw_opts)
+ return StripeCreateInvoiceOptions.model_validate(raw_opts)
except ValidationError as e:
logger.warning(f"Invalid Stripe options: {e}")
return None
### lnbits/helpers.py
@@ -12,7 +12,7 @@
from fastapi.routing import APIRoute
from loguru import logger
from packaging import version
-from pydantic.schema import field_schema
+from pydantic import TypeAdapter
from random_username.generate import generate_username # type: ignore[import-untyped]
from starlette.templating import Jinja2Templates
@@ -76,7 +76,7 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
# used in base.html
t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
t.env.globals["LNBITS_APPLE_TOUCH_ICON"] = settings.lnbits_apple_touch_icon
- t.env.globals["SETTINGS"] = settings.to_public().dict(by_alias=True)
+ t.env.globals["SETTINGS"] = settings.to_public().model_dump(by_alias=True)
t.env.globals["CURRENCIES"] = list(currencies.keys())
if settings.bundle_assets:
@@ -132,22 +132,18 @@ def generate_filter_params_openapi(model: type[FilterModel], keep_optional=False
:param keep_optional: If false, all parameters will be optional,
otherwise inferred from model
"""
- fields = list(model.__fields__.values())
params = []
- for field in fields:
- schema, _, _ = field_schema(field, model_name_map={})
+ for name, field in model.model_fields.items():
+ schema = TypeAdapter(field.rebuild_annotation()).json_schema()
description = "Supports Filtering"
- if (
- hasattr(model, "__search_fields__")
- and field.name in model.__search_fields__
- ):
+ if hasattr(model, "__search_fields__") and name in model.__search_fields__:
description += ". Supports Search"
parameter = {
- "name": field.alias,
+ "name": field.alias or name,
"in": "query",
- "required": field.required if keep_optional else False,
+ "required": field.is_required() if keep_optional else False,
"schema": schema,
"description": description,
}
### lnbits/nodes/base.py
@@ -61,8 +61,8 @@ class NodeChannel(BaseModel):
class ChannelStats(BaseModel):
counts: dict[ChannelState, int]
avg_size: int
- biggest_size: int | None
- smallest_size: int | None
+ biggest_size: int | None = None
+ smallest_size: int | None = None
total_capacity: int
@classmethod
@@ -107,8 +107,8 @@ class PublicNodeInfo(BaseModel):
backend_name: str
alias: str
color: str
- num_peers: int | None
- blockheight: int | None
+ num_peers: int | None = None
+ blockheight: int | None = None
channel_stats: ChannelStats
addresses: list[str]
managed_channels: bool = False
@@ -128,8 +128,8 @@ class NodePayment(BaseModel):
memo: str | None = None
time: int
bolt11: str | None = None
- preimage: str | None
- payment_hash: str | None
+ preimage: str | None = None
+ payment_hash: str | None = None
payment_id: str | None = None
txid: str | None = None
expiry: float | None = None
@@ -139,9 +139,9 @@ class NodePayment(BaseModel):
class NodeInvoice(BaseModel):
pending: bool
amount: int
- memo: str | None
+ memo: str | None = None
bolt11: str
- preimage: str | None
+ preimage: str | None = None
payment_hash: str
paid_at: int | None = None
expiry: int | None = None
### lnbits/nodes/lndrest.py
@@ -364,7 +364,7 @@ async def get_info(self) -> NodeInfoResponse:
fee_report = await self.get("/v1/fees")
balance = await self.get("/v1/balance/channels")
return NodeInfoResponse(
- **public.dict(),
+ **public.model_dump(),
onchain_balance_sat=onchain["total_balance"],
onchain_confirmed_sat=onchain["confirmed_balance"],
balance_msat=balance["local_balance"]["msat"],
### lnbits/nodes/phoenixd.py
@@ -30,11 +30,11 @@
class PhoenixdStatus(BaseModel):
- version: str | None
+ version: str | None = None
chain: str
- blockheight: int | None
+ blockheight: int | None = None
fee_credit_sat: int
- swap_in: dict[str, int] | None
+ swap_in: dict[str, int] | None = None
capabilities: list[str]
### lnbits/settings.py
@@ -2,7 +2,6 @@
import importlib
import importlib.metadata
-import inspect
import json
import os
import re
@@ -11,11 +10,20 @@
from os import path
from pathlib import Path
from time import gmtime, strftime, time
-from typing import Any, Literal
+from typing import Any, Literal, get_args, get_origin
from uuid import uuid4
from loguru import logger
-from pydantic import BaseModel, BaseSettings, Extra, Field, SecretStr, validator
+from pydantic import (
+ AliasChoices,
+ BaseModel,
+ ConfigDict,
+ Field,
+ SecretStr,
+ ValidationInfo,
+ field_validator,
+)
+from pydantic_settings import BaseSettings, SettingsConfigDict
DEFAULT_WASM_MANIFESTS = [
"https://raw.githubusercontent.com/lnbits/lnbits-extensions-wasm/refs/heads/main/extensions.json"
@@ -711,10 +719,8 @@ class BoltzFundingSource(LNbitsSettings):
class StrikeFundingSource(LNbitsSettings):
- strike_api_endpoint: str | None = Field(
- default="https://api.strike.me/v1", env="STRIKE_API_ENDPOINT"
- )
- strike_api_key: str | None = Field(default=None, env="STRIKE_API_KEY")
+ strike_api_endpoint: str | None = Field(default="https://api.strike.me/v1")
+ strike_api_key: str | None = Field(default=None)
class FiatProviderLimits(BaseModel):
@@ -995,7 +1001,8 @@ class TwoFactorSettings(LNbitsSettings):
lnbits_two_factor_methods: list[str] = Field(default=["totp"])
lnbits_two_factor_mandatory: bool = Field(default=False)
- @validator("lnbits_two_factor_methods")
+ @field_validator("lnbits_two_factor_methods")
+ @classmethod
def validate_two_factor_methods(cls, methods: list[str]) -> list[str]:
if any(method != "totp" for method in methods):
raise ValueError("Only TOTP is supported.")
@@ -1123,43 +1130,37 @@ class EditableSettings(
KeycloakAuthSettings,
OidcAuthSettings,
):
- @validator(
+ @field_validator(
"lnbits_admin_users",
"lnbits_allowed_users",
"lnbits_wallet_lightning_address_blacklist",
"lnbits_theme_options",
"lnbits_admin_extensions",
"lnbits_extensions_manifests",
"lnbits_wasm_extensions_manifests",
- pre=True,
+ mode="before",
)
@classmethod
def validate_editable_settings(cls, val):
return super().validate_list(val)
@classmethod
def from_dict(cls, d: dict):
- return cls(
- **{k: v for k, v in d.items() if k in inspect.signature(cls).parameters}
- )
-
- # fixes openapi.json validation, remove field env_names
- class Config:
- @staticmethod
- def schema_extra(schema: dict[str, Any]) -> None:
- for prop in schema.get("properties", {}).values():
- prop.pop("env_names", None)
+ return cls(**{k: v for k, v in d.items() if k in cls.model_fields})
class UpdateSettings(EditableSettings):
- class Config(EditableSettings.Config):
- extra = Extra.forbid
+ model_config = ConfigDict(extra="forbid")
class EnvSettings(LNbitsSettings):
+ model_config = ConfigDict(populate_by_name=True)
+
lnbits_onchain_master_key: SecretStr | None = Field(
default=None,
- env=["LNBITS_ONCHAIN_MASTER_KEY", "WATCHONLY_MASTER_KEY"],
+ validation_alias=AliasChoices(
+ "lnbits_onchain_master_key", "WATCHONLY_MASTER_KEY"
+ ),
exclude=True,
)
debug: bool = Field(default=False)
@@ -1234,14 +1235,16 @@ def check_totp_encryption_key(self):
class PersistenceSettings(LNbitsSettings):
lnbits_data_folder: str = Field(default="./data")
lnbits_database_url: str | None = Field(default=None)
- lnbits_wasm_extensions_path: str = Field(default="")
+ lnbits_wasm_extensions_path: str = Field(default="", validate_default=True)
- @validator("lnbits_wasm_extensions_path", pre=True, always=True)
+ @field_validator("lnbits_wasm_extensions_path", mode="before")
@classmethod
- def validate_wasm_extensions_path(cls, value, values) -> str:
+ def validate_wasm_extensions_path(cls, value, info: ValidationInfo) -> str:
if value:
return str(value)
- return str(Path(values.get("lnbits_data_folder", "./data"), "wasm_extensions"))
+ return str(
+ Path(info.data.get("lnbits_data_folder", "./data"), "wasm_extensions")
+ )
@property
def wasm_extensions_dir(self) -> Path:
@@ -1323,7 +1326,7 @@ def lnbits_server_up_time(self) -> str:
@classmethod
def readonly_fields(cls):
- return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
+ return list(cls.model_fields)
class ReadOnlySettings(
@@ -1338,25 +1341,45 @@ class ReadOnlySettings(
def lnbits_extensions_upgrade_path(self) -> str:
return str(Path(self.lnbits_data_folder, "upgrades"))
- @validator(
- "lnbits_allowed_funding_sources",
- pre=True,
- )
+ @field_validator("lnbits_allowed_funding_sources", mode="before")
@classmethod
def validate_readonly_settings(cls, val):
return super().validate_list(val)
@classmethod
def readonly_fields(cls):
- return [f for f in inspect.signature(cls).parameters if not f.startswith("_")]
+ return list(cls.model_fields)
-class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings):
- class Config(EditableSettings.Config, BaseSettings.Config): # type: ignore[misc]
- env_file = ".env"
- env_file_encoding = "utf-8"
- case_sensitive = False
- json_loads = list_parse_fallback # type: ignore[assignment]
+# BaseSettings narrows BaseModel.model_config from ConfigDict to SettingsConfigDict.
+class Settings( # pyright: ignore[reportIncompatibleVariableOverride]
+ EditableSettings, ReadOnlySettings, TransientSettings, BaseSettings
+):
+ model_config = SettingsConfigDict(
+ env_file=".env",
+ env_file_encoding="utf-8",
+ case_sensitive=False,
+ extra="ignore",
+ populate_by_name=True,
+ enable_decoding=False,
+ )
+
+ @field_validator("*", mode="before")
+ @classmethod
+ def decode_env_values(cls, value: Any, info: ValidationInfo) -> Any:
+ assert info.field_name is not None
+ annotation = cls.model_fields[info.field_name].annotation
+ types = (annotation, *get_args(annotation))
+ if isinstance(value, str) and any(
+ get_origin(type_) in (list, dict, set) for type_ in types
+ ):
+ return list_parse_fallback(value)
+ if isinstance(value, str) and any(
+ isinstance(type_, type) and issubclass(type_, (BaseModel, list, dict, set))
+ for type_ in types
+ ):
+ return list_parse_fallback(value)
+ return value
def is_user_allowed(self, user_id: str) -> bool:
return (
@@ -1398,22 +1421,22 @@ class PublicSettings(BaseModel):
qr_logo: str = Field(alias="qrLogo")
site_title: str = Field(alias="siteTitle")
site_tagline: str = Field(alias="siteTagline")
- site_description: str | None = Field(alias="siteDescription")
+ site_description: str | None = Field(default=None, alias="siteDescription")
auth_methods: list[str] = Field(alias="authMethods")
- keycloak_org: str | None = Field(alias="keycloakOrg")
- keycloak_icon: str | None = Field(alias="keycloakIcon")
- oidc_org: str | None = Field(alias="oidcOrg")
- oidc_icon: str | None = Field(alias="oidcIcon")
+ keycloak_org: str | None = Field(default=None, alias="keycloakOrg")
+ keycloak_icon: str | None = Field(default=None, alias="keycloakIcon")
+ oidc_org: str | None = Field(default=None, alias="oidcOrg")
+ oidc_icon: str | None = Field(default=None, alias="oidcIcon")
has_holdinvoice: bool = Field(alias="hasHoldinvoice")
has_nodemanager: bool = Field(alias="hasNodemanager")
show_nodemanager: bool = Field(alias="showNodemanager")
- custom_logo: str | None = Field(alias="customLogo")
+ custom_logo: str | None = Field(default=None, alias="customLogo")
show_voidwallet: bool = Field(alias="showVoidwallet")
version: str = Field(alias="version")
show_home_page_elements: bool = Field(alias="showHomePageElements")
hide_api: bool = Field(alias="hideApi")
cache_key: str = Field(alias="cacheKey")
- webpush_pubkey: str | None = Field(alias="webpushPubkey")
+ webpush_pubkey: str | None = Field(default=None, alias="webpushPubkey")
show_extensions: bool = Field(alias="showExtensions")
show_audit: bool = Field(alias="showAudit")
show_block_explorer: bool = Field(alias="showBlockExplorer")
@@ -1423,24 +1446,24 @@ class PublicSettings(BaseModel):
ad_space: list[list[str]] = Field(alias="adSpace")
ad_space_title: str = Field(alias="adSpaceTitle")
show_ad_space: bool = Field(alias="showAdSpace")
- custom_image: str | None = Field(alias="customImage")
- custom_badge: str | None = Field(alias="customBadge")
- custom_badge_color: str | None = Field(alias="customBadgeColor")
+ custom_image: str | None = Field(default=None, alias="customImage")
+ custom_badge: str | None = Field(default=None, alias="customBadge")
+ custom_badge_color: str | None = Field(default=None, alias="customBadgeColor")
service_fee: float = Field(alias="serviceFee")
service_fee_max: int = Field(alias="serviceFeeMax")
- service_fee_wallet: str | None = Field(alias="serviceFeeWallet")
+ service_fee_wallet: str | None = Field(default=None, alias="serviceFeeWallet")
theme_options: list[str] = Field(alias="themeOptions")
default_reaction: str = Field(alias="defaultReaction")
default_theme: str = Field(alias="defaultTheme")
default_border: str = Field(alias="defaultBorder")
- default_bgimage: str | None = Field(alias="defaultBgimage")
+ default_bgimage: str | None = Field(default=None, alias="defaultBgimage")
default_gradient: bool = Field(alias="defaultGradient")
default_dark: bool = Field(alias="defaultDark")
default_card_rounded: bool = Field(alias="defaultCardRounded")
default_card_gradient: bool = Field(alias="defaultCardGradient")
default_card_shadow: bool = Field(alias="defaultCardShadow")
default_burger_menu_background: bool = Field(alias="defaultBurgerMenuBackground")
- denomination: str | None = Field()
+ denomination: str | None = Field(default=None)
extensions: list[str] = Field()
allowed_currencies: list[str] = Field(alias="allowedCurrencies")
default_accounting_currency: str = Field(alias="defaultAccountingCurrency")
@@ -1449,9 +1472,15 @@ class PublicSettings(BaseModel):
nostr_configured: bool = Field(alias="nostrConfigured")
email_configured: bool = Field(alias="emailConfigured")
telegram_configured: bool = Field(alias="telegramConfigured")
- wallet_featured_button_label: str | None = Field(alias="walletFeaturedButtonLabel")
- wallet_featured_button_url: str | None = Field(alias="walletFeaturedButtonUrl")
- wallet_featured_button_icon: str | None = Field(alias="walletFeaturedButtonIcon")
+ wallet_featured_button_label: str | None = Field(
+ default=None, alias="walletFeaturedButtonLabel"
+ )
+ wallet_featured_button_url: str | None = Field(
+ default=None, alias="walletFeaturedButtonUrl"
+ )
+ wallet_featured_button_icon: str | None = Field(
+ default=None, alias="walletFeaturedButtonIcon"
+ )
enable_wallet_lightning_addresses: bool = Field(
alias="enableWalletLightningAddresses"
)
@@ -1558,12 +1587,12 @@ class SuperSettings(EditableSettings):
class AdminSettings(EditableSettings):
is_super_user: bool
- lnbits_allowed_funding_sources: list[str] | None
+ lnbits_allowed_funding_sources: list[str] | None = None
class SettingsField(BaseModel):
id: str
- value: Any | None
+ value: Any | None = None
tag: str = "core"
@@ -1598,7 +1627,7 @@ def set_cli_settings(**kwargs):
# printing environment variable for debugging
if not settings.lnbits_admin_ui:
logger.debug("Environment Settings:")
- for key, value in settings.dict(
+ for key, value in settings.model_dump(
exclude_none=True, exclude={"auth_secret_key", "totp_encryption_key"}
).items():
logger.debug(f"{key}: {value}")
### lnbits/task_manager.py
@@ -542,7 +542,7 @@ async def relay_ws_queue(
if event_task in done:
event = event_task.result()
try:
- await websocket.send_json(serialize(event).dict())
+ await websocket.send_json(serialize(event).model_dump())
except Exception as exc:
logger.debug(f"ws relay send error: {exc}")
break
### lnbits/utils/electrum.py
@@ -20,7 +20,7 @@
from embit.script import Script
from embit.transaction import Transaction as EmbitTransaction
from loguru import logger
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
DEFAULT_NETWORK = NETWORKS["main"]
@@ -151,8 +151,7 @@ class FeeHistogramEntry(BaseModel):
class ServerFeatures(BaseModel):
- class Config:
- extra = "allow"
+ model_config = ConfigDict(extra="allow")
genesis_hash: str = ""
protocol_max: str = ""
@@ -535,7 +534,7 @@ async def server_banner(self) -> str:
async def server_features(self) -> ServerFeatures:
data = await self._call("server.features")
- return ServerFeatures.parse_obj(data)
+ return ServerFeatures.model_validate(data)
async def server_peers(self) -> list[Any]:
return await self._call("server.peers.subscribe")
@@ -544,19 +543,19 @@ async def server_peers(self) -> list[Any]:
async def get_balance(self, scripthash: str) -> Balance:
data = await self._call("blockchain.scripthash.get_balance", [scripthash])
- return Balance.parse_obj(data)
+ return Balance.model_validate(data)
async def get_history(self, scripthash: str) -> list[HistoryEntry]:
data = await self._call("blockchain.scripthash.get_history", [scripthash])
- return [HistoryEntry.parse_obj(e) for e in data]
+ return [HistoryEntry.model_validate(e) for e in data]
async def get_mempool(self, scripthash: str) -> list[MempoolEntry]:
data = await self._call("blockchain.scripthash.get_mempool", [scripthash])
- return [MempoolEntry.parse_obj(e) for e in data]
+ return [MempoolEntry.model_validate(e) for e in data]
async def listunspent(self, scripthash: str) -> list[UTXO]:
data = await self._call("blockchain.scripthash.listunspent", [scripthash])
- return [UTXO.parse_obj(e) for e in data]
+ return [UTXO.model_validate(e) for e in data]
async def subscribe_scripthash(
self,
@@ -585,7 +584,7 @@ async def subscribe_headers(
if callback:
self.on("blockchain.headers.subscribe", callback)
data = await self._call("blockchain.headers.subscribe")
- return BlockHeader.parse_obj(data)
+ return BlockHeader.model_validate(data)
# ---- transaction methods ----
@@ -599,7 +598,7 @@ async def get_transaction(self, txid: str) -> str:
async def get_merkle(self, txid: str, height: int) -> MerkleProof:
data = await self._call("blockchain.transaction.get_merkle", [txid, height])
- return MerkleProof.parse_obj(data)
+ return MerkleProof.model_validate(data)
async def get_tx_id_from_pos(
self, height: int, tx_pos: int, merkle: bool = False
@@ -608,15 +607,15 @@ async def get_tx_id_from_pos(
"blockchain.transaction.id_from_pos", [height, tx_pos, merkle]
)
if isinstance(data, dict):
- return TxIdWithMerkle.parse_obj(data)
+ return TxIdWithMerkle.model_validate(data)
return data
# ---- block methods ----
async def get_tip(self) -> BlockHeader:
"""Returns current chain tip."""
data = await self._call("blockchain.headers.subscribe")
- return BlockHeader.parse_obj(data)
+ return BlockHeader.model_validate(data)
async def get_height(self) -> int:
"""Returns the current best block height."""
@@ -627,7 +626,7 @@ async def get_block_header(
) -> str | BlockHeaderProof:
data = await self._call("blockchain.block.header", [height, cp_height])
if isinstance(data, dict):
- return BlockHeaderProof.parse_obj(data)
+ return BlockHeaderProof.model_validate(data)
return data
async def get_block_headers(
@@ -636,7 +635,7 @@ async def get_block_headers(
data = await self._call(
"blockchain.block.headers", [start_height, count, cp_height]
)
- return BlockHeaders.parse_obj(data)
+ return BlockHeaders.model_validate(data)
# ---- fee methods ----
### lnbits/utils/network.py
@@ -0,0 +1,26 @@
+import ipaddress
+
+_NAT64_NETWORK = ipaddress.IPv6Network("64:ff9b::/96")
+_NAT64_LOCAL_NETWORK = ipaddress.IPv6Network("64:ff9b:1::/48")
+_IPV4_COMPATIBLE_NETWORK = ipaddress.IPv6Network("::/96")
+
+
+def is_global_address(address: ipaddress.IPv4Address | ipaddress.IPv6Address) -> bool:
+ """Require both the address and any embedded IPv4 addresses to be global."""
+ if not address.is_global:
+ return False
+ if isinstance(address, ipaddress.IPv4Address):
+ return True
+
+ # Match newer Python versions; local NAT64 can use different IPv4 layouts.
+ if address in _NAT64_LOCAL_NETWORK:
+ return False
+ if address.ipv4_mapped is not None:
+ return address.ipv4_mapped.is_global
+ if address.sixtofour is not None:
+ return address.sixtofour.is_global
+ if address.teredo is not None:
+ return all(ip.is_global for ip in address.teredo)
+ if address in _NAT64_NETWORK or address in _IPV4_COMPATIBLE_NETWORK:
+ return ipaddress.IPv4Address(address.packed[-4:]).is_global
+ return True
### lnbits/wallets/breez.py
@@ -39,8 +39,8 @@ def __init__(self):
default_config,
mnemonic_to_seed,
)
- from breez_sdk import (
- PaymentStatus as BreezPaymentStatus, # type: ignore[reportMissingImports]
+ from breez_sdk import ( # type: ignore[reportMissingImports]
+ PaymentStatus as BreezPaymentStatus,
)
from loguru import logger
### lnbits/wallets/eclair.py
@@ -45,7 +45,9 @@ def __init__(self):
raise ValueError("cannot initialize EclairWallet: missing eclair_pass")
self.url = normalize_endpoint(settings.eclair_url)
- self.ws_url = f"ws://{urllib.parse.urlsplit(self.url).netloc}/ws"
+ parsed_url = urllib.parse.urlsplit(self.url)
+ ws_scheme = "wss" if parsed_url.scheme == "https" else "ws"
+ self.ws_url = f"{ws_scheme}://{parsed_url.netloc}/ws"
password = settings.eclair_pass
encoded_auth = base64.b64encode(f":{password}".encode())
### poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.4.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.5.1 and should not be changed by hand.
[[package]]
name = "aiohappyeyeballs"
@@ -199,6 +199,18 @@ files = [
{file = "annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4"},
]
+[[package]]
+name = "annotated-types"
+version = "0.8.0"
+description = "Reusable constraint types to use with typing.Annotated"
+optional = false
+python-versions = ">=3.10"
+groups = ["main", "dev"]
+files = [
+ {file = "annotated_types-0.8.0-py3-none-any.whl", hash = "sha256:f072f4d804ea359e4eaf198b1af7a8b0943881a87f31bb764f8bf219bb9419e0"},
+ {file = "annotated_types-0.8.0.tar.gz", hash = "sha256:13b2beaad985e05e2d6407ee4c4f35590b11f8d693a258a561055cac8f64cab7"},
+]
+
[[package]]
name = "anyio"
version = "4.12.1"
@@ -1450,7 +1462,7 @@ files = [
]
[package.dependencies]
-pydantic = ">=1.7.4,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0 || >2.0.0,<2.0.1 || >2.0.1,<2.1.0 || >2.1.0,<3.0.0"
+pydantic = ">=1.7.4,!=1.8,!=1.8.1,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0"
starlette = ">=0.40.0,<0.49.0"
typing-extensions = ">=4.8.0"
@@ -1928,6 +1940,7 @@ certifi = "*"
httpcore = "==1.*"
idna = "*"
sniffio = "*"
+socksio = {version = "==1.*", optional = true, markers = "extra == \"socks\""}
[package.extras]
brotli = ["brotli ; platform_python_implementation == \"CPython\"", "brotlicffi ; platform_python_implementation != \"CPython\""]
@@ -2287,24 +2300,24 @@ valkey = ["valkey (>=6)"]
[[package]]
name = "lnurl"
-version = "0.10.0"
+version = "2.0.2"
description = "LNURL implementation for Python."
optional = false
python-versions = "<3.13,>=3.10"
groups = ["main"]
files = [
- {file = "lnurl-0.10.0-py3-none-any.whl", hash = "sha256:0d43561b4370cecec19c8f1044fc840f0199fc2698bc83cd8782e8264bfde8f4"},
- {file = "lnurl-0.10.0.tar.gz", hash = "sha256:55ba0a7e810bcdfc7410c682f91c76df4446ff24e83d6bf931a7c759e2e0d5cc"},
+ {file = "lnurl-2.0.2-py3-none-any.whl", hash = "sha256:4094b4a07e26eb9e5792111e7482a79cfe87c88fddae03c895abd06de5fd06d0"},
+ {file = "lnurl-2.0.2.tar.gz", hash = "sha256:64cdfe5af0c37117e91c84a72441824b8f5c6945e5923a16efd69654a06b0c51"},
]
[package.dependencies]
bech32 = "*"
bip32 = ">=5.0.0"
bolt11 = "*"
coincurve = ">=20.0.0"
-httpx = "*"
+httpx = {version = "*", extras = ["socks"]}
pycryptodomex = ">=3.21.0"
-pydantic = ">=1.10.0,<2.0.0"
+pydantic = ">=2.10.0,<3.0.0"
[[package]]
name = "loguru"
@@ -3366,58 +3379,184 @@ files = [
[[package]]
name = "pydantic"
-version = "1.10.26"
-description = "Data validation and settings management using python type hints"
+version = "2.12.5"
+description = "Data validation using Python type hints"
optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.9"
groups = ["main", "dev"]
files = [
- {file = "pydantic-1.10.26-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f7ae36fa0ecef8d39884120f212e16c06bb096a38f523421278e2f39c1784546"},
- {file = "pydantic-1.10.26-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d95a76cf503f0f72ed7812a91de948440b2bf564269975738a4751e4fadeb572"},
- {file = "pydantic-1.10.26-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a943ce8e00ad708ed06a1d9df5b4fd28f5635a003b82a4908ece6f24c0b18464"},
- {file = "pydantic-1.10.26-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:465ad8edb29b15c10b779b16431fe8e77c380098badf6db367b7a1d3e572cf53"},
- {file = "pydantic-1.10.26-cp310-cp310-win_amd64.whl", hash = "sha256:80e6be6272839c8a7641d26ad569ab77772809dd78f91d0068dc0fc97f071945"},
- {file = "pydantic-1.10.26-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:116233e53889bcc536f617e38c1b8337d7fa9c280f0fd7a4045947515a785637"},
- {file = "pydantic-1.10.26-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c3cfdd361addb6eb64ccd26ac356ad6514cee06a61ab26b27e16b5ed53108f77"},
- {file = "pydantic-1.10.26-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0e4451951a9a93bf9a90576f3e25240b47ee49ab5236adccb8eff6ac943adf0f"},
- {file = "pydantic-1.10.26-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9858ed44c6bea5f29ffe95308db9e62060791c877766c67dd5f55d072c8612b5"},
- {file = "pydantic-1.10.26-cp311-cp311-win_amd64.whl", hash = "sha256:ac1089f723e2106ebde434377d31239e00870a7563245072968e5af5cc4d33df"},
- {file = "pydantic-1.10.26-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:468d5b9cacfcaadc76ed0a4645354ab6f263ec01a63fb6d05630ea1df6ae453f"},
- {file = "pydantic-1.10.26-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2c1b0b914be31671000ca25cf7ea17fcaaa68cfeadf6924529c5c5aa24b7ab1f"},
- {file = "pydantic-1.10.26-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:15b13b9f8ba8867095769e1156e0d7fbafa1f65b898dd40fd1c02e34430973cb"},
- {file = "pydantic-1.10.26-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ad7025ca324ae263d4313998e25078dcaec5f9ed0392c06dedb57e053cc8086b"},
- {file = "pydantic-1.10.26-cp312-cp312-win_amd64.whl", hash = "sha256:4482b299874dabb88a6c3759e3d85c6557c407c3b586891f7d808d8a38b66b9c"},
- {file = "pydantic-1.10.26-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1ae7913bb40a96c87e3d3f6fe4e918ef53bf181583de4e71824360a9b11aef1c"},
- {file = "pydantic-1.10.26-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8154c13f58d4de5d3a856bb6c909c7370f41fb876a5952a503af6b975265f4ba"},
- {file = "pydantic-1.10.26-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f8af0507bf6118b054a9765fb2e402f18a8b70c964f420d95b525eb711122d62"},
- {file = "pydantic-1.10.26-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dcb5a7318fb43189fde6af6f21ac7149c4bcbcfffc54bc87b5becddc46084847"},
- {file = "pydantic-1.10.26-cp313-cp313-win_amd64.whl", hash = "sha256:71cde228bc0600cf8619f0ee62db050d1880dcc477eba0e90b23011b4ee0f314"},
- {file = "pydantic-1.10.26-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6b40730cc81d53d515dc0b8bb5c9b43fadb9bed46de4a3c03bd95e8571616dba"},
- {file = "pydantic-1.10.26-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c3bbb9c0eecdf599e4db9b372fa9cc55be12e80a0d9c6d307950a39050cb0e37"},
- {file = "pydantic-1.10.26-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cc2e3fe7bc4993626ef6b6fa855defafa1d6f8996aa1caef2deb83c5ac4d043a"},
- {file = "pydantic-1.10.26-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:36d9e46b588aaeb1dcd2409fa4c467fe0b331f3cc9f227b03a7a00643704e962"},
- {file = "pydantic-1.10.26-cp314-cp314-win_amd64.whl", hash = "sha256:81ce3c8616d12a7be31b4aadfd3434f78f6b44b75adbfaec2fe1ad4f7f999b8c"},
- {file = "pydantic-1.10.26-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bc5c91a3b3106caf07ac6735ec6efad8ba37b860b9eb569923386debe65039ad"},
- {file = "pydantic-1.10.26-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:dde599e0388e04778480d57f49355c9cc7916de818bf674de5d5429f2feebfb6"},
- {file = "pydantic-1.10.26-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8be08b5cfe88e58198722861c7aab737c978423c3a27300911767931e5311d0d"},
- {file = "pydantic-1.10.26-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:0141f4bafe5eda539d98c9755128a9ea933654c6ca4306b5059fc87a01a38573"},
- {file = "pydantic-1.10.26-cp38-cp38-win_amd64.whl", hash = "sha256:eb664305ffca8a9766a8629303bb596607d77eae35bb5f32ff9245984881b638"},
- {file = "pydantic-1.10.26-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:502b9d30d18a2dfaf81b7302f6ba0e5853474b1c96212449eb4db912cb604b7d"},
- {file = "pydantic-1.10.26-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0d8f6087bf697dec3bf7ffcd7fe8362674f16519f3151789f33cbe8f1d19fc15"},
- {file = "pydantic-1.10.26-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:dd40a99c358419910c85e6f5d22f9c56684c25b5e7abc40879b3b4a52f34ae90"},
- {file = "pydantic-1.10.26-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:ce3293b86ca9f4125df02ff0a70be91bc7946522467cbd98e7f1493f340616ba"},
- {file = "pydantic-1.10.26-cp39-cp39-win_amd64.whl", hash = "sha256:1a4e3062b71ab1d5df339ba12c48f9ed5817c5de6cb92a961dd5c64bb32e7b96"},
- {file = "pydantic-1.10.26-py3-none-any.whl", hash = "sha256:c43ad70dc3ce7787543d563792426a16fd7895e14be4b194b5665e36459dd917"},
- {file = "pydantic-1.10.26.tar.gz", hash = "sha256:8c6aa39b494c5af092e690127c283d84f363ac36017106a9e66cb33a22ac412e"},
+ {file = "pydantic-2.12.5-py3-none-any.whl", hash = "sha256:e561593fccf61e8a20fc46dfc2dfe075b8be7d0188df33f221ad1f0139180f9d"},
+ {file = "pydantic-2.12.5.tar.gz", hash = "sha256:4d351024c75c0f085a9febbb665ce8c0c6ec5d30e903bdb6394b7ede26aebb49"},
]
[package.dependencies]
-email-validator = {version = ">=1.0.3", optional = true, markers = "extra == \"email\""}
-typing-extensions = ">=4.2.0"
+annotated-types = ">=0.6.0"
+email-validator = {version = ">=2.0.0", optional = true, markers = "extra == \"email\""}
+pydantic-core = "2.41.5"
+typing-extensions = ">=4.14.1"
+typing-inspection = ">=0.4.2"
[package.extras]
-dotenv = ["python-dotenv (>=0.10.4)"]
-email = ["email-validator (>=1.0.3)"]
+email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata ; python_version >= \"3.9\" and platform_system == \"Windows\""]
+
+[[package]]
+name = "pydantic-core"
+version = "2.41.5"
+description = "Core functionality for Pydantic validation and serialization"
+optional = false
+python-versions = ">=3.9"
+groups = ["main", "dev"]
+files = [
+ {file = "pydantic_core-2.41.5-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:77b63866ca88d804225eaa4af3e664c5faf3568cea95360d21f4725ab6e07146"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:dfa8a0c812ac681395907e71e1274819dec685fec28273a28905df579ef137e2"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5921a4d3ca3aee735d9fd163808f5e8dd6c6972101e4adbda9a4667908849b97"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e25c479382d26a2a41b7ebea1043564a937db462816ea07afa8a44c0866d52f9"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f547144f2966e1e16ae626d8ce72b4cfa0caedc7fa28052001c94fb2fcaa1c52"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6f52298fbd394f9ed112d56f3d11aabd0d5bd27beb3084cc3d8ad069483b8941"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:100baa204bb412b74fe285fb0f3a385256dad1d1879f0a5cb1499ed2e83d132a"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:05a2c8852530ad2812cb7914dc61a1125dc4e06252ee98e5638a12da6cc6fb6c"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:29452c56df2ed968d18d7e21f4ab0ac55e71dc59524872f6fc57dcf4a3249ed2"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:d5160812ea7a8a2ffbe233d8da666880cad0cbaf5d4de74ae15c313213d62556"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:df3959765b553b9440adfd3c795617c352154e497a4eaf3752555cfb5da8fc49"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-win32.whl", hash = "sha256:1f8d33a7f4d5a7889e60dc39856d76d09333d8a6ed0f5f1190635cbec70ec4ba"},
+ {file = "pydantic_core-2.41.5-cp310-cp310-win_amd64.whl", hash = "sha256:62de39db01b8d593e45871af2af9e497295db8d73b085f6bfd0b18c83c70a8f9"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:a3a52f6156e73e7ccb0f8cced536adccb7042be67cb45f9562e12b319c119da6"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7f3bf998340c6d4b0c9a2f02d6a400e51f123b59565d74dc60d252ce888c260b"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:378bec5c66998815d224c9ca994f1e14c0c21cb95d2f52b6021cc0b2a58f2a5a"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e7b576130c69225432866fe2f4a469a85a54ade141d96fd396dffcf607b558f8"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6cb58b9c66f7e4179a2d5e0f849c48eff5c1fca560994d6eb6543abf955a149e"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:88942d3a3dff3afc8288c21e565e476fc278902ae4d6d134f1eeda118cc830b1"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f31d95a179f8d64d90f6831d71fa93290893a33148d890ba15de25642c5d075b"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c1df3d34aced70add6f867a8cf413e299177e0c22660cc767218373d0779487b"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:4009935984bd36bd2c774e13f9a09563ce8de4abaa7226f5108262fa3e637284"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:34a64bc3441dc1213096a20fe27e8e128bd3ff89921706e83c0b1ac971276594"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c9e19dd6e28fdcaa5a1de679aec4141f691023916427ef9bae8584f9c2fb3b0e"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-win32.whl", hash = "sha256:2c010c6ded393148374c0f6f0bf89d206bf3217f201faa0635dcd56bd1520f6b"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-win_amd64.whl", hash = "sha256:76ee27c6e9c7f16f47db7a94157112a2f3a00e958bc626e2f4ee8bec5c328fbe"},
+ {file = "pydantic_core-2.41.5-cp311-cp311-win_arm64.whl", hash = "sha256:4bc36bbc0b7584de96561184ad7f012478987882ebf9f9c389b23f432ea3d90f"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f41a7489d32336dbf2199c8c0a215390a751c5b014c2c1c5366e817202e9cdf7"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:070259a8818988b9a84a449a2a7337c7f430a22acc0859c6b110aa7212a6d9c0"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e96cea19e34778f8d59fe40775a7a574d95816eb150850a85a7a4c8f4b94ac69"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed2e99c456e3fadd05c991f8f437ef902e00eedf34320ba2b0842bd1c3ca3a75"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:65840751b72fbfd82c3c640cff9284545342a4f1eb1586ad0636955b261b0b05"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e536c98a7626a98feb2d3eaf75944ef6f3dbee447e1f841eae16f2f0a72d8ddc"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eceb81a8d74f9267ef4081e246ffd6d129da5d87e37a77c9bde550cb04870c1c"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d38548150c39b74aeeb0ce8ee1d8e82696f4a4e16ddc6de7b1d8823f7de4b9b5"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c23e27686783f60290e36827f9c626e63154b82b116d7fe9adba1fda36da706c"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:482c982f814460eabe1d3bb0adfdc583387bd4691ef00b90575ca0d2b6fe2294"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:bfea2a5f0b4d8d43adf9d7b8bf019fb46fdd10a2e5cde477fbcb9d1fa08c68e1"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-win32.whl", hash = "sha256:b74557b16e390ec12dca509bce9264c3bbd128f8a2c376eaa68003d7f327276d"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-win_amd64.whl", hash = "sha256:1962293292865bca8e54702b08a4f26da73adc83dd1fcf26fbc875b35d81c815"},
+ {file = "pydantic_core-2.41.5-cp312-cp312-win_arm64.whl", hash = "sha256:1746d4a3d9a794cacae06a5eaaccb4b8643a131d45fbc9af23e353dc0a5ba5c3"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:941103c9be18ac8daf7b7adca8228f8ed6bb7a1849020f643b3a14d15b1924d9"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:112e305c3314f40c93998e567879e887a3160bb8689ef3d2c04b6cc62c33ac34"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cbaad15cb0c90aa221d43c00e77bb33c93e8d36e0bf74760cd00e732d10a6a0"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:03ca43e12fab6023fc79d28ca6b39b05f794ad08ec2feccc59a339b02f2b3d33"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dc799088c08fa04e43144b164feb0c13f9a0bc40503f8df3e9fde58a3c0c101e"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:97aeba56665b4c3235a0e52b2c2f5ae9cd071b8a8310ad27bddb3f7fb30e9aa2"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:406bf18d345822d6c21366031003612b9c77b3e29ffdb0f612367352aab7d586"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b93590ae81f7010dbe380cdeab6f515902ebcbefe0b9327cc4804d74e93ae69d"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:01a3d0ab748ee531f4ea6c3e48ad9dac84ddba4b0d82291f87248f2f9de8d740"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:6561e94ba9dacc9c61bce40e2d6bdc3bfaa0259d3ff36ace3b1e6901936d2e3e"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:915c3d10f81bec3a74fbd4faebe8391013ba61e5a1a8d48c4455b923bdda7858"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-win32.whl", hash = "sha256:650ae77860b45cfa6e2cdafc42618ceafab3a2d9a3811fcfbd3bbf8ac3c40d36"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-win_amd64.whl", hash = "sha256:79ec52ec461e99e13791ec6508c722742ad745571f234ea6255bed38c6480f11"},
+ {file = "pydantic_core-2.41.5-cp313-cp313-win_arm64.whl", hash = "sha256:3f84d5c1b4ab906093bdc1ff10484838aca54ef08de4afa9de0f5f14d69639cd"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:3f37a19d7ebcdd20b96485056ba9e8b304e27d9904d233d7b1015db320e51f0a"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1d1d9764366c73f996edd17abb6d9d7649a7eb690006ab6adbda117717099b14"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25e1c2af0fce638d5f1988b686f3b3ea8cd7de5f244ca147c777769e798a9cd1"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:506d766a8727beef16b7adaeb8ee6217c64fc813646b424d0804d67c16eddb66"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4819fa52133c9aa3c387b3328f25c1facc356491e6135b459f1de698ff64d869"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2b761d210c9ea91feda40d25b4efe82a1707da2ef62901466a42492c028553a2"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22f0fb8c1c583a3b6f24df2470833b40207e907b90c928cc8d3594b76f874375"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2782c870e99878c634505236d81e5443092fba820f0373997ff75f90f68cd553"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:0177272f88ab8312479336e1d777f6b124537d47f2123f89cb37e0accea97f90"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:63510af5e38f8955b8ee5687740d6ebf7c2a0886d15a6d65c32814613681bc07"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:e56ba91f47764cc14f1daacd723e3e82d1a89d783f0f5afe9c364b8bb491ccdb"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-win32.whl", hash = "sha256:aec5cf2fd867b4ff45b9959f8b20ea3993fc93e63c7363fe6851424c8a7e7c23"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-win_amd64.whl", hash = "sha256:8e7c86f27c585ef37c35e56a96363ab8de4e549a95512445b85c96d3e2f7c1bf"},
+ {file = "pydantic_core-2.41.5-cp314-cp314-win_arm64.whl", hash = "sha256:e672ba74fbc2dc8eea59fb6d4aed6845e6905fc2a8afe93175d94a83ba2a01a0"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:8566def80554c3faa0e65ac30ab0932b9e3a5cd7f8323764303d468e5c37595a"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b80aa5095cd3109962a298ce14110ae16b8c1aece8b72f9dafe81cf597ad80b3"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3006c3dd9ba34b0c094c544c6006cc79e87d8612999f1a5d43b769b89181f23c"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:72f6c8b11857a856bcfa48c86f5368439f74453563f951e473514579d44aa612"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5cb1b2f9742240e4bb26b652a5aeb840aa4b417c7748b6f8387927bc6e45e40d"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bd3d54f38609ff308209bd43acea66061494157703364ae40c951f83ba99a1a9"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ff4321e56e879ee8d2a879501c8e469414d948f4aba74a2d4593184eb326660"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d0d2568a8c11bf8225044aa94409e21da0cb09dcdafe9ecd10250b2baad531a9"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:a39455728aabd58ceabb03c90e12f71fd30fa69615760a075b9fec596456ccc3"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:239edca560d05757817c13dc17c50766136d21f7cd0fac50295499ae24f90fdf"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:2a5e06546e19f24c6a96a129142a75cee553cc018ffee48a460059b1185f4470"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-win32.whl", hash = "sha256:b4ececa40ac28afa90871c2cc2b9ffd2ff0bf749380fbdf57d165fd23da353aa"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-win_amd64.whl", hash = "sha256:80aa89cad80b32a912a65332f64a4450ed00966111b6615ca6816153d3585a8c"},
+ {file = "pydantic_core-2.41.5-cp314-cp314t-win_arm64.whl", hash = "sha256:35b44f37a3199f771c3eaa53051bc8a70cd7b54f333531c59e29fd4db5d15008"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:8bfeaf8735be79f225f3fefab7f941c712aaca36f1128c9d7e2352ee1aa87bdf"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:346285d28e4c8017da95144c7f3acd42740d637ff41946af5ce6e5e420502dd5"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a75dafbf87d6276ddc5b2bf6fae5254e3d0876b626eb24969a574fff9149ee5d"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7b93a4d08587e2b7e7882de461e82b6ed76d9026ce91ca7915e740ecc7855f60"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e8465ab91a4bd96d36dde3263f06caa6a8a6019e4113f24dc753d79a8b3a3f82"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:299e0a22e7ae2b85c1a57f104538b2656e8ab1873511fd718a1c1c6f149b77b5"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:707625ef0983fcfb461acfaf14de2067c5942c6bb0f3b4c99158bed6fedd3cf3"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f41eb9797986d6ebac5e8edff36d5cef9de40def462311b3eb3eeded1431e425"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0384e2e1021894b1ff5a786dbf94771e2986ebe2869533874d7e43bc79c6f504"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-musllinux_1_1_armv7l.whl", hash = "sha256:f0cd744688278965817fd0839c4a4116add48d23890d468bc436f78beb28abf5"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:753e230374206729bf0a807954bcc6c150d3743928a73faffee51ac6557a03c3"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-win32.whl", hash = "sha256:873e0d5b4fb9b89ef7c2d2a963ea7d02879d9da0da8d9d4933dee8ee86a8b460"},
+ {file = "pydantic_core-2.41.5-cp39-cp39-win_amd64.whl", hash = "sha256:e4f4a984405e91527a0d62649ee21138f8e3d0ef103be488c1dc11a80d7f184b"},
+ {file = "pydantic_core-2.41.5-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:b96d5f26b05d03cc60f11a7761a5ded1741da411e7fe0909e27a5e6a0cb7b034"},
+ {file = "pydantic_core-2.41.5-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:634e8609e89ceecea15e2d61bc9ac3718caaaa71963717bf3c8f38bfde64242c"},
+ {file = "pydantic_core-2.41.5-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:93e8740d7503eb008aa2df04d3b9735f845d43ae845e6dcd2be0b55a2da43cd2"},
+ {file = "pydantic_core-2.41.5-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f15489ba13d61f670dcc96772e733aad1a6f9c429cc27574c6cdaed82d0146ad"},
+ {file = "pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:7da7087d756b19037bc2c06edc6c170eeef3c3bafcb8f532ff17d64dc427adfd"},
+ {file = "pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:aabf5777b5c8ca26f7824cb4a120a740c9588ed58df9b2d196ce92fba42ff8dc"},
+ {file = "pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c007fe8a43d43b3969e8469004e9845944f1a80e6acd47c150856bb87f230c56"},
+ {file = "pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:76d0819de158cd855d1cbb8fcafdf6f5cf1eb8e470abe056d5d161106e38062b"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:b5819cd790dbf0c5eb9f82c73c16b39a65dd6dd4d1439dcdea7816ec9adddab8"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:5a4e67afbc95fa5c34cf27d9089bca7fcab4e51e57278d710320a70b956d1b9a"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ece5c59f0ce7d001e017643d8d24da587ea1f74f6993467d85ae8a5ef9d4f42b"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:16f80f7abe3351f8ea6858914ddc8c77e02578544a0ebc15b4c2e1a0e813b0b2"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:33cb885e759a705b426baada1fe68cbb0a2e68e34c5d0d0289a364cf01709093"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:c8d8b4eb992936023be7dee581270af5c6e0697a8559895f527f5b7105ecd36a"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:242a206cd0318f95cd21bdacff3fcc3aab23e79bba5cac3db5a841c9ef9c6963"},
+ {file = "pydantic_core-2.41.5-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:d3a978c4f57a597908b7e697229d996d77a6d3c94901e9edee593adada95ce1a"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:b2379fa7ed44ddecb5bfe4e48577d752db9fc10be00a6b7446e9663ba143de26"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:266fb4cbf5e3cbd0b53669a6d1b039c45e3ce651fd5442eff4d07c2cc8d66808"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58133647260ea01e4d0500089a8c4f07bd7aa6ce109682b1426394988d8aaacc"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:287dad91cfb551c363dc62899a80e9e14da1f0e2b6ebde82c806612ca2a13ef1"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:03b77d184b9eb40240ae9fd676ca364ce1085f203e1b1256f8ab9984dca80a84"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:a668ce24de96165bb239160b3d854943128f4334822900534f2fe947930e5770"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f14f8f046c14563f8eb3f45f499cc658ab8d10072961e07225e507adb700e93f"},
+ {file = "pydantic_core-2.41.5-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:56121965f7a4dc965bff783d70b907ddf3d57f6eba29b6d2e5dabfaf07799c51"},
+ {file = "pydantic_core-2.41.5.tar.gz", hash = "sha256:08daa51ea16ad373ffd5e7606252cc32f07bc72b28284b6bc9c6df804816476e"},
+]
+
+[package.dependencies]
+typing-extensions = ">=4.14.1"
+
+[[package]]
+name = "pydantic-settings"
+version = "2.12.0"
+description = "Settings management using Pydantic"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+ {file = "pydantic_settings-2.12.0-py3-none-any.whl", hash = "sha256:fddb9fd99a5b18da837b29710391e945b1e30c135477f484084ee513adb93809"},
+ {file = "pydantic_settings-2.12.0.tar.gz", hash = "sha256:005538ef951e3c2a68e1c08b292b5f2e71490def8589d4221b95dab00dafcfd0"},
+]
+
+[package.dependencies]
+pydantic = ">=2.7.0"
+python-dotenv = ">=0.21.0"
+typing-inspection = ">=0.4.0"
+
+[package.extras]
+aws-secrets-manager = ["boto3 (>=1.35.0)", "boto3-stubs[secretsmanager]"]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
+gcp-secret-manager = ["google-cloud-secret-manager (>=2.23.1)"]
+toml = ["tomli (>=2.0.1)"]
+yaml = ["pyyaml (>=6.0.1)"]
[[package]]
name = "pyee"
@@ -4307,6 +4446,18 @@ files = [
{file = "sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"},
]
+[[package]]
+name = "socksio"
+version = "1.0.0"
+description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5."
+optional = false
+python-versions = ">=3.6"
+groups = ["main"]
+files = [
+ {file = "socksio-1.0.0-py3-none-any.whl", hash = "sha256:95dc1f15f9b34e8d7b16f06d74b8ccf48f609af32ab33c608d08761c5dcbb1f3"},
+ {file = "socksio-1.0.0.tar.gz", hash = "sha256:f88beb3da5b5c38b9890469de67d0cb0f9d494b78b106ca1845f96c10b91c4ac"},
+]
+
[[package]]
name = "sqlalchemy"
version = "1.4.54"
@@ -4487,7 +4638,7 @@ description = "A lil' TOML parser"
optional = false
python-versions = ">=3.8"
groups = ["dev"]
-markers = "python_full_version <= \"3.11.0a6\""
+markers = "python_version == \"3.10\""
files = [
{file = "tomli-2.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b5ef256a3fd497d4973c11bf142e9ed78b150d36f5773f1ca6088c230ffc5867"},
{file = "tomli-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5572e41282d5268eb09a697c89a7bee84fae66511f87533a6f88bd2f7b652da9"},
@@ -4646,6 +4797,21 @@ files = [
{file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"},
]
+[[package]]
+name = "typing-inspection"
+version = "0.4.4"
+description = "Runtime typing introspection tools"
+optional = false
+python-versions = ">=3.10"
+groups = ["main", "dev"]
+files = [
+ {file = "typing_inspection-0.4.4-py3-none-any.whl", hash = "sha256:65b8397ba37ccbce054456aaccddfc91e6e3083c92824df348d96ca832f3f147"},
+ {file = "typing_inspection-0.4.4.tar.gz", hash = "sha256:547274fa6b0a561ccf549cc9524b999a578e737d015d8709d021f9d0d13bea47"},
+]
+
+[package.dependencies]
+typing-extensions = ">=4.15.0"
+
[[package]]
name = "urllib3"
version = "2.7.0"
@@ -5223,4 +5389,4 @@ migration = ["psycopg2-binary"]
[metadata]
lock-version = "2.1"
python-versions = ">=3.10,<3.13"
-content-hash = "7e96886e588cb2d5695d97adf236edf338796a85661f552575c82a60752dc0ed"
+content-hash = "930df24630fe4fc2edbeef333e22c0f53bb03e53413b0f8b3c6b51b1d34d2d68"
### pyproject.toml
@@ -13,8 +13,9 @@ dependencies = [
"starlette~=0.48.0",
"httpx~=0.27.2",
"jinja2~=3.1.6",
- "lnurl~=0.10.0",
- "pydantic~=1.10.26",
+ "lnurl~=2.0.2",
+ "pydantic~=2.12.5",
+ "pydantic-settings~=2.12.0",
"pyqrcode~=1.2.1",
"shortuuid~=1.0.13",
"sse-starlette~=2.3.6",
@@ -227,8 +228,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
# needed for pydantic
[tool.ruff.lint.pep8-naming]
classmethod-decorators = [
- "root_validator",
- "validator",
+ "field_validator",
]
[tool.ruff.lint.per-file-ignores]
### tests/api/test_api.py
@@ -433,7 +433,7 @@ async def test_pay_invoice_rejects_conflicting_payment_requests(
assert response.status_code == 400
assert response.json()["detail"][0]["msg"] == (
- "payment_request and bolt11 must match."
+ "Value error, payment_request and bolt11 must match."
)
pay_invoice.assert_not_awaited()
pay_offer.assert_not_awaited()
@@ -532,7 +532,7 @@ async def test_payment_preimage_requires_owning_wallet_key(
)
refresh = mocker.patch(
"lnbits.core.views.payment_api.update_pending_payment",
- return_value=payment.copy(update={"status": PaymentState.SUCCESS}),
+ return_value=payment.model_copy(update={"status": PaymentState.SUCCESS}),
)
key = {
None: None,
@@ -657,7 +657,7 @@ async def test_pay_invoice_self_payment(client, adminkey_headers_from):
create_invoice = CreateInvoice(out=False, amount=1000, memo="test")
response = await client.post(
"/api/v1/payments",
- json=create_invoice.dict(),
+ json=create_invoice.model_dump(),
headers=adminkey_headers_from,
)
assert response.status_code < 300
@@ -1246,7 +1246,7 @@ async def test_api_payments_pay_lnurl(client, adminkey_headers_from):
"/api/v1/payments/lnurl", json=lnurl_data, headers=adminkey_headers_from
)
assert response.status_code == 400
- assert "invalid or missing URL scheme" in response.json()["detail"][0]["msg"]
+ assert response.json()["detail"][0]["type"] == "url_parsing"
################################ Labels ################################
### tests/api/test_auth.py
@@ -95,7 +95,7 @@ async def test_login_usr_not_allowed_for_admin_without_credentials(
# Login with user ID
login_data = LoginUsr(usr=account.id)
- response = await http_client.post("/api/v1/auth/usr", json=login_data.dict())
+ response = await http_client.post("/api/v1/auth/usr", json=login_data.model_dump())
http_client.cookies.clear()
assert response.status_code == 200, "User logs in OK."
access_token = response.json().get("access_token")
@@ -106,7 +106,7 @@ async def test_login_usr_not_allowed_for_admin_without_credentials(
settings.lnbits_admin_users = [account.id]
# Attempt to login with user ID for admin
- response = await http_client.post("/api/v1/auth/usr", json=login_data.dict())
+ response = await http_client.post("/api/v1/auth/usr", json=login_data.model_dump())
assert response.status_code == 403
assert (
@@ -1435,7 +1435,7 @@ async def test_api_update_user_acl_success(http_client: AsyncClient, user_alan:
)
response = await http_client.put(
"/api/v1/auth/acl",
- json=data.dict(),
+ json=data.model_dump(),
headers={"Authorization": f"Bearer {access_token}"},
)
assert response.status_code == 200, "ACL should be created successfully."
@@ -1463,7 +1463,7 @@ async def test_api_update_user_acl_invalid_password(
)
response = await http_client.put(
"/api/v1/auth/acl",
- json=data.dict(),
+ json=data.model_dump(),
headers={"Authorization": f"Bearer {access_token}"},
)
assert (
@@ -1490,7 +1490,7 @@ async def test_api_update_user_acl_update_existing(
)
response = await http_client.put(
"/api/v1/auth/acl",
- json=data.dict(),
+ json=data.model_dump(),
headers={"Authorization": f"Bearer {access_token}"},
)
assert response.status_code == 200, "ACL should be created successfully."
@@ -1503,7 +1503,7 @@ async def test_api_update_user_acl_update_existing(
)
response = await http_client.put(
"/api/v1/auth/acl",
- json=data.dict(),
+ json=data.model_dump(),
headers={"Authorization": f"Bearer {access_token}"},
)
assert response.status_code == 200, "ACL should be updated successfully."
@@ -1529,7 +1529,7 @@ async def test_api_update_user_acl_missing_password(
data = UpdateAccessControlList(id="", name="New ACL", password="", endpoints=[])
response = await http_client.put(
"/api/v1/auth/acl",
- json=data.dict(),
+ json=data.model_dump(),
headers={"Authorization": f"Bearer {access_token}"},
)
assert (
@@ -1635,7 +1635,7 @@ async def test_api_get_user_acls_with_acl(http_client: AsyncClient):
response = await http_client.put(
"/api/v1/auth/acl",
headers={"Authorization": f"Bearer {access_token}"},
- json=acl_data.dict(),
+ json=acl_data.model_dump(),
)
assert response.status_code == 200, "ACL created successfully."
@@ -1883,7 +1883,7 @@ async def test_api_create_user_api_token_success(
response = await http_client.put(
"/api/v1/auth/acl",
headers={"Authorization": f"Bearer {access_token}"},
- json=acl_data.dict(),
+ json=acl_data.model_dump(),
)
assert response.status_code == 200, "ACL created."
acl_id = response.json()["access_control_list"][0]["id"]
@@ -1898,7 +1898,7 @@ async def test_api_create_user_api_token_success(
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=token_request.dict(),
+ json=token_request.model_dump(),
)
assert response.status_code == 200, "API token created."
api_token = response.json().get("api_token")
@@ -1956,7 +1956,7 @@ async def test_api_create_user_api_token_invalid_password(http_client: AsyncClie
response = await http_client.put(
"/api/v1/auth/acl",
headers={"Authorization": f"Bearer {access_token}"},
- json=acl_data.dict(),
+ json=acl_data.model_dump(),
)
assert response.status_code == 200, "ACL created."
acl_id = response.json()["access_control_list"][0]["id"]
@@ -1971,7 +1971,7 @@ async def test_api_create_user_api_token_invalid_password(http_client: AsyncClie
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=token_request.dict(),
+ json=token_request.model_dump(),
)
assert response.status_code == 401, "Invalid credentials."
@@ -1989,7 +1989,7 @@ async def test_acl_api_token_access(user_alan: User, http_client: AsyncClient):
auth_time=int(time.time()),
)
- api_token = create_access_token(data=payload.dict(), token_expire_minutes=10)
+ api_token = create_access_token(data=payload.model_dump(), token_expire_minutes=10)
acl.token_id_list.append(SimpleItem(id=api_token_id, name="Test Token"))
await update_user_access_control_list(user_acls)
@@ -2083,7 +2083,7 @@ async def test_cached_acl_api_token_access_is_revalidated(
sub=username,
api_token_id=api_token_id,
auth_time=int(time.time()),
- ).dict(),
+ ).model_dump(),
token_expire_minutes=10,
)
acl.token_id_list.append(SimpleItem(id=api_token_id, name="Status Token"))
@@ -2115,7 +2115,7 @@ async def test_cached_acl_api_token_access_is_revalidated(
sub=username,
api_token_id=api_token_id,
auth_time=int(time.time()),
- ).dict(),
+ ).model_dump(),
token_expire_minutes=10,
)
acl.endpoints = [
@@ -2194,7 +2194,7 @@ async def test_api_create_user_api_token_invalid_acl_id(http_client: AsyncClient
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=token_request.dict(),
+ json=token_request.model_dump(),
)
assert response.status_code == 401, "Invalid ACL id."
@@ -2225,7 +2225,7 @@ async def test_api_create_user_api_token_expiration_time_invalid(
response = await http_client.put(
"/api/v1/auth/acl",
headers={"Authorization": f"Bearer {access_token}"},
- json=acl_data.dict(),
+ json=acl_data.model_dump(),
)
assert response.status_code == 200, "ACL created."
acl_id = response.json()["access_control_list"][0]["id"]
@@ -2240,7 +2240,7 @@ async def test_api_create_user_api_token_expiration_time_invalid(
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=token_request.dict(),
+ json=token_request.model_dump(),
)
assert response.status_code == 400, "Expiration time must be in the future."
@@ -2286,7 +2286,7 @@ async def test_api_delete_user_api_token_success(
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=api_token_request.dict(),
+ json=api_token_request.model_dump(),
)
assert response.status_code == 200, "API token created."
api_token_id = response.json().get("id")
@@ -2300,7 +2300,7 @@ async def test_api_delete_user_api_token_success(
"DELETE",
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=delete_token_request.dict(),
+ json=delete_token_request.model_dump(),
)
assert response.status_code == 200, "API token deleted."
@@ -2346,7 +2346,7 @@ async def test_api_delete_user_api_token_invalid_password(
response = await http_client.post(
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=api_token_request.dict(),
+ json=api_token_request.model_dump(),
)
assert response.status_code == 200, "API token created."
api_token_id = response.json().get("id")
@@ -2360,7 +2360,7 @@ async def test_api_delete_user_api_token_invalid_password(
"DELETE",
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=delete_token_request.dict(),
+ json=delete_token_request.model_dump(),
)
assert response.status_code == 401, "Invalid credentials."
@@ -2392,7 +2392,7 @@ async def test_api_delete_user_api_token_invalid_acl_id(
"DELETE",
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=delete_token_request.dict(),
+ json=delete_token_request.model_dump(),
)
assert response.status_code == 401, "Invalid ACL id."
@@ -2436,7 +2436,7 @@ async def test_api_delete_user_api_token_missing_token_id(
"DELETE",
"/api/v1/auth/acl/token",
headers={"Authorization": f"Bearer {access_token}"},
- json=delete_token_request.dict(),
+ json=delete_token_request.model_dump(),
)
assert response.status_code == 200, "Does noting if token not found."
@@ -2454,7 +2454,9 @@ async def test_api_update_user_labels(http_client: AsyncClient):
]
data = UpdateUser(user_id=user.id, username=f"u{tiny_id}", extra=user.extra)
assert data.extra
- response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=data.dict())
+ response = await http_client.patch(
+ "/api/v1/auth?usr=" + user.id, json=data.model_dump()
+ )
assert response.status_code == 200
user_data = response.json()
assert len(user_data["extra"]["labels"]) == 2
@@ -2464,21 +2466,21 @@ async def test_api_update_user_labels(http_client: AsyncClient):
assert user_data["extra"]["labels"][1]["color"] == "#00FF00"
data.extra.labels = []
- response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=data.dict())
+ response = await http_client.patch(
+ "/api/v1/auth?usr=" + user.id, json=data.model_dump()
+ )
assert response.status_code == 200
user_data = response.json()
assert len(user_data["extra"]["labels"]) == 0
- json_data = data.dict()
+ json_data = data.model_dump()
json_data["extra"] = {"labels": [{"name": "label + 01", "color": "#FF0000"}]}
response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=json_data)
assert response.status_code == 400
data = response.json()
- assert (
- """string does not match regex "([A-Za-z0-9 ._-]{1,100}$)"""
- in data["detail"][0]["msg"]
- )
+ assert data["detail"][0]["type"] == "string_pattern_mismatch"
+ assert data["detail"][0]["loc"] == ["body", "extra", "labels", 0, "name"]
@pytest.mark.anyio
@@ -2619,7 +2621,7 @@ async def test_impersonate_user_invalid_data(
)
assert response.status_code == 400
- assert "type_error.none.not_allowed" in str(response.json()["detail"])
+ assert response.json()["detail"][0]["type"] == "string_type"
@pytest.mark.anyio
@@ -2636,7 +2638,7 @@ async def test_impersonate_user_missing_usr_field(
headers={"Authorization": f"Bearer {admin_token}"},
)
assert response.status_code == 400
- assert "value_error.missing" in str(response.json()["detail"])
+ assert response.json()["detail"][0]["type"] == "missing"
@pytest.mark.anyio
### tests/api/test_extension_api.py
@@ -258,7 +258,7 @@ async def test_explicit_wasm_release_loads_install_permissions(
pay_link=None,
extension_type="wasm",
)
- non_wasm_release = explicit_release.copy(
+ non_wasm_release = explicit_release.model_copy(
update={
"id": non_wasm_ext_id,
"name": "Explicit Python Extension",
@@ -507,7 +507,8 @@ async def test_extension_api_admin_updates_wasm_extension_permission_limits(
}
]
installed_permissions = [
- ExtensionPermission.parse_obj(permission) for permission in manifest_permissions
+ ExtensionPermission.model_validate(permission)
+ for permission in manifest_permissions
]
updated_permissions = [
ExtensionPermission(
@@ -581,7 +582,7 @@ async def test_extension_api_admin_updates_scheduler_job_limits(
id="scheduler.user",
policies=[{"handler": "check", "cron_expression": "*/10 * * * *"}],
)
- config = _wasm_config(ext_id, permissions=[permission.dict()])
+ config = _wasm_config(ext_id, permissions=[permission.model_dump()])
config["wasm"]["exports"] = [{"name": "check", "visibility": "event"}]
config_dir = settings.wasm_extensions_dir / ext_id
config_dir.mkdir(parents=True)
@@ -601,14 +602,16 @@ async def test_extension_api_admin_updates_scheduler_job_limits(
permission.policies[0]["max_jobs_per_user"] = limit
response = await http_client.put(
f"/api/v1/extension/{ext_id}/permissions",
- json={"permissions": [permission.dict()]},
+ json={"permissions": [permission.model_dump()]},
headers={"Authorization": f"Bearer {superuser_token}"},
)
assert response.status_code == 200
grants = response.json()["extension_permissions"]
assert grants[0]["policies"][0]["max_jobs_per_user"] == limit
stored = await get_installed_extension(ext_id)
- assert stored and [item.dict() for item in stored.permissions] == grants
+ assert (
+ stored and [item.model_dump() for item in stored.permissions] == grants
+ )
finally:
await delete_installed_extension(ext_id=ext_id)
### tests/api/test_fiat_wallet_type.py
@@ -200,7 +200,7 @@ async def test_fiat_wallet_receives_but_cannot_spend(
json={"amount": 5, "unit": "USD", "memo": "Receipt"},
)
assert response.status_code == 201
- receipt = Payment.parse_obj(response.json())
+ receipt = Payment.model_validate(response.json())
assert receipt.success
assert receipt.is_internal
wallet = await get_wallet(wallet.id)
@@ -310,7 +310,7 @@ async def test_cash_validation_creates_and_settles_with_owner_admin_key(
"/api/v1/fiat/cash", headers={"X-Api-Key": wallet.adminkey}, json=data
)
assert response.status_code == 201
- receipt = Payment.parse_obj(response.json())
+ receipt = Payment.model_validate(response.json())
assert receipt.success and receipt.is_internal and receipt.fee == 0
assert receipt.extra["fiat_method"] == "cash"
assert receipt.extra["fiat_amount"] == 12.34
@@ -428,7 +428,7 @@ async def test_fiat_balances_excluded_from_user_and_server_totals(client, mocker
json={"amount": 5, "unit": "USD"},
)
assert response.status_code == 201
- cash = Payment.parse_obj(response.json())
+ cash = Payment.model_validate(response.json())
assert cash.is_internal and cash.success
assert await get_total_balance() == initial_total + 10000
assert await get_total_balance(fiat=True) == initial_fiat_total + cash.amount
### tests/api/test_lnurl_api.py
@@ -17,7 +17,7 @@
)
from lnurl.models import MessageAction
from lnurl.types import CallbackUrl, LightningInvoice
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
from lnbits.core.crud.wallets import create_wallet, get_wallet
from lnbits.core.models import Account, CreateInvoice
@@ -177,7 +177,7 @@ async def test_lnurl_api_auth_and_pay_flow(mocker):
)
auth_response = LnurlAuthResponse(
- callback=parse_obj_as(CallbackUrl, "https://example.com/auth"),
+ callback=TypeAdapter(CallbackUrl).validate_python("https://example.com/auth"),
k1="k1-value",
)
mocker.patch(
@@ -198,7 +198,7 @@ async def test_lnurl_api_auth_and_pay_flow(mocker):
action_response = LnurlPayActionResponse(
pr=cast(LightningInvoice, LightningInvoice(TEST_BOLT11)),
disposable=False,
- successAction=parse_obj_as(MessageAction, {"message": "paid"}),
+ successAction=TypeAdapter(MessageAction).validate_python({"message": "paid"}),
)
fetch_mock = mocker.patch(
"lnbits.core.views.lnurl_api.fetch_lnurl_pay_request",
### tests/api/test_node_api.py
@@ -65,7 +65,7 @@ def __init__(self):
self.fees_updated: tuple[str, int | None, int | None] | None = None
async def get_public_info(self) -> PublicNodeInfo:
- return PublicNodeInfo(**self.info.dict())
+ return PublicNodeInfo(**self.info.model_dump())
async def get_info(self) -> NodeInfoResponse:
return self.info
@@ -320,7 +320,7 @@ async def test_node_api_route_functions_with_fake_node(
rank = await node_api.api_get_1ml_stats(node=node)
assert rank is not None
- rank_data = node_api.NodeRank.parse_obj(rank)
+ rank_data = node_api.NodeRank.model_validate(rank)
assert rank_data.channelcount == 2
finally:
settings.lnbits_node_ui_transactions = original_transactions
### tests/api/test_onchain_wallet.py
@@ -580,7 +580,7 @@ async def test_onchain_conditional_sync_policy(
assert stored
stored.onchain_config.explorer_provider = provider
await update_onchain_wallet_config(stored.onchain_config, wallet.id)
- meta = stored.onchain_meta.dict()
+ meta = stored.onchain_meta.model_dump()
meta.update(sync_checked_at=checked_at, sync_failed_at=failed_at, sync_error=error)
await db.execute(
"UPDATE wallets SET onchain_meta = :meta, onchain_sync_lease_until = :lease "
@@ -816,7 +816,7 @@ async def test_onchain_hot_wallet_custom_path(
assert meta["accountPath"] == "m/100'/7/3'"
assert meta["script_type"] == script_type
stored = await get_onchain_wallet(wallet.id)
- assert stored and stored.onchain_meta.dict() == meta
+ assert stored and stored.onchain_meta.model_dump() == meta
backup = await http_client.post(
f"/api/v1/onchain/hot-wallet/{wallet.id}/backup", headers=headers
)
@@ -927,10 +927,10 @@ def explorer(_request):
),
)
path = f"/api/v1/onchain/hot-wallet/{account['id']}/sign"
- rejected = await http_client.post(path, headers=headers, json=payment.dict())
+ rejected = await http_client.post(path, headers=headers, json=payment.model_dump())
assert rejected.status_code == 400
spent = False
- signed = await http_client.post(path, headers=headers, json=payment.dict())
+ signed = await http_client.post(path, headers=headers, json=payment.model_dump())
assert signed.status_code == 200, signed.text
assert signed.json()["tx_hex"]
assert signed.headers["cache-control"] == "no-store"
@@ -1187,7 +1187,7 @@ async def test_onchain_metadata_and_seed_survive_generic_wallet_updates(
assert "network" not in json.loads(stored["onchain_config"])
loaded = await get_wallet(wallet.id)
assert loaded and loaded.name == "Onchain savings"
- assert "onchain_encrypted_seed" not in loaded.dict()
+ assert "onchain_encrypted_seed" not in loaded.model_dump()
assert await get_wallet_for_key(wallet.adminkey)
assert await get_wallets(user.id)
assert wallet.id in await get_wallets_ids(user.id)
@@ -1261,7 +1261,7 @@ async def test_onchain_scan_metadata_preserves_setup_and_newer_leases(
assert updated["sync_error"] is None
assert updated["sync_checked_at"] > 42
assert updated["sync_failed_at"] == 0
- assert updated["sync_checkpoint"] == checkpoint.dict()
+ assert updated["sync_checkpoint"] == checkpoint.model_dump()
for key in ("masterpub", "fingerprint", "script_type", "accountPath"):
assert updated[key] == meta[key]
### tests/api/test_payment_status_api.py
@@ -99,7 +99,8 @@ async def test_change_status_notifies_only_on_success(
assert wallet.id == payment.wallet_id
assert wallet.balance_msat == stored_wallet.balance_msat
assert (
- notified_payment.dict() == (await get_payment(payment.checking_id)).dict()
+ notified_payment.model_dump()
+ == (await get_payment(payment.checking_id)).model_dump()
)
else:
notify.assert_not_called()
@@ -296,7 +297,7 @@ async def test_change_status_uses_exact_wallet_and_checking_id(
payment, _ = await status_payment(from_user)
other_wallet = await create_wallet(user_id=from_user.id)
- other_payment = payment.copy(update={"wallet_id": other_wallet.id})
+ other_payment = payment.model_copy(update={"wallet_id": other_wallet.id})
await db.insert("apipayments", other_payment)
response = await change_status(client, superuser_token, payment, "success")
assert response.status_code == 200
### tests/api/test_scheduler_api.py
@@ -176,7 +176,7 @@ async def test_scheduler_overview_returns_user_identity(
account = await create_account(
Account(id=uuid4().hex, username=username, email=email)
)
- job = scheduled_jobs[2].copy(
+ job = scheduled_jobs[2].model_copy(
update={"id": f"{scheduled_jobs[2].id}-account", "user_id": account.id}
)
await crud.save_scheduled_job(job)
@@ -204,8 +204,8 @@ async def test_scheduler_overview_partial_user_filter_paginates(
http_client, superuser_token, scheduled_jobs
):
job = scheduled_jobs[2]
- second = job.copy(update={"id": f"{job.id}-second"})
- other = job.copy(update={"id": f"{job.id}-other", "user_id": "another-owner"})
+ second = job.model_copy(update={"id": f"{job.id}-second"})
+ other = job.model_copy(update={"id": f"{job.id}-other", "user_id": "another-owner"})
await crud.save_scheduled_job(second)
await crud.save_scheduled_job(other)
headers = {"Authorization": f"Bearer {superuser_token}"}
@@ -275,7 +275,7 @@ async def test_scheduler_crud_pagination_counts_only_owner_jobs(
scheduled_jobs, job_index
):
job = scheduled_jobs[job_index]
- second = job.copy(update={"id": f"{job.id}-second"})
+ second = job.model_copy(update={"id": f"{job.id}-second"})
await crud.save_scheduled_job(second)
try:
for offset, expected_ids in [(0, [job.id]), (1, [second.id]), (2, [])]:
@@ -362,7 +362,9 @@ async def test_scheduler_history_filters_paginates_and_survives_deletion(
page = response.json()
assert page["total"] == 2
assert page["data"] == [
- latest.copy(update={"status": "succeeded", "finished_at": now + 1.5}).dict()
+ latest.model_copy(
+ update={"status": "succeeded", "finished_at": now + 1.5}
+ ).model_dump()
]
assert "private-scheduler" not in response.text
assert not {"lease_token", "user_id", "payload_json"} & page["data"][0].keys()
@@ -407,7 +409,7 @@ async def test_scheduler_history_filters_user_after_job_deletion(
owned_runs = []
for index, user_id in enumerate(("alice", "alice", "bob", None)):
job = await crud.save_scheduled_job(
- scheduled_jobs[1].copy(
+ scheduled_jobs[1].model_copy(
update={"id": f"{scheduled_jobs[1].id}-{index}", "user_id": user_id}
)
)
### tests/api/test_two_factor.py
@@ -96,8 +96,10 @@ async def test_two_factor_enrollment_privacy_and_account_updates(
assert len(enrollment["recovery_codes"]) == 10
config = await get_two_factor_config(account.id)
assert config.secret and not config.pending_secret
- assert base64.b32encode(secret).decode() not in config.json()
- assert all(code not in config.json() for code in enrollment["recovery_codes"])
+ assert base64.b32encode(secret).decode() not in config.model_dump_json()
+ assert all(
+ code not in config.model_dump_json() for code in enrollment["recovery_codes"]
+ )
assert (await http_client.get("/api/v1/auth")).status_code == 200
profile = await http_client.patch("/api/v1/auth/ui", json={"theme": "test"})
assert profile.status_code == 200
@@ -248,7 +250,7 @@ async def test_password_update_revokes_sessions(
assert challenge.jti not in after.challenges
assert not before.challenges.keys() & after.challenges.keys()
assert (
- after.copy(
+ after.model_copy(
update={"revision": before.revision, "challenges": before.challenges}
)
== before
@@ -261,7 +263,7 @@ async def test_password_update_revokes_sessions(
assert (await http_client.get(path)).status_code == 401
http_client.cookies.clear()
challenge_headers = {
- "Authorization": f"Bearer {create_access_token(challenge.dict())}"
+ "Authorization": f"Bearer {create_access_token(challenge.model_dump())}"
}
assert (
await http_client.get("/api/v1/auth/2fa/status", headers=challenge_headers)
@@ -545,7 +547,7 @@ async def test_two_factor_sso_does_not_bypass(http_client, factor_account):
await update_account(factor_account)
await enroll(http_client, factor_account)
response = await _handle_sso_login(
- OpenID.parse_obj({"email": factor_account.email})
+ OpenID.model_validate({"email": factor_account.email})
)
assert response.headers["location"] == "/2fa"
cookies = response.headers.getlist("set-cookie")
@@ -617,7 +619,7 @@ async def test_two_factor_key_and_methods_validation(
):
settings.lnbits_admin_users = [factor_account.id]
await login(http_client, factor_account)
- for field in ("totp_encryption_key", "__dict__", "__fields__"):
+ for field in ("totp_encryption_key", "__dict__", "model_fields"):
assert (
await http_client.get(
"/admin/api/v1/settings/default", params={"field_name": field}
### tests/api/test_user_api.py
@@ -41,7 +41,7 @@ async def test_user_api_toggle_admin_and_update_balance(
balance = await http_client.put(
"/users/api/v1/balance",
headers={"Authorization": f"Bearer {superuser_token}"},
- json=UpdateBalance(id=wallet.id, amount=7).dict(),
+ json=UpdateBalance(id=wallet.id, amount=7).model_dump(),
)
assert balance.status_code == 200
assert balance.json()["success"] is True
### tests/api/test_users.py
@@ -13,6 +13,7 @@
from lnbits.core.services.users import create_user_account
from lnbits.db import Filters
from lnbits.settings import Settings
+from lnbits.utils.cache import cache
from lnbits.utils.nostr import generate_keypair, hex_to_npub
@@ -668,6 +669,7 @@ async def test_delete_wallet_twice_removes_it(
async def test_user_activation(
http_client: AsyncClient, invoice: Payment, settings: Settings, superuser_token: str
):
+ settings.auth_authentication_cache_minutes = 1
# Register a new user
username = f"u21.{shortuuid.uuid()[:8]}"
@@ -695,6 +697,16 @@ async def test_user_activation(
)
assert response.status_code == 200, "User logs in OK"
+ # Cache both wallet keys before deactivation.
+ wallets = await get_wallets(user_id=user_id)
+ for wallet in wallets:
+ for key in (wallet.adminkey, wallet.inkey):
+ response = await http_client.get(
+ "/api/v1/payments", headers={"X-Api-Key": key}
+ )
+ assert response.status_code == 200
+ assert cache.get(f"auth:x-api-key:{key}") is not None
+
# Deactivate the user
respones = await http_client.put(
f"/users/api/v1/user/{user_id}/activate",
### tests/api/test_wallet_key_access.py
@@ -80,7 +80,7 @@ async def test_wallet_keys_require_current_endpoint_write_access(
token_id = uuid4().hex
token = create_access_token(
- AccessTokenPayload(sub=user.username or "", api_token_id=token_id).dict()
+ AccessTokenPayload(sub=user.username or "", api_token_id=token_id).model_dump()
)
endpoint = EndpointAccess(path=acl_path, name="Wallet response", read=True)
acl = AccessControlList(
### tests/conftest.py
@@ -1,6 +1,5 @@
import asyncio
import copy
-import inspect
from datetime import datetime, timezone
from uuid import uuid4
@@ -50,11 +49,7 @@
for field_name in Settings.readonly_fields()
if field_name != "super_user"
}
- | {
- name
- for name in inspect.signature(EditableSettings).parameters
- if not name.startswith("_")
- }
+ | {name for name in EditableSettings.model_fields if not name.startswith("_")}
)
)
@@ -349,7 +344,9 @@ async def fake_payments(client, inkey_fresh_headers_to):
for invoice in fake_data:
response = await client.post(
- "/api/v1/payments", headers=inkey_fresh_headers_to, json=invoice.dict()
+ "/api/v1/payments",
+ headers=inkey_fresh_headers_to,
+ json=invoice.model_dump(),
)
assert response.is_success
data = response.json()
### tests/helpers.py
@@ -2,13 +2,12 @@
import string
from io import BytesIO
-from bolt11.types import MilliSatoshi
from fastapi import UploadFile
from httpx import AsyncClient
from lnurl import LnurlPayResponse
-from lnurl.types import CallbackUrl, LnurlPayMetadata
+from lnurl.types import CallbackUrl, LnurlPayMetadata, MilliSatoshi
from PIL import Image
-from pydantic import BaseModel, parse_obj_as
+from pydantic import BaseModel, TypeAdapter
from starlette.datastructures import Headers
from lnbits.core.models.extensions import (
@@ -184,7 +183,7 @@ def make_lnurl_pay_response(
callback: str = "https://example.com/callback",
) -> LnurlPayResponse:
return LnurlPayResponse(
- callback=parse_obj_as(CallbackUrl, callback),
+ callback=TypeAdapter(CallbackUrl).validate_python(callback),
minSendable=MilliSatoshi(min_sendable_msat),
maxSendable=MilliSatoshi(max_sendable_msat),
metadata=LnurlPayMetadata(
### tests/regtest/test_real_invoice.py
@@ -208,7 +208,7 @@ async def test_create_real_invoice(
create_invoice = CreateInvoice(out=False, amount=1000, memo="test")
response = await client.post(
"/api/v1/payments",
- json=create_invoice.dict(),
+ json=create_invoice.model_dump(),
headers=adminkey_headers_from,
)
assert response.status_code < 300
@@ -446,7 +446,7 @@ async def test_receive_real_invoice_set_pending_and_check_state(
create_invoice = CreateInvoice(out=False, amount=1000, memo="test")
response = await client.post(
"/api/v1/payments",
- json=create_invoice.dict(),
+ json=create_invoice.model_dump(),
headers=adminkey_headers_from,
)
assert response.status_code < 300
@@ -504,7 +504,7 @@ async def test_check_fee_reserve(client, adminkey_headers_from):
create_invoice = CreateInvoice(out=False, amount=1000, memo="test")
response = await client.post(
"/api/v1/payments",
- json=create_invoice.dict(),
+ json=create_invoice.model_dump(),
headers=adminkey_headers_from,
)
assert response.status_code < 300
### tests/regtest/test_x_node_api.py
@@ -4,7 +4,7 @@
import pytest
from httpx import AsyncClient, Headers
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
from lnbits import bolt11
from lnbits.nodes.base import ChannelPoint, ChannelState, NodeChannel
@@ -111,7 +111,7 @@ async def test_get_channel(node_client):
await asyncio.sleep(3)
response = await node_client.get("/node/api/v1/channels")
assert response.status_code == 200
- channels = parse_obj_as(list[NodeChannel], response.json())
+ channels = TypeAdapter(list[NodeChannel]).validate_python(response.json())
ch = random.choice(
[channel for channel in channels if channel.state == ChannelState.ACTIVE]
)
@@ -121,7 +121,7 @@ async def test_get_channel(node_client):
response = await node_client.get(f"/node/api/v1/channels/{ch.id}")
assert response.status_code == 200
- channel = parse_obj_as(NodeChannel, response.json())
+ channel = TypeAdapter(NodeChannel).validate_python(response.json())
assert channel.id == ch.id
@@ -131,7 +131,7 @@ async def test_set_channel_fees(node_client):
await asyncio.sleep(3)
response = await node_client.get("/node/api/v1/channels")
assert response.status_code == 200
- channels = parse_obj_as(list[NodeChannel], response.json())
+ channels = TypeAdapter(list[NodeChannel]).validate_python(response.json())
ch = random.choice(
[channel for channel in channels if channel.state == ChannelState.ACTIVE]
@@ -146,7 +146,7 @@ async def test_set_channel_fees(node_client):
response = await node_client.get(f"/node/api/v1/channels/{ch.id}")
assert response.status_code == 200
- channel = parse_obj_as(NodeChannel, response.json())
+ channel = TypeAdapter(NodeChannel).validate_python(response.json())
assert channel.fee_ppm == 69
assert channel.fee_base_msat == 42
@@ -162,7 +162,7 @@ async def get_channels():
await asyncio.sleep(3)
response = await node_client.get("/node/api/v1/channels")
assert response.status_code == 200
- return parse_obj_as(list[NodeChannel], response.json())
+ return TypeAdapter(list[NodeChannel]).validate_python(response.json())
data = await get_channels()
close = random.choice(
@@ -173,7 +173,7 @@ async def get_channels():
response = await node_client.delete(
"/node/api/v1/channels",
- params={"short_id": close.short_id, **close.point.dict()},
+ params={"short_id": close.short_id, **close.point.model_dump()},
)
assert response.status_code == 200
### tests/unit/onchain/test_explorer.py
@@ -29,7 +29,7 @@ def test_default_provider_matches_enabled_network(settings):
assert blockexplorer.explorer_url(config, name) == "/blockexplorer"
assert (
blockexplorer.provider_name(
- config.copy(update={"explorer_provider": "mempool"}), name
+ config.model_copy(update={"explorer_provider": "mempool"}), name
)
== "mempool"
)
### tests/unit/onchain/test_hot_wallet.py
@@ -63,7 +63,7 @@ def wallet_and_payment(
previous = wally.tx_init(2, 0, 1, 1)
wally.tx_add_raw_input(previous, bytes(32), 0, 0xFFFFFFFF, None, None, 0)
wally.tx_add_raw_output(previous, 100000, descriptor_script(parsed, 0, 0), 0)
- tx = CreatePsbt.parse_obj(
+ tx = CreatePsbt.model_validate(
{
"masterpubs": [],
"fee_rate": 1,
@@ -183,10 +183,10 @@ def test_encryption_is_random_authenticated_and_bound_to_wallet(monkeypatch):
for field, value in [
("id", "other"),
("onchain_network", "Mainnet"),
- ("onchain_meta", wallet.onchain_meta.copy(update={"masterpub": "other"})),
+ ("onchain_meta", wallet.onchain_meta.model_copy(update={"masterpub": "other"})),
]:
with pytest.raises(ValueError):
- decrypt_wallet_mnemonic(first, wallet.copy(update={field: value}))
+ decrypt_wallet_mnemonic(first, wallet.model_copy(update={field: value}))
# Existing wallets used the same ID in both context positions.
raw = bytearray(base64.b64decode(first))
old_cipher = AES.new(bytes(range(32)), AES.MODE_GCM, nonce=bytes(raw[1:13]))
@@ -248,7 +248,7 @@ def test_signing_rejects_invalid_spending(attack): # noqa: C901
if attack == "foreign-input":
tx.inputs[0].wallet = "victim"
if attack == "duplicate":
- tx.inputs.append(tx.inputs[0].copy())
+ tx.inputs.append(tx.inputs[0].model_copy())
if attack == "amount":
tx.inputs[0].amount += 1000
if attack == "outpoint":
@@ -271,7 +271,7 @@ def test_signing_rejects_invalid_spending(attack): # noqa: C901
def test_fractional_amounts_are_not_truncated():
_, payment = wallet_and_payment()
- data = payment.dict()
+ data = payment.model_dump()
data["transaction"]["outputs"][0]["amount"] = 1234.5
with pytest.raises(ValueError, match="whole satoshis"):
HotWalletPayment(**data)
### tests/unit/onchain/test_psbt.py
@@ -199,7 +199,7 @@ def test_signing_metadata_and_finalization(kind, network):
def test_change_metadata_follows_each_output_after_shuffling():
_, _, data = signing_data()
data.outputs.reverse()
- data.outputs.append(data.outputs[0].copy(deep=True))
+ data.outputs.append(data.outputs[0].model_copy(deep=True))
psbt = create_psbt(data)
assert [wally.psbt_get_output_keypaths_size(psbt, i) for i in range(3)] == [1, 0, 1]
wally.psbt_set_output_keypaths(psbt, 0, wally.map_keypath_bip32_init(0))
@@ -255,7 +255,7 @@ def test_compact_segwit_psbt_stays_below_bowser_transfer_limit():
wally.tx_add_raw_output(previous, data.inputs[0].amount, spk, 0)
data.inputs[0].tx_hex = wally.tx_to_hex(previous, 0)
data.inputs[0].tx_id = bytes(wally.tx_get_txid(previous))[::-1].hex()
- data.inputs = [data.inputs[0].copy(update={"vout": i}) for i in range(64)]
+ data.inputs = [data.inputs[0].model_copy(update={"vout": i}) for i in range(64)]
encoded = wally.psbt_to_base64(create_psbt(data), 0)
assert len(encoded) <= 16384
assert wally.psbt_get_num_inputs(wally.psbt_from_base64(encoded, 0)) == 64
@@ -270,7 +270,7 @@ async def test_psbt_api_create_and_extract(kind, network):
psbt = wally.psbt_from_base64(encoded, 0)
wally.psbt_sign_bip32(psbt, root, 0)
result = await onchain_api.api_psbt_extract_tx(
- ExtractPsbt.parse_obj(
+ ExtractPsbt.model_validate(
{
"psbt_base64": wally.psbt_to_base64(psbt, 0),
"inputs": [{"tx_hex": data.inputs[0].tx_hex}],
@@ -307,7 +307,7 @@ async def test_extract_rejects_unrelated_previous_transaction():
wrong = signing_vector("pkh")["data"]["inputs"][0]["tx_hex"]
with pytest.raises(HTTPException, match="outpoint"):
await onchain_api.api_psbt_extract_tx(
- ExtractPsbt.parse_obj(
+ ExtractPsbt.model_validate(
{"psbt_base64": vector["signed"], "inputs": [{"tx_hex": wrong}]}
),
_auth=OnchainAuth("test"),
### tests/unit/test_db.py
@@ -12,14 +12,51 @@
from lnbits.core.crud.payments import get_payment
from lnbits.core.models import CreateInvoice, PaymentFilters
from lnbits.core.services.payments import create_wallet_invoice
-from lnbits.db import (
- POSTGRES,
- SQLITE,
- Filter,
- Filters,
- dict_to_model,
- model_to_dict,
-)
+from lnbits.db import POSTGRES, SQLITE, Filter, Filters, dict_to_model, model_to_dict
+
+
+@pytest.mark.parametrize("db_type", [SQLITE, POSTGRES])
+def test_model_database_roundtrip_preserves_nested_and_optional_fields(
+ monkeypatch, db_type
+):
+ class Details(BaseModel):
+ description: str
+ note: str | None = None
+ attributes: dict[str, int] = {}
+
+ class Record(BaseModel):
+ details: Details | None = None
+ history: list[Details] = []
+ optional_history: list[Details] | None = None
+ metadata: dict[str, int] = {}
+ created_at: datetime
+ enabled: bool = False
+ derived: int = Field(default=0, json_schema_extra={"no_database": True})
+
+ monkeypatch.setattr("lnbits.db.DB_TYPE", db_type)
+ record = Record(
+ details=Details(description="invoice", attributes={"attempts": 1}),
+ history=[Details(description="created")],
+ metadata={"attempts": 1},
+ created_at=datetime(2026, 1, 1, tzinfo=timezone.utc),
+ enabled=True,
+ derived=10,
+ )
+ row = model_to_dict(record)
+ assert "derived" not in row
+ assert isinstance(row["details"], str)
+ assert isinstance(row["history"], str)
+ assert isinstance(row["metadata"], str)
+ row["enabled"] = 1
+ row["joined_column"] = "ignored"
+ restored = dict_to_model(row, Record)
+ assert restored.model_dump(exclude={"derived"}) == record.model_dump(
+ exclude={"derived"}
+ )
+ assert restored.derived == 0
+
+ row["details"] = "null"
+ assert dict_to_model(row, Record).details is None
@pytest.mark.parametrize(
### tests/unit/test_decorators.py
@@ -1,18 +1,18 @@
from base64 import urlsafe_b64encode
-from uuid import uuid4
+from uuid import UUID, uuid4
import jwt
import pytest
import shortuuid
from fastapi import Request
from fastapi.exceptions import HTTPException
from httpx import AsyncClient
-from pydantic.types import UUID4
from pytest_mock import MockerFixture
-from lnbits.core.crud.users import delete_account
-from lnbits.core.models import User
+from lnbits.core.crud.users import delete_account, update_account
+from lnbits.core.models import Account, User
from lnbits.core.models.users import AccessTokenPayload, AccountId, EndpointAccess
+from lnbits.core.services.users import create_user_account
from lnbits.decorators import (
_extension_id_from_request_path,
access_token_payload,
@@ -48,6 +48,36 @@ async def test_check_user_exists_with_valid_access_token(
assert request.scope["user_id"] == user.id
+@pytest.mark.anyio
+async def test_check_user_exists_after_username_reuse(http_client: AsyncClient):
+ username = f"user_{uuid4().hex[:8]}"
+ account = Account(id=uuid4().hex, username=username)
+ account.hash_password("secret1234")
+ await create_user_account(account)
+ response = await http_client.post(
+ "/api/v1/auth", json={"username": username, "password": "secret1234"}
+ )
+ assert response.status_code == 200
+ access_token = response.json()["access_token"]
+ request = Request({"type": "http", "path": "/api/v1/auth", "method": "GET"})
+
+ account.username = f"renamed_{uuid4().hex[:8]}"
+ await update_account(account)
+ user = await check_user_exists(request, access_token=access_token)
+ assert user.id == account.id
+
+ await create_user_account(Account(id=uuid4().hex, username=username))
+ user = await check_user_exists(request, access_token=access_token)
+ assert user.id == account.id
+ assert user.username == account.username
+
+ await delete_account(account.id)
+ with pytest.raises(HTTPException) as exc_info:
+ await check_user_exists(request, access_token=access_token)
+ assert exc_info.value.status_code == 401
+ assert exc_info.value.detail == "User not found."
+
+
@pytest.mark.anyio
async def test_check_user_exists_with_invalid_access_token():
request = Request({"type": "http", "path": "/some/path", "method": "GET"})
@@ -82,7 +112,7 @@ async def test_check_user_exists_with_missing_access_token():
@pytest.mark.anyio
async def test_check_user_exists_with_valid_user_id(user_alan: User):
request = Request({"type": "http", "path": "/some/path", "method": "GET"})
- user = await check_user_exists(request, access_token=None, usr=UUID4(user_alan.id))
+ user = await check_user_exists(request, access_token=None, usr=UUID(user_alan.id))
assert user.id == user_alan.id
@@ -102,7 +132,7 @@ async def test_check_user_exists_with_user_not_allowed(user_alan: User):
request = Request({"type": "http", "path": "/some/path", "method": "GET"})
settings.lnbits_allowed_users = ["only_this_user_id"]
with pytest.raises(HTTPException) as exc_info:
- await check_user_exists(request, access_token=None, usr=UUID4(user_alan.id))
+ await check_user_exists(request, access_token=None, usr=UUID(user_alan.id))
assert exc_info.value.status_code == 403
assert exc_info.value.detail == "User not allowed."
@@ -149,7 +179,7 @@ async def test_check_user_exists_with_user_id_only_allowed(
):
settings.auth_allowed_methods = [AuthMethods.user_id_only.value]
request = Request({"type": "http", "path": "/some/path", "method": "GET"})
- user = await check_user_exists(request, access_token=None, usr=UUID4(user_alan.id))
+ user = await check_user_exists(request, access_token=None, usr=UUID(user_alan.id))
assert user.id == user_alan.id
assert request.scope["user_id"] == user.id
@@ -160,7 +190,7 @@ async def test_check_user_exists_with_user_id_only_not_allowed(user_alan: User):
settings.auth_allowed_methods = []
request = Request({"type": "http", "path": "/some/path", "method": "GET"})
with pytest.raises(HTTPException) as exc_info:
- await check_user_exists(request, access_token=None, usr=UUID4(user_alan.id))
+ await check_user_exists(request, access_token=None, usr=UUID(user_alan.id))
assert exc_info.value.status_code == 401
assert exc_info.value.detail == "Missing user ID or access token."
@@ -243,7 +273,7 @@ async def test_optional_user_id_uses_user_id_or_access_token(
request = Request({"type": "http", "path": "/wallet", "method": "GET"})
assert (
- await optional_user_id(request, access_token=None, usr=UUID4(user_alan.id))
+ await optional_user_id(request, access_token=None, usr=UUID(user_alan.id))
== user_alan.id
)
@@ -289,7 +319,7 @@ async def test_check_extension_builder_requires_admin_when_disabled_for_users(
):
await check_extension_builder(user_alan)
- admin_user = user_alan.copy(deep=True)
+ admin_user = user_alan.model_copy(deep=True)
admin_user.admin = True
await check_extension_builder(admin_user)
### tests/unit/test_exceptions.py
@@ -0,0 +1,34 @@
+import pytest
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from pydantic import BaseModel, Field, model_validator
+
+from lnbits.exceptions import register_exception_handlers
+
+
+class ValidationPayload(BaseModel):
+ password: str = Field(min_length=8)
+
+ @model_validator(mode="after")
+ def reject_password(self):
+ raise ValueError("Password rejected.")
+
+
+@pytest.mark.parametrize("password", ["p4s$", "private-test-password"])
+def test_validation_errors_are_json_serializable_and_omit_inputs(password, mocker):
+ app = FastAPI()
+ register_exception_handlers(app)
+
+ @app.post("/api/v1/validation-test")
+ def validate(payload: ValidationPayload):
+ return payload
+
+ log = mocker.patch("lnbits.exceptions.logger.error")
+ with TestClient(app) as client:
+ response = client.post("/api/v1/validation-test", json={"password": password})
+
+ assert response.status_code == 400
+ assert response.json()["detail"][0]["type"] in {"string_too_short", "value_error"}
+ assert "input" not in response.json()["detail"][0]
+ assert password not in response.text
+ assert password not in str(log.call_args)
### tests/unit/test_fiat_providers.py
@@ -88,15 +88,15 @@ def fiat_provider_test_settings(settings: Settings):
original_square_payment_success_url = settings.square_payment_success_url
original_square_payment_webhook_url = settings.square_payment_webhook_url
original_square_webhook_signature_key = settings.square_webhook_signature_key
- original_square_limits = settings.square_limits.copy(deep=True)
+ original_square_limits = settings.square_limits.model_copy(deep=True)
original_revolut_enabled = settings.revolut_enabled
original_revolut_api_endpoint = settings.revolut_api_endpoint
original_revolut_api_secret_key = settings.revolut_api_secret_key
original_revolut_api_version = settings.revolut_api_version
original_revolut_payment_success_url = settings.revolut_payment_success_url
original_revolut_payment_webhook_url = settings.revolut_payment_webhook_url
original_revolut_webhook_signing_secret = settings.revolut_webhook_signing_secret
- original_revolut_limits = settings.revolut_limits.copy(deep=True)
+ original_revolut_limits = settings.revolut_limits.model_copy(deep=True)
settings.lnbits_allowed_currencies = []
settings.paypal_enabled = False
settings.square_enabled = False
### tests/unit/test_models_extensions.py
@@ -58,7 +58,7 @@ async def test_get_installable_extensions_loads_wasm_manifests(
mocker.AsyncMock(
side_effect=[
Manifest(),
- Manifest.parse_obj(
+ Manifest.model_validate(
{
"extensions": [
{
### tests/unit/test_models_payments.py
@@ -9,7 +9,7 @@
"fields", [("payment_request",), ("bolt11",), ("payment_request", "bolt11")]
)
def test_create_invoice_accepts_payment_request(payment_request, fields):
- invoice = CreateInvoice.parse_obj(dict.fromkeys(fields, payment_request))
+ invoice = CreateInvoice.model_validate(dict.fromkeys(fields, payment_request))
assert invoice.payment_request == payment_request
### tests/unit/test_models_wallets.py
@@ -14,17 +14,17 @@ def test_copy_with_keys(keep: bool | None):
adminkey="admin-key",
inkey="invoice-key",
)
- original = json.loads(wallet.json())
+ original = json.loads(wallet.model_dump_json())
result = (
wallet.copy_with_keys() if keep is None else wallet.copy_with_keys(keep=keep)
)
assert isinstance(result, Wallet)
assert result is not wallet
- assert json.loads(wallet.json()) == original
+ assert json.loads(wallet.model_dump_json()) == original
expected = original
if keep is False:
expected = {**original, "adminkey": "*" * 32, "inkey": "*" * 32}
- assert json.loads(result.json()) == expected
- assert Wallet(**result.dict()) == result
+ assert json.loads(result.model_dump_json()) == expected
+ assert Wallet(**result.model_dump()) == result
### tests/unit/test_network.py
@@ -0,0 +1,47 @@
+import ipaddress
+
+import pytest
+
+from lnbits.utils.network import is_global_address
+
+
+@pytest.mark.parametrize(
+ "address",
+ [
+ "127.0.0.1",
+ "10.0.0.1",
+ "169.254.169.254",
+ "::1",
+ "fc00::1",
+ "64:ff9b::127.0.0.1",
+ "64:ff9b::10.0.0.1",
+ "64:ff9b::a9fe:a9fe",
+ "64:ff9b::100.64.0.1",
+ "64:ff9b::240.0.0.1",
+ "64:ff9b:1::127.0.0.1",
+ "64:ff9b:1::8.8.8.8",
+ "2002:7f00:0001::",
+ "2002:c0a8:0101::",
+ "2001:0:808:808:0:0:80ff:fffe",
+ "::ffff:127.0.0.1",
+ "::ffff:100.64.0.1",
+ "::127.0.0.1",
+ ],
+)
+def test_is_global_address_rejects_internal_targets(address: str):
+ assert not is_global_address(ipaddress.ip_address(address))
+
+
+@pytest.mark.parametrize(
+ "address",
+ [
+ "8.8.8.8",
+ "2606:4700:4700::1111",
+ "2606:4700::7f00:1",
+ "64:ff9b::8.8.8.8",
+ "::ffff:8.8.8.8",
+ "::8.8.8.8",
+ ],
+)
+def test_is_global_address_allows_public_targets(address: str):
+ assert is_global_address(ipaddress.ip_address(address))
### tests/unit/test_onchain_key.py
@@ -104,7 +104,7 @@ async def test_environment_key_and_legacy_migration(key_store, monkeypatch, sett
assert (await onchain.onchain_key_status()).source == "file"
settings.lnbits_onchain_master_key = SecretStr(base64.b64encode(bytes(32)).decode())
assert not (await onchain.onchain_key_status()).configured
- assert "lnbits_onchain_master_key" not in settings.dict()
+ assert "lnbits_onchain_master_key" not in settings.model_dump()
def test_env_file_key_loading(tmp_path, monkeypatch):
@@ -116,7 +116,7 @@ def test_env_file_key_loading(tmp_path, monkeypatch):
loaded = Settings(_env_file=env) # pyright: ignore[reportCallIssue]
assert loaded.lnbits_onchain_master_key
assert loaded.lnbits_onchain_master_key.get_secret_value() == encoded
- assert encoded not in loaded.json()
+ assert encoded not in loaded.model_dump_json()
@pytest.mark.anyio
### tests/unit/test_pay_invoice.py
@@ -1047,7 +1047,7 @@ async def test_service_fee_repeated_success_credits_once(
mocker: MockerFixture,
):
_, fee_wallet = service_fee_wallets
- stale_payment = pending_service_fee_payment.copy(deep=True)
+ stale_payment = pending_service_fee_payment.model_copy(deep=True)
mocker.patch.object(
external_funding_source,
"get_payment_status",
@@ -1089,8 +1089,8 @@ async def successful_status(checking_id):
AsyncMock(side_effect=successful_status),
)
results = await asyncio.gather(
- update_pending_payment(pending_service_fee_payment.copy(deep=True)),
- update_pending_payment(pending_service_fee_payment.copy(deep=True)),
+ update_pending_payment(pending_service_fee_payment.model_copy(deep=True)),
+ update_pending_payment(pending_service_fee_payment.model_copy(deep=True)),
return_exceptions=True,
)
### tests/unit/test_phoenixd_node.py
@@ -98,7 +98,7 @@ def handler(request):
status = await node.get_status()
assert status.fee_credit_sat == 50
assert "swapin" in status.capabilities
- public = (await node.get_public_info()).dict()
+ public = (await node.get_public_info()).model_dump()
assert public["managed_channels"] is True
assert not {"balance_msat", "fee_credit_sat", "swap_in", "channels"} & public.keys()
### tests/unit/test_scheduler.py
@@ -234,15 +234,15 @@ def test_config_rejects_invalid_payloads_and_ownership(fields: dict):
@pytest.mark.anyio
async def test_persistence_and_scope_isolation(schedule_db):
- first = job().copy(update={"namespace": "extension:one", "user_id": "alice"})
+ first = job().model_copy(update={"namespace": "extension:one", "user_id": "alice"})
await crud.save_scheduled_job(first)
for changes in (
{"user_id": "bob"},
{"user_id": None},
{"namespace": "extension:two"},
):
with pytest.raises(PermissionError):
- await crud.save_scheduled_job(first.copy(update=changes))
+ await crud.save_scheduled_job(first.model_copy(update=changes))
page = await crud.get_scheduled_jobs_paginated("extension:one", "alice")
assert page.data == [first]
assert page.total == 1
@@ -413,7 +413,7 @@ async def create(index, namespace="extension:one", owner="alice", handler="check
{"namespace": "extension:two"},
):
with pytest.raises(PermissionError, match="another owner or handler"):
- await crud.save_scheduled_job(existing.copy(update=changes))
+ await crud.save_scheduled_job(existing.model_copy(update=changes))
assert await crud.get_scheduled_job(existing.id) == existing
@@ -642,7 +642,7 @@ async def test_namespace_stop_bounds_wait_without_stopping_other_jobs(
}
for job_id, namespace in namespaces.items():
await crud.save_scheduled_job(
- job(job_id).copy(
+ job(job_id).model_copy(
update={
"namespace": namespace,
"user_id": "alice" if job_id == "user" else None,
@@ -946,7 +946,7 @@ async def test_inactive_owner_schedules_stop_accumulating_runs(
("shared", "core", None, "check", True),
):
original[job_id] = await crud.save_scheduled_job(
- job(job_id).copy(
+ job(job_id).model_copy(
update={
"namespace": namespace,
"user_id": owner,
@@ -1007,7 +1007,7 @@ async def test_inactive_owner_heartbeat_disables_schedules_and_cancels_callback(
):
await crud.save_scheduled_job(job("running", user_id="alice"))
await crud.save_scheduled_job(
- job("future", user_id="alice").copy(update={"next_run_at": NOW + 3600})
+ job("future", user_id="alice").model_copy(update={"next_run_at": NOW + 3600})
)
worker = Scheduler(lease_seconds=3)
started, cancelled = asyncio.Event(), asyncio.Event()
@@ -1119,15 +1119,17 @@ async def test_wasm_schedule_save_requires_approved_policy(
with pytest.raises(PermissionError, match="admin-approved"):
await worker.save(
"extension:one",
- config.copy(update={"id": job_id, **changes}),
+ config.model_copy(update={"id": job_id, **changes}),
user_id=user_id,
)
assert await crud.get_scheduled_job(saved.id) == saved
assert await crud.get_scheduled_job("unapproved") is None
# Payload and pause state can still be changed without changing the schedule.
updated = await worker.save(
"extension:one",
- config.copy(update={"enabled": False, "payload_json": '{"threshold": 100}'}),
+ config.model_copy(
+ update={"enabled": False, "payload_json": '{"threshold": 100}'}
+ ),
user_id=user_id,
)
assert not updated.enabled and json.loads(updated.payload_json) == {
@@ -1149,7 +1151,7 @@ async def test_wasm_schedule_rechecks_policy_before_execution(
user_id, changes, schedule_db, clock, wasm_schedule_grants, mocker: MockerFixture
):
grant = wasm_schedule_grants.permissions[0 if user_id else 1]
- config = ScheduleConfig.parse_obj(grant.policies[0])
+ config = ScheduleConfig.model_validate(grant.policies[0])
worker = Scheduler()
callback = mocker.AsyncMock()
worker.register("extension:one", "check", callback)
@@ -1177,7 +1179,7 @@ async def test_wasm_schedule_policy_revocation_cancels_running_callback(
user_id, schedule_db, clock, wasm_schedule_grants
):
grant = wasm_schedule_grants.permissions[0 if user_id else 1]
- config = ScheduleConfig.parse_obj(grant.policies[0])
+ config = ScheduleConfig.model_validate(grant.policies[0])
worker = Scheduler(lease_seconds=3)
started, cancelled = asyncio.Event(), asyncio.Event()
@@ -1210,7 +1212,7 @@ async def test_wasm_schedule_cannot_use_other_scope_policy(
user_id, wasm_schedule_grants
):
other_grant = wasm_schedule_grants.permissions[1 if user_id else 0]
- config = ScheduleConfig.parse_obj(other_grant.policies[0])
+ config = ScheduleConfig.model_validate(other_grant.policies[0])
with pytest.raises(PermissionError, match="admin-approved"):
await check_schedule_access("extension:one", user_id, config)
@@ -1341,7 +1343,7 @@ async def test_config_update_keeps_claim_and_new_schedule(schedule_db):
await crud.save_scheduled_job(job())
claimed = await crud.claim_scheduled_job("test", "claim", NOW, NOW + 60)
assert claimed
- changed = claimed.copy(
+ changed = claimed.model_copy(
update={"cron_expression": "0 9 * * *", "next_run_at": NOW + 9 * 3600}
)
await crud.save_scheduled_job(changed)
@@ -1409,8 +1411,8 @@ async def callback(_job):
assert run.started_at == NOW
assert run.finished_at == clock.now
assert run.status == outcome
- assert "hidden-" not in run.json()
- assert "lease_token" not in run.dict()
+ assert "hidden-" not in run.model_dump_json()
+ assert "lease_token" not in run.model_dump()
if outcome == "succeeded":
assert run.error_summary is None
elif outcome == "failed":
@@ -1499,7 +1501,7 @@ async def callback(_job):
run = page.data[0]
assert run.status == "failed"
assert run.error_summary == expected
- assert "hidden-payload" not in run.json()
+ assert "hidden-payload" not in run.model_dump_json()
warning.assert_called_once_with(
"Scheduled job {} failed ({}); next attempt follows its cron schedule.",
"test",
@@ -1663,9 +1665,9 @@ async def test_history_migration_preserves_existing_jobs(schedule_db):
def test_scheduler_history_retention_setting(field, default):
assert SchedulerSettings().lnbits_scheduler_enabled is True
assert getattr(SchedulerSettings(), field) == default
- assert getattr(SchedulerSettings.parse_obj({field: 42}), field) == 42
+ assert getattr(SchedulerSettings.model_validate({field: 42}), field) == 42
with pytest.raises(ValidationError):
- SchedulerSettings.parse_obj({field: 0})
+ SchedulerSettings.model_validate({field: 0})
@pytest.mark.anyio
@@ -1707,7 +1709,7 @@ async def history_run(
finished_at=NOW,
):
stored = await crud.save_scheduled_job(
- job(job_id).copy(
+ job(job_id).model_copy(
update={"namespace": namespace, "user_id": user_id, "handler": handler}
)
)
@@ -1766,7 +1768,7 @@ async def test_history_user_cap_spans_handlers_sources_and_deleted_jobs(
"shared",
*active_ids,
}
- assert all("user_id" not in run.dict() for run in page.data)
+ assert all("user_id" not in run.model_dump() for run in page.data)
# The same worker applies a lowered limit on its next maintenance tick.
settings.lnbits_scheduler_history_max_runs_per_user = 1
### tests/unit/test_services_extensions_builder.py
@@ -7,6 +7,7 @@
from pytest_mock.plugin import MockerFixture
from lnbits.core.models.extensions import ExtensionRelease
+from lnbits.core.models.extensions_builder import DataField
from lnbits.core.services.extensions_builder import (
build_extension_from_data,
clean_extension_builder_data,
@@ -16,6 +17,17 @@
from tests.helpers import make_extension_data
+def test_generated_optional_fields_have_defaults():
+ assert (
+ DataField(name="memo", type="text", optional=True).field_to_py()
+ == "memo: str | None = None"
+ )
+ assert (
+ DataField(name="unit", type="currency", optional=True).field_to_py()
+ == 'unit: str | None = "sat"'
+ )
+
+
@pytest.mark.anyio
async def test_build_extension_from_data_orchestrates_builder_steps(
tmp_path, mocker: MockerFixture
### tests/unit/test_services_lnurl.py
@@ -4,7 +4,6 @@
import httpx
import pytest
-from bolt11.types import MilliSatoshi
from lnurl import (
LnAddress,
LnurlErrorResponse,
@@ -13,13 +12,13 @@
LnurlSuccessResponse,
LnurlWithdrawResponse,
)
-from lnurl.types import CallbackUrl, LightningInvoice
-from pydantic import parse_obj_as
+from lnurl.types import CallbackUrl, LightningInvoice, MilliSatoshi
+from pydantic import TypeAdapter, ValidationError
from pytest_mock.plugin import MockerFixture
from lnbits.core.crud import create_account, create_wallet, get_wallet
from lnbits.core.models import Account
-from lnbits.core.models.lnurl import CreateLnurlPayment
+from lnbits.core.models.lnurl import CreateLnurlPayment, LnurlScan
from lnbits.core.models.wallets import Wallet
from lnbits.core.services import lnurl as lnurl_service
from lnbits.core.services.lnurl import (
@@ -41,22 +40,36 @@
)
+def test_lightning_address_model_validation_and_schema():
+ scan = LnurlScan.model_validate({"lnurl": "alice@example.com"})
+ assert isinstance(scan.lnurl, LnAddress)
+ assert scan.model_dump(mode="json") == {"lnurl": "alice@example.com"}
+ assert LnurlScan.model_json_schema()["properties"]["lnurl"]
+ for invalid in [123, {}, "not-an-address"]:
+ with pytest.raises(ValidationError):
+ LnurlScan.model_validate({"lnurl": invalid})
+
+
@pytest.mark.anyio
+@pytest.mark.parametrize(
+ "target_ip", ["169.254.169.254", "64:ff9b::127.0.0.1", "64:ff9b::a9fe:a9fe"]
+)
async def test_lnurl_requests_reject_private_ips_by_default(
- settings: Settings, mocker: MockerFixture
+ settings: Settings, mocker: MockerFixture, target_ip: str
):
settings.lnbits_lnurl_allow_private_ips = False
+ target_url = httpx.URL("https://metadata.internal/latest/meta-data/").copy_with(
+ host=target_ip
+ )
with pytest.raises(
LnurlResponseException, match="resolves to a private or non-global IP address"
):
- await lnurl_service._validate_lnurl_request_url(
- httpx.URL("https://169.254.169.254/latest/meta-data/"), tor_socks=None
- )
+ await lnurl_service._validate_lnurl_request_url(target_url, tor_socks=None)
mocker.patch(
"lnbits.core.services.lnurl._resolve_lnurl_host",
- mocker.AsyncMock(return_value=[ipaddress.ip_address("10.0.0.1")]),
+ mocker.AsyncMock(return_value=[ipaddress.ip_address(target_ip)]),
)
with pytest.raises(
LnurlResponseException, match="resolves to a private or non-global IP address"
@@ -66,6 +79,12 @@ async def test_lnurl_requests_reject_private_ips_by_default(
)
settings.lnbits_lnurl_allow_private_ips = True
+ addresses, proxy = await lnurl_service._validate_lnurl_request_url(
+ target_url, tor_socks=None
+ )
+ assert addresses == [ipaddress.ip_address(target_ip)]
+ assert proxy is None
+
with pytest.raises(LnurlResponseException, match="not allowed over HTTP"):
await lnurl_service._validate_lnurl_request_url(
httpx.URL("http://93.184.216.34/lnurl"), tor_socks=None
@@ -239,7 +258,9 @@ async def test_lnurl_requests_are_pinned_to_validated_ip(mocker: MockerFixture):
@pytest.mark.anyio
async def test_perform_withdraw_success_and_validation(mocker: MockerFixture):
withdraw_response = LnurlWithdrawResponse(
- callback=parse_obj_as(CallbackUrl, "https://example.com/callback"),
+ callback=TypeAdapter(CallbackUrl).validate_python(
+ "https://example.com/callback"
+ ),
k1="k1",
minWithdrawable=MilliSatoshi(1),
maxWithdrawable=MilliSatoshi(1000),
### tests/unit/test_services_notifications.py
@@ -661,10 +661,16 @@ async def test_dispatch_webhook_status_is_scoped_to_payment(
@pytest.mark.anyio
+@pytest.mark.parametrize(
+ "target_ip", ["169.254.169.254", "64:ff9b::127.0.0.1", "64:ff9b::a9fe:a9fe"]
+)
async def test_dispatch_webhook_blocks_private_targets(
- settings: Settings, mocker: MockerFixture
+ settings: Settings, mocker: MockerFixture, target_ip: str
):
settings.lnbits_callback_url_rules = []
+ target_url = httpx.URL("http://metadata.internal/metadata").copy_with(
+ host=target_ip
+ )
wallet = await _create_wallet()
response = httpx.Response(
200,
@@ -676,9 +682,7 @@ async def test_dispatch_webhook_blocks_private_targets(
return_value=client,
)
- direct_payment = await _create_payment(
- wallet, webhook="http://169.254.169.254/metadata"
- )
+ direct_payment = await _create_payment(wallet, webhook=str(target_url))
await dispatch_webhook(direct_payment)
assert (await get_payment(direct_payment.checking_id)).webhook_status == "-1"
@@ -689,7 +693,7 @@ async def test_dispatch_webhook_blocks_private_targets(
mocker.AsyncMock(
return_value=[
ipaddress.ip_address("93.184.216.34"),
- ipaddress.ip_address("10.0.0.1"),
+ ipaddress.ip_address(target_ip),
]
),
)
@@ -702,14 +706,16 @@ async def test_dispatch_webhook_blocks_private_targets(
assert client.posts == []
settings.lnbits_callback_allow_private_ips = True
- resolver.return_value = [ipaddress.ip_address("10.0.0.1")]
+ resolver.return_value = [ipaddress.ip_address(target_ip)]
allowed_payment = await _create_payment(
wallet, webhook="https://attacker.example/internal"
)
await dispatch_webhook(allowed_payment)
assert (await get_payment(allowed_payment.checking_id)).webhook_status == "200"
- assert str(client.posts[0][0]) == "https://10.0.0.1/internal"
+ assert client.posts[0][0] == httpx.URL(
+ "https://attacker.example/internal"
+ ).copy_with(host=str(ipaddress.ip_address(target_ip)))
@pytest.mark.anyio
### tests/unit/test_services_payments.py
@@ -153,7 +153,7 @@ async def test_lnurl_withdraw_success_keeps_invoice_pending(mocker: MockerFixtur
CreateInvoice(
amount=1,
out=False,
- lnurl_withdraw=LnurlWithdrawResponse.parse_obj(
+ lnurl_withdraw=LnurlWithdrawResponse.model_validate(
{
"tag": "withdrawRequest",
"callback": "https://example.com/callback",
@@ -529,18 +529,59 @@ async def test_check_wallet_limits_and_time_limit(
@pytest.mark.anyio
-async def test_check_wallet_daily_limit_counts_all_daily_payments(settings: Settings):
+@pytest.mark.parametrize("amount_msat", (1_000, 5_000, 5_001))
+async def test_check_wallet_daily_limit_first_payment(
+ app, settings: Settings, amount_msat: int
+):
+ wallet = await _create_wallet()
+ settings.lnbits_wallet_limit_daily_max_withdraw = 5
+
+ if amount_msat > 5_000:
+ with pytest.raises(
+ ValueError, match="Daily withdrawal limit of 5 sats reached."
+ ):
+ await check_wallet_daily_withdraw_limit(wallet.id, amount_msat)
+ else:
+ assert await check_wallet_daily_withdraw_limit(wallet.id, amount_msat) is None
+
+
+@pytest.mark.anyio
+async def test_check_wallet_daily_limit_rejects_interrupted_history(
+ settings: Settings, mocker: MockerFixture
+):
+ settings.lnbits_wallet_limit_daily_max_withdraw = 5
+ mocker.patch.object(settings, "lnbits_running", True)
+
+ async def get_history_page(**kwargs):
+ settings.lnbits_running = False
+ return [SimpleNamespace(amount=-1)] * 1000
+
+ mocker.patch(
+ "lnbits.core.services.payments.get_payments", side_effect=get_history_page
+ )
+
+ with pytest.raises(PaymentError, match="Server is shutting down."):
+ await check_wallet_daily_withdraw_limit("wallet-1", 1_000)
+
+
+@pytest.mark.anyio
+@pytest.mark.parametrize("payment_count", (2, 11, 1_001))
+async def test_check_wallet_daily_limit_counts_all_daily_payments(
+ app, settings: Settings, payment_count: int
+):
wallet = await _create_wallet()
- await _create_payment(wallet, amount_msat=-2_000, status=PaymentState.SUCCESS)
- await _create_payment(wallet, amount_msat=-3_000, status=PaymentState.SUCCESS)
+ for _ in range(payment_count):
+ await _create_payment(wallet, amount_msat=-1_000, status=PaymentState.SUCCESS)
original_limit = settings.lnbits_wallet_limit_daily_max_withdraw
try:
- settings.lnbits_wallet_limit_daily_max_withdraw = 5
+ settings.lnbits_wallet_limit_daily_max_withdraw = payment_count + 1
+ assert await check_wallet_daily_withdraw_limit(wallet.id, 1_000) is None
with pytest.raises(
- ValueError, match="Daily withdrawal limit of 5 sats reached."
+ ValueError,
+ match=f"Daily withdrawal limit of {payment_count + 1} sats reached.",
):
- await check_wallet_daily_withdraw_limit(wallet.id, 1_000)
+ await check_wallet_daily_withdraw_limit(wallet.id, 1_001)
finally:
settings.lnbits_wallet_limit_daily_max_withdraw = original_limit
### tests/unit/test_services_settings.py
@@ -110,9 +110,9 @@ async def test_check_webpush_settings_generates_and_persists_keys(
if previous_settings:
await create_admin_settings(
previous_settings.super_user,
- previous_settings.dict(exclude={"super_user"}),
+ previous_settings.model_dump(exclude={"super_user"}),
)
- update_cached_settings(previous_settings.dict())
+ update_cached_settings(previous_settings.model_dump())
settings.lnbits_webpush_privkey = previous_private
settings.lnbits_webpush_pubkey = previous_public
settings.lnbits_admin_ui = previous_admin_ui
### tests/unit/test_services_users.py
@@ -264,9 +264,9 @@ async def test_check_admin_settings_initializes_cache_and_marks_first_install(
if previous_settings:
await create_admin_settings(
previous_settings.super_user,
- previous_settings.dict(exclude={"super_user"}),
+ previous_settings.model_dump(exclude={"super_user"}),
)
- update_cached_settings(previous_settings.dict())
+ update_cached_settings(previous_settings.model_dump())
settings.super_user = previous_super_user
settings.lnbits_data_folder = previous_data_folder
settings.lnbits_admin_ui = previous_admin_ui
### tests/unit/test_settings.py
@@ -20,6 +20,51 @@
set_cli_settings,
)
+
+@pytest.mark.parametrize("admins", ['["alice", "bob"]', "alice,bob"])
+def test_settings_load_env_collections_and_ignore_unrelated_dotenv_values(
+ monkeypatch, tmp_path, admins
+):
+ monkeypatch.setenv("LNBITS_ADMIN_USERS", admins)
+ monkeypatch.setenv("LNBITS_ASSETS_ALLOWED_MIME_TYPES", "image/png,image/jpeg")
+ monkeypatch.setenv("LNBITS_DATA_FOLDER", str(tmp_path))
+ monkeypatch.delenv("LNBITS_WASM_EXTENSIONS_PATH", raising=False)
+ monkeypatch.setenv("STRIKE_API_KEY", "test-strike-key")
+ monkeypatch.setenv(
+ "STRIPE_LIMITS", '{"allowed_users":["alice"],"service_max_fee_sats":5}'
+ )
+ monkeypatch.setenv(
+ "LNBITS_EXCHANGE_RATE_PROVIDERS",
+ '[{"name":"test","api_url":"https://example.com","path":"price"}]',
+ )
+ env_file = tmp_path / ".env"
+ env_file.write_text("UNRELATED_VARIABLE=ignored\n")
+
+ loaded = Settings(_env_file=env_file) # pyright: ignore[reportCallIssue]
+ assert loaded.lnbits_admin_users == ["alice", "bob"]
+ assert loaded.lnbits_assets_allowed_mime_types == ["image/png", "image/jpeg"]
+ assert loaded.lnbits_exchange_rate_providers[0].name == "test"
+ assert loaded.strike_api_key == "test-strike-key"
+ assert loaded.stripe_limits.allowed_users == ["alice"]
+ assert loaded.stripe_limits.service_max_fee_sats == 5
+ assert loaded.wasm_extensions_dir == tmp_path / "wasm_extensions"
+
+
+def test_settings_master_key_alias_precedence_and_serialization(monkeypatch):
+ monkeypatch.setenv("WATCHONLY_MASTER_KEY", "legacy-test-key")
+ monkeypatch.delenv("LNBITS_ONCHAIN_MASTER_KEY", raising=False)
+ loaded = Settings(_env_file=None) # pyright: ignore[reportCallIssue]
+ assert loaded.lnbits_onchain_master_key is not None
+ assert loaded.lnbits_onchain_master_key.get_secret_value() == "legacy-test-key"
+
+ monkeypatch.setenv("LNBITS_ONCHAIN_MASTER_KEY", "current-test-key")
+ loaded = Settings(_env_file=None) # pyright: ignore[reportCallIssue]
+ assert loaded.lnbits_onchain_master_key is not None
+ assert loaded.lnbits_onchain_master_key.get_secret_value() == "current-test-key"
+ assert "lnbits_onchain_master_key" not in loaded.model_dump()
+ assert "current-test-key" not in loaded.model_dump_json()
+
+
lnurlp_redirect_path: dict[str, Any] = {
"from_path": "/.well-known/lnurlp",
"redirect_to_path": "/api/v1/well-known",
@@ -66,7 +111,7 @@ def test_ln_address_mode_defaults_to_extension_first():
def test_ln_address_mode_rejects_invalid_value():
with pytest.raises(ValueError):
- UsersSettings.parse_obj({"lnbits_ln_address_mode": "invalid"})
+ UsersSettings.model_validate({"lnbits_ln_address_mode": "invalid"})
@pytest.fixture()
@@ -235,10 +280,10 @@ def test_settings_keep_wasm_manifests_separate_from_extension_manifests():
*DEFAULT_WASM_MANIFESTS,
"https://example.com/extensions.json",
]
- assert settings.dict()["lnbits_extensions_manifests"] == [
+ assert settings.model_dump()["lnbits_extensions_manifests"] == [
"https://example.com/extensions.json"
]
- assert settings.dict()["lnbits_wasm_extensions_manifests"] == [
+ assert settings.model_dump()["lnbits_wasm_extensions_manifests"] == [
*DEFAULT_WASM_MANIFESTS,
"https://example.com/extensions.json",
]
### tests/unit/test_wasm_extension_api_client.py
@@ -197,7 +197,7 @@ async def test_wasm_extension_api_request_rejects_oversized_body_and_response(
[{"id": "target", "access": ["write"]}],
"user-id",
"access-token",
- ExtensionApiRequest.construct(
+ ExtensionApiRequest.model_construct(
extension_id="target",
method="POST",
path="/api/v1/run",
### tests/unit/test_wasm_extension_automatic_schedules.py
@@ -62,7 +62,7 @@ def test_automatic_schedule_rejects_invalid_declarations(invalid):
def test_automatic_schedule_requires_matching_requested_and_granted_policy():
config = automatic_config()
extension = make_installable_extension("demo")
- grants = [ExtensionPermission.parse_obj(p) for p in config["permissions"]]
+ grants = [ExtensionPermission.model_validate(p) for p in config["permissions"]]
assert validate_wasm_extension_permissions(extension, grants, config) == grants
with pytest.raises(ValueError, match="requires permission approval"):
validate_wasm_extension_permissions(extension, None, config)
### tests/unit/test_wasm_extension_events.py
@@ -291,5 +291,5 @@ def _payment(ext_id: str, *, extra: dict | None = None) -> SimpleNamespace:
memo="memo",
pending=False,
status="success",
- json=lambda: json.dumps({"id": "payment-row"}),
+ model_dump_json=lambda: json.dumps({"id": "payment-row"}),
)
### tests/unit/test_wasm_extension_http.py
@@ -29,16 +29,20 @@ def test_wasm_http_origin_normalization_and_url_rejections():
@pytest.mark.anyio
-async def test_wasm_http_rejects_internal_hosts(mocker: MockerFixture):
+@pytest.mark.parametrize(
+ "target_ip", ["127.0.0.1", "64:ff9b::127.0.0.1", "64:ff9b::a9fe:a9fe"]
+)
+async def test_wasm_http_rejects_internal_hosts(mocker: MockerFixture, target_ip: str):
with pytest.raises(PermissionError, match="localhost"):
await wasm_http._reject_internal_host("https://localhost/api")
with pytest.raises(PermissionError, match="internal network"):
- await wasm_http._reject_internal_host("https://127.0.0.1/api")
+ url = httpx.URL("https://api.example.com/api").copy_with(host=target_ip)
+ await wasm_http._reject_internal_host(str(url))
mocker.patch(
"lnbits.core.wasm_ext.client.http._resolve_host",
- mocker.AsyncMock(return_value=[ipaddress.ip_address("10.0.0.1")]),
+ mocker.AsyncMock(return_value=[ipaddress.ip_address(target_ip)]),
)
with pytest.raises(PermissionError, match="internal network"):
await wasm_http._reject_internal_host("https://api.example.com")
@@ -126,7 +130,7 @@ async def test_wasm_http_request_rejects_oversized_bodies_and_responses(
await wasm_http.send_extension_http_request(
"demoext",
[{"host": "https://api.example.com"}],
- HttpRequest.construct(
+ HttpRequest.model_construct(
method="GET",
url="https://api.example.com/path",
headers={},
### tests/unit/test_wasm_extension_loader.py
@@ -60,7 +60,7 @@ def test_wasm_extension_config_rejects_coerced_scalar_types():
config = _wasm_config("demoext")
config["wasm"] = {"module": 123}
- with pytest.raises(ValueError, match="str type expected"):
+ with pytest.raises(ValueError, match="Input should be a valid string"):
parse_wasm_extension_config("demoext", config)
### tests/unit/test_wasm_extension_notifications.py
@@ -166,7 +166,9 @@ async def test_notification_rejects_missing_or_mismatched_event_metadata(
mocker: MockerFixture,
fields: dict | None,
):
- invocation = event_invocation.copy(update=fields) if fields is not None else None
+ invocation = (
+ event_invocation.model_copy(update=fields) if fields is not None else None
+ )
mocker.patch(
"lnbits.core.crud.extensions.get_wasm_invocation",
AsyncMock(return_value=invocation),
@@ -218,7 +220,7 @@ async def test_user_notification_uses_only_selected_saved_user_destination(
"lnbits.core.services.notifications.send_admin_notification", AsyncMock()
)
- preferences_before = notification_user.extra.notifications.copy(deep=True)
+ preferences_before = notification_user.extra.notifications.model_copy(deep=True)
api = ExtensionHostAPI("forms", [METHOD], user_id="recipient-user")
result = await ExtensionAPIHost(api).invoke(
METHOD, {**REQUEST, "type": notification_type}
@@ -392,7 +394,7 @@ def test_notification_permission_and_sdk_are_available():
"short_description": "Forms",
"extension_type": "wasm",
"wasm": {"module": "extension.wasm"},
- "permissions": [permission.dict()],
+ "permissions": [permission.model_dump()],
}
extension = make_installable_extension("forms")
### tests/unit/test_wasm_extension_permissions.py
@@ -67,7 +67,9 @@ def test_scheduler_permissions_approve_exact_schedules_per_handler_and_scope(
):
config = scheduler_permission_config
extension = make_installable_extension("demoext")
- grants = [ExtensionPermission.parse_obj(item) for item in config["permissions"]]
+ grants = [
+ ExtensionPermission.model_validate(item) for item in config["permissions"]
+ ]
assert validate_wasm_extension_permissions(extension, grants, config) == grants
# Admins can approve only some declared handlers and omit the shared permission.
grants[0].policies = [
@@ -157,7 +159,7 @@ def test_scheduler_permissions_reject_invalid_job_limits(
):
config = scheduler_permission_config
grants = [
- ExtensionPermission.parse_obj(item).copy(deep=True)
+ ExtensionPermission.model_validate(item).model_copy(deep=True)
for item in config["permissions"]
]
assert grants[0].policies is not None
@@ -183,7 +185,7 @@ def test_scheduler_permissions_job_limit_overrides(
):
config = scheduler_permission_config
grants = [
- ExtensionPermission.parse_obj(item).copy(deep=True)
+ ExtensionPermission.model_validate(item).model_copy(deep=True)
for item in config["permissions"]
]
assert grants[0].policies is not None
### tests/unit/test_wasm_extension_scheduler.py
@@ -161,7 +161,7 @@ async def test_schedule_dispatch_preserves_user_or_global_context(
invoke = mocker.patch.object(
wasm_scheduler, "invoke_wasm_extension_export", mocker.AsyncMock()
)
- job = schedule().copy(update={"user_id": owner})
+ job = schedule().model_copy(update={"user_id": owner})
await wasm_scheduler.dispatch_wasm_schedule(job)
assert invoke.await_args is not None
assert invoke.await_args.args[0:2] == ("demo", "check")
@@ -285,7 +285,7 @@ def test_scheduler_permissions_and_sdk_are_discoverable():
"module": "extension.wasm",
"exports": [{"name": "check", "visibility": "event"}],
},
- "permissions": [p.dict() for p in permissions],
+ "permissions": [p.model_dump() for p in permissions],
}
extension = make_installable_extension("demo")
with pytest.raises(ValueError, match="requires permission approval"):
### tests/wallets/fixtures/models.py
@@ -3,24 +3,24 @@
class FundingSourceConfig(BaseModel):
name: str
- skip: bool | None
+ skip: bool | None = None
wallet_class: str
settings: dict
- mock_settings: dict | None
+ mock_settings: dict | None = None
class FunctionMock(BaseModel):
- uri: str | None
- query_params: dict | None
- headers: dict | None
- method: str | None
+ uri: str | None = None
+ query_params: dict | None = None
+ headers: dict | None = None
+ method: str | None = None
class TestMock(BaseModel):
- skip: bool | None
- description: str | None
- request_type: str | None
- request_body: dict | None
+ skip: bool | None = None
+ description: str | None = None
+ request_type: str | None = None
+ request_body: dict | None = None
response_type: str
response: str | dict | list
@@ -61,13 +61,13 @@ class FunctionData(BaseModel):
class WalletTest(BaseModel):
- skip: bool | None
+ skip: bool | None = None
function: str
description: str
funding_source: FundingSourceConfig
call_params: dict | None = {}
- expect: dict | None
- expect_error: dict | None
+ expect: dict | None = None
+ expect_error: dict | None = None
mocks: list[Mock] = []
@staticmethod
@@ -156,7 +156,7 @@ def _tests_from_mock(self, mock_obj) -> "WalletTest":
return WalletTest(
**(
- self.dict()
+ self.model_dump()
| {
"description": f"{self.description}:{extra_description}",
"mocks": test_mocks,
### tests/wallets/helpers.py
@@ -77,7 +77,7 @@ def load_funding_source(funding_source: FundingSourceConfig) -> WalletInfo:
async def check_assertions(wallet, _test_data: WalletTest):
- test_data = _test_data.dict()
+ test_data = _test_data.model_dump()
tested_func = _test_data.function
call_params = _test_data.call_params
### tests/wallets/test_eclair.py
@@ -0,0 +1,50 @@
+import asyncio
+import base64
+import json
+
+import pytest
+
+from lnbits.wallets.eclair import EclairWallet
+
+
+@pytest.mark.anyio
+@pytest.mark.parametrize(
+ ("url", "ws_url"),
+ [
+ ("https://eclair.test", "wss://eclair.test/ws"),
+ ("https://eclair.test:443", "wss://eclair.test:443/ws"),
+ ("https://eclair.test:8443", "wss://eclair.test:8443/ws"),
+ ("https://eclair.test:8443/", "wss://eclair.test:8443/ws"),
+ ("https://[::1]:8443", "wss://[::1]:8443/ws"),
+ ("eclair.test:8443", "wss://eclair.test:8443/ws"),
+ ("http://eclair.test", "ws://eclair.test/ws"),
+ ("http://127.0.0.1:8283", "ws://127.0.0.1:8283/ws"),
+ ],
+)
+async def test_invoice_stream_preserves_configured_transport(
+ settings, mocker, url, ws_url
+):
+ settings.eclair_url = url
+ settings.eclair_pass = "test-password"
+ settings.lnbits_running = True
+ websocket = mocker.AsyncMock()
+ websocket.recv.return_value = json.dumps(
+ {"type": "payment-received", "paymentHash": "test-payment-hash"}
+ )
+ connect = mocker.patch("lnbits.wallets.eclair.connect")
+ connect.return_value.__aenter__.return_value = websocket
+
+ wallet = EclairWallet()
+ stream = wallet.paid_invoices_stream()
+ try:
+ assert await asyncio.wait_for(anext(stream), timeout=1) == "test-payment-hash"
+ auth = base64.b64encode(b":test-password").decode()
+ connect.assert_called_once_with(
+ ws_url, additional_headers=[("Authorization", f"Basic {auth}")]
+ )
+ assert wallet.client.base_url.scheme == (
+ "https" if ws_url.startswith("wss:") else "http"
+ )
+ finally:
+ await stream.aclose()
+ await wallet.cleanup()
### tests/wallets/test_rest_wallets.py
@@ -59,7 +59,7 @@ async def test_rest_wallet(httpserver: HTTPServer, test_data: WalletTest):
def _apply_mock(httpserver: HTTPServer, mock: Mock):
request_data: dict[str, str | dict | list] = {}
- request_type = getattr(mock.dict(), "request_type", None)
+ request_type = getattr(mock.model_dump(), "request_type", None)
# request_type = mock.request_type <--- this des not work for whatever reason!!!
if request_type == "data":
### tools/codegen/extension_sdk_typescript.py
@@ -81,8 +81,8 @@ def _collect_models(methods: Sequence[ExtensionAPIMethod]) -> list[type[BaseMode
if model.__name__ in models:
continue
models[model.__name__] = model
- for field in model.__fields__.values():
- pending.extend(_nested_model_types(field.outer_type_))
+ for field in model.model_fields.values():
+ pending.extend(_nested_model_types(field.annotation))
return [models[name] for name in sorted(models)]
@@ -97,20 +97,20 @@ def _nested_model_types(type_: Any) -> list[type[BaseModel]]:
def _render_model_type(model: type[BaseModel]) -> list[str]:
name = _model_name(model)
- fields = model.__fields__
+ fields = model.model_fields
if not fields:
return [f"export type {name} = Record<string, never>"]
lines = [f"export type {name} = {{"]
for field_name, field in fields.items():
- optional = "?" if not field.required else ""
- ts_type = _python_type_to_ts(field.outer_type_, field.allow_none)
+ optional = "?" if not field.is_required() else ""
+ ts_type = _python_type_to_ts(field.annotation)
lines.append(f" {_camel(field_name)}{optional}: {ts_type}")
lines.append("}")
return lines
-def _python_type_to_ts(type_: Any, allow_none: bool = False) -> str:
+def _python_type_to_ts(type_: Any) -> str:
origin = get_origin(type_)
args = get_args(type_)
@@ -147,7 +147,7 @@ def _python_type_to_ts(type_: Any, allow_none: bool = False) -> str:
else:
ts = "unknown"
- return f"{ts} | null" if allow_none else ts
+ return ts
def _literal_to_ts(value: Any) -> str:
@@ -337,7 +337,7 @@ def _ts_access(value: str) -> str:
def _is_empty_model(model: type[BaseModel]) -> bool:
- return not model.__fields__
+ return not model.model_fields
def main(argv: Sequence[str] | None = None) -> int:
### uv.lock
@@ -127,6 +127,15 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/3e/30/e900b21425a860e195f32e37657aa1f7c7f2b1bfb26f03ca209b90933c06/annotated_doc-0.0.5-py3-none-any.whl", hash = "sha256:117bac03a25ede5df5440e855b32d556049ca169ead221505badf432fed4b101", size = 5302, upload-time = "2026-07-28T13:50:57.239Z" },
]
+[[package]]
+name = "annotated-types"
+version = "0.8.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/56/a8120250d128bed162cd73c76d45f6ef9991f3e068f62a8ee060afa3104a/annotated_types-0.8.0.tar.gz", hash = "sha256:13b2beaad985e05e2d6407ee4c4f35590b11f8d693a258a561055cac8f64cab7", size = 15893, upload-time = "2026-07-23T20:16:13.995Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/99/91/8acff4f5e50511b911bbccb72b8628a49c68ce14148cd9f6431094859a90/annotated_types-0.8.0-py3-none-any.whl", hash = "sha256:f072f4d804ea359e4eaf198b1af7a8b0943881a87f31bb764f8bf219bb9419e0", size = 13427, upload-time = "2026-07-23T20:16:12.938Z" },
+]
+
[[package]]
name = "anyio"
version = "4.12.1"
@@ -829,7 +838,7 @@ name = "exceptiongroup"
version = "1.3.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
- { name = "typing-extensions" },
+ { name = "typing-extensions", marker = "python_full_version < '3.11'" },
]
sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
wheels = [
@@ -1351,6 +1360,7 @@ dependencies = [
{ name = "protobuf" },
{ name = "pycryptodomex" },
{ name = "pydantic" },
+ { name = "pydantic-settings" },
{ name = "pyinstrument" },
{ name = "pyjwt" },
{ name = "pyln-client" },
@@ -1434,15 +1444,16 @@ requires-dist = [
{ name = "itsdangerous", specifier = "~=2.2.0" },
{ name = "jinja2", specifier = "~=3.1.6" },
{ name = "jsonpath-ng", specifier = "~=1.7.0" },
- { name = "lnurl", specifier = "~=0.10.0" },
+ { name = "lnurl", specifier = "~=2.0.2" },
{ name = "loguru", specifier = "~=0.7.3" },
{ name = "nostr-sdk", specifier = "~=0.44.0" },
{ name = "packaging", specifier = "~=25.0.0" },
{ name = "pillow", specifier = "~=12.3.0" },
{ name = "protobuf", specifier = "~=6.33.5" },
{ name = "psycopg2-binary", marker = "extra == 'migration'", specifier = "~=2.9.11" },
{ name = "pycryptodomex", specifier = "~=3.23.0" },
- { name = "pydantic", specifier = "~=1.10.26" },
+ { name = "pydantic", specifier = "~=2.12.5" },
+ { name = "pydantic-settings", specifier = "~=2.12.0" },
{ name = "pyinstrument", specifier = ">=5.1.2" },
{ name = "pyjwt", specifier = "~=2.15.1" },
{ name = "pyln-client", specifier = "==25.12.0" },
@@ -1495,7 +1506,7 @@ dev = [
[[package]]
name = "lnurl"
-version = "0.10.4"
+version = "2.0.2"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "bech32" },
@@ -1506,9 +1517,9 @@ dependencies = [
{ name = "pycryptodomex" },
{ name = "pydantic" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/a3/5d/bf998e137d2c5999039a605823db67602a5ccd187b45df16909aa9e459ac/lnurl-0.10.4.tar.gz", hash = "sha256:c43a6cf45b6f20da67088193da5cd67276038f81188c287a8b2aecc323959022", size = 70070, upload-time = "2026-08-10T05:32:29.499Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/45/3d/6665acce88c569652e6640889d6602fda101714adf4505ae05e23eb6eec3/lnurl-2.0.2.tar.gz", hash = "sha256:64cdfe5af0c37117e91c84a72441824b8f5c6945e5923a16efd69654a06b0c51", size = 76930, upload-time = "2026-07-16T15:21:00.707Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/35/9d/d64637d347e69296ba83438c4c3144e38c881a2e6077978410894c6ad4ed/lnurl-0.10.4-py3-none-any.whl", hash = "sha256:1173de3fa47550ff9a9484f15f4b876c93220042423aef5205c6ae749f065f70", size = 18159, upload-time = "2026-08-10T05:32:28.59Z" },
+ { url = "https://files.pythonhosted.org/packages/78/04/19e4b145416f5f1b87c77591f9045894777e49aae8131a31f0cf35bb9af9/lnurl-2.0.2-py3-none-any.whl", hash = "sha256:4094b4a07e26eb9e5792111e7482a79cfe87c88fddae03c895abd06de5fd06d0", size = 18652, upload-time = "2026-07-16T15:20:59.485Z" },
]
[[package]]
@@ -2087,36 +2098,114 @@ wheels = [
[[package]]
name = "pydantic"
-version = "1.10.26"
+version = "2.12.5"
source = { registry = "https://pypi.org/simple" }
dependencies = [
+ { name = "annotated-types" },
+ { name = "pydantic-core" },
{ name = "typing-extensions" },
+ { name = "typing-inspection" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/7b/da/fd89f987a376c807cd81ea0eff4589aade783bbb702637b4734ef2c743a2/pydantic-1.10.26.tar.gz", hash = "sha256:8c6aa39b494c5af092e690127c283d84f363ac36017106a9e66cb33a22ac412e", size = 357906, upload-time = "2025-12-18T15:47:46.557Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/71/08/2587a6d4314e7539eec84acd062cb7b037638edb57a0335d20e4c5b8878c/pydantic-1.10.26-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f7ae36fa0ecef8d39884120f212e16c06bb096a38f523421278e2f39c1784546", size = 2444588, upload-time = "2025-12-18T15:46:28.882Z" },
- { url = "https://files.pythonhosted.org/packages/47/e6/10df5f08c105bcbb4adbee7d1108ff4b347702b110fed058f6a03f1c6b73/pydantic-1.10.26-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d95a76cf503f0f72ed7812a91de948440b2bf564269975738a4751e4fadeb572", size = 2255972, upload-time = "2025-12-18T15:46:31.72Z" },
- { url = "https://files.pythonhosted.org/packages/ba/7d/fdb961e7adc2c31f394feba6f560ef2c74c446f0285e2c2eb87d2b7206c7/pydantic-1.10.26-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a943ce8e00ad708ed06a1d9df5b4fd28f5635a003b82a4908ece6f24c0b18464", size = 2857175, upload-time = "2025-12-18T15:46:34Z" },
- { url = "https://files.pythonhosted.org/packages/8f/6c/f21e27dda475d4c562bd01b5874284dd3180f336c1e669413b743ca8b278/pydantic-1.10.26-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:465ad8edb29b15c10b779b16431fe8e77c380098badf6db367b7a1d3e572cf53", size = 2947001, upload-time = "2025-12-18T15:46:35.922Z" },
- { url = "https://files.pythonhosted.org/packages/6d/f6/27ea206232cbb6ec24dc4e4e8888a9a734f96a1eaf13504be4b30ef26aa7/pydantic-1.10.26-cp310-cp310-win_amd64.whl", hash = "sha256:80e6be6272839c8a7641d26ad569ab77772809dd78f91d0068dc0fc97f071945", size = 2066217, upload-time = "2025-12-18T15:46:37.614Z" },
- { url = "https://files.pythonhosted.org/packages/1d/c1/d521e64c8130e1ad9d22c270bed3fabcc0940c9539b076b639c88fd32a8d/pydantic-1.10.26-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:116233e53889bcc536f617e38c1b8337d7fa9c280f0fd7a4045947515a785637", size = 2428347, upload-time = "2025-12-18T15:46:39.41Z" },
- { url = "https://files.pythonhosted.org/packages/2c/08/f4b804a00c16e3ea994cb640a7c25c579b4f1fa674cde6a19fa0dfb0ae4f/pydantic-1.10.26-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c3cfdd361addb6eb64ccd26ac356ad6514cee06a61ab26b27e16b5ed53108f77", size = 2212605, upload-time = "2025-12-18T15:46:41.006Z" },
- { url = "https://files.pythonhosted.org/packages/5d/78/0df4b9efef29bbc5e39f247fcba99060d15946b4463d82a5589cf7923d71/pydantic-1.10.26-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0e4451951a9a93bf9a90576f3e25240b47ee49ab5236adccb8eff6ac943adf0f", size = 2753560, upload-time = "2025-12-18T15:46:43.215Z" },
- { url = "https://files.pythonhosted.org/packages/68/66/6ab6c1d3a116d05d2508fce64f96e35242938fac07544d611e11d0d363a0/pydantic-1.10.26-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9858ed44c6bea5f29ffe95308db9e62060791c877766c67dd5f55d072c8612b5", size = 2859235, upload-time = "2025-12-18T15:46:45.112Z" },
- { url = "https://files.pythonhosted.org/packages/61/4e/f1676bb0fcdf6ed2ce4670d7d1fc1d6c3a06d84497644acfbe02649503f1/pydantic-1.10.26-cp311-cp311-win_amd64.whl", hash = "sha256:ac1089f723e2106ebde434377d31239e00870a7563245072968e5af5cc4d33df", size = 2066646, upload-time = "2025-12-18T15:46:46.816Z" },
- { url = "https://files.pythonhosted.org/packages/02/6c/cd97a5a776c4515e6ee2ae81c2f2c5be51376dda6c31f965d7746ce0019f/pydantic-1.10.26-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:468d5b9cacfcaadc76ed0a4645354ab6f263ec01a63fb6d05630ea1df6ae453f", size = 2433795, upload-time = "2025-12-18T15:46:49.321Z" },
- { url = "https://files.pythonhosted.org/packages/47/12/de20affa30dcef728fcf9cc98e13ff4438c7a630de8d2f90eb38eba0891c/pydantic-1.10.26-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2c1b0b914be31671000ca25cf7ea17fcaaa68cfeadf6924529c5c5aa24b7ab1f", size = 2227387, upload-time = "2025-12-18T15:46:50.877Z" },
- { url = "https://files.pythonhosted.org/packages/7b/1d/9d65dcc5b8c17ba590f1f9f486e9306346831902318b7ee93f63516f4003/pydantic-1.10.26-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:15b13b9f8ba8867095769e1156e0d7fbafa1f65b898dd40fd1c02e34430973cb", size = 2629594, upload-time = "2025-12-18T15:46:53.42Z" },
- { url = "https://files.pythonhosted.org/packages/3f/76/acb41409356789e23e1a7ef58f93821410c96409183ce314ddb58d97f23e/pydantic-1.10.26-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ad7025ca324ae263d4313998e25078dcaec5f9ed0392c06dedb57e053cc8086b", size = 2745305, upload-time = "2025-12-18T15:46:55.987Z" },
- { url = "https://files.pythonhosted.org/packages/22/72/a98c0c5e527a66057d969fedd61675223c7975ade61acebbca9f1abd6dc0/pydantic-1.10.26-cp312-cp312-win_amd64.whl", hash = "sha256:4482b299874dabb88a6c3759e3d85c6557c407c3b586891f7d808d8a38b66b9c", size = 1937647, upload-time = "2025-12-18T15:46:57.905Z" },
- { url = "https://files.pythonhosted.org/packages/1f/98/556e82f00b98486def0b8af85da95e69d2be7e367cf2431408e108bc3095/pydantic-1.10.26-py3-none-any.whl", hash = "sha256:c43ad70dc3ce7787543d563792426a16fd7895e14be4b194b5665e36459dd917", size = 166975, upload-time = "2025-12-18T15:47:44.927Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/69/44/36f1a6e523abc58ae5f928898e4aca2e0ea509b5aa6f6f392a5d882be928/pydantic-2.12.5.tar.gz", hash = "sha256:4d351024c75c0f085a9febbb665ce8c0c6ec5d30e903bdb6394b7ede26aebb49", size = 821591, upload-time = "2025-11-26T15:11:46.471Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/5a/87/b70ad306ebb6f9b585f114d0ac2137d792b48be34d732d60e597c2f8465a/pydantic-2.12.5-py3-none-any.whl", hash = "sha256:e561593fccf61e8a20fc46dfc2dfe075b8be7d0188df33f221ad1f0139180f9d", size = 463580, upload-time = "2025-11-26T15:11:44.605Z" },
]
[package.optional-dependencies]
email = [
{ name = "email-validator" },
]
+[[package]]
+name = "pydantic-core"
+version = "2.41.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/71/70/23b021c950c2addd24ec408e9ab05d59b035b39d97cdc1130e1bce647bb6/pydantic_core-2.41.5.tar.gz", hash = "sha256:08daa51ea16ad373ffd5e7606252cc32f07bc72b28284b6bc9c6df804816476e", size = 460952, upload-time = "2025-11-04T13:43:49.098Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/c6/90/32c9941e728d564b411d574d8ee0cf09b12ec978cb22b294995bae5549a5/pydantic_core-2.41.5-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:77b63866ca88d804225eaa4af3e664c5faf3568cea95360d21f4725ab6e07146", size = 2107298, upload-time = "2025-11-04T13:39:04.116Z" },
+ { url = "https://files.pythonhosted.org/packages/fb/a8/61c96a77fe28993d9a6fb0f4127e05430a267b235a124545d79fea46dd65/pydantic_core-2.41.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:dfa8a0c812ac681395907e71e1274819dec685fec28273a28905df579ef137e2", size = 1901475, upload-time = "2025-11-04T13:39:06.055Z" },
+ { url = "https://files.pythonhosted.org/packages/5d/b6/338abf60225acc18cdc08b4faef592d0310923d19a87fba1faf05af5346e/pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5921a4d3ca3aee735d9fd163808f5e8dd6c6972101e4adbda9a4667908849b97", size = 1918815, upload-time = "2025-11-04T13:39:10.41Z" },
+ { url = "https://files.pythonhosted.org/packages/d1/1c/2ed0433e682983d8e8cba9c8d8ef274d4791ec6a6f24c58935b90e780e0a/pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e25c479382d26a2a41b7ebea1043564a937db462816ea07afa8a44c0866d52f9", size = 2065567, upload-time = "2025-11-04T13:39:12.244Z" },
+ { url = "https://files.pythonhosted.org/packages/b3/24/cf84974ee7d6eae06b9e63289b7b8f6549d416b5c199ca2d7ce13bbcf619/pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f547144f2966e1e16ae626d8ce72b4cfa0caedc7fa28052001c94fb2fcaa1c52", size = 2230442, upload-time = "2025-11-04T13:39:13.962Z" },
+ { url = "https://files.pythonhosted.org/packages/fd/21/4e287865504b3edc0136c89c9c09431be326168b1eb7841911cbc877a995/pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6f52298fbd394f9ed112d56f3d11aabd0d5bd27beb3084cc3d8ad069483b8941", size = 2350956, upload-time = "2025-11-04T13:39:15.889Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/76/7727ef2ffa4b62fcab916686a68a0426b9b790139720e1934e8ba797e238/pydantic_core-2.41.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:100baa204bb412b74fe285fb0f3a385256dad1d1879f0a5cb1499ed2e83d132a", size = 2068253, upload-time = "2025-11-04T13:39:17.403Z" },
+ { url = "https://files.pythonhosted.org/packages/d5/8c/a4abfc79604bcb4c748e18975c44f94f756f08fb04218d5cb87eb0d3a63e/pydantic_core-2.41.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:05a2c8852530ad2812cb7914dc61a1125dc4e06252ee98e5638a12da6cc6fb6c", size = 2177050, upload-time = "2025-11-04T13:39:19.351Z" },
+ { url = "https://files.pythonhosted.org/packages/67/b1/de2e9a9a79b480f9cb0b6e8b6ba4c50b18d4e89852426364c66aa82bb7b3/pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:29452c56df2ed968d18d7e21f4ab0ac55e71dc59524872f6fc57dcf4a3249ed2", size = 2147178, upload-time = "2025-11-04T13:39:21Z" },
+ { url = "https://files.pythonhosted.org/packages/16/c1/dfb33f837a47b20417500efaa0378adc6635b3c79e8369ff7a03c494b4ac/pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:d5160812ea7a8a2ffbe233d8da666880cad0cbaf5d4de74ae15c313213d62556", size = 2341833, upload-time = "2025-11-04T13:39:22.606Z" },
+ { url = "https://files.pythonhosted.org/packages/47/36/00f398642a0f4b815a9a558c4f1dca1b4020a7d49562807d7bc9ff279a6c/pydantic_core-2.41.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:df3959765b553b9440adfd3c795617c352154e497a4eaf3752555cfb5da8fc49", size = 2321156, upload-time = "2025-11-04T13:39:25.843Z" },
+ { url = "https://files.pythonhosted.org/packages/7e/70/cad3acd89fde2010807354d978725ae111ddf6d0ea46d1ea1775b5c1bd0c/pydantic_core-2.41.5-cp310-cp310-win32.whl", hash = "sha256:1f8d33a7f4d5a7889e60dc39856d76d09333d8a6ed0f5f1190635cbec70ec4ba", size = 1989378, upload-time = "2025-11-04T13:39:27.92Z" },
+ { url = "https://files.pythonhosted.org/packages/76/92/d338652464c6c367e5608e4488201702cd1cbb0f33f7b6a85a60fe5f3720/pydantic_core-2.41.5-cp310-cp310-win_amd64.whl", hash = "sha256:62de39db01b8d593e45871af2af9e497295db8d73b085f6bfd0b18c83c70a8f9", size = 2013622, upload-time = "2025-11-04T13:39:29.848Z" },
+ { url = "https://files.pythonhosted.org/packages/e8/72/74a989dd9f2084b3d9530b0915fdda64ac48831c30dbf7c72a41a5232db8/pydantic_core-2.41.5-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:a3a52f6156e73e7ccb0f8cced536adccb7042be67cb45f9562e12b319c119da6", size = 2105873, upload-time = "2025-11-04T13:39:31.373Z" },
+ { url = "https://files.pythonhosted.org/packages/12/44/37e403fd9455708b3b942949e1d7febc02167662bf1a7da5b78ee1ea2842/pydantic_core-2.41.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7f3bf998340c6d4b0c9a2f02d6a400e51f123b59565d74dc60d252ce888c260b", size = 1899826, upload-time = "2025-11-04T13:39:32.897Z" },
+ { url = "https://files.pythonhosted.org/packages/33/7f/1d5cab3ccf44c1935a359d51a8a2a9e1a654b744b5e7f80d41b88d501eec/pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:378bec5c66998815d224c9ca994f1e14c0c21cb95d2f52b6021cc0b2a58f2a5a", size = 1917869, upload-time = "2025-11-04T13:39:34.469Z" },
+ { url = "https://files.pythonhosted.org/packages/6e/6a/30d94a9674a7fe4f4744052ed6c5e083424510be1e93da5bc47569d11810/pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e7b576130c69225432866fe2f4a469a85a54ade141d96fd396dffcf607b558f8", size = 2063890, upload-time = "2025-11-04T13:39:36.053Z" },
+ { url = "https://files.pythonhosted.org/packages/50/be/76e5d46203fcb2750e542f32e6c371ffa9b8ad17364cf94bb0818dbfb50c/pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6cb58b9c66f7e4179a2d5e0f849c48eff5c1fca560994d6eb6543abf955a149e", size = 2229740, upload-time = "2025-11-04T13:39:37.753Z" },
+ { url = "https://files.pythonhosted.org/packages/d3/ee/fed784df0144793489f87db310a6bbf8118d7b630ed07aa180d6067e653a/pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:88942d3a3dff3afc8288c21e565e476fc278902ae4d6d134f1eeda118cc830b1", size = 2350021, upload-time = "2025-11-04T13:39:40.94Z" },
+ { url = "https://files.pythonhosted.org/packages/c8/be/8fed28dd0a180dca19e72c233cbf58efa36df055e5b9d90d64fd1740b828/pydantic_core-2.41.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f31d95a179f8d64d90f6831d71fa93290893a33148d890ba15de25642c5d075b", size = 2066378, upload-time = "2025-11-04T13:39:42.523Z" },
+ { url = "https://files.pythonhosted.org/packages/b0/3b/698cf8ae1d536a010e05121b4958b1257f0b5522085e335360e53a6b1c8b/pydantic_core-2.41.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c1df3d34aced70add6f867a8cf413e299177e0c22660cc767218373d0779487b", size = 2175761, upload-time = "2025-11-04T13:39:44.553Z" },
+ { url = "https://files.pythonhosted.org/packages/b8/ba/15d537423939553116dea94ce02f9c31be0fa9d0b806d427e0308ec17145/pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:4009935984bd36bd2c774e13f9a09563ce8de4abaa7226f5108262fa3e637284", size = 2146303, upload-time = "2025-11-04T13:39:46.238Z" },
+ { url = "https://files.pythonhosted.org/packages/58/7f/0de669bf37d206723795f9c90c82966726a2ab06c336deba4735b55af431/pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:34a64bc3441dc1213096a20fe27e8e128bd3ff89921706e83c0b1ac971276594", size = 2340355, upload-time = "2025-11-04T13:39:48.002Z" },
+ { url = "https://files.pythonhosted.org/packages/e5/de/e7482c435b83d7e3c3ee5ee4451f6e8973cff0eb6007d2872ce6383f6398/pydantic_core-2.41.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c9e19dd6e28fdcaa5a1de679aec4141f691023916427ef9bae8584f9c2fb3b0e", size = 2319875, upload-time = "2025-11-04T13:39:49.705Z" },
+ { url = "https://files.pythonhosted.org/packages/fe/e6/8c9e81bb6dd7560e33b9053351c29f30c8194b72f2d6932888581f503482/pydantic_core-2.41.5-cp311-cp311-win32.whl", hash = "sha256:2c010c6ded393148374c0f6f0bf89d206bf3217f201faa0635dcd56bd1520f6b", size = 1987549, upload-time = "2025-11-04T13:39:51.842Z" },
+ { url = "https://files.pythonhosted.org/packages/11/66/f14d1d978ea94d1bc21fc98fcf570f9542fe55bfcc40269d4e1a21c19bf7/pydantic_core-2.41.5-cp311-cp311-win_amd64.whl", hash = "sha256:76ee27c6e9c7f16f47db7a94157112a2f3a00e958bc626e2f4ee8bec5c328fbe", size = 2011305, upload-time = "2025-11-04T13:39:53.485Z" },
+ { url = "https://files.pythonhosted.org/packages/56/d8/0e271434e8efd03186c5386671328154ee349ff0354d83c74f5caaf096ed/pydantic_core-2.41.5-cp311-cp311-win_arm64.whl", hash = "sha256:4bc36bbc0b7584de96561184ad7f012478987882ebf9f9c389b23f432ea3d90f", size = 1972902, upload-time = "2025-11-04T13:39:56.488Z" },
+ { url = "https://files.pythonhosted.org/packages/5f/5d/5f6c63eebb5afee93bcaae4ce9a898f3373ca23df3ccaef086d0233a35a7/pydantic_core-2.41.5-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f41a7489d32336dbf2199c8c0a215390a751c5b014c2c1c5366e817202e9cdf7", size = 2110990, upload-time = "2025-11-04T13:39:58.079Z" },
+ { url = "https://files.pythonhosted.org/packages/aa/32/9c2e8ccb57c01111e0fd091f236c7b371c1bccea0fa85247ac55b1e2b6b6/pydantic_core-2.41.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:070259a8818988b9a84a449a2a7337c7f430a22acc0859c6b110aa7212a6d9c0", size = 1896003, upload-time = "2025-11-04T13:39:59.956Z" },
+ { url = "https://files.pythonhosted.org/packages/68/b8/a01b53cb0e59139fbc9e4fda3e9724ede8de279097179be4ff31f1abb65a/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e96cea19e34778f8d59fe40775a7a574d95816eb150850a85a7a4c8f4b94ac69", size = 1919200, upload-time = "2025-11-04T13:40:02.241Z" },
+ { url = "https://files.pythonhosted.org/packages/38/de/8c36b5198a29bdaade07b5985e80a233a5ac27137846f3bc2d3b40a47360/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed2e99c456e3fadd05c991f8f437ef902e00eedf34320ba2b0842bd1c3ca3a75", size = 2052578, upload-time = "2025-11-04T13:40:04.401Z" },
+ { url = "https://files.pythonhosted.org/packages/00/b5/0e8e4b5b081eac6cb3dbb7e60a65907549a1ce035a724368c330112adfdd/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:65840751b72fbfd82c3c640cff9284545342a4f1eb1586ad0636955b261b0b05", size = 2208504, upload-time = "2025-11-04T13:40:06.072Z" },
+ { url = "https://files.pythonhosted.org/packages/77/56/87a61aad59c7c5b9dc8caad5a41a5545cba3810c3e828708b3d7404f6cef/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e536c98a7626a98feb2d3eaf75944ef6f3dbee447e1f841eae16f2f0a72d8ddc", size = 2335816, upload-time = "2025-11-04T13:40:07.835Z" },
+ { url = "https://files.pythonhosted.org/packages/0d/76/941cc9f73529988688a665a5c0ecff1112b3d95ab48f81db5f7606f522d3/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eceb81a8d74f9267ef4081e246ffd6d129da5d87e37a77c9bde550cb04870c1c", size = 2075366, upload-time = "2025-11-04T13:40:09.804Z" },
+ { url = "https://files.pythonhosted.org/packages/d3/43/ebef01f69baa07a482844faaa0a591bad1ef129253ffd0cdaa9d8a7f72d3/pydantic_core-2.41.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d38548150c39b74aeeb0ce8ee1d8e82696f4a4e16ddc6de7b1d8823f7de4b9b5", size = 2171698, upload-time = "2025-11-04T13:40:12.004Z" },
+ { url = "https://files.pythonhosted.org/packages/b1/87/41f3202e4193e3bacfc2c065fab7706ebe81af46a83d3e27605029c1f5a6/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c23e27686783f60290e36827f9c626e63154b82b116d7fe9adba1fda36da706c", size = 2132603, upload-time = "2025-11-04T13:40:13.868Z" },
+ { url = "https://files.pythonhosted.org/packages/49/7d/4c00df99cb12070b6bccdef4a195255e6020a550d572768d92cc54dba91a/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:482c982f814460eabe1d3bb0adfdc583387bd4691ef00b90575ca0d2b6fe2294", size = 2329591, upload-time = "2025-11-04T13:40:15.672Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/6a/ebf4b1d65d458f3cda6a7335d141305dfa19bdc61140a884d165a8a1bbc7/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:bfea2a5f0b4d8d43adf9d7b8bf019fb46fdd10a2e5cde477fbcb9d1fa08c68e1", size = 2319068, upload-time = "2025-11-04T13:40:17.532Z" },
+ { url = "https://files.pythonhosted.org/packages/49/3b/774f2b5cd4192d5ab75870ce4381fd89cf218af999515baf07e7206753f0/pydantic_core-2.41.5-cp312-cp312-win32.whl", hash = "sha256:b74557b16e390ec12dca509bce9264c3bbd128f8a2c376eaa68003d7f327276d", size = 1985908, upload-time = "2025-11-04T13:40:19.309Z" },
+ { url = "https://files.pythonhosted.org/packages/86/45/00173a033c801cacf67c190fef088789394feaf88a98a7035b0e40d53dc9/pydantic_core-2.41.5-cp312-cp312-win_amd64.whl", hash = "sha256:1962293292865bca8e54702b08a4f26da73adc83dd1fcf26fbc875b35d81c815", size = 2020145, upload-time = "2025-11-04T13:40:21.548Z" },
+ { url = "https://files.pythonhosted.org/packages/f9/22/91fbc821fa6d261b376a3f73809f907cec5ca6025642c463d3488aad22fb/pydantic_core-2.41.5-cp312-cp312-win_arm64.whl", hash = "sha256:1746d4a3d9a794cacae06a5eaaccb4b8643a131d45fbc9af23e353dc0a5ba5c3", size = 1976179, upload-time = "2025-11-04T13:40:23.393Z" },
+ { url = "https://files.pythonhosted.org/packages/11/72/90fda5ee3b97e51c494938a4a44c3a35a9c96c19bba12372fb9c634d6f57/pydantic_core-2.41.5-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:b96d5f26b05d03cc60f11a7761a5ded1741da411e7fe0909e27a5e6a0cb7b034", size = 2115441, upload-time = "2025-11-04T13:42:39.557Z" },
+ { url = "https://files.pythonhosted.org/packages/1f/53/8942f884fa33f50794f119012dc6a1a02ac43a56407adaac20463df8e98f/pydantic_core-2.41.5-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:634e8609e89ceecea15e2d61bc9ac3718caaaa71963717bf3c8f38bfde64242c", size = 1930291, upload-time = "2025-11-04T13:42:42.169Z" },
+ { url = "https://files.pythonhosted.org/packages/79/c8/ecb9ed9cd942bce09fc888ee960b52654fbdbede4ba6c2d6e0d3b1d8b49c/pydantic_core-2.41.5-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:93e8740d7503eb008aa2df04d3b9735f845d43ae845e6dcd2be0b55a2da43cd2", size = 1948632, upload-time = "2025-11-04T13:42:44.564Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/1b/687711069de7efa6af934e74f601e2a4307365e8fdc404703afc453eab26/pydantic_core-2.41.5-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f15489ba13d61f670dcc96772e733aad1a6f9c429cc27574c6cdaed82d0146ad", size = 2138905, upload-time = "2025-11-04T13:42:47.156Z" },
+ { url = "https://files.pythonhosted.org/packages/09/32/59b0c7e63e277fa7911c2fc70ccfb45ce4b98991e7ef37110663437005af/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:7da7087d756b19037bc2c06edc6c170eeef3c3bafcb8f532ff17d64dc427adfd", size = 2110495, upload-time = "2025-11-04T13:42:49.689Z" },
+ { url = "https://files.pythonhosted.org/packages/aa/81/05e400037eaf55ad400bcd318c05bb345b57e708887f07ddb2d20e3f0e98/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:aabf5777b5c8ca26f7824cb4a120a740c9588ed58df9b2d196ce92fba42ff8dc", size = 1915388, upload-time = "2025-11-04T13:42:52.215Z" },
+ { url = "https://files.pythonhosted.org/packages/6e/0d/e3549b2399f71d56476b77dbf3cf8937cec5cd70536bdc0e374a421d0599/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c007fe8a43d43b3969e8469004e9845944f1a80e6acd47c150856bb87f230c56", size = 1942879, upload-time = "2025-11-04T13:42:56.483Z" },
+ { url = "https://files.pythonhosted.org/packages/f7/07/34573da085946b6a313d7c42f82f16e8920bfd730665de2d11c0c37a74b5/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:76d0819de158cd855d1cbb8fcafdf6f5cf1eb8e470abe056d5d161106e38062b", size = 2139017, upload-time = "2025-11-04T13:42:59.471Z" },
+ { url = "https://files.pythonhosted.org/packages/e6/b0/1a2aa41e3b5a4ba11420aba2d091b2d17959c8d1519ece3627c371951e73/pydantic_core-2.41.5-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:b5819cd790dbf0c5eb9f82c73c16b39a65dd6dd4d1439dcdea7816ec9adddab8", size = 2103351, upload-time = "2025-11-04T13:43:02.058Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/ee/31b1f0020baaf6d091c87900ae05c6aeae101fa4e188e1613c80e4f1ea31/pydantic_core-2.41.5-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:5a4e67afbc95fa5c34cf27d9089bca7fcab4e51e57278d710320a70b956d1b9a", size = 1925363, upload-time = "2025-11-04T13:43:05.159Z" },
+ { url = "https://files.pythonhosted.org/packages/e1/89/ab8e86208467e467a80deaca4e434adac37b10a9d134cd2f99b28a01e483/pydantic_core-2.41.5-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ece5c59f0ce7d001e017643d8d24da587ea1f74f6993467d85ae8a5ef9d4f42b", size = 2135615, upload-time = "2025-11-04T13:43:08.116Z" },
+ { url = "https://files.pythonhosted.org/packages/99/0a/99a53d06dd0348b2008f2f30884b34719c323f16c3be4e6cc1203b74a91d/pydantic_core-2.41.5-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:16f80f7abe3351f8ea6858914ddc8c77e02578544a0ebc15b4c2e1a0e813b0b2", size = 2175369, upload-time = "2025-11-04T13:43:12.49Z" },
+ { url = "https://files.pythonhosted.org/packages/6d/94/30ca3b73c6d485b9bb0bc66e611cff4a7138ff9736b7e66bcf0852151636/pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:33cb885e759a705b426baada1fe68cbb0a2e68e34c5d0d0289a364cf01709093", size = 2144218, upload-time = "2025-11-04T13:43:15.431Z" },
+ { url = "https://files.pythonhosted.org/packages/87/57/31b4f8e12680b739a91f472b5671294236b82586889ef764b5fbc6669238/pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:c8d8b4eb992936023be7dee581270af5c6e0697a8559895f527f5b7105ecd36a", size = 2329951, upload-time = "2025-11-04T13:43:18.062Z" },
+ { url = "https://files.pythonhosted.org/packages/7d/73/3c2c8edef77b8f7310e6fb012dbc4b8551386ed575b9eb6fb2506e28a7eb/pydantic_core-2.41.5-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:242a206cd0318f95cd21bdacff3fcc3aab23e79bba5cac3db5a841c9ef9c6963", size = 2318428, upload-time = "2025-11-04T13:43:20.679Z" },
+ { url = "https://files.pythonhosted.org/packages/2f/02/8559b1f26ee0d502c74f9cca5c0d2fd97e967e083e006bbbb4e97f3a043a/pydantic_core-2.41.5-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:d3a978c4f57a597908b7e697229d996d77a6d3c94901e9edee593adada95ce1a", size = 2147009, upload-time = "2025-11-04T13:43:23.286Z" },
+ { url = "https://files.pythonhosted.org/packages/5f/9b/1b3f0e9f9305839d7e84912f9e8bfbd191ed1b1ef48083609f0dabde978c/pydantic_core-2.41.5-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:b2379fa7ed44ddecb5bfe4e48577d752db9fc10be00a6b7446e9663ba143de26", size = 2101980, upload-time = "2025-11-04T13:43:25.97Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/ed/d71fefcb4263df0da6a85b5d8a7508360f2f2e9b3bf5814be9c8bccdccc1/pydantic_core-2.41.5-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:266fb4cbf5e3cbd0b53669a6d1b039c45e3ce651fd5442eff4d07c2cc8d66808", size = 1923865, upload-time = "2025-11-04T13:43:28.763Z" },
+ { url = "https://files.pythonhosted.org/packages/ce/3a/626b38db460d675f873e4444b4bb030453bbe7b4ba55df821d026a0493c4/pydantic_core-2.41.5-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58133647260ea01e4d0500089a8c4f07bd7aa6ce109682b1426394988d8aaacc", size = 2134256, upload-time = "2025-11-04T13:43:31.71Z" },
+ { url = "https://files.pythonhosted.org/packages/83/d9/8412d7f06f616bbc053d30cb4e5f76786af3221462ad5eee1f202021eb4e/pydantic_core-2.41.5-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:287dad91cfb551c363dc62899a80e9e14da1f0e2b6ebde82c806612ca2a13ef1", size = 2174762, upload-time = "2025-11-04T13:43:34.744Z" },
+ { url = "https://files.pythonhosted.org/packages/55/4c/162d906b8e3ba3a99354e20faa1b49a85206c47de97a639510a0e673f5da/pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:03b77d184b9eb40240ae9fd676ca364ce1085f203e1b1256f8ab9984dca80a84", size = 2143141, upload-time = "2025-11-04T13:43:37.701Z" },
+ { url = "https://files.pythonhosted.org/packages/1f/f2/f11dd73284122713f5f89fc940f370d035fa8e1e078d446b3313955157fe/pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:a668ce24de96165bb239160b3d854943128f4334822900534f2fe947930e5770", size = 2330317, upload-time = "2025-11-04T13:43:40.406Z" },
+ { url = "https://files.pythonhosted.org/packages/88/9d/b06ca6acfe4abb296110fb1273a4d848a0bfb2ff65f3ee92127b3244e16b/pydantic_core-2.41.5-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f14f8f046c14563f8eb3f45f499cc658ab8d10072961e07225e507adb700e93f", size = 2316992, upload-time = "2025-11-04T13:43:43.602Z" },
+ { url = "https://files.pythonhosted.org/packages/36/c7/cfc8e811f061c841d7990b0201912c3556bfeb99cdcb7ed24adc8d6f8704/pydantic_core-2.41.5-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:56121965f7a4dc965bff783d70b907ddf3d57f6eba29b6d2e5dabfaf07799c51", size = 2145302, upload-time = "2025-11-04T13:43:46.64Z" },
+]
+
+[[package]]
+name = "pydantic-settings"
+version = "2.12.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "pydantic" },
+ { name = "python-dotenv" },
+ { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/43/4b/ac7e0aae12027748076d72a8764ff1c9d82ca75a7a52622e67ed3f765c54/pydantic_settings-2.12.0.tar.gz", hash = "sha256:005538ef951e3c2a68e1c08b292b5f2e71490def8589d4221b95dab00dafcfd0", size = 194184, upload-time = "2025-11-10T14:25:47.013Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/c1/60/5d4751ba3f4a40a6891f24eec885f51afd78d208498268c734e256fb13c4/pydantic_settings-2.12.0-py3-none-any.whl", hash = "sha256:fddb9fd99a5b18da837b29710391e945b1e30c135477f484084ee513adb93809", size = 51880, upload-time = "2025-11-10T14:25:45.546Z" },
+]
+
[[package]]
name = "pyee"
version = "13.0.1"
@@ -2917,6 +3006,18 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" },
]
+[[package]]
+name = "typing-inspection"
+version = "0.4.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a3/26/b09b8010994eccc3c09092e6b34058f36a460eea2d4c3e8b910c695975a0/typing_inspection-0.4.4.tar.gz", hash = "sha256:547274fa6b0a561ccf549cc9524b999a578e737d015d8709d021f9d0d13bea47", size = 76928, upload-time = "2026-08-12T12:37:25.997Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/67/81/4add07e5172b7ac40d8ed5ff580409a7801a4fe26d529bdd915401dabfbe/typing_inspection-0.4.4-py3-none-any.whl", hash = "sha256:65b8397ba37ccbce054456aaccddfc91e6e3083c92824df348d96ca832f3f147", size = 14750, upload-time = "2026-08-12T12:37:24.648Z" },
+]
+
[[package]]
name = "urllib3"
version = "2.8.0"Why this scored 39/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.