From bb84f6b0e8ea74db4b615ab8ae4da0ef4d2849ab Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 28 Nov 2022 13:24:10 +0000 Subject: [PATCH] Black --- lnbits/core/services.py | 23 ++++++++++++------ lnbits/core/views/api.py | 45 ++++++++++++++++++++++++++---------- lnbits/core/views/generic.py | 22 +++++++++++++----- 3 files changed, 65 insertions(+), 25 deletions(-) diff --git a/lnbits/core/services.py b/lnbits/core/services.py index 798680a2..d0f6ebd3 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -13,18 +13,27 @@ from loguru import logger from lnbits import bolt11 from lnbits.db import Connection -from lnbits.decorators import (WalletTypeInfo, get_key_type, require_admin_key, - require_invoice_key) +from lnbits.decorators import ( + WalletTypeInfo, + get_key_type, + require_admin_key, + require_invoice_key, +) from lnbits.helpers import url_for, urlsafe_short_hash from lnbits.requestvars import g -from lnbits.settings import (FAKE_WALLET, RESERVE_FEE_MIN, RESERVE_FEE_PERCENT, - WALLET) +from lnbits.settings import FAKE_WALLET, RESERVE_FEE_MIN, RESERVE_FEE_PERCENT, WALLET from lnbits.wallets.base import PaymentResponse, PaymentStatus from . import db -from .crud import (check_internal, create_payment, delete_wallet_payment, - get_wallet, get_wallet_payment, update_payment_details, - update_payment_status) +from .crud import ( + check_internal, + create_payment, + delete_wallet_payment, + get_wallet, + get_wallet_payment, + update_payment_details, + update_payment_status, +) from .models import Payment try: diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py index c6c5f992..1a7ee8f5 100644 --- a/lnbits/core/views/api.py +++ b/lnbits/core/views/api.py @@ -11,8 +11,7 @@ from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse import httpx import pyqrcode -from fastapi import (Depends, Header, Query, Request, WebSocket, - WebSocketDisconnect) +from fastapi import Depends, Header, Query, Request, WebSocket, WebSocketDisconnect from fastapi.exceptions import HTTPException from fastapi.params import Body from loguru import logger @@ -24,20 +23,42 @@ from starlette.responses import HTMLResponse, StreamingResponse import async_timeout from lnbits import bolt11, lnurl from lnbits.core.models import Payment, Wallet -from lnbits.decorators import (WalletTypeInfo, get_key_type, require_admin_key, - require_invoice_key) +from lnbits.decorators import ( + WalletTypeInfo, + get_key_type, + require_admin_key, + require_invoice_key, +) from lnbits.helpers import url_for, urlsafe_short_hash from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE, WALLET -from lnbits.utils.exchange_rates import (currencies, fiat_amount_as_satoshis, - satoshis_amount_as_fiat) +from lnbits.utils.exchange_rates import ( + currencies, + fiat_amount_as_satoshis, + satoshis_amount_as_fiat, +) from .. import core_app, db -from ..crud import (create_payment, get_payments, get_standalone_payment, - get_total_balance, get_wallet, get_wallet_for_key, - save_balance_check, update_payment_status, update_wallet) -from ..services import (InvoiceFailure, PaymentFailure, - check_transaction_status, create_invoice, pay_invoice, - perform_lnurlauth, websocketManager, websocketUpdater) +from ..crud import ( + create_payment, + get_payments, + get_standalone_payment, + get_total_balance, + get_wallet, + get_wallet_for_key, + save_balance_check, + update_payment_status, + update_wallet, +) +from ..services import ( + InvoiceFailure, + PaymentFailure, + check_transaction_status, + create_invoice, + pay_invoice, + perform_lnurlauth, + websocketManager, + websocketUpdater, +) from ..tasks import api_invoice_listeners diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py index c16c8a41..31a7b030 100644 --- a/lnbits/core/views/generic.py +++ b/lnbits/core/views/generic.py @@ -15,14 +15,24 @@ from lnbits.core import db from lnbits.core.models import User from lnbits.decorators import check_user_exists from lnbits.helpers import template_renderer, url_for -from lnbits.settings import (LNBITS_ADMIN_USERS, LNBITS_ALLOWED_USERS, - LNBITS_CUSTOM_LOGO, LNBITS_SITE_TITLE, - SERVICE_FEE) +from lnbits.settings import ( + LNBITS_ADMIN_USERS, + LNBITS_ALLOWED_USERS, + LNBITS_CUSTOM_LOGO, + LNBITS_SITE_TITLE, + SERVICE_FEE, +) from ...helpers import get_valid_extensions -from ..crud import (create_account, create_wallet, delete_wallet, - get_balance_check, get_user, save_balance_notify, - update_user_extension) +from ..crud import ( + create_account, + create_wallet, + delete_wallet, + get_balance_check, + get_user, + save_balance_notify, + update_user_extension, +) from ..services import pay_invoice, redeem_lnurl_withdraw core_html_routes: APIRouter = APIRouter(tags=["Core NON-API Website Routes"])