bleskomat with import error in views_api

lnbits/extensions/bleskomat/views_api.py

@@ -1,120 +1,86 @@
-from quart import g, jsonify, request
 from http import HTTPStatus
 
+from fastapi.params import Query
+from starlette.exceptions import HTTPException
+
 from lnbits.core.crud import get_user
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.decorators import WalletTypeInfo, require_admin_key
+from lnbits.extensions.bleskomat.models import CreateBleskomat
 
 from . import bleskomat_ext
 from .crud import (
     create_bleskomat,
+    delete_bleskomat,
     get_bleskomat,
     get_bleskomats,
     update_bleskomat,
-    delete_bleskomat,
-)
-
-from .exchange_rates import (
-    exchange_rate_providers,
-    fetch_fiat_exchange_rate,
-    fiat_currencies,
 )
+from .exchange_rates import fetch_fiat_exchange_rate
 
 
-@bleskomat_ext.route("/api/v1/bleskomats", methods=["GET"])
-@api_check_wallet_key("admin")
-async def api_bleskomats():
-    wallet_ids = [g.wallet.id]
+@bleskomat_ext.get("/api/v1/bleskomats")
+async def api_bleskomats(wallet: WalletTypeInfo(require_admin_key), all_wallets: bool = Query(False)):
+    wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
-        wallet_ids = (await get_user(g.wallet.user)).wallet_ids
+    if all_wallets:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return (
-        jsonify(
-            [bleskomat._asdict() for bleskomat in await get_bleskomats(wallet_ids)]
-        ),
-        HTTPStatus.OK,
-    )
+    return [bleskomat.dict() for bleskomat in await get_bleskomats(wallet_ids)]
 
 
-@bleskomat_ext.route("/api/v1/bleskomat/<bleskomat_id>", methods=["GET"])
-@api_check_wallet_key("admin")
-async def api_bleskomat_retrieve(bleskomat_id):
+@bleskomat_ext.get("/api/v1/bleskomat/{bleskomat_id}")
+async def api_bleskomat_retrieve(wallet: WalletTypeInfo(require_admin_key), bleskomat_id):
     bleskomat = await get_bleskomat(bleskomat_id)
 
-    if not bleskomat or bleskomat.wallet != g.wallet.id:
-        return (
-            jsonify({"message": "Bleskomat configuration not found."}),
-            HTTPStatus.NOT_FOUND,
-        )
+    if not bleskomat or bleskomat.wallet != wallet.wallet.id:
+        raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Bleskomat configuration not found."
+            )
 
-    return jsonify(bleskomat._asdict()), HTTPStatus.OK
+    return bleskomat.dict()
 
 
-@bleskomat_ext.route("/api/v1/bleskomat", methods=["POST"])
-@bleskomat_ext.route("/api/v1/bleskomat/<bleskomat_id>", methods=["PUT"])
-@api_check_wallet_key("admin")
-@api_validate_post_request(
-    schema={
-        "name": {"type": "string", "empty": False, "required": True},
-        "fiat_currency": {
-            "type": "string",
-            "allowed": fiat_currencies.keys(),
-            "required": True,
-        },
-        "exchange_rate_provider": {
-            "type": "string",
-            "allowed": exchange_rate_providers.keys(),
-            "required": True,
-        },
-        "fee": {"type": ["string", "float", "number", "integer"], "required": True},
-    }
-)
-async def api_bleskomat_create_or_update(bleskomat_id=None):
+@bleskomat_ext.post("/api/v1/bleskomat")
+@bleskomat_ext.put("/api/v1/bleskomat/{bleskomat_id}",)
+async def api_bleskomat_create_or_update(data: CreateBleskomat, wallet: WalletTypeInfo(require_admin_key), bleskomat_id=None):
     try:
-        fiat_currency = g.data["fiat_currency"]
-        exchange_rate_provider = g.data["exchange_rate_provider"]
+        fiat_currency = data.fiat_currency
+        exchange_rate_provider = data.exchange_rate_provider
         await fetch_fiat_exchange_rate(
             currency=fiat_currency, provider=exchange_rate_provider
         )
     except Exception as e:
         print(e)
-        return (
-            jsonify(
-                {
-                    "message": f'Failed to fetch BTC/{fiat_currency} currency pair from "{exchange_rate_provider}"'
-                }
-            ),
-            HTTPStatus.INTERNAL_SERVER_ERROR,
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f'Failed to fetch BTC/{fiat_currency} currency pair from "{exchange_rate_provider}"'
         )
 
     if bleskomat_id:
         bleskomat = await get_bleskomat(bleskomat_id)
-        if not bleskomat or bleskomat.wallet != g.wallet.id:
-            return (
-                jsonify({"message": "Bleskomat configuration not found."}),
-                HTTPStatus.NOT_FOUND,
+        if not bleskomat or bleskomat.wallet != wallet.wallet.id:
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Bleskomat configuration not found."
             )
-        bleskomat = await update_bleskomat(bleskomat_id, **g.data)
+    
+        bleskomat = await update_bleskomat(bleskomat_id, **data.dict())
     else:
-        bleskomat = await create_bleskomat(wallet_id=g.wallet.id, **g.data)
+        bleskomat = await create_bleskomat(wallet_id=wallet.wallet.id, data=data)
 
-    return (
-        jsonify(bleskomat._asdict()),
-        HTTPStatus.OK if bleskomat_id else HTTPStatus.CREATED,
-    )
+    return bleskomat.dict()
 
 
-@bleskomat_ext.route("/api/v1/bleskomat/<bleskomat_id>", methods=["DELETE"])
-@api_check_wallet_key("admin")
-async def api_bleskomat_delete(bleskomat_id):
+@bleskomat_ext.delete("/api/v1/bleskomat/{bleskomat_id}")
+async def api_bleskomat_delete(wallet: WalletTypeInfo(require_admin_key), bleskomat_id):
     bleskomat = await get_bleskomat(bleskomat_id)
 
-    if not bleskomat or bleskomat.wallet != g.wallet.id:
-        return (
-            jsonify({"message": "Bleskomat configuration not found."}),
-            HTTPStatus.NOT_FOUND,
-        )
+    if not bleskomat or bleskomat.wallet != wallet.wallet.id:
+        raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Bleskomat configuration not found."
+            )
 
     await delete_bleskomat(bleskomat_id)
-
-    return "", HTTPStatus.NO_CONTENT
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)