Migrate to Pydantic 2 for LNbits 1.7.0

config.json

@@ -3,8 +3,8 @@
   "name": "Orders",
   "short_description": "If enabled orders from tpos and webshop will be pulled.",
   "tile": "/orders/static/image/orders.png",
-  "version": "0.1.0",
-  "min_lnbits_version": "1.4.0",
+  "version": "0.2.0",
+  "min_lnbits_version": "1.7.0-rc1",
   "contributors": [
     {
       "name": "LNbits community",

crud.py

@@ -17,7 +17,7 @@
 
 ########################### Orders ############################
 async def create_orders(user_id: str, data: CreateOrders) -> Orders:
-    orders = Orders(**data.dict(exclude_none=True), id=urlsafe_short_hash(), user_id=user_id)
+    orders = Orders(**data.model_dump(exclude_none=True), id=urlsafe_short_hash(), user_id=user_id)
     await db.insert("orders.orders", orders)
     return orders
 
@@ -113,7 +113,7 @@ async def delete_orders(user_id: str, orders_id: str) -> None:
 
 ############################ Settings #############################
 async def create_extension_settings(user_id: str, data: ExtensionSettings) -> ExtensionSettings:
-    settings = UserExtensionSettings(**data.dict(), id=user_id)
+    settings = UserExtensionSettings(**data.model_dump(), id=user_id)
     await db.insert("orders.extension_settings", settings)
     return settings
 
@@ -132,6 +132,6 @@ async def get_extension_settings(
 
 
 async def update_extension_settings(user_id: str, data: ExtensionSettings) -> ExtensionSettings:
-    settings = UserExtensionSettings(**data.dict(), id=user_id)
+    settings = UserExtensionSettings(**data.model_dump(), id=user_id)
     await db.update("orders.extension_settings", settings)
     return settings

models.py

@@ -141,8 +141,8 @@ class OrdersFilters(FilterModel):
         "updated_at",
     ]
 
-    created_at: datetime | None
-    updated_at: datetime | None
+    created_at: datetime | None = None
+    updated_at: datetime | None = None
     paid: bool | None = None
     shipped: bool | None = None
 

pyproject.toml

@@ -1,17 +1,17 @@
 [project]
 name = "orders"
-version = "0.1.0"
-requires-python = ">=3.10,<3.13"
+version = "0.2.0"
+requires-python = ">=3.10,<3.14"
 description = "<<If enabled orders from tpos and webshop will be pulled.>>"
 authors = []
 urls = { Homepage = "https://lnbits.com", Repository = "https://github.com/lnbits/orders" }
-dependencies = [ "lnbits>=1.4.0" ]
+dependencies = [ "lnbits>=1.7.0rc1" ]
 
 [tool.poetry]
 package-mode = false
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "black>=24.3.0",
     "pytest-asyncio>=0.21.0",
     "pytest>=7.3.2",
@@ -21,6 +21,12 @@ dev-dependencies = [
     "types-cffi>=1.16.0.20240331",
 ]
 
+[tool.poetry.dependencies]
+python = ">=3.10,<3.13"
+
+[tool.uv]
+build-constraint-dependencies = ["scikit-build-core<0.10"]
+
 [tool.mypy]
 plugins = ["pydantic.mypy"]
 

tests/test_crud.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timezone
+from typing import cast
 from uuid import uuid4
 
 import pytest
@@ -44,7 +45,7 @@ async def test_create_and_get_orders():
     assert orders_one.id is not None
     assert orders_one.user_id == user_id
 
-    orders_one = await get_orders(user_id, orders_one.id)
+    orders_one = cast(Orders, await get_orders(user_id, orders_one.id))
     assert orders_one.id is not None
     assert orders_one.user_id == user_id
     assert orders_one.source == data.source
@@ -117,7 +118,7 @@ async def test_update_orders():
     assert orders_one.id is not None
     assert orders_one.user_id == user_id
 
-    orders_one = await get_orders(user_id, orders_one.id)
+    orders_one = cast(Orders, await get_orders(user_id, orders_one.id))
     assert orders_one.id is not None
     assert orders_one.user_id == user_id
     assert orders_one.source == data.source
@@ -147,7 +148,7 @@ async def test_update_orders():
     orders_updated = Orders(**{**orders_one.dict(), **data_updated.dict()})
 
     await update_orders(orders_updated)
-    orders_one = await get_orders_by_id(orders_one.id)
+    orders_one = cast(Orders, await get_orders_by_id(orders_one.id))
     assert orders_one.source == orders_updated.source
     assert orders_one.items == orders_updated.items
     assert orders_one.payment_hash == orders_updated.payment_hash