diff --git a/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql b/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql index ed9b82575..4fc6c963a 100644 --- a/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql +++ b/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql @@ -34,7 +34,7 @@ ALTER TABLE gpts_messages ADD COLUMN `resource_info` text DEFAULT NULL COMMENT --prompt_manage ALTER TABLE prompt_manage ADD COLUMN `prompt_code` varchar(255) NULL COMMENT 'Prompt code'; ALTER TABLE prompt_manage ADD COLUMN `response_schema` text NULL COMMENT 'Prompt response schema'; -ALTER TABLE prompt_manage ADD COLUMN `user_id` varchar(128) NULL COMMENT 'User id'; +ALTER TABLE prompt_manage ADD COLUMN `user_code` varchar(128) NULL COMMENT 'User code'; -- dbgpt.recommend_question definition CREATE TABLE `recommend_question` ( diff --git a/assets/schema/upgrade/v0_6_0/v0.6.0.sql b/assets/schema/upgrade/v0_6_0/v0.6.0.sql index daa3e47d8..3b15a46f2 100644 --- a/assets/schema/upgrade/v0_6_0/v0.6.0.sql +++ b/assets/schema/upgrade/v0_6_0/v0.6.0.sql @@ -186,7 +186,7 @@ CREATE TABLE IF NOT EXISTS `prompt_manage` `prompt_language` varchar(32) DEFAULT NULL COMMENT 'Prompt language(eg:en, zh-cn)', `prompt_format` varchar(32) DEFAULT 'f-string' COMMENT 'Prompt format(eg: f-string, jinja2)', `prompt_desc` varchar(512) DEFAULT NULL COMMENT 'Prompt description', - `user_id` varchar(128) DEFAULT NULL COMMENT 'User id', + `user_code` varchar(128) DEFAULT NULL COMMENT 'User code', `user_name` varchar(128) DEFAULT NULL COMMENT 'User name', `sys_code` varchar(128) DEFAULT NULL COMMENT 'System code', `gmt_created` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'created time', diff --git a/dbgpt/app/openapi/api_view_model.py b/dbgpt/app/openapi/api_view_model.py index ec8f62ba2..d7564f128 100644 --- a/dbgpt/app/openapi/api_view_model.py +++ b/dbgpt/app/openapi/api_view_model.py @@ -68,7 +68,7 @@ class ConversationVo(BaseModel): """ chat scene select param """ - select_param: Optional[str] = Field(None, description="chat scene select param") + select_param: Optional[Any] = Field(None, description="chat scene select param") """ llm model name """ diff --git a/dbgpt/serve/prompt/api/schemas.py b/dbgpt/serve/prompt/api/schemas.py index 270ebd9cb..ded9ecd6d 100644 --- a/dbgpt/serve/prompt/api/schemas.py +++ b/dbgpt/serve/prompt/api/schemas.py @@ -84,7 +84,7 @@ class ServeRequest(BaseModel): description="The prompt language.", examples=["en", "zh"], ) - user_id: Optional[str] = Field( + user_code: Optional[str] = Field( None, description="The user id.", examples=[""], diff --git a/dbgpt/serve/prompt/models/models.py b/dbgpt/serve/prompt/models/models.py index 52b47eee6..1ae7264f0 100644 --- a/dbgpt/serve/prompt/models/models.py +++ b/dbgpt/serve/prompt/models/models.py @@ -52,7 +52,7 @@ class ServeEntity(Model): comment="Prompt format(eg: f-string, jinja2)", ) prompt_desc = Column(String(512), nullable=True, comment="Prompt description") - user_id = Column(String(128), index=True, nullable=True, comment="User id") + user_code = Column(String(128), index=True, nullable=True, comment="User code") user_name = Column(String(128), index=True, nullable=True, comment="User name") sys_code = Column(String(128), index=True, nullable=True, comment="System code") gmt_created = Column(DateTime, default=datetime.now, comment="Record creation time") @@ -62,7 +62,7 @@ class ServeEntity(Model): return ( f"ServeEntity(id={self.id}, chat_scene='{self.chat_scene}', sub_chat_scene='{self.sub_chat_scene}', " f"prompt_type='{self.prompt_type}', prompt_name='{self.prompt_name}', content='{self.content}'," - f"user_id='{self.user_id}', user_name='{self.user_name}', gmt_created='{self.gmt_created}', gmt_modified='{self.gmt_modified}')" + f"user_code='{self.user_code}', user_name='{self.user_name}', gmt_created='{self.gmt_created}', gmt_modified='{self.gmt_modified}')" ) @@ -105,7 +105,7 @@ class ServeDao(BaseDao[ServeEntity, ServeRequest, ServerResponse]): promt_code=entity.prompt_code, content=entity.content, prompt_desc=entity.prompt_desc, - user_id=entity.user_id, + user_code=entity.user_code, user_name=entity.user_name, sys_code=entity.sys_code, ) @@ -132,7 +132,7 @@ class ServeDao(BaseDao[ServeEntity, ServeRequest, ServerResponse]): content=entity.content, prompt_desc=entity.prompt_desc, user_name=entity.user_name, - user_id=entity.user_id, + user_code=entity.user_code, model=entity.model, input_variables=entity.input_variables, prompt_language=entity.prompt_language,