refactor apps

This commit is contained in:
takatost
2024-03-02 02:40:18 +08:00
parent 5e38996222
commit 5c7ea08bdf
111 changed files with 1979 additions and 1819 deletions

View File

@ -2,8 +2,8 @@ from unittest.mock import MagicMock
import pytest
from core.entities.application_entities import PromptTemplateEntity, AdvancedCompletionPromptTemplateEntity, \
ModelConfigEntity, AdvancedChatPromptTemplateEntity, AdvancedChatMessageEntity
from core.app.app_config.entities import PromptTemplateEntity, AdvancedCompletionPromptTemplateEntity, \
ModelConfigEntity, AdvancedChatPromptTemplateEntity, AdvancedChatMessageEntity, FileUploadEntity
from core.file.file_obj import FileObj, FileType, FileTransferMethod
from core.memory.token_buffer_memory import TokenBufferMemory
from core.model_runtime.entities.message_entities import UserPromptMessage, AssistantPromptMessage, PromptMessageRole
@ -137,11 +137,11 @@ def test__get_chat_model_prompt_messages_with_files_no_memory(get_chat_model_arg
type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
url="https://example.com/image1.jpg",
file_config={
"image": {
file_upload_entity=FileUploadEntity(
image_config={
"detail": "high",
}
}
)
)
]

View File

@ -1,6 +1,6 @@
from unittest.mock import MagicMock
from core.entities.application_entities import ModelConfigEntity
from core.app.app_config.entities import ModelConfigEntity
from core.entities.provider_configuration import ProviderModelBundle
from core.model_runtime.entities.message_entities import UserPromptMessage
from core.model_runtime.entities.model_entities import ModelPropertyKey, AIModelEntity, ParameterRule

View File

@ -1,6 +1,6 @@
from unittest.mock import MagicMock
from core.entities.application_entities import ModelConfigEntity
from core.app.entities.app_invoke_entities import EasyUIBasedModelConfigEntity
from core.memory.token_buffer_memory import TokenBufferMemory
from core.model_runtime.entities.message_entities import UserPromptMessage, AssistantPromptMessage
from core.prompt.simple_prompt_transform import SimplePromptTransform
@ -139,7 +139,7 @@ def test_get_common_chat_app_prompt_template_with_p():
def test__get_chat_model_prompt_messages():
model_config_mock = MagicMock(spec=ModelConfigEntity)
model_config_mock = MagicMock(spec=EasyUIBasedModelConfigEntity)
model_config_mock.provider = 'openai'
model_config_mock.model = 'gpt-4'
@ -191,7 +191,7 @@ def test__get_chat_model_prompt_messages():
def test__get_completion_model_prompt_messages():
model_config_mock = MagicMock(spec=ModelConfigEntity)
model_config_mock = MagicMock(spec=EasyUIBasedModelConfigEntity)
model_config_mock.provider = 'openai'
model_config_mock.model = 'gpt-3.5-turbo-instruct'

View File

@ -4,7 +4,7 @@ from unittest.mock import MagicMock
import pytest
from core.entities.application_entities import VariableEntity, ExternalDataVariableEntity, DatasetEntity, \
from core.app.app_config.entities import VariableEntity, ExternalDataVariableEntity, DatasetEntity, \
DatasetRetrieveConfigEntity, ModelConfigEntity, PromptTemplateEntity, AdvancedChatPromptTemplateEntity, \
AdvancedChatMessageEntity, AdvancedCompletionPromptTemplateEntity
from core.helper import encrypter