Merge branch 'main' into feat/external-knowledge-api

# Conflicts:
#	api/core/rag/retrieval/dataset_retrieval.py
This commit is contained in:
jyong
2024-09-24 18:03:14 +08:00
463 changed files with 16622 additions and 1442 deletions

View File

@ -710,6 +710,7 @@ class Message(db.Model):
answer_tokens = db.Column(db.Integer, nullable=False, server_default=db.text("0"))
answer_unit_price = db.Column(db.Numeric(10, 4), nullable=False)
answer_price_unit = db.Column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
parent_message_id = db.Column(StringUUID, nullable=True)
provider_response_latency = db.Column(db.Float, nullable=False, server_default=db.text("0"))
total_price = db.Column(db.Numeric(10, 7))
currency = db.Column(db.String(255), nullable=False)