chore(db): use a better way to export models and remove unused table (#11838)

Signed-off-by: -LAN- <laipz8200@outlook.com>
This commit is contained in:
-LAN-
2024-12-20 14:12:29 +08:00
committed by GitHub
parent 2d186e1e76
commit 3599751f93
19 changed files with 206 additions and 91 deletions

View File

@@ -8,8 +8,8 @@ from sqlalchemy.orm import Mapped, mapped_column
from core.tools.entities.common_entities import I18nObject
from core.tools.entities.tool_bundle import ApiToolBundle
from core.tools.entities.tool_entities import ApiProviderSchemaType, WorkflowToolParameterConfiguration
from extensions.ext_database import db
from .engine import db
from .model import Account, App, Tenant
from .types import StringUUID
@@ -82,7 +82,7 @@ class PublishedAppTool(db.Model):
return I18nObject(**json.loads(self.description))
@property
def app(self) -> App:
def app(self):
return db.session.query(App).filter(App.id == self.app_id).first()
@@ -201,10 +201,6 @@ class WorkflowToolProvider(db.Model):
created_at = db.Column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
@property
def schema_type(self) -> ApiProviderSchemaType:
return ApiProviderSchemaType.value_of(self.schema_type_str)
@property
def user(self) -> Account | None:
return db.session.query(Account).filter(Account.id == self.user_id).first()