fix(model): make sure AppModelConfig.model_dict returns a dict. (#10972)

This commit is contained in:
-LAN- 2024-11-22 15:48:50 +08:00 committed by GitHub
parent 8a83edc1b5
commit 535c72cad7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -255,7 +255,7 @@ class AppModelConfig(db.Model):
@property @property
def model_dict(self) -> dict: def model_dict(self) -> dict:
return json.loads(self.model) if self.model else None return json.loads(self.model) if self.model else {}
@property @property
def suggested_questions_list(self) -> list: def suggested_questions_list(self) -> list:
@ -600,8 +600,8 @@ class Conversation(db.Model):
app_model_config = ( app_model_config = (
db.session.query(AppModelConfig).filter(AppModelConfig.id == self.app_model_config_id).first() db.session.query(AppModelConfig).filter(AppModelConfig.id == self.app_model_config_id).first()
) )
if app_model_config:
model_config = app_model_config.to_dict() model_config = app_model_config.to_dict()
model_config["model_id"] = self.model_id model_config["model_id"] = self.model_id
model_config["provider"] = self.model_provider model_config["provider"] = self.model_provider