scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-06 02:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 103

fix - handle merge conflicts

Browse source
This commit is contained in:
Ishaan Jaff 2024-12-11 01:06:40 -08:00
parent 06074bb13b
commit fe768a9ab7
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
litellm/llms/predibase/chat/handler.py
View file

@ -19,6 +19,10 @@ import litellm.litellm_core_utils
import litellm.litellm_core_utils.litellm_logging
from litellm import verbose_logger
from litellm.litellm_core_utils.core_helpers import map_finish_reason
from litellm.litellm_core_utils.prompt_templates.factory import (
custom_prompt,
prompt_factory,
)
from litellm.llms.custom_httpx.http_handler import (
AsyncHTTPHandler,
get_async_httpx_client,
@ -26,7 +30,6 @@ from litellm.llms.custom_httpx.http_handler import (
from litellm.utils import Choices, CustomStreamWrapper, Message, ModelResponse, Usage
from ...base import BaseLLM
from ...prompt_templates.factory import custom_prompt, prompt_factory
from ..common_utils import PredibaseError

5
litellm/llms/triton/completion/handler.py
View file

@ -7,6 +7,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Union
import httpx # type: ignore
import litellm
from litellm.litellm_core_utils.prompt_templates.factory import (
custom_prompt,
prompt_factory,
)
from litellm.llms.custom_httpx.http_handler import (
AsyncHTTPHandler,
HTTPHandler,
@ -25,7 +29,6 @@ from litellm.utils import (
)
from ...base import BaseLLM
from ...prompt_templates.factory import custom_prompt, prompt_factory
from ..common_utils import TritonError