diff --git a/api/models/account.py b/api/models/account.py index ba01756021..c9861039ff 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -201,7 +201,7 @@ class Tenant(Base): id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()")) name: Mapped[str] = mapped_column(db.String(255)) - encrypt_public_key: Mapped[str] = mapped_column(db.Text) + encrypt_public_key: Mapped[Optional[str]] = mapped_column(db.Text) plan: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'basic'::character varying")) status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'normal'::character varying")) custom_config: Mapped[Optional[str]] = mapped_column(db.Text) diff --git a/api/models/dataset.py b/api/models/dataset.py index 04d753ad44..b986129d87 100644 --- a/api/models/dataset.py +++ b/api/models/dataset.py @@ -52,15 +52,15 @@ class Dataset(Base): description = mapped_column(db.Text, nullable=True) provider: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'vendor'::character varying")) permission: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'only_me'::character varying")) - data_source_type: Mapped[str] = mapped_column(db.String(255)) + data_source_type = mapped_column(db.String(255)) indexing_technique: Mapped[Optional[str]] = mapped_column(db.String(255)) index_struct = mapped_column(db.Text, nullable=True) created_by = mapped_column(StringUUID, nullable=False) created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp()) updated_by = mapped_column(StringUUID, nullable=True) updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp()) - embedding_model: Mapped[str] = mapped_column(db.String(255)) - embedding_model_provider: Mapped[str] = mapped_column(db.String(255)) + embedding_model: Mapped[Optional[str]] = mapped_column(db.String(255)) + embedding_model_provider: Mapped[Optional[str]] = mapped_column(db.String(255)) collection_binding_id = mapped_column(StringUUID, nullable=True) retrieval_model = mapped_column(JSONB, nullable=True) built_in_field_enabled = mapped_column(db.Boolean, nullable=False, server_default=db.text("false")) @@ -660,8 +660,8 @@ class DocumentSegment(Base): dataset_id = mapped_column(StringUUID, nullable=False) document_id = mapped_column(StringUUID, nullable=False) position: Mapped[int] - content: Mapped[str] - answer: Mapped[Optional[str]] + content = mapped_column(db.Text, nullable=False) + answer = mapped_column(db.Text, nullable=True) word_count: Mapped[int] tokens: Mapped[int] diff --git a/api/models/model.py b/api/models/model.py index 605fa61985..e496aa6a92 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -79,9 +79,9 @@ class App(Base): name: Mapped[str] = mapped_column(db.String(255)) description: Mapped[str] = mapped_column(db.Text, server_default=db.text("''::character varying")) mode: Mapped[str] = mapped_column(db.String(255)) - icon_type: Mapped[str] = mapped_column(db.String(255)) # image, emoji - icon: Mapped[str] = mapped_column(db.String(255)) - icon_background: Mapped[str] = mapped_column(db.String(255)) + icon_type: Mapped[Optional[str]] = mapped_column(db.String(255)) # image, emoji + icon: Mapped[Optional[str]] = mapped_column(db.String(255)) + icon_background: Mapped[Optional[str]] = mapped_column(db.String(255)) app_model_config_id = mapped_column(StringUUID, nullable=True) workflow_id = mapped_column(StringUUID, nullable=True) status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'normal'::character varying")) @@ -907,7 +907,7 @@ class Message(Base): message_tokens: Mapped[int] = mapped_column(db.Integer, nullable=False, server_default=db.text("0")) message_unit_price = mapped_column(db.Numeric(10, 4), nullable=False) message_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001")) - answer: Mapped[str] = mapped_column(db.Text, nullable=False) + answer = mapped_column(db.Text, nullable=False) answer_tokens: Mapped[int] = mapped_column(db.Integer, nullable=False, server_default=db.text("0")) answer_unit_price = mapped_column(db.Numeric(10, 4), nullable=False) answer_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001")) @@ -925,7 +925,7 @@ class Message(Base): created_at: Mapped[datetime] = mapped_column(db.DateTime, server_default=func.current_timestamp()) updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp()) agent_based = mapped_column(db.Boolean, nullable=False, server_default=db.text("false")) - workflow_run_id: Mapped[str] = mapped_column(StringUUID) + workflow_run_id: Mapped[Optional[str]] = mapped_column(StringUUID) @property def inputs(self): @@ -1326,8 +1326,8 @@ class MessageAnnotation(Base): app_id: Mapped[str] = mapped_column(StringUUID) conversation_id: Mapped[Optional[str]] = mapped_column(StringUUID, db.ForeignKey("conversations.id")) message_id: Mapped[Optional[str]] = mapped_column(StringUUID) - question: Mapped[str] = mapped_column(db.Text, nullable=False) - content: Mapped[str] = mapped_column(db.Text, nullable=False) + question: Mapped[Optional[str]] = mapped_column(db.Text) + content = mapped_column(db.Text, nullable=False) hit_count = mapped_column(db.Integer, nullable=False, server_default=db.text("0")) account_id = mapped_column(StringUUID, nullable=False) created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())