refacto: Tools customer message

microsoft · Dec 12, 2024 · ff08922 · ff08922
1 parent b3d6f2e
commit ff08922
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 167 deletions.
diff --git a/app/helpers/call_llm.py b/app/helpers/call_llm.py
@@ -178,7 +178,7 @@ async def _stop_callback() -> None:
 
         async def _commit_answer(
             wait: bool,
-            tool_blacklist: set[str] | None = None,
+            tool_blacklist: set[str] = set(),
         ) -> None:
             """
             Process the response.
@@ -289,9 +289,9 @@ async def _continue_chat(  # noqa: PLR0915, PLR0913
     client: CallAutomationClient,
     post_callback: Callable[[CallStateModel], Awaitable[None]],
     scheduler: Scheduler,
-    tool_blacklist: set[str] | None,
     training_callback: Callable[[CallStateModel], Awaitable[None]],
     tts_client: SpeechSynthesizer,
+    tool_blacklist: set[str] = set(),
     _iterations_remaining: int = 3,
 ) -> CallStateModel:
     """
@@ -482,7 +482,7 @@ async def _generate_chat_completion(  # noqa: PLR0913, PLR0911, PLR0912, PLR0915
     client: CallAutomationClient,
     post_callback: Callable[[CallStateModel], Awaitable[None]],
     scheduler: Scheduler,
-    tool_blacklist: set[str] | None,
+    tool_blacklist: set[str],
     tts_callback: Callable[[str, MessageStyleEnum], Awaitable[None]],
     tts_client: SpeechSynthesizer,
     use_tools: bool,
@@ -539,7 +539,7 @@ async def _content_callback(buffer: str) -> None:
     if not use_tools:
         logger.warning("Tools disabled for this chat")
     else:
-        tools = await plugins.to_openai(tool_blacklist)
+        tools = await plugins.to_openai(frozenset(tool_blacklist))
         # logger.debug("Tools: %s", tools)
 
     # Execute LLM inference
@@ -626,7 +626,13 @@ async def _content_callback(buffer: str) -> None:
         scheduler=scheduler,
     ):
         await asyncio.gather(
-            *[plugins.execute_tool(tool_call) for tool_call in tool_calls]
+            *[
+                plugins.execute(
+                    blacklist=tool_blacklist,
+                    tool=tool_call,
+                )
+                for tool_call in tool_calls
+            ]
         )
 
     # Update call model if object reference changed