Skip to content

Commit 99a5e2d

Browse files
committed
feat: change dashboard commercial logic
1 parent bea1d8f commit 99a5e2d

5 files changed

Lines changed: 8 additions & 21 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,4 @@ docker/mysql/data/*
264264
docker/office/bisheng/*.gz
265265

266266
CLAUDE.md
267+
!src/backend/bisheng/telemetry_search/*.pyc

src/backend/bisheng/api/router.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717
knowledge_router_rpc, workflow_router_rpc,
1818
filelib_router_rpc)
1919
from bisheng.share_link.api.router import router as share_link_router
20-
21-
try:
22-
from bisheng.telemetry_search.api.router import router as telemetry_search_router
23-
except ImportError:
24-
telemetry_search_router = None
25-
pass
20+
from bisheng.telemetry_search.api.router import router as telemetry_search_router
2621

2722
router = APIRouter(prefix='/api/v1', )
2823
router.include_router(chat_router)
@@ -52,8 +47,7 @@
5247
router.include_router(invite_code_router)
5348
router.include_router(session_router)
5449
router.include_router(share_link_router)
55-
if telemetry_search_router:
56-
router.include_router(telemetry_search_router)
50+
router.include_router(telemetry_search_router)
5751

5852
router_rpc = APIRouter(prefix='/api/v2', )
5953
router_rpc.include_router(knowledge_router_rpc)

src/backend/bisheng/api/services/role_group_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from bisheng.database.models.role import RoleDao
2323
from bisheng.database.models.user_group import UserGroupCreate, UserGroupDao, UserGroupRead
2424
from bisheng.knowledge.domain.models.knowledge import KnowledgeDao
25+
from bisheng.telemetry_search.domain.services.dashboard import DashboardService
2526
from bisheng.tool.domain.models.gpts_tools import GptsToolsDao
2627
from bisheng.user.domain.models.user import User, UserDao
2728
from bisheng.user.domain.models.user_role import UserRoleDao
@@ -348,7 +349,6 @@ def get_group_tool(self, group_id: int, keyword: str, page_size: int, page_num:
348349

349350
async def get_group_dashboards(self, group_id: int, keyword: str, page_size: int, page_num: int) -> (List[Any],
350351
int):
351-
from bisheng.telemetry_search.domain.services.dashboard import DashboardService
352352

353353
""" 获取用户组下的仪表盘列表 """
354354
# 查询用户组下的仪表盘ID列表

src/backend/bisheng/common/init_data.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from bisheng.database.models.role import Role
1717
from bisheng.database.models.role_access import RoleAccess, AccessType, WebMenuResource
1818
from bisheng.database.models.template import Template
19+
from bisheng.telemetry_search.domain.init_dataset import init_dashboard_datasets
1920
from bisheng.tool.domain.models.gpts_tools import GptsTools
2021
from bisheng.tool.domain.models.gpts_tools import GptsToolsType
2122
from bisheng.user.domain.models.user import User
@@ -132,13 +133,9 @@ async def init_default_data():
132133

133134
# 初始化数据库config
134135
await settings.init_config()
135-
try:
136-
from bisheng.telemetry_search.domain.init_dataset import init_dashboard_datasets
137136

138-
# init dashboard data
139-
await init_dashboard_datasets()
140-
except Exception as e:
141-
logger.error(f"dashboard data init error: {e}")
137+
# init dashboard data
138+
await init_dashboard_datasets()
142139
except Exception as exc:
143140
# if the exception involves tables already existing
144141
# we can ignore it

src/backend/bisheng/common/services/config_service.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,7 @@ def get_system_login_method(self) -> SystemLoginMethod:
198198
# 获取密码相关的配置项
199199
all_config = self.get_all_config()
200200
tmp = SystemLoginMethod(**all_config.get('system_login_method', {}))
201-
try:
202-
from bisheng.telemetry_search.domain.utils import is_commercial
203-
tmp.bisheng_pro = is_commercial()
204-
except Exception as e:
205-
logger.error("import dashboard error")
206-
tmp.bisheng_pro = False
201+
tmp.bisheng_pro = os.getenv('BISHENG_PRO') == 'true'
207202
return tmp
208203

209204
def get_workflow_conf(self) -> WorkflowConf:

0 commit comments

Comments
 (0)