Fix imports ans status callback

ls1intum · Apr 25, 2024 · f0fe359 · f0fe359
1 parent 8a27bb6
commit f0fe359
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/app/llm/external/ollama.py b/app/llm/external/ollama.py
@@ -3,8 +3,8 @@
 
 from ollama import Client, Message
 
-from common.message_converters import map_role_to_str, map_str_to_role
-from domain.data.text_message_content_dto import TextMessageContentDTO
+from ...common.message_converters import map_role_to_str, map_str_to_role
+from ...domain.data.text_message_content_dto import TextMessageContentDTO
 from ...domain import PyrisMessage
 from ...llm import CompletionArguments
 from ...llm.external.model import ChatModel, CompletionModel, EmbeddingModel

diff --git a/app/llm/external/openai_chat.py b/app/llm/external/openai_chat.py
@@ -5,7 +5,7 @@
 from openai.lib.azure import AzureOpenAI
 from openai.types.chat import ChatCompletionMessageParam, ChatCompletionMessage
 
-from common.message_converters import map_role_to_str, map_str_to_role
+from ...common.message_converters import map_role_to_str, map_str_to_role
 from app.domain.data.text_message_content_dto import TextMessageContentDTO
 from ...domain import PyrisMessage
 from ...llm import CompletionArguments

diff --git a/app/pipeline/chat/file_selector_pipeline.py b/app/pipeline/chat/file_selector_pipeline.py
@@ -7,7 +7,7 @@
 from langchain_core.runnables import Runnable
 from pydantic import BaseModel
 
-from llm import CapabilityRequestHandler, RequirementList
+from ...llm import CapabilityRequestHandler, RequirementList
 from ...llm import CompletionArguments
 from ...llm.langchain import IrisLangchainChatModel
 from ...pipeline import Pipeline

diff --git a/app/pipeline/chat/tutor_chat_pipeline.py b/app/pipeline/chat/tutor_chat_pipeline.py
@@ -10,9 +10,9 @@
 )
 from langchain_core.runnables import Runnable
 
-from common import convert_iris_message_to_langchain_message
-from domain import PyrisMessage
-from llm import CapabilityRequestHandler, RequirementList
+from ...common import convert_iris_message_to_langchain_message
+from ...domain import PyrisMessage
+from ...llm import CapabilityRequestHandler, RequirementList
 from ...domain.data.build_log_entry import BuildLogEntryDTO
 from ...domain.data.feedback_dto import FeedbackDTO
 from ..prompts.iris_tutor_chat_prompts import (

diff --git a/app/web/status/status_update.py b/app/web/status/status_update.py
@@ -43,7 +43,7 @@ def __init__(
         self, run_id: str, base_url: str, initial_stages: List[StageDTO] = None
     ):
         url = f"{base_url}/api/public/pyris/pipelines/tutor-chat/runs/{run_id}/status"
-        current_stage_index = 1
+        current_stage_index = len(initial_stages) - 1 if initial_stages else 0
         stages = initial_stages or []
         stages += [
             StageDTO(weight=30, state=StageStateEnum.NOT_STARTED, name="File Lookup"),