migrate to sqlalchemy-aio.

a big refactor that:

- fixes some issues that might have happened (or not) with asynchronous
    reactions to payments;
- paves the way to https://github.com/lnbits/lnbits/issues/121;
- uses more async/await notation which just looks nice; and
- makes it simple(r?) for one extension to modify stuff from other extensions.

lnbits/extensions/amilk/__init__.py

@@ -1,5 +1,7 @@
 from quart import Blueprint
+from lnbits.db import Database
 
+db = Database("ext_amilk")
 
 amilk_ext: Blueprint = Blueprint("amilk", __name__, static_folder="static", template_folder="templates")
 

lnbits/extensions/amilk/crud.py

@@ -2,43 +2,39 @@ from base64 import urlsafe_b64encode
 from uuid import uuid4
 from typing import List, Optional, Union
 
-from lnbits.db import open_ext_db
-
+from . import db
 from .models import AMilk
 
 
-def create_amilk(*, wallet_id: str, lnurl: str, atime: int, amount: int) -> AMilk:
-    with open_ext_db("amilk") as db:
-        amilk_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
-        db.execute(
-            """
-            INSERT INTO amilks (id, wallet, lnurl, atime, amount)
-            VALUES (?, ?, ?, ?, ?)
-            """,
-            (amilk_id, wallet_id, lnurl, atime, amount),
-        )
+async def create_amilk(*, wallet_id: str, lnurl: str, atime: int, amount: int) -> AMilk:
+    amilk_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
+    await db.execute(
+        """
+        INSERT INTO amilks (id, wallet, lnurl, atime, amount)
+        VALUES (?, ?, ?, ?, ?)
+        """,
+        (amilk_id, wallet_id, lnurl, atime, amount),
+    )
 
-    return get_amilk(amilk_id)
+    amilk = await get_amilk(amilk_id)
+    assert amilk, "Newly created amilk_id couldn't be retrieved"
+    return amilk
 
 
-def get_amilk(amilk_id: str) -> Optional[AMilk]:
-    with open_ext_db("amilk") as db:
-        row = db.fetchone("SELECT * FROM amilks WHERE id = ?", (amilk_id,))
-
+async def get_amilk(amilk_id: str) -> Optional[AMilk]:
+    row = await db.fetchone("SELECT * FROM amilks WHERE id = ?", (amilk_id,))
     return AMilk(**row) if row else None
 
 
-def get_amilks(wallet_ids: Union[str, List[str]]) -> List[AMilk]:
+async def get_amilks(wallet_ids: Union[str, List[str]]) -> List[AMilk]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
 
-    with open_ext_db("amilk") as db:
-        q = ",".join(["?"] * len(wallet_ids))
-        rows = db.fetchall(f"SELECT * FROM amilks WHERE wallet IN ({q})", (*wallet_ids,))
+    q = ",".join(["?"] * len(wallet_ids))
+    rows = await db.fetchall(f"SELECT * FROM amilks WHERE wallet IN ({q})", (*wallet_ids,))
 
     return [AMilk(**row) for row in rows]
 
 
-def delete_amilk(amilk_id: str) -> None:
-    with open_ext_db("amilk") as db:
-        db.execute("DELETE FROM amilks WHERE id = ?", (amilk_id,))
+async def delete_amilk(amilk_id: str) -> None:
+    await db.execute("DELETE FROM amilks WHERE id = ?", (amilk_id,))

lnbits/extensions/amilk/migrations.py

@@ -1,8 +1,8 @@
-def m001_initial(db):
+async def m001_initial(db):
     """
     Initial amilks table.
     """
-    db.execute(
+    await db.execute(
         """
         CREATE TABLE IF NOT EXISTS amilks (
             id TEXT PRIMARY KEY,

lnbits/extensions/amilk/views.py

@@ -2,8 +2,8 @@ from quart import g, abort, render_template
 from http import HTTPStatus
 
 from lnbits.decorators import check_user_exists, validate_uuids
-from lnbits.extensions.amilk import amilk_ext
 
+from . import amilk_ext
 from .crud import get_amilk
 
 
@@ -16,5 +16,8 @@ async def index():
 
 @amilk_ext.route("/<amilk_id>")
 async def wall(amilk_id):
-    amilk = get_amilk(amilk_id) or abort(HTTPStatus.NOT_FOUND, "AMilk does not exist.")
+    amilk = await get_amilk(amilk_id)
+    if not amilk:
+        abort(HTTPStatus.NOT_FOUND, "AMilk does not exist.")
+
     return await render_template("amilk/wall.html", amilk=amilk)

lnbits/extensions/amilk/views_api.py

@@ -1,15 +1,15 @@
 import httpx
 from quart import g, jsonify, request, abort
 from http import HTTPStatus
-from lnurl import LnurlWithdrawResponse, handle as handle_lnurl
-from lnurl.exceptions import LnurlException
+from lnurl import LnurlWithdrawResponse, handle as handle_lnurl  # type: ignore
+from lnurl.exceptions import LnurlException  # type: ignore
 from time import sleep
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import api_check_wallet_key, api_validate_post_request
 from lnbits.core.services import create_invoice, check_invoice_status
 
-from lnbits.extensions.amilk import amilk_ext
+from . import amilk_ext
 from .crud import create_amilk, get_amilk, get_amilks, delete_amilk
 
 
@@ -19,14 +19,14 @@ async def api_amilks():
     wallet_ids = [g.wallet.id]
 
     if "all_wallets" in request.args:
-        wallet_ids = get_user(g.wallet.user).wallet_ids
+        wallet_ids = (await get_user(g.wallet.user)).wallet_ids
 
-    return jsonify([amilk._asdict() for amilk in get_amilks(wallet_ids)]), HTTPStatus.OK
+    return jsonify([amilk._asdict() for amilk in await get_amilks(wallet_ids)]), HTTPStatus.OK
 
 
 @amilk_ext.route("/api/v1/amilk/milk/<amilk_id>", methods=["GET"])
 async def api_amilkit(amilk_id):
-    milk = get_amilk(amilk_id)
+    milk = await get_amilk(amilk_id)
     memo = milk.id
 
     try:
@@ -34,7 +34,7 @@ async def api_amilkit(amilk_id):
     except LnurlException:
         abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.")
 
-    payment_hash, payment_request = create_invoice(
+    payment_hash, payment_request = await create_invoice(
         wallet_id=milk.wallet, amount=withdraw_res.max_sats, memo=memo, extra={"tag": "amilk"}
     )
 
@@ -48,7 +48,7 @@ async def api_amilkit(amilk_id):
 
     for i in range(10):
         sleep(i)
-        invoice_status = check_invoice_status(milk.wallet, payment_hash)
+        invoice_status = await check_invoice_status(milk.wallet, payment_hash)
         if invoice_status.paid:
             return jsonify({"paid": True}), HTTPStatus.OK
         else:
@@ -67,7 +67,9 @@ async def api_amilkit(amilk_id):
     }
 )
 async def api_amilk_create():
-    amilk = create_amilk(wallet_id=g.wallet.id, lnurl=g.data["lnurl"], atime=g.data["atime"], amount=g.data["amount"])
+    amilk = await create_amilk(
+        wallet_id=g.wallet.id, lnurl=g.data["lnurl"], atime=g.data["atime"], amount=g.data["amount"]
+    )
 
     return jsonify(amilk._asdict()), HTTPStatus.CREATED
 
@@ -75,7 +77,7 @@ async def api_amilk_create():
 @amilk_ext.route("/api/v1/amilk/<amilk_id>", methods=["DELETE"])
 @api_check_wallet_key("invoice")
 async def api_amilk_delete(amilk_id):
-    amilk = get_amilk(amilk_id)
+    amilk = await get_amilk(amilk_id)
 
     if not amilk:
         return jsonify({"message": "Paywall does not exist."}), HTTPStatus.NOT_FOUND
@@ -83,6 +85,6 @@ async def api_amilk_delete(amilk_id):
     if amilk.wallet != g.wallet.id:
         return jsonify({"message": "Not your amilk."}), HTTPStatus.FORBIDDEN
 
-    delete_amilk(amilk_id)
+    await delete_amilk(amilk_id)
 
     return "", HTTPStatus.NO_CONTENT