fix: dependecies groups use standard instead of uv

.github/workflows/release.yml

@@ -7,7 +7,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create github release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

models.py

@@ -1,8 +1,7 @@
 from datetime import datetime, timezone
 
-from pydantic import BaseModel, Field
-
 from lnbits.db import FilterModel
+from pydantic import BaseModel, Field
 
 
 class CreateInventory(BaseModel):

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "lnbits-inventory"
+name = "inventory"
 version = "0.0.0"
 requires-python = ">=3.10,<3.13"
 description = "Shared Inventory extension"
@@ -8,8 +8,8 @@ urls = { Homepage = "https://lnbits.com", Repository = "https://github.com/lnbit
 
 dependencies = [ "lnbits>1" ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "black",
     "pytest-asyncio",
     "pytest",
@@ -18,6 +18,9 @@ dev-dependencies = [
     "ruff",
 ]
 
+[tool.poetry]
+package-mode = false
+
 [tool.mypy]
 exclude = "(nostr/*)"
 plugins = ["pydantic.mypy"]
@@ -28,18 +31,6 @@ init_typed = true
 warn_required_dynamic_aliases = true
 warn_untyped_fields = true
 
-[[tool.mypy.overrides]]
-module = [
-  "lnbits.*",
-  "lnurl.*",
-  "loguru.*",
-  "fastapi.*",
-  "pydantic.*",
-  "pyqrcode.*",
-  "shortuuid.*",
-  "httpx.*",
-]
-ignore_missing_imports = "True"
 
 [tool.pytest.ini_options]
 log_cli = false

static/js/index.js

@@ -555,26 +555,38 @@ window.app = Vue.createApp({
       }
     },
     async updateItem(data) {
-      const newPhotos = this.itemDialog.gallery.filter(p => p.isNew && p.file)
-      let newAssetIds = []
+      const filesToUpload = this.itemDialog.gallery
+        .filter(
+          p =>
+            (p.isNew && p.file) ||
+            (!p.isNew && p.assetId && isBase64String(p.assetId))
+        )
+        .map(p => {
+          if (p.isNew && p.file) return p.file
+          if (!p.isNew && p.assetId && isBase64String(p.assetId))
+            return base64ToFile(p.assetId)
+          return null
+        })
+        .filter(Boolean)
 
-      if (newPhotos.length > 0) {
+      let uploadedAssetIds = []
+      if (filesToUpload.length > 0) {
         try {
-          newAssetIds = await Promise.all(
-            newPhotos.map(p => this.uploadPhoto(p.file))
+          uploadedAssetIds = await Promise.all(
+            filesToUpload.map(file => this.uploadPhoto(file))
           )
         } catch (error) {
-          LNbits.utils.notifyError('Failed to upload new photos')
+          LNbits.utils.notifyError('Failed to upload photos')
           return
         }
       }
 
-      const finalIds = [
-        ...this.itemDialog.gallery
-          .filter(p => !p.isNew && p.assetId)
-          .map(p => p.assetId),
-        ...newAssetIds
-      ]
+      // Asset IDs from gallery that are not new and not base64
+      const existingAssetIds = this.itemDialog.gallery
+        .filter(p => !p.isNew && p.assetId && !isBase64String(p.assetId))
+        .map(p => p.assetId)
+
+      const finalIds = [...existingAssetIds, ...uploadedAssetIds]
 
       data.images = toCsv(finalIds)
 

static/js/utils.js

@@ -35,6 +35,18 @@ function fileToBase64(file) {
   })
 }
 
+function base64ToFile(base64String, filename) {
+  const arr = base64String.split(',')
+  const mime = arr[0].match(/:(.*?);/)[1]
+  const bstr = atob(arr[1])
+  let n = bstr.length
+  const u8arr = new Uint8Array(n)
+  while (n--) {
+    u8arr[n] = bstr.charCodeAt(n)
+  }
+  return new File([u8arr], filename, {type: mime})
+}
+
 function isBase64String(str) {
   if (typeof str !== 'string') return false
   return str.includes('data:') && str.includes('base64')