From b5d472fad78a1c61deae9636ca879d359d22d012 Mon Sep 17 00:00:00 2001 From: -LAN- Date: Wed, 14 Aug 2024 14:09:26 +0800 Subject: [PATCH] test(*): Avoid import from `api` in tests. (#7251) --- api/libs/bearer_data_source.py | 2 +- .../model_runtime/__mock/huggingface_tei.py | 5 ++--- .../model_runtime/huggingface_tei/test_embeddings.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api/libs/bearer_data_source.py b/api/libs/bearer_data_source.py index 04de1fb6da..c1aee7b819 100644 --- a/api/libs/bearer_data_source.py +++ b/api/libs/bearer_data_source.py @@ -2,10 +2,10 @@ from abc import abstractmethod import requests -from api.models.source import DataSourceBearerBinding from flask_login import current_user from extensions.ext_database import db +from models.source import DataSourceBearerBinding class BearerDataSource: diff --git a/api/tests/integration_tests/model_runtime/__mock/huggingface_tei.py b/api/tests/integration_tests/model_runtime/__mock/huggingface_tei.py index 2f66d707ca..c2fe95974b 100644 --- a/api/tests/integration_tests/model_runtime/__mock/huggingface_tei.py +++ b/api/tests/integration_tests/model_runtime/__mock/huggingface_tei.py @@ -1,5 +1,4 @@ - -from api.core.model_runtime.model_providers.huggingface_tei.tei_helper import TeiModelExtraParameter +from core.model_runtime.model_providers.huggingface_tei.tei_helper import TeiModelExtraParameter class MockTEIClass: @@ -12,7 +11,7 @@ class MockTEIClass: model_type = 'embedding' return TeiModelExtraParameter(model_type=model_type, max_input_length=512, max_client_batch_size=1) - + @staticmethod def invoke_tokenize(server_url: str, texts: list[str]) -> list[list[dict]]: # Use space as token separator, and split the text into tokens diff --git a/api/tests/integration_tests/model_runtime/huggingface_tei/test_embeddings.py b/api/tests/integration_tests/model_runtime/huggingface_tei/test_embeddings.py index da65c7dfc7..ed371fbc07 100644 --- a/api/tests/integration_tests/model_runtime/huggingface_tei/test_embeddings.py +++ b/api/tests/integration_tests/model_runtime/huggingface_tei/test_embeddings.py @@ -1,12 +1,12 @@ import os import pytest -from api.core.model_runtime.model_providers.huggingface_tei.text_embedding.text_embedding import TeiHelper from core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult from core.model_runtime.errors.validate import CredentialsValidateFailedError from core.model_runtime.model_providers.huggingface_tei.text_embedding.text_embedding import ( HuggingfaceTeiTextEmbeddingModel, + TeiHelper, ) from tests.integration_tests.model_runtime.__mock.huggingface_tei import MockTEIClass