opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add cnt script and one more example (#28272) 

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
Asuka Minato 2025-11-18 16:44:14 +09:00 committed by GitHub
parent c4b02be6d3
commit 108bcbeb7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/autofix.yml vendored
View File

@ -28,6 +28,11 @@ jobs:
# Format code # Format code
uv run ruff format .. uv run ruff format ..
- name: count migration progress
run: |
cd api
./cnt_base.sh
- name: ast-grep - name: ast-grep
run: | run: |
uvx --from ast-grep-cli sg --pattern 'db.session.query($WHATEVER).filter($HERE)' --rewrite 'db.session.query($WHATEVER).where($HERE)' -l py --update-all uvx --from ast-grep-cli sg --pattern 'db.session.query($WHATEVER).filter($HERE)' --rewrite 'db.session.query($WHATEVER).where($HERE)' -l py --update-all

7
api/cnt_base.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -euxo pipefail
for pattern in "Base" "TypeBase"; do
printf "%s " "$pattern"
grep "($pattern):" -r --include='*.py' --exclude-dir=".venv" --exclude-dir="tests" . | wc -l
done

76
api/models/dataset.py
View File

@ -225,7 +225,7 @@ class Dataset(Base):
ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id ExternalKnowledgeApis.id == external_knowledge_binding.external_knowledge_api_id
) )
) )
if not external_knowledge_api: if external_knowledge_api is None or external_knowledge_api.settings is None:
return None return None
return { return {
"external_knowledge_id": external_knowledge_binding.external_knowledge_id, "external_knowledge_id": external_knowledge_binding.external_knowledge_id,
@ -945,18 +945,20 @@ class DatasetQuery(Base):
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=sa.func.current_timestamp()) created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=sa.func.current_timestamp())
class DatasetKeywordTable(Base): class DatasetKeywordTable(TypeBase):
__tablename__ = "dataset_keyword_tables" __tablename__ = "dataset_keyword_tables"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="dataset_keyword_table_pkey"), sa.PrimaryKeyConstraint("id", name="dataset_keyword_table_pkey"),
sa.Index("dataset_keyword_table_dataset_id_idx", "dataset_id"), sa.Index("dataset_keyword_table_dataset_id_idx", "dataset_id"),
) )
id = mapped_column(StringUUID, primary_key=True, server_default=sa.text("uuid_generate_v4()")) id: Mapped[str] = mapped_column(
dataset_id = mapped_column(StringUUID, nullable=False, unique=True) StringUUID, primary_key=True, server_default=sa.text("uuid_generate_v4()"), init=False
keyword_table = mapped_column(sa.Text, nullable=False) )
data_source_type = mapped_column( dataset_id: Mapped[str] = mapped_column(StringUUID, nullable=False, unique=True)
String(255), nullable=False, server_default=sa.text("'database'::character varying") keyword_table: Mapped[str] = mapped_column(sa.Text, nullable=False)
data_source_type: Mapped[str] = mapped_column(
String(255), nullable=False, server_default=sa.text("'database'::character varying"), default="database"
) )
@property @property
@ -1054,19 +1056,23 @@ class TidbAuthBinding(Base):
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp()) created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
class Whitelist(Base): class Whitelist(TypeBase):
__tablename__ = "whitelists" __tablename__ = "whitelists"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="whitelists_pkey"), sa.PrimaryKeyConstraint("id", name="whitelists_pkey"),
sa.Index("whitelists_tenant_idx", "tenant_id"), sa.Index("whitelists_tenant_idx", "tenant_id"),
) )
id = mapped_column(StringUUID, primary_key=True, server_default=sa.text("uuid_generate_v4()")) id: Mapped[str] = mapped_column(
tenant_id = mapped_column(StringUUID, nullable=True) StringUUID, primary_key=True, server_default=sa.text("uuid_generate_v4()"), init=False
)
tenant_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
category: Mapped[str] = mapped_column(String(255), nullable=False) category: Mapped[str] = mapped_column(String(255), nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp()) created_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=func.current_timestamp(), init=False
)
class DatasetPermission(Base): class DatasetPermission(TypeBase):
__tablename__ = "dataset_permissions" __tablename__ = "dataset_permissions"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="dataset_permission_pkey"), sa.PrimaryKeyConstraint("id", name="dataset_permission_pkey"),
@ -1075,15 +1081,21 @@ class DatasetPermission(Base):
sa.Index("idx_dataset_permissions_tenant_id", "tenant_id"), sa.Index("idx_dataset_permissions_tenant_id", "tenant_id"),
) )
id = mapped_column(StringUUID, server_default=sa.text("uuid_generate_v4()"), primary_key=True) id: Mapped[str] = mapped_column(
dataset_id = mapped_column(StringUUID, nullable=False) StringUUID, server_default=sa.text("uuid_generate_v4()"), primary_key=True, init=False
account_id = mapped_column(StringUUID, nullable=False) )
tenant_id = mapped_column(StringUUID, nullable=False) dataset_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
has_permission: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("true")) account_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp()) tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
has_permission: Mapped[bool] = mapped_column(
sa.Boolean, nullable=False, server_default=sa.text("true"), default=True
)
created_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=func.current_timestamp(), init=False
)
class ExternalKnowledgeApis(Base): class ExternalKnowledgeApis(TypeBase):
__tablename__ = "external_knowledge_apis" __tablename__ = "external_knowledge_apis"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="external_knowledge_apis_pkey"), sa.PrimaryKeyConstraint("id", name="external_knowledge_apis_pkey"),
@ -1091,16 +1103,20 @@ class ExternalKnowledgeApis(Base):
sa.Index("external_knowledge_apis_name_idx", "name"), sa.Index("external_knowledge_apis_name_idx", "name"),
) )
id = mapped_column(StringUUID, nullable=False, server_default=sa.text("uuid_generate_v4()")) id: Mapped[str] = mapped_column(
StringUUID, nullable=False, server_default=sa.text("uuid_generate_v4()"), init=False
)
name: Mapped[str] = mapped_column(String(255), nullable=False) name: Mapped[str] = mapped_column(String(255), nullable=False)
description: Mapped[str] = mapped_column(String(255), nullable=False) description: Mapped[str] = mapped_column(String(255), nullable=False)
tenant_id = mapped_column(StringUUID, nullable=False) tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
settings = mapped_column(sa.Text, nullable=True) settings: Mapped[str | None] = mapped_column(sa.Text, nullable=True)
created_by = mapped_column(StringUUID, nullable=False) created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp()) created_at: Mapped[datetime] = mapped_column(
updated_by = mapped_column(StringUUID, nullable=True) DateTime, nullable=False, server_default=func.current_timestamp(), init=False
)
updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
updated_at: Mapped[datetime] = mapped_column( updated_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp() DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp(), init=False
) )
def to_dict(self) -> dict[str, Any]: def to_dict(self) -> dict[str, Any]:
@ -1178,7 +1194,7 @@ class DatasetAutoDisableLog(Base):
) )
class RateLimitLog(Base): class RateLimitLog(TypeBase):
__tablename__ = "rate_limit_logs" __tablename__ = "rate_limit_logs"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="rate_limit_log_pkey"), sa.PrimaryKeyConstraint("id", name="rate_limit_log_pkey"),
@ -1186,12 +1202,12 @@ class RateLimitLog(Base):
sa.Index("rate_limit_log_operation_idx", "operation"), sa.Index("rate_limit_log_operation_idx", "operation"),
) )
id = mapped_column(StringUUID, server_default=sa.text("uuid_generate_v4()")) id: Mapped[str] = mapped_column(StringUUID, server_default=sa.text("uuid_generate_v4()"), init=False)
tenant_id = mapped_column(StringUUID, nullable=False) tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
subscription_plan: Mapped[str] = mapped_column(String(255), nullable=False) subscription_plan: Mapped[str] = mapped_column(String(255), nullable=False)
operation: Mapped[str] = mapped_column(String(255), nullable=False) operation: Mapped[str] = mapped_column(String(255), nullable=False)
created_at: Mapped[datetime] = mapped_column( created_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=sa.text("CURRENT_TIMESTAMP(0)") DateTime, nullable=False, server_default=sa.text("CURRENT_TIMESTAMP(0)"), init=False
) )

12
api/models/trigger.py
View File

@ -14,7 +14,7 @@ from core.trigger.entities.api_entities import TriggerProviderSubscriptionApiEnt
from core.trigger.entities.entities import Subscription from core.trigger.entities.entities import Subscription
from core.trigger.utils.endpoint import generate_plugin_trigger_endpoint_url, generate_webhook_trigger_endpoint from core.trigger.utils.endpoint import generate_plugin_trigger_endpoint_url, generate_webhook_trigger_endpoint
from libs.datetime_utils import naive_utc_now from libs.datetime_utils import naive_utc_now
from models.base import Base from models.base import Base, TypeBase
from models.engine import db from models.engine import db
from models.enums import AppTriggerStatus, AppTriggerType, CreatorUserRole, WorkflowTriggerStatus from models.enums import AppTriggerStatus, AppTriggerType, CreatorUserRole, WorkflowTriggerStatus
from models.model import Account from models.model import Account
@ -399,7 +399,7 @@ class AppTrigger(Base):
) )
class WorkflowSchedulePlan(Base): class WorkflowSchedulePlan(TypeBase):
""" """
Workflow Schedule Configuration Workflow Schedule Configuration
@ -425,7 +425,7 @@ class WorkflowSchedulePlan(Base):
sa.Index("workflow_schedule_plan_next_idx", "next_run_at"), sa.Index("workflow_schedule_plan_next_idx", "next_run_at"),
) )
id: Mapped[str] = mapped_column(StringUUID, server_default=sa.text("uuidv7()")) id: Mapped[str] = mapped_column(StringUUID, primary_key=True, server_default=sa.text("uuidv7()"), init=False)
app_id: Mapped[str] = mapped_column(StringUUID, nullable=False) app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
node_id: Mapped[str] = mapped_column(String(64), nullable=False) node_id: Mapped[str] = mapped_column(String(64), nullable=False)
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False) tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
@ -436,9 +436,11 @@ class WorkflowSchedulePlan(Base):
# Schedule control # Schedule control
next_run_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) next_run_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp()) created_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=func.current_timestamp(), init=False
)
updated_at: Mapped[datetime] = mapped_column( updated_at: Mapped[datetime] = mapped_column(
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp() DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp(), init=False
) )
def to_dict(self) -> dict[str, Any]: def to_dict(self) -> dict[str, Any]:

6
api/services/external_knowledge_service.py
View File

@ -62,7 +62,7 @@ class ExternalDatasetService:
tenant_id=tenant_id, tenant_id=tenant_id,
created_by=user_id, created_by=user_id,
updated_by=user_id, updated_by=user_id,
name=args.get("name"), name=str(args.get("name")),
description=args.get("description", ""), description=args.get("description", ""),
settings=json.dumps(args.get("settings"), ensure_ascii=False), settings=json.dumps(args.get("settings"), ensure_ascii=False),
) )
@ -163,7 +163,7 @@ class ExternalDatasetService:
external_knowledge_api = ( external_knowledge_api = (
db.session.query(ExternalKnowledgeApis).filter_by(id=external_knowledge_api_id, tenant_id=tenant_id).first() db.session.query(ExternalKnowledgeApis).filter_by(id=external_knowledge_api_id, tenant_id=tenant_id).first()
) )
if external_knowledge_api is None: if external_knowledge_api is None or external_knowledge_api.settings is None:
raise ValueError("api template not found") raise ValueError("api template not found")
settings = json.loads(external_knowledge_api.settings) settings = json.loads(external_knowledge_api.settings)
for setting in settings: for setting in settings:
@ -290,7 +290,7 @@ class ExternalDatasetService:
.filter_by(id=external_knowledge_binding.external_knowledge_api_id) .filter_by(id=external_knowledge_binding.external_knowledge_api_id)
.first() .first()
) )
if not external_knowledge_api: if external_knowledge_api is None or external_knowledge_api.settings is None:
raise ValueError("external api template not found") raise ValueError("external api template not found")
settings = json.loads(external_knowledge_api.settings) settings = json.loads(external_knowledge_api.settings)