Show the model an account only where it tells tools apart

Actions that different services share are described with the service
alone; the account is named only when one service is connected twice.

docsgpt/agents/tool_executor.py

@@ -747,12 +747,10 @@ class ToolExecutor:
         result = []
         for index, (tool_id, tool_name, action_name, action, is_client) in enumerate(entries):
             service, account = connected.get(index, (None, None))
-            if service is None:
-                slug = ""
-            elif per_service[(action_name, service)] > 1:
-                slug = _account_slug(account)
-            else:
-                slug = _account_slug(service)
+            # The account is named only where it is what tells tools apart.
+            if service is not None and per_service[(action_name, service)] < 2:
+                account = None
+            slug = _account_slug(account or service)
             if name_counts[action_name] == 1 and len(action_name) <= _MAX_LLM_NAME_LEN:
                 llm_name = action_name
             else:
@@ -788,8 +786,10 @@ class ToolExecutor:
                 )
 
             description = action.get("description", "")
-            if service:
+            if account:
                 description = f"{description} ({service} account: {account})".strip()
+            elif service:
+                description = f"{description} ({service})".strip()
             result.append(
                 {
                     "type": "function",

tests/connectors/test_runtime.py

@@ -315,7 +315,7 @@ class TestAccountsTellApartForTheModel:
         with _service_db(pg_conn):
             functions = {f["function"]["name"]: f["function"] for f in _executor().prepare_tools_for_llm(tools)}
         assert set(functions) == {"search_wiki", "search_tracker"}
-        assert functions["search_wiki"]["description"].startswith("Search (Wiki account:")
+        assert functions["search_wiki"]["description"] == "Search (Wiki)"
 
     def test_names_stay_within_provider_limits(self, pg_conn):
         tools = self._two_bots(pg_conn, ["x" * 80, "x" * 80])