Fixe from rebase

defenseunicorns · Sep 9, 2024 · f51ba8f · f51ba8f
1 parent 08a1af5
commit f51ba8f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/src/leapfrogai_api/backend/composer.py b/src/leapfrogai_api/backend/composer.py
@@ -28,26 +28,12 @@
 from pydantic import BaseModel
 from starlette.responses import StreamingResponse
 
-from leapfrogai_api.types.constants import (
-    DEFAULT_MAX_COMPLETION_TOKENS,
-    DEFAULT_MAX_PROMPT_TOKENS,
-)
 from leapfrogai_api.backend.converters import (
     from_assistant_stream_event_to_str,
     from_text_to_message,
     from_chat_completion_choice_to_thread_message_delta,
 )
 from leapfrogai_api.backend.rag.query import QueryService
-<<<<<<<< HEAD:src/leapfrogai_api/backend/composer.py
-========
-from leapfrogai_api.backend.types import (
-    ChatMessage,
-    SearchResponse,
-    ChatCompletionResponse,
-    ChatCompletionRequest,
-    ChatChoice,
-)
->>>>>>>> 24d9074d (chore: New 'types' module):src/leapfrogai_api/types/request/run_create_params_base.py
 from leapfrogai_api.data.crud_assistant import CRUDAssistant, FilterAssistant
 from leapfrogai_api.data.crud_message import CRUDMessage
 from leapfrogai_api.routers.openai.chat import chat_complete, chat_complete_stream_raw

diff --git a/src/leapfrogai_api/typedef/runs/run_create.py b/src/leapfrogai_api/typedef/runs/run_create.py
@@ -8,13 +8,8 @@
     AdditionalMessageAttachmentToolFileSearch,
 )
 from pydantic import Field
-<<<<<<<< HEAD:src/leapfrogai_api/typedef/runs/run_create.py
 
 from .run_create_base import (
-========
-from starlette.responses import StreamingResponse
-from leapfrogai_api.types.request.run_create_params_base import (
->>>>>>>> 24d9074d (chore: New 'types' module):src/leapfrogai_api/types/request/run_create_params.py
     RunCreateParamsRequestBase,
 )
 from leapfrogai_api.typedef.messages import (