codemie-test-harness 0.1.180__py3-none-any.whl → 0.1.182__py3-none-any.whl

codemie_test_harness/tests/assistant/tools/ado/test_assistant_for_ado_wiki_tools.py

@@ -10,7 +10,10 @@ from codemie_test_harness.tests.test_data.ado_wiki_tools_test_data import (
     ADO_WIKI_DELETE_PAGE,
 )
 from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
-from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.base_utils import (
+    get_random_name,
+    assert_tool_triggered,
+)
 
 
 @pytest.mark.assistant
@@ -41,7 +44,11 @@ def test_assistant_with_ado_wiki_get_tools(
         settings=settings,
     )
 
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
+
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)
 
 
@@ -72,7 +79,10 @@ def test_assistant_with_ado_wiki_modify_tools(
     # 1. Create the page
     create_prompt = ADO_WIKI_CREATE_PAGE["prompt_to_assistant"].format(page_title)
     create_expected = ADO_WIKI_CREATE_PAGE["expected_llm_answer"].format(page_title)
-    response = assistant_utils.ask_assistant(assistant, create_prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, create_prompt, minimal_response=False
+    )
+    assert_tool_triggered(AzureDevOpsWikiTool.MODIFY_WIKI_PAGE, triggered_tools)
     similarity_check.check_similarity(response, create_expected)
 
     # 2. Rename the page
@@ -82,7 +92,10 @@ def test_assistant_with_ado_wiki_modify_tools(
     rename_expected = ADO_WIKI_RENAME_PAGE["expected_llm_answer"].format(
         page_title, page_title
     )
-    response = assistant_utils.ask_assistant(assistant, rename_prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, rename_prompt, minimal_response=False
+    )
+    assert_tool_triggered(AzureDevOpsWikiTool.RENAME_WIKI_PAGE, triggered_tools)
     similarity_check.check_similarity(response, rename_expected)
 
     # 3. Modify the page
@@ -92,7 +105,10 @@ def test_assistant_with_ado_wiki_modify_tools(
     modify_expected = ADO_WIKI_MODIFY_PAGE["expected_llm_answer"].format(
         page_title + "-Updated"
     )
-    response = assistant_utils.ask_assistant(assistant, modify_prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, modify_prompt, minimal_response=False
+    )
+    assert_tool_triggered(AzureDevOpsWikiTool.MODIFY_WIKI_PAGE, triggered_tools)
     similarity_check.check_similarity(response, modify_expected)
 
     # 4. Delete the page
@@ -102,5 +118,8 @@ def test_assistant_with_ado_wiki_modify_tools(
     delete_expected = ADO_WIKI_DELETE_PAGE["expected_llm_answer"].format(
         page_title + "-Updated"
     )
-    response = assistant_utils.ask_assistant(assistant, delete_prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, delete_prompt, minimal_response=False
+    )
+    assert_tool_triggered(AzureDevOpsWikiTool.DELETE_WIKI_PAGE_BY_PATH, triggered_tools)
     similarity_check.check_similarity(response, delete_expected)

codemie_test_harness/tests/assistant/tools/ado/test_assistant_for_ado_work_item_tools.py

@@ -9,7 +9,10 @@ from codemie_test_harness.tests.test_data.ado_work_item_tools_test_data import (
     ADO_WORK_ITEM_LINK,
 )
 from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
-from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.base_utils import (
+    get_random_name,
+    assert_tool_triggered,
+)
 from codemie_test_harness.tests.utils.constants import WORK_ITEM_ID_PATTERN
 from codemie_test_harness.tests.utils.json_utils import extract_id_from_ado_response
 
@@ -42,7 +45,11 @@ def test_assistant_with_ado_work_item_get_tools(
         settings=settings,
     )
 
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
+
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)
 
 
@@ -72,29 +79,42 @@ def test_assistant_with_ado_work_item_modify_tools(
     work_item_title = f"Autotest Task {get_random_name()}"
 
     create_prompt = ADO_WORK_ITEM_CREATE["prompt_to_assistant"].format(work_item_title)
-    create_response = assistant_utils.ask_assistant(assistant, create_prompt)
+    create_response, create_triggered_tools = assistant_utils.ask_assistant(
+        assistant, create_prompt, minimal_response=False
+    )
 
     work_item_id = extract_id_from_ado_response(create_response, WORK_ITEM_ID_PATTERN)
     create_expected = ADO_WORK_ITEM_CREATE["expected_llm_answer"].format(
         work_item_title
     )
+    assert_tool_triggered(
+        AzureDevOpsWorkItemTool.CREATE_WORK_ITEM, create_triggered_tools
+    )
     similarity_check.check_similarity(create_response, create_expected)
 
     new_title = f"Autotest Epic {get_random_name()}"
     update_prompt = ADO_WORK_ITEM_UPDATE["prompt_to_assistant"].format(
         work_item_id, new_title
     )
-    update_response = assistant_utils.ask_assistant(assistant, update_prompt)
+    update_response, update_triggered_tools = assistant_utils.ask_assistant(
+        assistant, update_prompt, minimal_response=False
+    )
 
     update_expected = ADO_WORK_ITEM_UPDATE["expected_llm_answer"].format(
         work_item_id, new_title
     )
+    assert_tool_triggered(
+        AzureDevOpsWorkItemTool.UPDATE_WORK_ITEM, update_triggered_tools
+    )
     similarity_check.check_similarity(update_response, update_expected)
 
     link_prompt = ADO_WORK_ITEM_LINK["prompt_to_assistant"].format(
         work_item_id, work_item_id
     )
-    link_response = assistant_utils.ask_assistant(assistant, link_prompt)
+    link_response, link_triggered_tools = assistant_utils.ask_assistant(
+        assistant, link_prompt, minimal_response=False
+    )
 
     link_expected = ADO_WORK_ITEM_LINK["expected_llm_answer"].format(work_item_id)
+    assert_tool_triggered(AzureDevOpsWorkItemTool.LINK_WORK_ITEMS, link_triggered_tools)
     similarity_check.check_similarity(link_response, link_expected)

codemie_test_harness/tests/assistant/tools/cloud/test_cloud_tools.py

@@ -2,6 +2,8 @@ import pytest
 
 from codemie_test_harness.tests.test_data.cloud_tools_test_data import cloud_test_data
 
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
+
 
 @pytest.mark.assistant
 @pytest.mark.cloud
@@ -24,8 +26,12 @@ def test_assistant_with_cloud_tools(
 ):
     settings = integration_utils.create_integration(credential_type, credentials)
 
-    aws_assistant = assistant(toolkit, tool_name, settings=settings)
+    cloud_assistant = assistant(toolkit, tool_name, settings=settings)
+
+    response, triggered_tools = assistant_utils.ask_assistant(
+        cloud_assistant, prompt, minimal_response=False
+    )
 
-    response = assistant_utils.ask_assistant(aws_assistant, prompt)
+    assert_tool_triggered(tool_name, triggered_tools)
 
     similarity_check.check_similarity(response, expected_response)

codemie_test_harness/tests/assistant/tools/codebase/test_codebase_tools.py

@@ -8,6 +8,7 @@ from codemie_test_harness.tests.test_data.codebase_tools_test_data import (
     code_tools_test_data,
     sonar_tools_test_data,
 )
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
 
 
 @pytest.mark.assistant
@@ -30,7 +31,11 @@ def test_assistant_with_codebase_tools(
     expected_response,
 ):
     assistant = assistant(toolkit, tool_name, context=code_context(code_datasource))
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
+
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)
 
 
@@ -60,5 +65,9 @@ def test_assistant_with_sonar_tools(
         settings=settings,
     )
 
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
+
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected)

codemie_test_harness/tests/assistant/tools/datamanagement/test_assistant_with_data_management_tools.py

@@ -19,6 +19,7 @@ from codemie_test_harness.tests.test_data.data_management_tools_test_data import
 )
 from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
 
 pytestmark = pytest.mark.skipif(
     EnvironmentResolver.is_localhost(),
@@ -43,8 +44,11 @@ def test_create_assistant_with_elastic_tool(
         settings=settings,
     )
 
-    response = assistant_utils.ask_assistant(assistant, ELASTIC_TOOL_TASK)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, ELASTIC_TOOL_TASK, minimal_response=False
+    )
 
+    assert_tool_triggered(DataManagementTool.ELASTIC, triggered_tools)
     similarity_check.check_similarity(response, RESPONSE_FOR_ELASTIC)
 
 
@@ -71,19 +75,36 @@ def test_create_assistant_with_sql_tool(
 
     conversation_id = str(uuid.uuid4())
 
-    assistant_utils.ask_assistant(
-        assistant, SQL_TOOL_CREATE_TABLE_TASK, conversation_id=conversation_id
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant,
+        SQL_TOOL_CREATE_TABLE_TASK,
+        conversation_id=conversation_id,
+        minimal_response=False,
     )
-    assistant_utils.ask_assistant(
-        assistant, SQL_TOOL_INSERT_TABLE_TASK, conversation_id=conversation_id
+    assert_tool_triggered(DataManagementTool.SQL, triggered_tools)
+
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant,
+        SQL_TOOL_INSERT_TABLE_TASK,
+        conversation_id=conversation_id,
+        minimal_response=False,
     )
+    assert_tool_triggered(DataManagementTool.SQL, triggered_tools)
 
-    response = assistant_utils.ask_assistant(
-        assistant, SQL_TOOL_QUERY_TABLE_TASK, conversation_id=conversation_id
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant,
+        SQL_TOOL_QUERY_TABLE_TASK,
+        conversation_id=conversation_id,
+        minimal_response=False,
     )
+    assert_tool_triggered(DataManagementTool.SQL, triggered_tools)
 
-    assistant_utils.ask_assistant(
-        assistant, SQL_TOOL_DELETE_TABLE_TASK, conversation_id=conversation_id
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant,
+        SQL_TOOL_DELETE_TABLE_TASK,
+        conversation_id=conversation_id,
+        minimal_response=False,
     )
+    assert_tool_triggered(DataManagementTool.SQL, triggered_tools)
 
     similarity_check.check_similarity(response, RESPONSE_FOR_SQL)

codemie_test_harness/tests/assistant/tools/filemanagement/test_assistant_with_file_management_tools.py

@@ -14,7 +14,10 @@ from codemie_test_harness.tests.test_data.file_management_tools_test_data import
     file_editing_tools_test_data,
     show_diff_task,
 )
-from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.base_utils import (
+    get_random_name,
+    assert_tool_triggered,
+)
 from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 
@@ -39,8 +42,11 @@ def test_create_assistant_with_file_management_tool(
         Toolkit.FILE_MANAGEMENT, tool_name, settings=filesystem_integration
     )
 
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
 
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)
 
 
@@ -60,7 +66,11 @@ def test_create_assistant_with_file_management_generate_image_tool(
         settings=filesystem_integration,
     )
 
-    response = assistant_utils.ask_assistant(assistant, GENERATE_IMAGE_TOOL_TASK)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, GENERATE_IMAGE_TOOL_TASK, minimal_response=False
+    )
+
+    assert_tool_triggered(FileManagementTool.GENERATE_IMAGE, triggered_tools)
 
     assert_that(
         response.lower(),
@@ -84,9 +94,15 @@ def test_create_assistant_with_file_management_read_file_tool(
         settings=filesystem_integration,
     )
 
-    assistant_utils.ask_assistant(assistant, WRITE_FILE_TASK)
+    _, write_triggered_tools = assistant_utils.ask_assistant(
+        assistant, WRITE_FILE_TASK, minimal_response=False
+    )
+    assert_tool_triggered(FileManagementTool.WRITE_FILE, write_triggered_tools)
 
-    response = assistant_utils.ask_assistant(assistant, READ_FILE_TOOL_TASK)
+    response, read_triggered_tools = assistant_utils.ask_assistant(
+        assistant, READ_FILE_TOOL_TASK, minimal_response=False
+    )
+    assert_tool_triggered(FileManagementTool.READ_FILE, read_triggered_tools)
 
     similarity_check.check_similarity(response, RESPONSE_FOR_READ_FILE_TASK)
 
@@ -115,9 +131,15 @@ def test_create_assistant_with_file_management_file_editing_tool(
         settings=filesystem_integration,
     )
     file_to_update = f"sum_{get_random_name()}.py"
-    assistant_utils.ask_assistant(assistant, create_file_task(file_to_update))
+    _, create_triggered_tools = assistant_utils.ask_assistant(
+        assistant, create_file_task(file_to_update), minimal_response=False
+    )
+    assert_tool_triggered(tool_name, create_triggered_tools)
 
-    assistant_utils.ask_assistant(assistant, insert_to_file_task(file_to_update))
+    _, insert_triggered_tools = assistant_utils.ask_assistant(
+        assistant, insert_to_file_task(file_to_update), minimal_response=False
+    )
+    assert_tool_triggered(tool_name, insert_triggered_tools)
 
     prompt = (
         show_file_task(file_to_update)
@@ -125,6 +147,9 @@ def test_create_assistant_with_file_management_file_editing_tool(
         else show_diff_task(file_to_update)
     )
 
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
 
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)

codemie_test_harness/tests/assistant/tools/git/test_assistant_with_git_tools.py

@@ -10,7 +10,11 @@ from codemie_test_harness.tests.test_data.git_tools_test_data import (
     get_merge_request_changes_test_data,
     update_file_test_data,
 )
-from codemie_test_harness.tests.utils.base_utils import get_random_name, to_camel_case
+from codemie_test_harness.tests.utils.base_utils import (
+    get_random_name,
+    to_camel_case,
+    assert_tool_triggered,
+)
 
 
 @pytest.mark.assistant
@@ -40,7 +44,10 @@ def test_assistant_with_list_branch_set_active_branch_tools(
         context=code_context(code_datasource),
         settings=git_integration,
     )
-    response = assistant_utils.ask_assistant(assistant, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, prompt, minimal_response=False
+    )
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)
 
 
@@ -76,7 +83,10 @@ def test_assistant_with_create_branch_tool(
             context=code_context(code_datasource),
             settings=git_integration,
         )
-        response = assistant_utils.ask_assistant(assistant, prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name, triggered_tools)
 
         assert_that(
             git_utils.branch_exists(branch_name),
@@ -126,7 +136,10 @@ def test_assistant_with_create_file_tool(
             context=code_context(code_datasource),
             settings=git_integration,
         )
-        response = assistant_utils.ask_assistant(assistant, prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name, triggered_tools)
 
         file_content = git_utils.get_file_content(file_name, "main")
 
@@ -172,7 +185,10 @@ def test_assistant_with_create_merge_request_tool(
             context=code_context(code_datasource),
             settings=git_integration,
         )
-        response = assistant_utils.ask_assistant(assistant, prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name, triggered_tools)
         mr_id = git_utils.get_merge_request_id_by_title(mr_name)
 
         expected = expected_template(source_branch, mr_name, mr_id)
@@ -231,7 +247,10 @@ def test_assistant_with_delete_file_tool(
             context=code_context(code_datasource),
             settings=git_integration,
         )
-        response = assistant_utils.ask_assistant(assistant, prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name, triggered_tools)
 
         assert_that(
             git_utils.file_exists(file_name, "main"),
@@ -282,7 +301,10 @@ def test_assistant_with_get_merge_request_changes_tool(
 
         create_mr_prompt = create_mr_prompt_template(source_branch, class_name, mr_name)
 
-        response = assistant_utils.ask_assistant(assistant, create_mr_prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, create_mr_prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name[:-1], triggered_tools)
         mr_id = git_utils.get_merge_request_id_by_title(mr_name)
 
         create_mr_expected = create_mr_expected_template(source_branch, mr_name, mr_id)
@@ -295,7 +317,10 @@ def test_assistant_with_get_merge_request_changes_tool(
         get_changes_prompt = get_mr_changes_prompt_template(mr_id)
         get_changes_expected = get_mr_changes_expected_template(class_name)
 
-        response = assistant_utils.ask_assistant(assistant, get_changes_prompt)
+        response, triggered_tools = assistant_utils.ask_assistant(
+            assistant, get_changes_prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name[-1], triggered_tools)
         similarity_check.check_similarity(response, get_changes_expected)
     finally:
         if git_utils.branch_exists(source_branch):
@@ -340,7 +365,10 @@ def test_assistant_with_update_file_tools(
         )
 
         create_prompt = create_prompt_template(class_name)
-        response = assistant_utils.ask_assistant(assistant, create_prompt)
+        response, create_triggered_tools = assistant_utils.ask_assistant(
+            assistant, create_prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name[0], create_triggered_tools)
 
         create_expected = create_expected_template(class_name)
         similarity_check.check_similarity(response, create_expected)
@@ -355,7 +383,10 @@ def test_assistant_with_update_file_tools(
         )
 
         update_prompt = update_prompt_template(class_name)
-        response = assistant_utils.ask_assistant(assistant, update_prompt)
+        response, update_triggered_tools = assistant_utils.ask_assistant(
+            assistant, update_prompt, minimal_response=False
+        )
+        assert_tool_triggered(tool_name[1], update_triggered_tools)
 
         update_expected = update_expected_template(class_name)
         similarity_check.check_similarity(response, update_expected)

codemie_test_harness/tests/assistant/tools/mcp/test_cli_mcp_server.py

@@ -7,16 +7,19 @@ from hamcrest import assert_that, contains_string
 from codemie_sdk.models.integration import CredentialTypes
 from codemie_test_harness.tests import autotest_entity_prefix
 from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
-from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
-from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.base_utils import (
+    get_random_name,
+    assert_tool_triggered,
+)
+from codemie_test_harness.tests.enums.tools import CliMcpServer
 from codemie_test_harness.tests.test_data.mcp_server_test_data import (
     cli_mcp_server_test_data,
     CLI_MCP_SERVER,
 )
 
-pytestmark = pytest.mark.skipif(
-    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
-)
+# pytestmark = pytest.mark.skipif(
+#     EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
+# )
 
 
 @pytest.mark.assistant
@@ -31,11 +34,13 @@ def test_cli_mcp_server(
     assistant_utils, assistant, similarity_check, command, expected_answer
 ):
     assistant = assistant(mcp_server=CLI_MCP_SERVER)
-    response = assistant_utils.ask_assistant(
+    response, triggered_tools = assistant_utils.ask_assistant(
         assistant,
         f"execute command: '{command}'. In case of error just explain the issue and do not suggest "
         "any workarounds and do not try to run command with other parameters.",
+        minimal_response=False,
     )
+    assert_tool_triggered(CliMcpServer.RUN_COMMAND, triggered_tools)
     similarity_check.check_similarity(response, expected_answer)
 
 
@@ -64,10 +69,12 @@ def test_env_var_in_mcp_server(
     assistant = assistant(mcp_server=cli_mcp_server_with_integration)
 
     dir_name = f"{autotest_entity_prefix}{get_random_name()}"
-    response = assistant_utils.ask_assistant(
+    response, triggered_tools = assistant_utils.ask_assistant(
         assistant,
         f"Execute commands sequentially: 'mkdir {dir_name}' then 'ls'. In the end return output of the second command.",
+        minimal_response=False,
     )
+    assert_tool_triggered(CliMcpServer.RUN_COMMAND, triggered_tools)
     assert_that(
         response,
         contains_string(dir_name),

codemie_test_harness/tests/assistant/tools/mcp/test_mcp_servers.py

@@ -1,4 +1,5 @@
-from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
+from codemie_test_harness.tests.enums.tools import McpServerTime, McpServerFetch
 
 import pytest
 
@@ -11,9 +12,9 @@ from codemie_test_harness.tests.test_data.mcp_server_test_data import (
     fetch_server_prompt,
 )
 
-pytestmark = pytest.mark.skipif(
-    EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
-)
+# pytestmark = pytest.mark.skipif(
+#     EnvironmentResolver.is_localhost(), reason="Skipping this test on local environment"
+# )
 
 
 @pytest.mark.assistant
@@ -31,11 +32,13 @@ def test_creation_mcp_server_with_form_configuration(
 ):
     assistant = assistant(mcp_server=mcp_server)
 
-    response = assistant_utils.ask_assistant(
+    response, triggered_tools = assistant_utils.ask_assistant(
         assistant,
         time_server_prompt,
+        minimal_response=False,
     )
 
+    assert_tool_triggered(McpServerTime.CONVERT_TIME, triggered_tools)
     similarity_check.check_similarity(response, time_expected_response)
 
 
@@ -45,6 +48,9 @@ def test_creation_mcp_server_with_form_configuration(
 def test_fetch_mcp_server(assistant_utils, assistant, similarity_check):
     assistant = assistant(mcp_server=FETCH_MCP_SERVER)
 
-    response = assistant_utils.ask_assistant(assistant, fetch_server_prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, fetch_server_prompt, minimal_response=False
+    )
 
+    assert_tool_triggered(McpServerFetch.FETCH, triggered_tools)
     similarity_check.check_similarity(response, fetch_expected_response)

codemie_test_harness/tests/assistant/tools/notification/test_assistant_notification_tools.py

@@ -6,6 +6,7 @@ from codemie_test_harness.tests.enums.tools import Toolkit, NotificationTool
 from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.enums.environment import Environment
 from codemie_test_harness.tests.utils.env_resolver import get_environment
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
 from codemie_test_harness.tests.test_data.notification_tools_test_data import (
     EMAIL_TOOL_PROMPT,
     EMAIL_RESPONSE,
@@ -40,7 +41,10 @@ def test_assistant_with_email_tool(
         Toolkit.NOTIFICATION, NotificationTool.EMAIL, settings=settings
     )
 
-    response = assistant_utils.ask_assistant(assistant, EMAIL_TOOL_PROMPT)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, EMAIL_TOOL_PROMPT, minimal_response=False
+    )
+    assert_tool_triggered(NotificationTool.EMAIL, triggered_tools)
     similarity_check.check_similarity(response, EMAIL_RESPONSE)
 
     message_data = gmail_message_operator.get_messages_list()
@@ -78,5 +82,8 @@ def test_assistant_with_telegram_tool(
         Toolkit.NOTIFICATION, NotificationTool.TELEGRAM, settings=settings
     )
 
-    response = assistant_utils.ask_assistant(assistant, TELEGRAM_TOOL_PROMPT)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant, TELEGRAM_TOOL_PROMPT, minimal_response=False
+    )
+    assert_tool_triggered(NotificationTool.TELEGRAM, triggered_tools)
     similarity_check.check_similarity(response, TELEGRAM_RESPONSE)

codemie_test_harness/tests/assistant/tools/openapi/test_assistant_with_open_api_tools.py

@@ -1,4 +1,5 @@
 from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
+from codemie_test_harness.tests.utils.base_utils import assert_tool_triggered
 
 import pytest
 
@@ -34,6 +35,9 @@ def test_create_assistant_with_open_api_tool(
         Toolkit.OPEN_API, tool_name, settings=open_api_integration
     )
 
-    response = assistant_utils.ask_assistant(assistant_instance, prompt)
+    response, triggered_tools = assistant_utils.ask_assistant(
+        assistant_instance, prompt, minimal_response=False
+    )
 
+    assert_tool_triggered(tool_name, triggered_tools)
     similarity_check.check_similarity(response, expected_response)