Skip to content

Commit ed50e06

Browse files
committed
feat: init dashboard data
1 parent 4654a3b commit ed50e06

3 files changed

Lines changed: 15 additions & 32 deletions

File tree

src/backend/bisheng/common/init_data.py

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
from typing import List
55

66
from loguru import logger
7-
from sqlmodel import select, update, text
7+
from sqlmodel import select, update
88

99
from bisheng.common.services.config_service import settings
1010
from bisheng.core.cache.redis_manager import get_redis_client
1111
from bisheng.core.database import get_async_db_session, get_database_connection
1212
from bisheng.core.storage.minio.minio_manager import get_minio_storage_sync
1313
from bisheng.database.constants import AdminRole, DefaultRole
1414
from bisheng.database.models.component import Component
15-
from bisheng.database.models.flow_version import FlowVersion
1615
from bisheng.database.models.group import Group, DefaultGroup
1716
from bisheng.database.models.role import Role
1817
from bisheng.database.models.role_access import RoleAccess, AccessType, WebMenuResource
1918
from bisheng.database.models.template import Template
20-
from bisheng.finetune.domain.models.sft_model import SftModel
2119
from bisheng.tool.domain.models.gpts_tools import GptsTools
2220
from bisheng.tool.domain.models.gpts_tools import GptsToolsType
2321
from bisheng.user.domain.models.user import User
@@ -131,36 +129,16 @@ async def init_default_data():
131129
await session.exec(
132130
update(GptsTools).where(GptsTools.id.in_(jr_types)).values(type=8))
133131
await session.commit()
134-
# 初始化配置可用于微调的基准模型
135-
preset_models = await session.exec(select(SftModel).limit(1))
136-
preset_models = preset_models.all()
137-
if not preset_models:
138-
preset_models = []
139-
json_items = json.loads(read_from_conf('../database/data/sft_model.json'))
140-
for item in json_items:
141-
preset_model = SftModel(**item)
142-
preset_models.append(preset_model)
143-
session.add_all(preset_models)
144-
await session.commit()
145132

146-
# 初始化补充默认的技能版本表
147-
flow_version = await session.exec(select(FlowVersion).limit(1))
148-
flow_version = flow_version.all()
149-
if not flow_version:
150-
sql_query = text(
151-
"INSERT INTO `flowversion` (`name`, `flow_id`, `data`, `user_id`, `is_current`, `is_delete`) \
152-
select 'v0', `id` as flow_id, `data`, `user_id`, 1, 0 from `flow`;")
153-
await session.execute(sql_query)
154-
await session.commit()
155-
# 修改表单数据表
156-
sql_query = text(
157-
'UPDATE `t_variable_value` a SET a.version_id=(SELECT `id` from `flowversion` '
158-
'WHERE flow_id=a.flow_id and is_current=1)'
159-
)
160-
await session.execute(sql_query)
161-
await session.commit()
162133
# 初始化数据库config
163134
await settings.init_config()
135+
try:
136+
from bisheng.telemetry_search.domain.init_dataset import init_dashboard_datasets
137+
138+
# init dashboard data
139+
await init_dashboard_datasets()
140+
except Exception as e:
141+
logger.error(f"dashboard data init error: {e}")
164142
except Exception as exc:
165143
# if the exception involves tables already existing
166144
# we can ignore it

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ 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-
tmp.bisheng_pro = os.getenv('BISHENG_PRO') == 'true'
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
202207
return tmp
203208

204209
def get_workflow_conf(self) -> WorkflowConf:

src/backend/bisheng/core/config/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class PasswordConf(BaseModel):
5757

5858
class SystemLoginMethod(BaseModel):
5959
""" System Login Method Config """
60-
bisheng_pro: bool = Field(default=False, description='是否是商业版, 从环境变量获取')
60+
bisheng_pro: bool = Field(default=False, description='是否是商业版, 校验配置的license')
6161
admin_username: Optional[str] = Field(default=None, description='通过网关注册的系统管理员用户名')
6262
allow_multi_login: bool = Field(default=True, description='是否允许多点登录')
6363

0 commit comments

Comments
 (0)