Fixed appending empty strings + wrong prompt positions in tests

deeppavlov · Jan 31, 2025 · 6440eaf · 6440eaf
1 parent 32eae7d
commit 6440eaf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/chatsky/conditions/llm.py b/chatsky/conditions/llm.py
@@ -36,6 +36,10 @@ class LLMCondition(BaseCondition):
     """
     Filter function to filter messages that will go the models context.
     """
+    prompt_misc_filter: str = Field(default=r"prompt")
+    """
+    idk
+    """
     max_size: int = 1000
     """
     Maximum size of any message in chat in symbols. If exceed the limit will raise ValueError.

diff --git a/chatsky/llm/langchain_context.py b/chatsky/llm/langchain_context.py
@@ -113,9 +113,10 @@ async def get_langchain_context(
     history = await context_to_history(ctx, **history_args)
     logger.debug(f"Position config: {position_config}")
     prompts: list[tuple[list[Union[HumanMessage, AIMessage, SystemMessage]], float]] = [
-        ([await message_to_langchain(system_prompt, ctx, source="system")], position_config.system_prompt),
         (history, position_config.history),
     ]
+    if system_prompt.text != '':
+        prompts.append(([await message_to_langchain(system_prompt, ctx, source="system")], position_config.system_prompt))
 
     logger.debug(f"System prompt: {prompts[0]}")
 
@@ -130,8 +131,9 @@ async def get_langchain_context(
             prompts.append(([prompt_langchain_message], prompt.position))
 
     call_prompt_text = await call_prompt.message(ctx)
-    call_prompt_message = await message_to_langchain(call_prompt_text, ctx, source="human")
-    prompts.append(([call_prompt_message], call_prompt.position or position_config.call_prompt))
+    if call_prompt_text.text != '':
+        call_prompt_message = await message_to_langchain(call_prompt_text, ctx, source="human")
+        prompts.append(([call_prompt_message], call_prompt.position or position_config.call_prompt))
 
     prompts.append(([await message_to_langchain(ctx.last_request, ctx, source="human")], position_config.last_request))
 

diff --git a/chatsky/slots/llm.py b/chatsky/slots/llm.py
@@ -79,6 +79,7 @@ async def get_value(self, ctx: Context) -> ExtractedGroupSlot:
         result_json = result.model_dump()
         logger.debug(f"Result JSON: {result_json}")
 
+        # TODO: un-flatten the dict with child.names.like.this
         res = {
             name: ExtractedValueSlot.model_construct(is_slot_extracted=True, extracted_value=result_json[name])
             for name in result_json

diff --git a/tests/llm/test_llm.py b/tests/llm/test_llm.py
@@ -207,17 +207,17 @@ async def test_message_to_langchain(context):
     [
         (
             2,
-            "Mock response with history: ['prompt', 'Request 1', 'Response 1', "
-            "'Request 2', 'Response 2', 'Last request']",
+            "Mock response with history: ['Request 1', 'Response 1', "
+            "'Request 2', 'Response 2', 'prompt', 'Last request']",
         ),
         (
             0,
             "Mock response with history: ['prompt', 'Last request']",
         ),
         (
             4,
-            "Mock response with history: ['prompt', 'Request 0', 'Response 0', "
-            "'Request 1', 'Response 1', 'Request 2', 'Response 2', 'Last request']",
+            "Mock response with history: ['Request 0', 'Response 0', "
+            "'Request 1', 'Response 1', 'Request 2', 'Response 2', 'prompt', 'Last request']",
         ),
     ],
 )