opensource/dify
3
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-24 23:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup duplicate code (#36173)

Browse Source
This commit is contained in:
chariri
2026-05-14 10:34:31 +00:00
committed by GitHub
parent 1a4288c811
commit a35b28dbef
33 changed files with 163 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
+9 -6
View File
@@ -35,9 +35,9 @@ from services.app_dsl_service import (
ImportMode,
ImportStatus,
PendingData,
_check_version_compatibility,
)
from services.app_service import AppService, CreateAppParams
from services.dsl_version import check_version_compatibility
from tests.test_containers_integration_tests.helpers import generate_valid_password
_DEFAULT_TENANT_ID = "00000000-0000-0000-0000-000000000001"
@@ -193,22 +193,25 @@ class TestAppDslService:
# ── Version Compatibility ─────────────────────────────────────────
def test_check_version_compatibility_invalid_version_returns_failed(self):
assert _check_version_compatibility("not-a-version") == ImportStatus.FAILED
assert check_version_compatibility("not-a-version", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.FAILED
def test_check_version_compatibility_newer_version_returns_pending(self):
assert _check_version_compatibility("99.0.0") == ImportStatus.PENDING
assert check_version_compatibility("99.0.0", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.PENDING
def test_check_version_compatibility_major_older_returns_pending(self, monkeypatch: pytest.MonkeyPatch):
monkeypatch.setattr(app_dsl_service, "CURRENT_DSL_VERSION", "1.0.0")
assert _check_version_compatibility("0.9.9") == ImportStatus.PENDING
assert check_version_compatibility("0.9.9", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.PENDING
def test_check_version_compatibility_minor_older_returns_completed_with_warnings(
self,
):
assert _check_version_compatibility("0.5.0") == ImportStatus.COMPLETED_WITH_WARNINGS
assert (
check_version_compatibility("0.5.0", app_dsl_service.CURRENT_DSL_VERSION)
== ImportStatus.COMPLETED_WITH_WARNINGS
)
def test_check_version_compatibility_equal_returns_completed(self):
assert _check_version_compatibility(CURRENT_DSL_VERSION) == ImportStatus.COMPLETED
assert check_version_compatibility(CURRENT_DSL_VERSION, CURRENT_DSL_VERSION) == ImportStatus.COMPLETED
# ── Import: Validation ────────────────────────────────────────────
api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
+6 -3
View File
@@ -8,11 +8,12 @@ from sqlalchemy.orm import Session
from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
from graphon.enums import BuiltinNodeTypes
from services.dsl_version import check_version_compatibility
from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
from services.rag_pipeline import rag_pipeline_dsl_service
from services.rag_pipeline.rag_pipeline_dsl_service import (
ImportStatus,
RagPipelineDslService,
_check_version_compatibility,
)
@@ -26,7 +27,9 @@ from services.rag_pipeline.rag_pipeline_dsl_service import (
],
)
def test_check_version_compatibility(imported_version: str, expected_status: ImportStatus) -> None:
assert _check_version_compatibility(imported_version) == expected_status
assert (
check_version_compatibility(imported_version, rag_pipeline_dsl_service.CURRENT_DSL_VERSION) == expected_status
)
def test_encrypt_decrypt_dataset_id_roundtrip() -> None:
@@ -1101,7 +1104,7 @@ def test_extract_dependencies_from_model_config_includes_dataset_reranking_and_t
def test_check_version_compatibility_hits_major_older_branch(mocker) -> None:
mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.CURRENT_DSL_VERSION", "1.0.0")
status = _check_version_compatibility("0.9.0")
status = check_version_compatibility("0.9.0", rag_pipeline_dsl_service.CURRENT_DSL_VERSION)
assert status == ImportStatus.PENDING