Revert "fix: 修复 DetachedInstanceError (#69)" (#70)

This reverts commit dc917ca.

Author: JohnRichard4096

nonebot_plugin_value/api/api_balance.py

@@ -92,7 +92,6 @@ async def get_or_create_account(
         currency_id = (await _get_default()).id
     async with get_session() as session:
         data = await _go_account(user_id, currency_id, session)
-        session.add(data)
         return UserAccountData.model_validate(data, from_attributes=True)
 
 

nonebot_plugin_value/repository.py

@@ -5,8 +5,7 @@
 
 from nonebot import logger
 from nonebot_plugin_orm import AsyncSession
-from sqlalchemy import delete, select, update
-from sqlalchemy.orm import joinedload
+from sqlalchemy import delete, insert, select, update
 
 from .exception import (
     AccountFrozen,
@@ -41,19 +40,18 @@ async def get_or_create_currency(
                 )
             )
             if (currency := stmt.scalars().first()) is not None:
-                session.add(currency)
                 return currency, True
-            result = await self.createcurrency(currency_data)
+            await self.createcurrency(currency_data)
+            result = await self.get_currency(currency_data.id)
+            assert result is not None
             return result, False
 
-    async def createcurrency(self, currency_data: CurrencyData) -> CurrencyMeta:
+    async def createcurrency(self, currency_data: CurrencyData):
         async with self.session as session:
             """创建新货币"""
-            currency = CurrencyMeta(**currency_data.model_dump())
-            session.add(currency)
+            stmt = insert(CurrencyMeta).values(**dict(currency_data))
+            await session.execute(stmt)
             await session.commit()
-            await session.refresh(currency)
-            return currency
 
     async def update_currency(self, currency_data: CurrencyData) -> CurrencyMeta:
         """更新货币信息"""
@@ -144,7 +142,6 @@ async def get_or_create_account(
                 # 检查账户是否存在
                 stmt = (
                     select(UserAccount)
-                    .options(joinedload(UserAccount.currency_id))
                     .where(UserAccount.uni_id == get_uni_id(user_id, currency_id))
                     .with_for_update()
                 )
@@ -165,7 +162,6 @@ async def get_or_create_account(
                 )
                 session.add(account)
                 await session.commit()
-                await session.refresh(account)
                 return account
             except Exception:
                 await session.rollback()
@@ -349,9 +345,18 @@ async def create_transaction(
             )
             session.add(transaction_data)
             await session.commit()
-            await session.refresh(transaction_data)
-            session.add(transaction_data)
-            return transaction_data
+            stmt = (
+                select(Transaction)
+                .where(
+                    Transaction.id == uuid,
+                )
+                .with_for_update()
+            )
+            result = await session.execute(stmt)
+            transaction = result.scalar_one_or_none()
+            assert transaction, f"无法读取到交易记录[... WHERE id = {uuid} ...]!"
+            session.add(transaction)
+            return transaction
 
     async def get_transaction_history(
         self, account_id: str, limit: int = 100

nonebot_plugin_value/services/balance.py

@@ -149,6 +149,7 @@ async def batch_del_balance(
 
         if not all(r.success for r in result_list):
             return [] if not return_all_on_fail else result_list
+        await session.commit()
         return result_list
 
 
@@ -260,6 +261,7 @@ async def batch_add_balance(
             result_list.append(data)
         if not all(r.success for r in result_list):
             return [] if not return_all_on_fail else result_list
+        await session.commit()
         return result_list
 
 
@@ -321,12 +323,15 @@ async def add_balance(
             balance_before,
             balance_after,
         )
-        await session.refresh(account)
+        # 在更新余额前重新获取账户对象以避免DetachedInstanceError
+        updated_account = await account_repo.get_or_create_account(user_id, currency_id)
         await account_repo.update_balance(
-            account.id,
+            updated_account.id,
             balance_after,
             currency_id,
         )
+        if arg_session is None:
+            await session.commit()
         try:
             await HooksManager().run_hooks(
                 HooksType.post(),
@@ -452,6 +457,10 @@ async def transfer_funds(
             balance_after=to_balance_after,
             timestamp=timestamp,
         )
+
+        # 提交事务
+        if arg_session is None:
+            await session.commit()
         try:
             await HooksManager().run_hooks(
                 HooksType.post(),

nonebot_plugin_value/services/transaction.py

@@ -72,6 +72,7 @@ async def remove_transaction(
             await TransactionRepository(session).remove_transaction(transaction_id)
             return True
         except Exception:
+            await session.rollback()
             if fail_then_throw:
                 raise
             return False

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-value"
-version = "0.1.3.post2"
+version = "0.1.3.post1"
 description = "Economy API for NoneBot2"
 readme = "README.md"
 requires-python = ">=3.10, <4.0.0"