feat/enhance the multi-modal support (#8818)

api/models/tools.py

@@ -1,6 +1,8 @@
 import json
+from typing import Optional
 
 from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column
 
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_bundle import ApiToolBundle
@@ -101,7 +103,7 @@ class ApiToolProvider(db.Model):
     icon = db.Column(db.String(255), nullable=False)
     # original schema
     schema = db.Column(db.Text, nullable=False)
-    schema_type_str = db.Column(db.String(40), nullable=False)
+    schema_type_str: Mapped[str] = db.Column(db.String(40), nullable=False)
     # who created this tool
     user_id = db.Column(StringUUID, nullable=False)
     # tenant id
@@ -133,11 +135,11 @@ class ApiToolProvider(db.Model):
         return json.loads(self.credentials_str)
 
     @property
-    def user(self) -> Account:
+    def user(self) -> Account | None:
         return db.session.query(Account).filter(Account.id == self.user_id).first()
 
     @property
-    def tenant(self) -> Tenant:
+    def tenant(self) -> Tenant | None:
         return db.session.query(Tenant).filter(Tenant.id == self.tenant_id).first()
 
 
@@ -203,11 +205,11 @@ class WorkflowToolProvider(db.Model):
         return ApiProviderSchemaType.value_of(self.schema_type_str)
 
     @property
-    def user(self) -> Account:
+    def user(self) -> Account | None:
         return db.session.query(Account).filter(Account.id == self.user_id).first()
 
     @property
-    def tenant(self) -> Tenant:
+    def tenant(self) -> Tenant | None:
         return db.session.query(Tenant).filter(Tenant.id == self.tenant_id).first()
 
     @property
@@ -215,7 +217,7 @@ class WorkflowToolProvider(db.Model):
         return [WorkflowToolParameterConfiguration(**config) for config in json.loads(self.parameter_configuration)]
 
     @property
-    def app(self) -> App:
+    def app(self) -> App | None:
         return db.session.query(App).filter(App.id == self.app_id).first()
 
 
@@ -288,27 +290,39 @@ class ToolConversationVariables(db.Model):
 
 
 class ToolFile(db.Model):
-    """
-    store the file created by agent
-    """
-
     __tablename__ = "tool_files"
     __table_args__ = (
         db.PrimaryKeyConstraint("id", name="tool_file_pkey"),
-        # add index for conversation_id
         db.Index("tool_file_conversation_id_idx", "conversation_id"),
     )
 
     id = db.Column(StringUUID, server_default=db.text("uuid_generate_v4()"))
-    # conversation user id
-    user_id = db.Column(StringUUID, nullable=False)
-    # tenant id
-    tenant_id = db.Column(StringUUID, nullable=False)
-    # conversation id
-    conversation_id = db.Column(StringUUID, nullable=True)
-    # file key
-    file_key = db.Column(db.String(255), nullable=False)
-    # mime type
-    mimetype = db.Column(db.String(255), nullable=False)
-    # original url
-    original_url = db.Column(db.String(2048), nullable=True)
+    user_id: Mapped[str] = db.Column(StringUUID, nullable=False)
+    tenant_id: Mapped[str] = db.Column(StringUUID, nullable=False)
+    conversation_id: Mapped[Optional[str]] = db.Column(StringUUID, nullable=True)
+    file_key: Mapped[str] = db.Column(db.String(255), nullable=False)
+    mimetype: Mapped[str] = db.Column(db.String(255), nullable=False)
+    original_url: Mapped[Optional[str]] = db.Column(db.String(2048), nullable=True)
+    name: Mapped[str] = mapped_column(default="")
+    size: Mapped[int] = mapped_column(default=-1)
+
+    def __init__(
+        self,
+        *,
+        user_id: str,
+        tenant_id: str,
+        conversation_id: Optional[str] = None,
+        file_key: str,
+        mimetype: str,
+        original_url: Optional[str] = None,
+        name: str,
+        size: int,
+    ):
+        self.user_id = user_id
+        self.tenant_id = tenant_id
+        self.conversation_id = conversation_id
+        self.file_key = file_key
+        self.mimetype = mimetype
+        self.original_url = original_url
+        self.name = name
+        self.size = size