From c7842141386baec7521b2c3349310cc74c753825 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Fri, 1 Dec 2023 12:12:37 +0000 Subject: [PATCH] fix: merge fixes --- aidial_adapter_bedrock/llm/model/cohere.py | 4 ++-- aidial_adapter_bedrock/llm/model/meta.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aidial_adapter_bedrock/llm/model/cohere.py b/aidial_adapter_bedrock/llm/model/cohere.py index 41cc73f..9ebfebc 100644 --- a/aidial_adapter_bedrock/llm/model/cohere.py +++ b/aidial_adapter_bedrock/llm/model/cohere.py @@ -5,13 +5,13 @@ from typing_extensions import override import aidial_adapter_bedrock.utils.stream as stream +from aidial_adapter_bedrock.dial_api.request import ModelParameters +from aidial_adapter_bedrock.dial_api.token_usage import TokenUsage from aidial_adapter_bedrock.llm.chat_emulation.pseudo_chat import RolePrompt from aidial_adapter_bedrock.llm.chat_model import PseudoChatModel from aidial_adapter_bedrock.llm.consumer import Consumer from aidial_adapter_bedrock.llm.message import BaseMessage from aidial_adapter_bedrock.llm.model.conf import DEFAULT_MAX_TOKENS_COHERE -from aidial_adapter_bedrock.universal_api.request import ModelParameters -from aidial_adapter_bedrock.universal_api.token_usage import TokenUsage from aidial_adapter_bedrock.utils.concurrency import make_async from aidial_adapter_bedrock.utils.log_config import bedrock_logger as log diff --git a/aidial_adapter_bedrock/llm/model/meta.py b/aidial_adapter_bedrock/llm/model/meta.py index 24c727c..22aa262 100644 --- a/aidial_adapter_bedrock/llm/model/meta.py +++ b/aidial_adapter_bedrock/llm/model/meta.py @@ -5,13 +5,13 @@ from typing_extensions import override import aidial_adapter_bedrock.utils.stream as stream +from aidial_adapter_bedrock.dial_api.request import ModelParameters +from aidial_adapter_bedrock.dial_api.token_usage import TokenUsage from aidial_adapter_bedrock.llm.chat_emulation.pseudo_chat import RolePrompt from aidial_adapter_bedrock.llm.chat_model import PseudoChatModel from aidial_adapter_bedrock.llm.consumer import Consumer from aidial_adapter_bedrock.llm.message import BaseMessage from aidial_adapter_bedrock.llm.model.conf import DEFAULT_MAX_TOKENS_META -from aidial_adapter_bedrock.universal_api.request import ModelParameters -from aidial_adapter_bedrock.universal_api.token_usage import TokenUsage from aidial_adapter_bedrock.utils.concurrency import make_async from aidial_adapter_bedrock.utils.log_config import bedrock_logger as log