refactor(api): move model_runtime into dify_graph (#32858)

This commit is contained in:
-LAN-
2026-03-02 20:15:32 +08:00
committed by GitHub
parent e985e73bdc
commit 4fd6b52808
253 changed files with 557 additions and 589 deletions

View File

@ -52,14 +52,14 @@ import pytest
from sqlalchemy.exc import IntegrityError
from core.entities.embedding_type import EmbeddingInputType
from core.model_runtime.entities.model_entities import ModelPropertyKey
from core.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
from core.model_runtime.errors.invoke import (
from core.rag.embedding.cached_embedding import CacheEmbedding
from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
from dify_graph.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
from dify_graph.model_runtime.errors.invoke import (
InvokeAuthorizationError,
InvokeConnectionError,
InvokeRateLimitError,
)
from core.rag.embedding.cached_embedding import CacheEmbedding
from models.dataset import Embedding

View File

@ -61,9 +61,9 @@ from core.indexing_runner import (
DocumentIsPausedError,
IndexingRunner,
)
from core.model_runtime.entities.model_entities import ModelType
from core.rag.index_processor.constant.index_type import IndexStructureType
from core.rag.models.document import ChildDocument, Document
from dify_graph.model_runtime.entities.model_entities import ModelType
from libs.datetime_utils import naive_utc_now
from models.dataset import Dataset, DatasetProcessRule
from models.dataset import Document as DatasetDocument

View File

@ -17,13 +17,13 @@ from unittest.mock import MagicMock, Mock, patch
import pytest
from core.model_manager import ModelInstance
from core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
from core.rag.models.document import Document
from core.rag.rerank.entity.weight import KeywordSetting, VectorSetting, Weights
from core.rag.rerank.rerank_factory import RerankRunnerFactory
from core.rag.rerank.rerank_model import RerankModelRunner
from core.rag.rerank.rerank_type import RerankMode
from core.rag.rerank.weight_rerank import WeightRerankRunner
from dify_graph.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
def create_mock_model_instance():