mirror of
https://github.com/langgenius/dify.git
synced 2026-05-05 18:08:07 +08:00
refactor(api): rename dify_graph to graphon (#34095)
This commit is contained in:
@ -841,7 +841,7 @@ class TestAgentService:
|
||||
app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
|
||||
conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
|
||||
|
||||
from dify_graph.file import FileTransferMethod, FileType
|
||||
from graphon.file import FileTransferMethod, FileType
|
||||
from models.enums import CreatorUserRole
|
||||
|
||||
# Add files to message
|
||||
|
||||
@ -5,8 +5,8 @@ from uuid import uuid4
|
||||
import pytest
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from dify_graph.variables import StringVariable
|
||||
from extensions.ext_database import db
|
||||
from graphon.variables import StringVariable
|
||||
from models.workflow import ConversationVariable
|
||||
from services.conversation_variable_updater import ConversationVariableNotFoundError, ConversationVariableUpdater
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
|
||||
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelType
|
||||
from graphon.model_runtime.entities.model_entities import ModelType
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.dataset import Dataset, DatasetPermissionEnum, Document, ExternalKnowledgeBindings, Pipeline
|
||||
from models.enums import DatasetRuntimeMode, DataSourceType, DocumentCreatedFrom, IndexingStatus
|
||||
|
||||
@ -5,7 +5,7 @@ import pytest
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from core.rag.index_processor.constant.index_type import IndexTechniqueType
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelType
|
||||
from graphon.model_runtime.entities.model_entities import ModelType
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.dataset import Dataset, ExternalKnowledgeBindings
|
||||
from models.enums import DataSourceType
|
||||
|
||||
@ -7,7 +7,7 @@ from uuid import uuid4
|
||||
|
||||
from sqlalchemy import select
|
||||
|
||||
from dify_graph.enums import WorkflowExecutionStatus
|
||||
from graphon.enums import WorkflowExecutionStatus
|
||||
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
|
||||
from models.workflow import WorkflowArchiveLog, WorkflowRun
|
||||
from services.retention.workflow_run.delete_archived_workflow_run import ArchivedWorkflowRunDeletion
|
||||
|
||||
@ -10,8 +10,8 @@ from core.workflow.human_input_compat import (
|
||||
EmailRecipients,
|
||||
ExternalRecipient,
|
||||
)
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from dify_graph.nodes.human_input.entities import HumanInputNodeData
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
from graphon.nodes.human_input.entities import HumanInputNodeData
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.model import App, AppMode
|
||||
from models.workflow import Workflow, WorkflowType
|
||||
|
||||
@ -8,9 +8,9 @@ import pytest
|
||||
from faker import Faker
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from dify_graph.file.enums import FileType
|
||||
from enums.cloud_plan import CloudPlan
|
||||
from extensions.ext_redis import redis_client
|
||||
from graphon.file.enums import FileType
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.enums import (
|
||||
ConversationFromSource,
|
||||
|
||||
@ -5,7 +5,7 @@ from faker import Faker
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from core.entities.model_entities import ModelStatus
|
||||
from dify_graph.model_runtime.entities.model_entities import FetchFrom, ModelType
|
||||
from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
|
||||
from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.provider import Provider, ProviderModel, ProviderModelSetting, ProviderType
|
||||
from services.model_provider_service import ModelProviderService
|
||||
@ -406,8 +406,8 @@ class TestModelProviderService:
|
||||
|
||||
# Create mock models
|
||||
from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
|
||||
from dify_graph.model_runtime.entities.common_entities import I18nObject
|
||||
from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
|
||||
from graphon.model_runtime.entities.common_entities import I18nObject
|
||||
from graphon.model_runtime.entities.provider_entities import ProviderEntity
|
||||
|
||||
# Create real model objects instead of mocks
|
||||
provider_entity_1 = SimpleModelProviderEntity(
|
||||
@ -644,7 +644,7 @@ class TestModelProviderService:
|
||||
|
||||
# Create mock default model response
|
||||
from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
|
||||
from dify_graph.model_runtime.entities.common_entities import I18nObject
|
||||
from graphon.model_runtime.entities.common_entities import I18nObject
|
||||
|
||||
mock_default_model = DefaultModelEntity(
|
||||
model="gpt-3.5-turbo",
|
||||
|
||||
@ -10,7 +10,7 @@ import pytest
|
||||
from faker import Faker
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from dify_graph.entities.workflow_execution import WorkflowExecutionStatus
|
||||
from graphon.entities.workflow_execution import WorkflowExecutionStatus
|
||||
from models import EndUser, Workflow, WorkflowAppLog, WorkflowArchiveLog, WorkflowRun
|
||||
from models.enums import AppTriggerType, CreatorUserRole, WorkflowRunTriggeredFrom
|
||||
from models.workflow import WorkflowAppLogCreatedFrom
|
||||
|
||||
@ -3,7 +3,7 @@ from faker import Faker
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
|
||||
from dify_graph.variables.segments import StringSegment
|
||||
from graphon.variables.segments import StringSegment
|
||||
from models import App, Workflow
|
||||
from models.enums import DraftVariableType
|
||||
from models.workflow import WorkflowDraftVariable
|
||||
@ -482,7 +482,7 @@ class TestWorkflowDraftVariableService:
|
||||
fake = Faker()
|
||||
app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
|
||||
workflow = self._create_test_workflow(db_session_with_containers, app, fake=fake)
|
||||
from dify_graph.variables.variables import StringVariable
|
||||
from graphon.variables.variables import StringVariable
|
||||
|
||||
conv_var = StringVariable(
|
||||
id=fake.uuid4(),
|
||||
@ -734,7 +734,7 @@ class TestWorkflowDraftVariableService:
|
||||
fake = Faker()
|
||||
app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
|
||||
workflow = self._create_test_workflow(db_session_with_containers, app, fake=fake)
|
||||
from dify_graph.variables.variables import StringVariable
|
||||
from graphon.variables.variables import StringVariable
|
||||
|
||||
conv_var1 = StringVariable(
|
||||
id=fake.uuid4(),
|
||||
|
||||
@ -1503,10 +1503,10 @@ class TestWorkflowService:
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from dify_graph.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from dify_graph.graph_events import NodeRunSucceededEvent
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.nodes.base.node import Node
|
||||
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from graphon.graph_events import NodeRunSucceededEvent
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.nodes.base.node import Node
|
||||
|
||||
# Create mock node
|
||||
mock_node = MagicMock(spec=Node)
|
||||
@ -1548,12 +1548,12 @@ class TestWorkflowService:
|
||||
# Assert
|
||||
assert result is not None
|
||||
assert result.node_id == node_id
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
|
||||
assert result.node_type == BuiltinNodeTypes.START # Should match the mock node type
|
||||
assert result.title == "Test Node"
|
||||
# Import the enum for comparison
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
|
||||
assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
|
||||
assert result.inputs is not None
|
||||
@ -1578,10 +1578,10 @@ class TestWorkflowService:
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from dify_graph.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from dify_graph.graph_events import NodeRunFailedEvent
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.nodes.base.node import Node
|
||||
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from graphon.graph_events import NodeRunFailedEvent
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.nodes.base.node import Node
|
||||
|
||||
# Create mock node
|
||||
mock_node = MagicMock(spec=Node)
|
||||
@ -1623,7 +1623,7 @@ class TestWorkflowService:
|
||||
assert result is not None
|
||||
assert result.node_id == node_id
|
||||
# Import the enum for comparison
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
|
||||
assert result.status == WorkflowNodeExecutionStatus.FAILED
|
||||
assert result.error is not None
|
||||
@ -1647,10 +1647,10 @@ class TestWorkflowService:
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from dify_graph.enums import BuiltinNodeTypes, ErrorStrategy, WorkflowNodeExecutionStatus
|
||||
from dify_graph.graph_events import NodeRunFailedEvent
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.nodes.base.node import Node
|
||||
from graphon.enums import BuiltinNodeTypes, ErrorStrategy, WorkflowNodeExecutionStatus
|
||||
from graphon.graph_events import NodeRunFailedEvent
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.nodes.base.node import Node
|
||||
|
||||
# Create mock node with continue_on_error
|
||||
mock_node = MagicMock(spec=Node)
|
||||
@ -1693,7 +1693,7 @@ class TestWorkflowService:
|
||||
assert result is not None
|
||||
assert result.node_id == node_id
|
||||
# Import the enum for comparison
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
|
||||
assert result.status == WorkflowNodeExecutionStatus.EXCEPTION # Should be EXCEPTION, not FAILED
|
||||
assert result.outputs is not None
|
||||
|
||||
@ -18,9 +18,9 @@ from core.app.app_config.entities import (
|
||||
PromptTemplateEntity,
|
||||
)
|
||||
from core.prompt.utils.prompt_template_parser import PromptTemplateParser
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMMode
|
||||
from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
|
||||
from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
|
||||
from graphon.model_runtime.entities.llm_entities import LLMMode
|
||||
from graphon.model_runtime.entities.message_entities import PromptMessageRole
|
||||
from graphon.variables.input_entities import VariableEntity, VariableEntityType
|
||||
from models import Account, Tenant
|
||||
from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
|
||||
from models.model import App, AppMode, AppModelConfig
|
||||
|
||||
@ -4,7 +4,7 @@ from uuid import uuid4
|
||||
from sqlalchemy import Engine, select
|
||||
from sqlalchemy.orm import Session, sessionmaker
|
||||
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
from libs.datetime_utils import naive_utc_now
|
||||
from models.enums import CreatorUserRole
|
||||
from models.workflow import WorkflowNodeExecutionModel
|
||||
|
||||
Reference in New Issue
Block a user