feat(bot): use runtime api for bot data
This commit is contained in:
@@ -1,312 +1,181 @@
|
||||
import asyncio
|
||||
import logging
|
||||
import threading
|
||||
from datetime import datetime
|
||||
from typing import Tuple, List, Dict, Any
|
||||
from .config import Config
|
||||
from .database import PointsDatabase
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
import asyncio
|
||||
import aiohttp
|
||||
import logging
|
||||
from typing import Tuple, List, Dict, Any, Optional
|
||||
from .config import Config
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class PointsAPI:
|
||||
"""Points system API for managing user points."""
|
||||
|
||||
def __init__(self, config: Config):
|
||||
self.config = config
|
||||
self.db = PointsDatabase(config)
|
||||
self._lock = threading.Lock()
|
||||
|
||||
async def get_balance(self, user_id: str) -> int:
|
||||
"""Get user's current points balance."""
|
||||
return await asyncio.to_thread(self.db.get_user_balance, user_id)
|
||||
"""Points system API for managing user points."""
|
||||
|
||||
def __init__(self, config: Config):
|
||||
self.config = config
|
||||
|
||||
def _url(self, path: str) -> str:
|
||||
"""拼接 /bot/points 端点地址。"""
|
||||
|
||||
return f"{self.config.POINTS_API_HOST}/{path.lstrip('/')}"
|
||||
|
||||
def _auth(self) -> Dict[str, str]:
|
||||
"""生成 xapi Bot 鉴权参数。"""
|
||||
|
||||
return {
|
||||
"user": self.config.BOT_USER,
|
||||
"token": self.config.BOT_TOKEN,
|
||||
}
|
||||
|
||||
async def _request(
|
||||
self,
|
||||
method: str,
|
||||
path: str,
|
||||
*,
|
||||
payload: Optional[Dict[str, Any]] = None,
|
||||
params: Optional[Dict[str, Any]] = None,
|
||||
) -> Optional[Dict[str, Any]]:
|
||||
"""调用 xapi /bot/points，并只向上层暴露 data。"""
|
||||
|
||||
request_url = self._url(path)
|
||||
timeout = aiohttp.ClientTimeout(total=10)
|
||||
try:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
if method == "GET":
|
||||
request_params = {**self._auth(), **(params or {})}
|
||||
async with session.get(request_url, params=request_params, timeout=timeout) as resp:
|
||||
return await self._parse_response(resp, path)
|
||||
request_payload = {**self._auth(), **(payload or {})}
|
||||
async with session.post(request_url, json=request_payload, timeout=timeout) as resp:
|
||||
return await self._parse_response(resp, path)
|
||||
except aiohttp.ClientError as exc:
|
||||
logger.error("points api request failed path=%s error=%s", path, exc)
|
||||
return None
|
||||
except asyncio.TimeoutError as exc:
|
||||
logger.error("points api request timeout path=%s error=%s", path, exc)
|
||||
return None
|
||||
|
||||
async def _parse_response(self, resp: aiohttp.ClientResponse, path: str) -> Optional[Dict[str, Any]]:
|
||||
"""解析 xapi 统一响应，失败时返回 None 维持旧 API 失败语义。"""
|
||||
|
||||
if resp.status != 200:
|
||||
logger.error("points api bad status path=%s status=%s", path, resp.status)
|
||||
return None
|
||||
body = await resp.json()
|
||||
if body.get("code") != 200:
|
||||
logger.error("points api fail path=%s code=%s message=%s", path, body.get("code"), body.get("message"))
|
||||
return None
|
||||
data = body.get("data")
|
||||
return data if isinstance(data, dict) else None
|
||||
|
||||
async def get_balance(self, user_id: str) -> int:
|
||||
"""Get user's current points balance."""
|
||||
data = await self._request("GET", "balance", params={"user_id": user_id})
|
||||
if data is None:
|
||||
return 0
|
||||
return int(data.get("balance", 0) or 0)
|
||||
|
||||
async def add_points(
|
||||
self, user_id: str, amount: int, source: str, reason: str = None
|
||||
) -> Tuple[bool, int]:
|
||||
"""Add points to user account.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# Parameter validation
|
||||
if not isinstance(amount, int) or amount <= 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
# Operation limit validation
|
||||
if self.config.POINTS_MAX_PER_OPERATION > 0:
|
||||
if amount > self.config.POINTS_MAX_PER_OPERATION:
|
||||
return False, 0
|
||||
|
||||
def _add():
|
||||
with self._lock:
|
||||
conn = self.db.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
# Ensure user exists
|
||||
self.db.ensure_user_exists(user_id, conn)
|
||||
|
||||
# Get current balance
|
||||
cursor.execute(
|
||||
"SELECT points FROM user_points WHERE user_id = ?",
|
||||
(user_id,),
|
||||
)
|
||||
row = cursor.fetchone()
|
||||
current_balance = row["points"] if row else 0
|
||||
|
||||
# Check balance limit
|
||||
new_balance = current_balance + amount
|
||||
if self.config.POINTS_MAX_BALANCE > 0:
|
||||
if new_balance > self.config.POINTS_MAX_BALANCE:
|
||||
conn.rollback()
|
||||
return False, current_balance
|
||||
|
||||
# Update balance and total_earned
|
||||
now = datetime.now().isoformat()
|
||||
cursor.execute(
|
||||
"""
|
||||
UPDATE user_points
|
||||
SET points = ?, total_earned = total_earned + ?, updated_at = ?
|
||||
WHERE user_id = ?
|
||||
""",
|
||||
(new_balance, amount, now, user_id),
|
||||
)
|
||||
|
||||
# Write transaction log
|
||||
cursor.execute(
|
||||
"""
|
||||
INSERT INTO point_transactions
|
||||
(user_id, amount, balance_after, source, reason, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?)
|
||||
""",
|
||||
(user_id, amount, new_balance, source, reason, now),
|
||||
)
|
||||
|
||||
conn.commit()
|
||||
return True, new_balance
|
||||
except Exception as e:
|
||||
conn.rollback()
|
||||
logger.error(f"add_points failed for {user_id}: {e}")
|
||||
return False, 0
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
return await asyncio.to_thread(_add)
|
||||
"""Add points to user account.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# 保留原 PointsAPI 的入参失败语义；限额校验由 xapi 承担。
|
||||
if not isinstance(amount, int) or amount <= 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
data = await self._request(
|
||||
"POST",
|
||||
"add",
|
||||
payload={"user_id": user_id, "amount": amount, "source": source, "reason": reason},
|
||||
)
|
||||
return self._change_result(data)
|
||||
|
||||
async def spend_points(
|
||||
self, user_id: str, amount: int, source: str, reason: str = None
|
||||
) -> Tuple[bool, int]:
|
||||
"""Spend points from user account.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# Parameter validation
|
||||
if not isinstance(amount, int) or amount <= 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
# Operation limit validation
|
||||
if self.config.POINTS_MAX_PER_OPERATION > 0:
|
||||
if amount > self.config.POINTS_MAX_PER_OPERATION:
|
||||
return False, 0
|
||||
|
||||
def _spend():
|
||||
with self._lock:
|
||||
conn = self.db.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
# Ensure user exists
|
||||
self.db.ensure_user_exists(user_id, conn)
|
||||
|
||||
# Get current balance
|
||||
cursor.execute(
|
||||
"SELECT points FROM user_points WHERE user_id = ?",
|
||||
(user_id,),
|
||||
)
|
||||
row = cursor.fetchone()
|
||||
current_balance = row["points"] if row else 0
|
||||
|
||||
# Check sufficient balance
|
||||
if current_balance < amount:
|
||||
conn.rollback()
|
||||
return False, current_balance
|
||||
|
||||
# Update balance and total_spent
|
||||
new_balance = current_balance - amount
|
||||
now = datetime.now().isoformat()
|
||||
cursor.execute(
|
||||
"""
|
||||
UPDATE user_points
|
||||
SET points = ?, total_spent = total_spent + ?, updated_at = ?
|
||||
WHERE user_id = ?
|
||||
""",
|
||||
(new_balance, amount, now, user_id),
|
||||
)
|
||||
|
||||
# Write transaction log (amount as negative)
|
||||
cursor.execute(
|
||||
"""
|
||||
INSERT INTO point_transactions
|
||||
(user_id, amount, balance_after, source, reason, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?)
|
||||
""",
|
||||
(user_id, -amount, new_balance, source, reason, now),
|
||||
)
|
||||
|
||||
conn.commit()
|
||||
return True, new_balance
|
||||
except Exception as e:
|
||||
conn.rollback()
|
||||
logger.error(f"spend_points failed for {user_id}: {e}")
|
||||
return False, 0
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
return await asyncio.to_thread(_spend)
|
||||
"""Spend points from user account.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# 保留原 PointsAPI 的入参失败语义；余额与限额校验由 xapi 承担。
|
||||
if not isinstance(amount, int) or amount <= 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
data = await self._request(
|
||||
"POST",
|
||||
"spend",
|
||||
payload={"user_id": user_id, "amount": amount, "source": source, "reason": reason},
|
||||
)
|
||||
return self._change_result(data)
|
||||
|
||||
async def set_points(
|
||||
self, user_id: str, amount: int, source: str, reason: str = None
|
||||
) -> Tuple[bool, int]:
|
||||
"""Set user's points to exact amount.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# Parameter validation
|
||||
if not isinstance(amount, int) or amount < 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
def _set():
|
||||
with self._lock:
|
||||
conn = self.db.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
# Ensure user exists
|
||||
self.db.ensure_user_exists(user_id, conn)
|
||||
|
||||
# Get current balance
|
||||
cursor.execute(
|
||||
"SELECT points, total_earned FROM user_points WHERE user_id = ?",
|
||||
(user_id,),
|
||||
)
|
||||
row = cursor.fetchone()
|
||||
current_balance = row["points"] if row else 0
|
||||
current_earned = row["total_earned"] if row else 0
|
||||
|
||||
# If new value equals old value, return without writing
|
||||
if current_balance == amount:
|
||||
conn.rollback()
|
||||
return True, amount
|
||||
|
||||
# Calculate difference for total_earned (only positive diff)
|
||||
diff = amount - current_balance
|
||||
earned_diff = max(0, diff)
|
||||
|
||||
# Update balance and total_earned
|
||||
now = datetime.now().isoformat()
|
||||
cursor.execute(
|
||||
"""
|
||||
UPDATE user_points
|
||||
SET points = ?, total_earned = total_earned + ?, updated_at = ?
|
||||
WHERE user_id = ?
|
||||
""",
|
||||
(amount, earned_diff, now, user_id),
|
||||
)
|
||||
|
||||
# Write transaction log
|
||||
cursor.execute(
|
||||
"""
|
||||
INSERT INTO point_transactions
|
||||
(user_id, amount, balance_after, source, reason, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?)
|
||||
""",
|
||||
(user_id, diff, amount, source, reason, now),
|
||||
)
|
||||
|
||||
conn.commit()
|
||||
return True, amount
|
||||
except Exception as e:
|
||||
conn.rollback()
|
||||
logger.error(f"set_points failed for {user_id}: {e}")
|
||||
return False, 0
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
return await asyncio.to_thread(_set)
|
||||
"""Set user's points to exact amount.
|
||||
|
||||
Returns: (success, new_balance)
|
||||
"""
|
||||
# set 仍保持原 PointsAPI 行为：只校验非负，不做余额上限判断。
|
||||
if not isinstance(amount, int) or amount < 0:
|
||||
return False, 0
|
||||
if not user_id or not source:
|
||||
return False, 0
|
||||
|
||||
data = await self._request(
|
||||
"POST",
|
||||
"set",
|
||||
payload={"user_id": user_id, "amount": amount, "source": source, "reason": reason},
|
||||
)
|
||||
return self._change_result(data)
|
||||
|
||||
async def get_transactions(
|
||||
self, user_id: str, limit: int = 20, offset: int = 0
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""Get transaction history for a user.
|
||||
|
||||
Returns: List of transaction dicts
|
||||
"""
|
||||
# Normalize parameters
|
||||
limit = max(1, min(100, limit))
|
||||
offset = max(0, offset)
|
||||
|
||||
def _get():
|
||||
conn = self.db.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(
|
||||
"""
|
||||
SELECT id, user_id, amount, balance_after, source, reason, created_at
|
||||
FROM point_transactions
|
||||
WHERE user_id = ?
|
||||
ORDER BY id DESC
|
||||
LIMIT ? OFFSET ?
|
||||
""",
|
||||
(user_id, limit, offset),
|
||||
)
|
||||
rows = cursor.fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
except Exception as e:
|
||||
logger.error(f"get_transactions failed for {user_id}: {e}")
|
||||
return []
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
return await asyncio.to_thread(_get)
|
||||
"""Get transaction history for a user.
|
||||
|
||||
Returns: List of transaction dicts
|
||||
"""
|
||||
limit = max(1, min(100, limit))
|
||||
offset = max(0, offset)
|
||||
data = await self._request(
|
||||
"GET",
|
||||
"transactions",
|
||||
params={"user_id": user_id, "limit": limit, "offset": offset},
|
||||
)
|
||||
if data is None:
|
||||
return []
|
||||
items = data.get("items", [])
|
||||
return items if isinstance(items, list) else []
|
||||
|
||||
async def get_ranking(
|
||||
self, limit: int = 10, order_by: str = "points"
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""Get points ranking.
|
||||
|
||||
Returns: List of ranking dicts with rank field
|
||||
"""
|
||||
# Normalize parameters
|
||||
limit = max(1, min(100, limit))
|
||||
if order_by not in ("points", "total_earned"):
|
||||
order_by = "points"
|
||||
|
||||
def _get():
|
||||
conn = self.db.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
order_column = "points" if order_by == "points" else "total_earned"
|
||||
query = f"""
|
||||
SELECT
|
||||
RANK() OVER (ORDER BY {order_column} DESC) as rank,
|
||||
user_id,
|
||||
points,
|
||||
total_earned,
|
||||
total_spent
|
||||
FROM user_points
|
||||
ORDER BY {order_column} DESC, user_id ASC
|
||||
LIMIT ?
|
||||
"""
|
||||
cursor.execute(query, (limit,))
|
||||
rows = cursor.fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
except Exception as e:
|
||||
logger.error(f"get_ranking failed: {e}")
|
||||
return []
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
return await asyncio.to_thread(_get)
|
||||
"""Get points ranking.
|
||||
|
||||
Returns: List of ranking dicts with rank field
|
||||
"""
|
||||
limit = max(1, min(100, limit))
|
||||
if order_by not in ("points", "total_earned"):
|
||||
order_by = "points"
|
||||
data = await self._request(
|
||||
"GET",
|
||||
"ranking",
|
||||
params={"limit": limit, "order_by": order_by},
|
||||
)
|
||||
if data is None:
|
||||
return []
|
||||
items = data.get("items", [])
|
||||
return items if isinstance(items, list) else []
|
||||
|
||||
def _change_result(self, data: Optional[Dict[str, Any]]) -> Tuple[bool, int]:
|
||||
"""解析 add/spend/set 响应并维持旧失败返回值。"""
|
||||
|
||||
if data is None:
|
||||
return False, 0
|
||||
return bool(data.get("success")), int(data.get("balance", 0) or 0)
|
||||
|
||||
Reference in New Issue
Block a user