mirror of
https://github.com/langgenius/dify.git
synced 2026-05-04 17:38:04 +08:00
refactor(api): move model_runtime into dify_graph (#32858)
This commit is contained in:
@ -10,8 +10,8 @@ from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
|
||||
from core.model_runtime.entities.model_entities import ModelType
|
||||
from core.rag.retrieval.retrieval_methods import RetrievalMethod
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelType
|
||||
from extensions.ext_database import db
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.dataset import Dataset, DatasetPermissionEnum, Document, ExternalKnowledgeBindings
|
||||
|
||||
@ -3,7 +3,7 @@ from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
|
||||
from core.model_runtime.entities.model_entities import ModelType
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelType
|
||||
from extensions.ext_database import db
|
||||
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
|
||||
from models.dataset import Dataset, ExternalKnowledgeBindings
|
||||
|
||||
@ -4,7 +4,7 @@ import pytest
|
||||
from faker import Faker
|
||||
|
||||
from core.entities.model_entities import ModelStatus
|
||||
from core.model_runtime.entities.model_entities import FetchFrom, ModelType
|
||||
from dify_graph.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
|
||||
@ -407,8 +407,8 @@ class TestModelProviderService:
|
||||
|
||||
# Create mock models
|
||||
from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
|
||||
from core.model_runtime.entities.common_entities import I18nObject
|
||||
from core.model_runtime.entities.provider_entities import ProviderEntity
|
||||
from dify_graph.model_runtime.entities.common_entities import I18nObject
|
||||
from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
|
||||
|
||||
# Create real model objects instead of mocks
|
||||
provider_entity_1 = SimpleModelProviderEntity(
|
||||
@ -643,7 +643,7 @@ class TestModelProviderService:
|
||||
|
||||
# Create mock default model response
|
||||
from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
|
||||
from core.model_runtime.entities.common_entities import I18nObject
|
||||
from dify_graph.model_runtime.entities.common_entities import I18nObject
|
||||
|
||||
mock_default_model = DefaultModelEntity(
|
||||
model="gpt-3.5-turbo",
|
||||
|
||||
@ -11,8 +11,8 @@ from core.app.app_config.entities import (
|
||||
ModelConfigEntity,
|
||||
PromptTemplateEntity,
|
||||
)
|
||||
from core.model_runtime.entities.llm_entities import LLMMode
|
||||
from core.prompt.utils.prompt_template_parser import PromptTemplateParser
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMMode
|
||||
from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
|
||||
from models import Account, Tenant
|
||||
from models.api_based_extension import APIBasedExtension
|
||||
|
||||
Reference in New Issue
Block a user