Skip to content

fix: correct workspace ID handling in prompt generation logic #7271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Oct 10, 2026
Merged

fix: correct workspace ID handling in prompt generation logic #7271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/models_provider/serializers/prompt_generate_serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,16 @@ def is_valid(self, *, raise_exception=False):
if model.model_type not in (ModelTypeConst.LLM.name, ModelTypeConst.IMAGE.name):
raise AppApiException(400, _("Model does not exists or is not an LLM model"))
# 共享/系统级模型:workspace_id 为字符串 "None",不校验传入的工作空间;否则必须属于传入的工作空间
if model.workspace_id != "None" and self.data.get("workspace_id") != model.workspace_id:
if (
model.workspace_id != "None"
and self.data.get("workspace_id")
and self.data.get("workspace_id") != model.workspace_id
):
raise AppApiException(403, _("Model is not visible to the workspace"))
return model

def generate_prompt(self):
model = self.is_valid(raise_exception=True)
workspace_id = self.data.get("workspace_id")
model_id = self.data.get("model_id")
model_params_setting = self.data.get("model_params_setting") or {}
prompt = self.data.get("prompt")
Expand All @@ -84,7 +87,7 @@ def process():
model_instance = ModelManage.get_model(model_id, lambda _id: get_model(model, **model_params))
else:
model_instance = get_model_instance_by_model_workspace_id(
model_id=model_id, workspace_id=workspace_id, **model_params_setting
model_id=model_id, workspace_id=model.workspace_id, **model_params_setting
)
try:
for r in model_instance.stream(
Expand Down
Loading