diff --git a/lnbits/bolt11.py b/lnbits/bolt11.py index 43288c6fb..07bff5a3c 100644 --- a/lnbits/bolt11.py +++ b/lnbits/bolt11.py @@ -5,7 +5,6 @@ from decimal import Decimal from typing import List, NamedTuple, Optional import bitstring -import embit import secp256k1 from bech32 import CHARSET, bech32_decode, bech32_encode from ecdsa import SECP256k1, VerifyingKey diff --git a/lnbits/core/__init__.py b/lnbits/core/__init__.py index 75b6d5878..4511a8eb8 100644 --- a/lnbits/core/__init__.py +++ b/lnbits/core/__init__.py @@ -9,7 +9,7 @@ core_app: APIRouter = APIRouter() core_app_extra: CoreAppExtra = CoreAppExtra() -from .views.admin_api import * # noqa -from .views.api import * # noqa -from .views.generic import * # noqa -from .views.public_api import * # noqa +from .views.admin_api import * # noqa: F401,F403 +from .views.api import * # noqa: F401,F403 +from .views.generic import * # noqa: F401,F403 +from .views.public_api import * # noqa: F401,F403 diff --git a/lnbits/core/models.py b/lnbits/core/models.py index c0643af7b..c3ff6fd9c 100644 --- a/lnbits/core/models.py +++ b/lnbits/core/models.py @@ -6,8 +6,8 @@ import time from sqlite3 import Row from typing import Callable, Dict, List, Optional -from ecdsa import SECP256k1, SigningKey # type: ignore -from lnurl import encode as lnurl_encode # type: ignore +from ecdsa import SECP256k1, SigningKey +from lnurl import encode as lnurl_encode from loguru import logger from pydantic import BaseModel diff --git a/lnbits/core/services.py b/lnbits/core/services.py index adee88c99..f5bf0b469 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -14,7 +14,6 @@ from lnbits import bolt11 from lnbits.db import Connection from lnbits.decorators import WalletTypeInfo, require_admin_key from lnbits.helpers import url_for, urlsafe_short_hash -from lnbits.requestvars import g from lnbits.settings import ( FAKE_WALLET, EditableSettings, @@ -22,7 +21,6 @@ from lnbits.settings import ( readonly_variables, send_admin_user_to_saas, settings, - transient_variables, ) from lnbits.wallets.base import PaymentResponse, PaymentStatus diff --git a/lnbits/extensions/bleskomat/__init__.py b/lnbits/extensions/bleskomat/__init__.py index bef362dc7..df54fc5f5 100644 --- a/lnbits/extensions/bleskomat/__init__.py +++ b/lnbits/extensions/bleskomat/__init__.py @@ -21,6 +21,6 @@ def bleskomat_renderer(): return template_renderer(["lnbits/extensions/bleskomat/templates"]) -from .lnurl_api import * # noqa -from .views import * # noqa -from .views_api import * # noqa +from .lnurl_api import * # noqa: F401,F403 +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/boltcards/__init__.py b/lnbits/extensions/boltcards/__init__.py index bfdc7492e..344177e8f 100644 --- a/lnbits/extensions/boltcards/__init__.py +++ b/lnbits/extensions/boltcards/__init__.py @@ -24,8 +24,8 @@ def boltcards_renderer(): return template_renderer(["lnbits/extensions/boltcards/templates"]) -from .lnurl import * # noqa -from .tasks import * # noqa +from .lnurl import * # noqa: F401,F403 +from .tasks import * # noqa: F401,F403 def boltcards_start(): @@ -33,5 +33,5 @@ def boltcards_start(): loop.create_task(catch_everything_and_restart(wait_for_paid_invoices)) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/boltcards/migrations.py b/lnbits/extensions/boltcards/migrations.py index 9609e0c37..43d5bb0f7 100644 --- a/lnbits/extensions/boltcards/migrations.py +++ b/lnbits/extensions/boltcards/migrations.py @@ -1,6 +1,3 @@ -from lnbits.helpers import urlsafe_short_hash - - async def m001_initial(db): await db.execute( """ diff --git a/lnbits/extensions/boltz/__init__.py b/lnbits/extensions/boltz/__init__.py index 9a3d5d896..98255e5e5 100644 --- a/lnbits/extensions/boltz/__init__.py +++ b/lnbits/extensions/boltz/__init__.py @@ -25,8 +25,8 @@ boltz_static_files = [ ] from .tasks import check_for_pending_swaps, wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def boltz_start(): diff --git a/lnbits/extensions/cashu/__init__.py b/lnbits/extensions/cashu/__init__.py index a519b0813..ca831ce0e 100644 --- a/lnbits/extensions/cashu/__init__.py +++ b/lnbits/extensions/cashu/__init__.py @@ -37,8 +37,8 @@ def cashu_renderer(): from .tasks import startup_cashu_mint, wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def cashu_start(): diff --git a/lnbits/extensions/cashu/crud.py b/lnbits/extensions/cashu/crud.py index 30bc74866..e27cc98cc 100644 --- a/lnbits/extensions/cashu/crud.py +++ b/lnbits/extensions/cashu/crud.py @@ -1,15 +1,7 @@ from typing import List, Optional, Union -from cashu.core.base import MintKeyset -from embit import bip32, bip39, ec, script -from embit.networks import NETWORKS -from loguru import logger - -from lnbits.db import Connection, Database -from lnbits.helpers import urlsafe_short_hash - from . import db -from .models import Cashu, Pegs, Promises, Proof +from .models import Cashu async def create_cashu( diff --git a/lnbits/extensions/cashu/tasks.py b/lnbits/extensions/cashu/tasks.py index 7893bc4f4..982d3ac18 100644 --- a/lnbits/extensions/cashu/tasks.py +++ b/lnbits/extensions/cashu/tasks.py @@ -7,7 +7,6 @@ from lnbits.core.models import Payment from lnbits.tasks import register_invoice_listener from . import db, ledger -from .crud import get_cashu async def startup_cashu_mint(): diff --git a/lnbits/extensions/deezy/__init__.py b/lnbits/extensions/deezy/__init__.py index 05d1c9a70..60596445c 100644 --- a/lnbits/extensions/deezy/__init__.py +++ b/lnbits/extensions/deezy/__init__.py @@ -21,5 +21,5 @@ def deezy_renderer(): return template_renderer(["lnbits/extensions/deezy/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/deezy/models.py b/lnbits/extensions/deezy/models.py index 895336931..ad0c03cba 100644 --- a/lnbits/extensions/deezy/models.py +++ b/lnbits/extensions/deezy/models.py @@ -1,5 +1,4 @@ from pydantic.main import BaseModel -from sqlalchemy.engine import base # type: ignore class Token(BaseModel): diff --git a/lnbits/extensions/deezy/views.py b/lnbits/extensions/deezy/views.py index 131c03b2a..c4cc4b22c 100644 --- a/lnbits/extensions/deezy/views.py +++ b/lnbits/extensions/deezy/views.py @@ -1,4 +1,4 @@ -from fastapi import FastAPI, Request +from fastapi import Request from fastapi.params import Depends from fastapi.templating import Jinja2Templates from starlette.responses import HTMLResponse diff --git a/lnbits/extensions/discordbot/__init__.py b/lnbits/extensions/discordbot/__init__.py index 21989b24a..ad4c76708 100644 --- a/lnbits/extensions/discordbot/__init__.py +++ b/lnbits/extensions/discordbot/__init__.py @@ -21,5 +21,5 @@ def discordbot_renderer(): return template_renderer(["lnbits/extensions/discordbot/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/events/__init__.py b/lnbits/extensions/events/__init__.py index b2cb75406..b9283368b 100644 --- a/lnbits/extensions/events/__init__.py +++ b/lnbits/extensions/events/__init__.py @@ -26,8 +26,8 @@ def events_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def events_start(): diff --git a/lnbits/extensions/example/__init__.py b/lnbits/extensions/example/__init__.py index 8cd9211b3..a78330e9d 100644 --- a/lnbits/extensions/example/__init__.py +++ b/lnbits/extensions/example/__init__.py @@ -25,8 +25,8 @@ def example_renderer(): from .tasks import wait_for_paid_invoices -from .views import * -from .views_api import * +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def tpos_start(): diff --git a/lnbits/extensions/gerty/__init__.py b/lnbits/extensions/gerty/__init__.py index da20adfb3..8eb76ec1b 100644 --- a/lnbits/extensions/gerty/__init__.py +++ b/lnbits/extensions/gerty/__init__.py @@ -22,5 +22,5 @@ def gerty_renderer(): return template_renderer(["lnbits/extensions/gerty/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/gerty/crud.py b/lnbits/extensions/gerty/crud.py index 24e8ef25a..6dccf325b 100644 --- a/lnbits/extensions/gerty/crud.py +++ b/lnbits/extensions/gerty/crud.py @@ -8,7 +8,7 @@ from loguru import logger from lnbits.helpers import urlsafe_short_hash from . import db -from .models import Gerty, Mempool, MempoolEndpoint +from .models import Gerty, MempoolEndpoint async def create_gerty(wallet_id: str, data: Gerty) -> Gerty: diff --git a/lnbits/extensions/gerty/helpers.py b/lnbits/extensions/gerty/helpers.py index a3422b794..e2b4ba1f2 100644 --- a/lnbits/extensions/gerty/helpers.py +++ b/lnbits/extensions/gerty/helpers.py @@ -13,7 +13,7 @@ from lnbits.settings import settings from lnbits.utils.exchange_rates import satoshis_amount_as_fiat from .crud import get_mempool_info -from .number_prefixer import * +from .number_prefixer import * # noqa: F403 def get_percent_difference(current, previous, precision=3): diff --git a/lnbits/extensions/hivemind/__init__.py b/lnbits/extensions/hivemind/__init__.py index afa677ced..066963f0b 100644 --- a/lnbits/extensions/hivemind/__init__.py +++ b/lnbits/extensions/hivemind/__init__.py @@ -21,4 +21,4 @@ hivemind_static_files = [ } ] -from .views import * # noqa +from .views import * # noqa: F401,F403 diff --git a/lnbits/extensions/invoices/__init__.py b/lnbits/extensions/invoices/__init__.py index 0b60837bb..735e95d81 100644 --- a/lnbits/extensions/invoices/__init__.py +++ b/lnbits/extensions/invoices/__init__.py @@ -32,5 +32,5 @@ def invoices_start(): loop.create_task(catch_everything_and_restart(wait_for_paid_invoices)) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/jukebox/__init__.py b/lnbits/extensions/jukebox/__init__.py index 4559dccfd..6307c923a 100644 --- a/lnbits/extensions/jukebox/__init__.py +++ b/lnbits/extensions/jukebox/__init__.py @@ -25,8 +25,8 @@ def jukebox_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def jukebox_start(): diff --git a/lnbits/extensions/livestream/__init__.py b/lnbits/extensions/livestream/__init__.py index e5f2987c8..accd61de3 100644 --- a/lnbits/extensions/livestream/__init__.py +++ b/lnbits/extensions/livestream/__init__.py @@ -24,10 +24,10 @@ def livestream_renderer(): return template_renderer(["lnbits/extensions/livestream/templates"]) -from .lnurl import * # noqa +from .lnurl import * # noqa: F401,F403 from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def livestream_start(): diff --git a/lnbits/extensions/livestream/tasks.py b/lnbits/extensions/livestream/tasks.py index 5cee447c8..4489dad98 100644 --- a/lnbits/extensions/livestream/tasks.py +++ b/lnbits/extensions/livestream/tasks.py @@ -2,7 +2,6 @@ import asyncio from loguru import logger -from lnbits.core import db as core_db from lnbits.core.models import Payment from lnbits.core.services import create_invoice, pay_invoice from lnbits.helpers import get_current_extension_name diff --git a/lnbits/extensions/lnaddress/__init__.py b/lnbits/extensions/lnaddress/__init__.py index a507a1dc7..dcc4a9516 100644 --- a/lnbits/extensions/lnaddress/__init__.py +++ b/lnbits/extensions/lnaddress/__init__.py @@ -24,10 +24,10 @@ def lnaddress_renderer(): return template_renderer(["lnbits/extensions/lnaddress/templates"]) -from .lnurl import * # noqa +from .lnurl import * # noqa: F401,F403 from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def lnaddress_start(): diff --git a/lnbits/extensions/lndhub/__init__.py b/lnbits/extensions/lndhub/__init__.py index 1d1effcf0..344e91c66 100644 --- a/lnbits/extensions/lndhub/__init__.py +++ b/lnbits/extensions/lndhub/__init__.py @@ -21,7 +21,7 @@ def lndhub_renderer(): return template_renderer(["lnbits/extensions/lndhub/templates"]) -from .decorators import * # noqa -from .utils import * # noqa -from .views import * # noqa -from .views_api import * # noqa +from .decorators import * # noqa: F401,F403 +from .utils import * # noqa: F401,F403 +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/lnurldevice/__init__.py b/lnbits/extensions/lnurldevice/__init__.py index 8ef391451..56e9d8f7d 100644 --- a/lnbits/extensions/lnurldevice/__init__.py +++ b/lnbits/extensions/lnurldevice/__init__.py @@ -24,10 +24,10 @@ def lnurldevice_renderer(): return template_renderer(["lnbits/extensions/lnurldevice/templates"]) -from .lnurl import * # noqa +from .lnurl import * # noqa: F401,F403 from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def lnurldevice_start(): diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py index b8098b40c..20e113d54 100644 --- a/lnbits/extensions/lnurldevice/lnurl.py +++ b/lnbits/extensions/lnurldevice/lnurl.py @@ -3,7 +3,6 @@ import hmac from http import HTTPStatus from io import BytesIO -import shortuuid from embit import bech32, compact from fastapi import HTTPException, Query, Request @@ -17,7 +16,6 @@ from .crud import ( create_lnurldevicepayment, get_lnurldevice, get_lnurldevicepayment, - get_lnurlpayload, update_lnurldevicepayment, ) diff --git a/lnbits/extensions/lnurlp/__init__.py b/lnbits/extensions/lnurlp/__init__.py index e2486df05..f5ea0cd29 100644 --- a/lnbits/extensions/lnurlp/__init__.py +++ b/lnbits/extensions/lnurlp/__init__.py @@ -24,10 +24,10 @@ def lnurlp_renderer(): return template_renderer(["lnbits/extensions/lnurlp/templates"]) -from .lnurl import * # noqa +from .lnurl import * # noqa: F401,F403 from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def lnurlp_start(): diff --git a/lnbits/extensions/market/__init__.py b/lnbits/extensions/market/__init__.py index 3795ec73f..a14fe6afc 100644 --- a/lnbits/extensions/market/__init__.py +++ b/lnbits/extensions/market/__init__.py @@ -34,8 +34,8 @@ def market_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def market_start(): diff --git a/lnbits/extensions/market/crud.py b/lnbits/extensions/market/crud.py index a7af6cde7..c2a6ace12 100644 --- a/lnbits/extensions/market/crud.py +++ b/lnbits/extensions/market/crud.py @@ -3,14 +3,12 @@ from typing import List, Optional, Union # from lnbits.db import open_ext_db from lnbits.db import SQLITE from lnbits.helpers import urlsafe_short_hash -from lnbits.settings import WALLET from . import db from .models import ( ChatMessage, CreateChatMessage, CreateMarket, - CreateMarketStalls, Market, MarketSettings, OrderDetail, diff --git a/lnbits/extensions/market/views.py b/lnbits/extensions/market/views.py index 2f5e6a899..0bcfac459 100644 --- a/lnbits/extensions/market/views.py +++ b/lnbits/extensions/market/views.py @@ -10,7 +10,6 @@ from fastapi import ( WebSocketDisconnect, ) from fastapi.templating import Jinja2Templates -from loguru import logger from starlette.exceptions import HTTPException from starlette.responses import HTMLResponse @@ -19,7 +18,6 @@ from lnbits.decorators import check_user_exists from . import market_ext, market_renderer from .crud import ( - create_chat_message, create_market_settings, get_market_market, get_market_market_stalls, @@ -29,10 +27,8 @@ from .crud import ( get_market_settings, get_market_stall, get_market_zone, - get_market_zones, - update_market_product_stock, ) -from .models import CreateChatMessage, SetSettings +from .models import SetSettings from .notifier import Notifier templates = Jinja2Templates(directory="templates") diff --git a/lnbits/extensions/market/views_api.py b/lnbits/extensions/market/views_api.py index d6e28d269..ad0cbb463 100644 --- a/lnbits/extensions/market/views_api.py +++ b/lnbits/extensions/market/views_api.py @@ -1,6 +1,6 @@ from http import HTTPStatus -from fastapi import Body, Depends, Query, Request +from fastapi import Depends, Query from loguru import logger from starlette.exceptions import HTTPException @@ -14,7 +14,7 @@ from lnbits.decorators import ( require_invoice_key, ) from lnbits.helpers import urlsafe_short_hash -from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis +from lnbits.utils.exchange_rates import currencies from . import db, market_ext from .crud import ( @@ -45,7 +45,6 @@ from .crud import ( get_market_settings, get_market_stall, get_market_stalls, - get_market_stalls_by_ids, get_market_zone, get_market_zones, set_market_order_pubkey, @@ -57,12 +56,7 @@ from .crud import ( ) from .models import ( CreateMarket, - CreateMarketStalls, - Orders, - Products, SetSettings, - Stalls, - Zones, createOrder, createProduct, createStalls, diff --git a/lnbits/extensions/ngrok/__init__.py b/lnbits/extensions/ngrok/__init__.py index 0ef256d13..16ac46507 100644 --- a/lnbits/extensions/ngrok/__init__.py +++ b/lnbits/extensions/ngrok/__init__.py @@ -12,4 +12,4 @@ def ngrok_renderer(): return template_renderer(["lnbits/extensions/ngrok/templates"]) -from .views import * +from .views import * # noqa: F401,F403 diff --git a/lnbits/extensions/nostrnip5/__init__.py b/lnbits/extensions/nostrnip5/__init__.py index a9a2ea1ce..a9cb526d5 100644 --- a/lnbits/extensions/nostrnip5/__init__.py +++ b/lnbits/extensions/nostrnip5/__init__.py @@ -32,5 +32,5 @@ def nostrnip5_start(): loop.create_task(catch_everything_and_restart(wait_for_paid_invoices)) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/offlineshop/__init__.py b/lnbits/extensions/offlineshop/__init__.py index 0b776a8ce..72d1ae6b3 100644 --- a/lnbits/extensions/offlineshop/__init__.py +++ b/lnbits/extensions/offlineshop/__init__.py @@ -21,6 +21,6 @@ def offlineshop_renderer(): return template_renderer(["lnbits/extensions/offlineshop/templates"]) -from .lnurl import * # noqa -from .views import * # noqa -from .views_api import * # noqa +from .lnurl import * # noqa: F401,F403 +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/offlineshop/views.py b/lnbits/extensions/offlineshop/views.py index a193b8eff..ebde17629 100644 --- a/lnbits/extensions/offlineshop/views.py +++ b/lnbits/extensions/offlineshop/views.py @@ -6,13 +6,12 @@ from fastapi import Depends, HTTPException, Query, Request from starlette.responses import HTMLResponse from lnbits.core.crud import get_standalone_payment -from lnbits.core.models import Payment, User +from lnbits.core.models import User from lnbits.core.views.api import api_payment from lnbits.decorators import check_user_exists from . import offlineshop_ext, offlineshop_renderer from .crud import get_item, get_shop -from .models import Item @offlineshop_ext.get("/", response_class=HTMLResponse) diff --git a/lnbits/extensions/paywall/__init__.py b/lnbits/extensions/paywall/__init__.py index d7adcdeda..5565a9349 100644 --- a/lnbits/extensions/paywall/__init__.py +++ b/lnbits/extensions/paywall/__init__.py @@ -21,5 +21,5 @@ def paywall_renderer(): return template_renderer(["lnbits/extensions/paywall/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/satsdice/__init__.py b/lnbits/extensions/satsdice/__init__.py index aaa56af2a..a13653bf3 100644 --- a/lnbits/extensions/satsdice/__init__.py +++ b/lnbits/extensions/satsdice/__init__.py @@ -21,6 +21,6 @@ def satsdice_renderer(): return template_renderer(["lnbits/extensions/satsdice/templates"]) -from .lnurl import * # noqa -from .views import * # noqa -from .views_api import * # noqa +from .lnurl import * # noqa: F401,F403 +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/satspay/__init__.py b/lnbits/extensions/satspay/__init__.py index 37245c21d..8f115a3cf 100644 --- a/lnbits/extensions/satspay/__init__.py +++ b/lnbits/extensions/satspay/__init__.py @@ -26,8 +26,8 @@ def satspay_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def satspay_start(): diff --git a/lnbits/extensions/scrub/__init__.py b/lnbits/extensions/scrub/__init__.py index 777a7c3f9..29428af96 100644 --- a/lnbits/extensions/scrub/__init__.py +++ b/lnbits/extensions/scrub/__init__.py @@ -25,8 +25,8 @@ def scrub_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def scrub_start(): diff --git a/lnbits/extensions/smtp/__init__.py b/lnbits/extensions/smtp/__init__.py index e7419852a..9b89a0c46 100644 --- a/lnbits/extensions/smtp/__init__.py +++ b/lnbits/extensions/smtp/__init__.py @@ -25,8 +25,8 @@ def smtp_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def smtp_start(): diff --git a/lnbits/extensions/splitpayments/__init__.py b/lnbits/extensions/splitpayments/__init__.py index 9989728ea..5efb6335f 100644 --- a/lnbits/extensions/splitpayments/__init__.py +++ b/lnbits/extensions/splitpayments/__init__.py @@ -26,8 +26,8 @@ def splitpayments_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def splitpayments_start(): diff --git a/lnbits/extensions/streamalerts/__init__.py b/lnbits/extensions/streamalerts/__init__.py index 0e4311240..603547d1c 100644 --- a/lnbits/extensions/streamalerts/__init__.py +++ b/lnbits/extensions/streamalerts/__init__.py @@ -21,5 +21,5 @@ def streamalerts_renderer(): return template_renderer(["lnbits/extensions/streamalerts/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/subdomains/__init__.py b/lnbits/extensions/subdomains/__init__.py index 0b0774dc5..7434555d9 100644 --- a/lnbits/extensions/subdomains/__init__.py +++ b/lnbits/extensions/subdomains/__init__.py @@ -25,8 +25,8 @@ def subdomains_renderer(): from .tasks import wait_for_paid_invoices -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 def subdomains_start(): diff --git a/lnbits/extensions/tipjar/__init__.py b/lnbits/extensions/tipjar/__init__.py index a64de43f2..b7e2b9678 100644 --- a/lnbits/extensions/tipjar/__init__.py +++ b/lnbits/extensions/tipjar/__init__.py @@ -21,5 +21,5 @@ def tipjar_renderer(): return template_renderer(["lnbits/extensions/tipjar/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/watchonly/__init__.py b/lnbits/extensions/watchonly/__init__.py index a7fff888a..49adb4623 100644 --- a/lnbits/extensions/watchonly/__init__.py +++ b/lnbits/extensions/watchonly/__init__.py @@ -21,5 +21,5 @@ def watchonly_renderer(): return template_renderer(["lnbits/extensions/watchonly/templates"]) -from .views import * # noqa -from .views_api import * # noqa +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/extensions/withdraw/__init__.py b/lnbits/extensions/withdraw/__init__.py index a0f4b6068..cb5eb9c43 100644 --- a/lnbits/extensions/withdraw/__init__.py +++ b/lnbits/extensions/withdraw/__init__.py @@ -22,6 +22,6 @@ def withdraw_renderer(): return template_renderer(["lnbits/extensions/withdraw/templates"]) -from .lnurl import * # noqa -from .views import * # noqa -from .views_api import * # noqa +from .lnurl import * # noqa: F401,F403 +from .views import * # noqa: F401,F403 +from .views_api import * # noqa: F401,F403 diff --git a/lnbits/jinja2_templating.py b/lnbits/jinja2_templating.py index 10506b6e1..5dfe36c36 100644 --- a/lnbits/jinja2_templating.py +++ b/lnbits/jinja2_templating.py @@ -7,8 +7,6 @@ from starlette import templating from starlette.datastructures import QueryParams from starlette.requests import Request -from lnbits.requestvars import g - try: import jinja2 except ImportError: # pragma: nocover diff --git a/lnbits/wallets/__init__.py b/lnbits/wallets/__init__.py index fa533566f..76c47c048 100644 --- a/lnbits/wallets/__init__.py +++ b/lnbits/wallets/__init__.py @@ -1,4 +1,4 @@ -# flake8: noqa +# flake8: noqa: F401 from .cliche import ClicheWallet diff --git a/lnbits/wallets/cliche.py b/lnbits/wallets/cliche.py index 4fcf75ae4..211ba4f3d 100644 --- a/lnbits/wallets/cliche.py +++ b/lnbits/wallets/cliche.py @@ -3,7 +3,6 @@ import hashlib import json from typing import AsyncGenerator, Optional -import httpx from loguru import logger from websocket import create_connection diff --git a/lnbits/wallets/eclair.py b/lnbits/wallets/eclair.py index b6e0c1e5f..a45123b1b 100644 --- a/lnbits/wallets/eclair.py +++ b/lnbits/wallets/eclair.py @@ -11,11 +11,6 @@ from loguru import logger # TODO: https://github.com/lnbits/lnbits/issues/764 # mypy https://github.com/aaugustin/websockets/issues/940 from websockets import connect # type: ignore -from websockets.exceptions import ( - ConnectionClosed, - ConnectionClosedError, - ConnectionClosedOK, -) from lnbits.settings import settings diff --git a/lnbits/wallets/lndgrpc.py b/lnbits/wallets/lndgrpc.py index b34368b1b..4173e79ee 100644 --- a/lnbits/wallets/lndgrpc.py +++ b/lnbits/wallets/lndgrpc.py @@ -1,7 +1,6 @@ imports_ok = True try: import grpc - from google import protobuf from grpc import RpcError except ImportError: # pragma: nocover imports_ok = False diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py index 0c9d5aed2..6e5962267 100644 --- a/lnbits/wallets/lndrest.py +++ b/lnbits/wallets/lndrest.py @@ -7,7 +7,6 @@ from typing import AsyncGenerator, Dict, Optional import httpx from loguru import logger -from lnbits import bolt11 as lnbits_bolt11 from lnbits.settings import settings from .base import ( diff --git a/lnbits/wallets/macaroon/__init__.py b/lnbits/wallets/macaroon/__init__.py index 16617aa65..7512e07f2 100644 --- a/lnbits/wallets/macaroon/__init__.py +++ b/lnbits/wallets/macaroon/__init__.py @@ -1 +1 @@ -from .macaroon import AESCipher, load_macaroon +from .macaroon import AESCipher, load_macaroon # noqa: F401 diff --git a/lnbits/wallets/opennode.py b/lnbits/wallets/opennode.py index ff71ef079..89c7f1d58 100644 --- a/lnbits/wallets/opennode.py +++ b/lnbits/wallets/opennode.py @@ -7,7 +7,6 @@ import httpx from fastapi.exceptions import HTTPException from loguru import logger -from lnbits.helpers import url_for from lnbits.settings import settings from .base import ( diff --git a/tests/conftest.py b/tests/conftest.py index 7010221d3..6bcb463fe 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,8 +5,7 @@ from httpx import AsyncClient from lnbits.app import create_app from lnbits.commands import migrate_databases -from lnbits.core.crud import create_account, create_wallet, get_wallet -from lnbits.core.models import BalanceCheck, Payment, User, Wallet +from lnbits.core.crud import create_account, create_wallet from lnbits.core.views.api import CreateInvoiceData, api_payments_create_invoice from lnbits.db import Database from lnbits.settings import settings diff --git a/tests/core/views/test_api.py b/tests/core/views/test_api.py index d6d341cd9..d62936198 100644 --- a/tests/core/views/test_api.py +++ b/tests/core/views/test_api.py @@ -1,15 +1,9 @@ import hashlib import pytest -import pytest_asyncio from lnbits import bolt11 -from lnbits.core.crud import get_wallet -from lnbits.core.views.api import ( - CreateInvoiceData, - api_payment, - api_payments_create_invoice, -) +from lnbits.core.views.api import api_payment from lnbits.settings import get_wallet_class from ...helpers import get_random_invoice_data, is_regtest diff --git a/tests/core/views/test_generic.py b/tests/core/views/test_generic.py index e8fc6fcc0..333251575 100644 --- a/tests/core/views/test_generic.py +++ b/tests/core/views/test_generic.py @@ -1,7 +1,4 @@ import pytest -import pytest_asyncio - -from tests.conftest import client @pytest.mark.asyncio diff --git a/tests/core/views/test_public_api.py b/tests/core/views/test_public_api.py index 6ebaeabd3..144cd161e 100644 --- a/tests/core/views/test_public_api.py +++ b/tests/core/views/test_public_api.py @@ -1,7 +1,4 @@ import pytest -import pytest_asyncio - -from lnbits.core.crud import get_wallet # check if the client is working diff --git a/tests/extensions/bleskomat/conftest.py b/tests/extensions/bleskomat/conftest.py index 13be2b579..595ba6b87 100644 --- a/tests/extensions/bleskomat/conftest.py +++ b/tests/extensions/bleskomat/conftest.py @@ -1,7 +1,6 @@ import json import secrets -import pytest import pytest_asyncio from lnbits.core.crud import create_account, create_wallet diff --git a/tests/extensions/bleskomat/test_lnurl_api.py b/tests/extensions/bleskomat/test_lnurl_api.py index dab0fb98c..a66c92204 100644 --- a/tests/extensions/bleskomat/test_lnurl_api.py +++ b/tests/extensions/bleskomat/test_lnurl_api.py @@ -1,7 +1,6 @@ import secrets import pytest -import pytest_asyncio from lnbits.core.crud import get_wallet from lnbits.extensions.bleskomat.crud import get_bleskomat_lnurl @@ -10,8 +9,6 @@ from lnbits.extensions.bleskomat.helpers import ( query_to_signing_payload, ) from lnbits.settings import get_wallet_class, settings -from tests.conftest import client -from tests.extensions.bleskomat.conftest import bleskomat, lnurl from tests.helpers import credit_wallet, is_regtest WALLET = get_wallet_class() diff --git a/tests/extensions/invoices/conftest.py b/tests/extensions/invoices/conftest.py index 00b9c2375..522ba81fc 100644 --- a/tests/extensions/invoices/conftest.py +++ b/tests/extensions/invoices/conftest.py @@ -1,4 +1,3 @@ -import pytest import pytest_asyncio from lnbits.core.crud import create_account, create_wallet diff --git a/tests/extensions/invoices/test_invoices_api.py b/tests/extensions/invoices/test_invoices_api.py index 5b7155f54..c0777690d 100644 --- a/tests/extensions/invoices/test_invoices_api.py +++ b/tests/extensions/invoices/test_invoices_api.py @@ -1,12 +1,15 @@ import pytest -import pytest_asyncio -from loguru import logger +import pytest_asyncio # noqa: F401 +from loguru import logger # noqa: F401 -from lnbits.core.crud import get_wallet -from tests.conftest import adminkey_headers_from, client, invoice -from tests.extensions.invoices.conftest import accounting_invoice, invoices_wallet -from tests.helpers import credit_wallet -from tests.mocks import WALLET +from lnbits.core.crud import get_wallet # noqa: F401 +from tests.conftest import adminkey_headers_from, client, invoice # noqa: F401 +from tests.extensions.invoices.conftest import ( # noqa: F401 + accounting_invoice, + invoices_wallet, +) +from tests.helpers import credit_wallet # noqa: F401 +from tests.mocks import WALLET # noqa: F401 @pytest.mark.asyncio