From 59daac5a3f466cbccdb0ea515451956ce91f79ab Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Wed, 11 Dec 2024 01:11:42 -0800 Subject: [PATCH] fix merge conflicts --- litellm/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litellm/main.py b/litellm/main.py index 6becf201a33..36508cc9a0e 100644 --- a/litellm/main.py +++ b/litellm/main.py @@ -104,6 +104,7 @@ from .llms.azure_ai.embed import AzureAIEmbedding from .llms.bedrock.chat import BedrockConverseLLM, BedrockLLM from .llms.bedrock.embed.embedding import BedrockEmbedding from .llms.bedrock.image.image_handler import BedrockImageGeneration +from .llms.codestral.completion.handler import CodestralTextCompletion from .llms.cohere.embed import handler as cohere_embed from .llms.custom_httpx.llm_http_handler import BaseLLMHTTPHandler from .llms.custom_llm import CustomLLM, custom_chat_llm_router @@ -125,7 +126,6 @@ from .llms.predibase.chat.handler import PredibaseChatCompletion from .llms.replicate.chat.handler import completion as replicate_chat_completion from .llms.sagemaker.chat.handler import SagemakerChatHandler from .llms.sagemaker.completion.handler import SagemakerLLM -from .llms.text_completion_codestral import CodestralTextCompletion from .llms.together_ai.completion.handler import TogetherAITextCompletion from .llms.triton.completion.handler import TritonChatCompletion from .llms.vertex_ai import vertex_ai_non_gemini