* feat(web): add PageEmpty component
* feat(web): add PageTabs component
* feat(web): add PageEmpty component
* feat(web): add PageTabs component
* feat(prompt): add history tracking for prompt releases
* feat(web): add prompt menu
* refactor: The PageScrollList component supports two generic parameters
* feat(web): BodyWrapper compoent update PageLoading
* feat(web): add Ontology menu
* feat(web): memory management add scene
* feat(tasks): add celery task configuration for periodic jobs
- Add ignore_result=True to prevent storing results for periodic tasks
- Set max_retries=0 to skip failed periodic tasks without retry attempts
- Configure acks_late=False for immediate acknowledgment in beat tasks
- Add time_limit and soft_time_limit to regenerate_memory_cache task (3600s/3300s)
- Add time_limit and soft_time_limit to workspace_reflection_task (300s/240s)
- Add time_limit and soft_time_limit to run_forgetting_cycle_task (7200s/7000s)
- Improve task reliability and resource management for scheduled jobs
* feat(sandbox): add Node.js code execution support to sandbox
* Release/v0.2.2 (#260)
* [modify] migration script
* [add] migration script
* fix(web): change form message
* fix(web): the memoryContent field is compatible with numbers and strings
* feat(web): code node hidden
* fix(model):
1. create a basic model to check if the name and provider are duplicated.
2. The result shows error models because the provider created API Keys for all matching models.
---------
Co-authored-by: Mark <zhuwenhui5566@163.com>
Co-authored-by: zhaoying <yzhao96@best-inc.com>
Co-authored-by: yingzhao <zhaoyingyz@126.com>
Co-authored-by: Timebomb2018 <18868801967@163.com>
* Feature/ontology class clean (#249)
* [add] Complete ontology engineering feature implementation
* [add] Add ontology feature integration and validation utilities
* [add] Add OWL validator and validation utilities
* [fix] Add missing render_ontology_extraction_prompt function
* [fix]Add dependencies, fix functionality
* [add] migration script
* feat(celery): add dedicated periodic tasks worker and queue (#261)
* fix(web): conflict resolve
* Fix/v022 bug (#263)
* [fix]Fix the issue of inconsistent language in explicit and episodic memory.
* [fix]Fix the issue of inconsistent language in explicit and episodic memory.
* [add]Add scene_id
* [fix]Based on the AI review to fix the code
* Fix/develop memory reflex (#265)
* 遗漏的历史映射
* 遗漏的历史映射
* 反思后台报错处理
* [add] migration script
* fix: chat conversation_id add node_start
* feat(web): show code node
* fix(web): Restructure the CustomSelect component, repair the interface that is called multiple times when the form is updated
* feat(web): RadioGroupCard support block mode
* feat(web): create space add icon
* feat(app and model): token consumption statistics
* Add/develop memory (#264)
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 遗漏的历史映射
* 新增长期记忆功能
* 新增长期记忆功能
* 新增长期记忆功能
* 知识库检索多余字段
* 长期
* feat(app and model): token consumption statistics of the cluster
* memory_BUG_fix
* fix(web): prompt history remove pageLoading
* fix(prompt): remove hard-coded import of prompt file paths (#279)
* Fix/develop memory bug (#274)
* 遗漏的历史映射
* 遗漏的历史映射
* fix_timeline_memories
* fix(web): update retrieve_type key
* Fix/develop memory bug (#276)
* 遗漏的历史映射
* 遗漏的历史映射
* fix_timeline_memories
* fix_timeline_memories
* write_gragp/bug_fix
* write_gragp/bug_fix
* write_gragp/bug_fix
* chore(celery): disable periodic task scheduling
* fix(prompt): remove hard-coded import of prompt file paths
---------
Co-authored-by: lixinyue11 <94037597+lixinyue11@users.noreply.github.com>
Co-authored-by: zhaoying <yzhao96@best-inc.com>
Co-authored-by: yingzhao <zhaoyingyz@126.com>
Co-authored-by: Ke Sun <kesun5@illinois.edu>
* fix(web): remove delete confirm content
* refactor(workflow): relocate template directory into workflow
* feat(memory): add long-term storage task routing and batching
* fix(web): PageScrollList loading update
* fix(web): PageScrollList loading update
* Ontology v1 bug (#291)
* [changes]Add 'id' as the secondary sorting key, and 'scene_id' now returns a UUID object
* [fix]Fix the "end_user" return to be sorted by update time.
* [fix]Set the default values of the memory configuration model based on the spatial model.
* [fix]Remove the entity extraction check combination model, read the configuration list, and add the return of scene_id
* [fix]Fix the "end_user" return to be sorted by update time.
* [fix]
* fix(memory): add Redis session validation
- Add macOS fork() safety configuration in celery_app.py to prevent initialization issues
- Add null/False checks for Redis session queries in term_memory_save to handle missing sessions gracefully
- Add null/False checks in memory_long_term_storage to prevent processing empty Redis results
- Add null/False checks in aggregate_judgment before format_parsing to avoid errors on missing data
- Initialize redis_messages variable in window_dialogue for consistency
- Add debug logging when no existing session found in Redis for better troubleshooting
- Add TODO comments for magic numbers (scope=6, time=5) to be extracted as constants
- Improve error handling when Redis returns False or empty results instead of crashing
* fix(web): PageScrollList style update
* fix(workflow): fix argument passing in code execution nodes
* fix(web): prompt add disabled
* fix(web): space icon required
* feat(app): modify the key of the token
* fix(fix the key of the app's token):
* fix(workflow): switch code input encoding to base64+URL encoding
* [add]The main project adds multi-API Key load balancing.
* [changes]Attribute security access, secure numerical conversion, unified use of local variables
* fix(web): save add session update
* fix(web): language editor support paste
* [changes]Active status filtering logic, API Key selection strategy
* memory_BUG
* memory_BUG_long_term
* [changes]
* memory_BUG_long_term
* memory_BUG_long_term
* Fix/release memory bug (#306)
* memory_BUG_fix
* memory_BUG
* memory_BUG_long_term
* memory_BUG_long_term
* memory_BUG_long_term
* knowledge_retrieval/bug/fix
* knowledge_retrieval/bug/fix
* knowledge_retrieval/bug/fix
* [fix]1.The "read_all_config" interface returns "scene_name";2.Memory configuration for lightweight query ontology scenarios
* fix(web): replace code editor
* [changes]Modify the description of the time for the recent event
* [changes]Modify the code based on the AI review
* feat(web): update memory config ontology api
* fix(web): ui update
* knowledge_retrieval/bug/fix
* knowledge_retrieval/bug/fix
* knowledge_retrieval/bug/fix
* feat(workflow): add token usage statistics for question classifier and parameter extraction
* feat(web): move prompt menu
* Multiple independent transactions - single transaction
* Multiple independent transactions - single transaction
* Multiple independent transactions - single transaction
* Multiple independent transactions - single transaction
* Write Missing None (#321)
* Write Missing None
* Write Missing None
* Write Missing None
* Apply suggestion from @sourcery-ai[bot]
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Write Missing None
---------
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Fix/release memory bug (#324)
* Write Missing None
* Write Missing None
* Write Missing None
* Apply suggestion from @sourcery-ai[bot]
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Write Missing None
* redis update
* redis update
* redis update
* redis update
---------
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Fix/writer memory bug (#326)
* [fix]Fix the bug
* [fix]Fix the bug
* [fix]Correct the direction indication.
* fix(web): markdown table ui update
* Fix/release memory bug (#332)
* Write Missing None
* Write Missing None
* Write Missing None
* Apply suggestion from @sourcery-ai[bot]
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Write Missing None
* redis update
* redis update
* redis update
* redis update
* writer_dup_bug/fix
---------
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Fix/fact summary (#333)
* [fix]Disable the contents related to fact_summary
* [fix]Disable the contents related to fact_summary
* [fix]Modify the code based on the AI review
* Fix/release memory bug (#335)
* Write Missing None
* Write Missing None
* Write Missing None
* Apply suggestion from @sourcery-ai[bot]
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Write Missing None
* redis update
* redis update
* redis update
* redis update
* writer_dup_bug/fix
* writer_graph_bug/fix
* writer_graph_bug/fix
---------
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* Revert "feat(web): move prompt menu"
This reverts commit 9e6e8f50f8.
* fix(web): ui update
* fix(web): update text
* fix(web): ui update
* fix(model): change the "vl" model type of dashscope to "chat"
* fix(model): change the "vl" model type of dashscope to "chat"
---------
Co-authored-by: zhaoying <yzhao96@best-inc.com>
Co-authored-by: Eternity <1533512157@qq.com>
Co-authored-by: Mark <zhuwenhui5566@163.com>
Co-authored-by: yingzhao <zhaoyingyz@126.com>
Co-authored-by: Timebomb2018 <18868801967@163.com>
Co-authored-by: 乐力齐 <162269739+lanceyq@users.noreply.github.com>
Co-authored-by: lixinyue11 <94037597+lixinyue11@users.noreply.github.com>
Co-authored-by: lixinyue <2569494688@qq.com>
Co-authored-by: Eternity <61316157+myhMARS@users.noreply.github.com>
Co-authored-by: lanceyq <1982376970@qq.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
194 lines
6.8 KiB
Python
194 lines
6.8 KiB
Python
"""应用统计服务"""
|
||
from datetime import datetime, timedelta
|
||
from typing import Dict, Any, List
|
||
import uuid
|
||
from sqlalchemy import func, and_, cast, Date
|
||
from sqlalchemy.orm import Session
|
||
|
||
from app.models.conversation_model import Conversation, Message
|
||
from app.models.end_user_model import EndUser
|
||
from app.models.api_key_model import ApiKey, ApiKeyLog
|
||
from app.core.exceptions import BusinessException
|
||
from app.core.error_codes import BizCode
|
||
|
||
|
||
class AppStatisticsService:
|
||
"""应用统计服务"""
|
||
|
||
def __init__(self, db: Session):
|
||
self.db = db
|
||
|
||
def get_app_statistics(
|
||
self,
|
||
app_id: uuid.UUID,
|
||
workspace_id: uuid.UUID,
|
||
start_date: int,
|
||
end_date: int
|
||
) -> Dict[str, Any]:
|
||
"""获取应用统计数据
|
||
|
||
Args:
|
||
app_id: 应用ID
|
||
workspace_id: 工作空间ID
|
||
start_date: 开始时间戳(毫秒)
|
||
end_date: 结束时间戳(毫秒)
|
||
|
||
Returns:
|
||
统计数据字典
|
||
"""
|
||
# 将毫秒时间戳转换为 datetime
|
||
start_dt = datetime.fromtimestamp(start_date / 1000)
|
||
end_dt = datetime.fromtimestamp(end_date / 1000) + timedelta(days=1)
|
||
|
||
# 1. 会话统计
|
||
conversations_stats = self._get_conversations_statistics(app_id, workspace_id, start_dt, end_dt)
|
||
|
||
# 2. 新增用户统计
|
||
users_stats = self._get_new_users_statistics(app_id, start_dt, end_dt)
|
||
|
||
# 3. API调用统计
|
||
api_stats = self._get_api_calls_statistics(app_id, start_dt, end_dt)
|
||
|
||
# 4. Token消耗统计
|
||
token_stats = self._get_token_statistics(app_id, start_dt, end_dt)
|
||
|
||
return {
|
||
"daily_conversations": conversations_stats["daily"],
|
||
"total_conversations": conversations_stats["total"],
|
||
"daily_new_users": users_stats["daily"],
|
||
"total_new_users": users_stats["total"],
|
||
"daily_api_calls": api_stats["daily"],
|
||
"total_api_calls": api_stats["total"],
|
||
"daily_tokens": token_stats["daily"],
|
||
"total_tokens": token_stats["total"]
|
||
}
|
||
|
||
def _get_conversations_statistics(
|
||
self,
|
||
app_id: uuid.UUID,
|
||
workspace_id: uuid.UUID,
|
||
start_dt: datetime,
|
||
end_dt: datetime
|
||
) -> Dict[str, Any]:
|
||
"""获取会话统计"""
|
||
# 每日会话数
|
||
daily_query = self.db.query(
|
||
cast(Conversation.created_at, Date).label('date'),
|
||
func.count(Conversation.id).label('count')
|
||
).filter(
|
||
and_(
|
||
Conversation.app_id == app_id,
|
||
Conversation.workspace_id == workspace_id,
|
||
Conversation.created_at >= start_dt,
|
||
Conversation.created_at < end_dt
|
||
)
|
||
).group_by(cast(Conversation.created_at, Date)).all()
|
||
|
||
daily_data = [{"date": str(row.date), "count": row.count} for row in daily_query]
|
||
total = sum(row["count"] for row in daily_data)
|
||
|
||
return {"daily": daily_data, "total": total}
|
||
|
||
def _get_new_users_statistics(
|
||
self,
|
||
app_id: uuid.UUID,
|
||
start_dt: datetime,
|
||
end_dt: datetime
|
||
) -> Dict[str, Any]:
|
||
"""获取新增用户统计"""
|
||
# 每日新增用户数
|
||
daily_query = self.db.query(
|
||
cast(EndUser.created_at, Date).label('date'),
|
||
func.count(EndUser.id).label('count')
|
||
).filter(
|
||
and_(
|
||
EndUser.app_id == app_id,
|
||
EndUser.created_at >= start_dt,
|
||
EndUser.created_at < end_dt
|
||
)
|
||
).group_by(cast(EndUser.created_at, Date)).all()
|
||
|
||
daily_data = [{"date": str(row.date), "count": row.count} for row in daily_query]
|
||
total = sum(row["count"] for row in daily_data)
|
||
|
||
return {"daily": daily_data, "total": total}
|
||
|
||
def _get_api_calls_statistics(
|
||
self,
|
||
app_id: uuid.UUID,
|
||
start_dt: datetime,
|
||
end_dt: datetime
|
||
) -> Dict[str, Any]:
|
||
"""获取API调用统计"""
|
||
# 每日API调用次数
|
||
daily_query = self.db.query(
|
||
cast(ApiKeyLog.created_at, Date).label('date'),
|
||
func.count(ApiKeyLog.id).label('count')
|
||
).join(
|
||
ApiKey, ApiKeyLog.api_key_id == ApiKey.id
|
||
).filter(
|
||
and_(
|
||
ApiKey.resource_id == app_id,
|
||
ApiKeyLog.created_at >= start_dt,
|
||
ApiKeyLog.created_at < end_dt
|
||
)
|
||
).group_by(cast(ApiKeyLog.created_at, Date)).all()
|
||
|
||
daily_data = [{"date": str(row.date), "count": row.count} for row in daily_query]
|
||
total = sum(row["count"] for row in daily_data)
|
||
|
||
return {"daily": daily_data, "total": total}
|
||
|
||
def _get_token_statistics(
|
||
self,
|
||
app_id: uuid.UUID,
|
||
start_dt: datetime,
|
||
end_dt: datetime
|
||
) -> Dict[str, Any]:
|
||
"""获取Token消耗统计(从Message的meta_data中提取)"""
|
||
from sqlalchemy import text
|
||
|
||
# 查询所有相关消息的token使用情况
|
||
# meta_data中可能包含: {"usage": {"total_tokens": 100}} 或 {"tokens": 100}
|
||
daily_query = self.db.query(
|
||
cast(Message.created_at, Date).label('date'),
|
||
Message.meta_data
|
||
).join(
|
||
Conversation, Message.conversation_id == Conversation.id
|
||
).filter(
|
||
and_(
|
||
Conversation.app_id == app_id,
|
||
Message.created_at >= start_dt,
|
||
Message.created_at < end_dt,
|
||
Message.meta_data.isnot(None)
|
||
)
|
||
).all()
|
||
|
||
# 按日期聚合token
|
||
daily_tokens = {}
|
||
for row in daily_query:
|
||
date_str = str(row.date)
|
||
meta = row.meta_data or {}
|
||
|
||
# 提取token数量(支持多种格式)
|
||
tokens = 0
|
||
if isinstance(meta, dict):
|
||
# 格式1: {"usage": {"total_tokens": 100}}
|
||
if "usage" in meta and isinstance(meta["usage"], dict):
|
||
tokens = meta["usage"].get("total_tokens", 0)
|
||
# 格式2: {"tokens": 100}
|
||
elif "tokens" in meta:
|
||
tokens = meta.get("tokens", 0)
|
||
# 格式3: {"total_tokens": 100}
|
||
elif "total_tokens" in meta:
|
||
tokens = meta.get("total_tokens", 0)
|
||
|
||
if date_str not in daily_tokens:
|
||
daily_tokens[date_str] = 0
|
||
daily_tokens[date_str] += int(tokens)
|
||
|
||
daily_data = [{"date": date, "count": tokens} for date, tokens in sorted(daily_tokens.items()) if tokens != 0]
|
||
total = sum(row["count"] for row in daily_data)
|
||
|
||
return {"daily": daily_data, "total": total}
|