Python: Remove custom separator in Bedrock tool call fully qualified name (microsoft#10826)

### Motivation and Context

<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->
Closes microsoft#10619 

Bedrock updated its rules on tool names. Previously, Bedrock disallowed
"-" in tool names, which is the default plugin name and function name
separator in SK. The solution was to use "_" as the separator. However,
this introduced a bug where the translation between the SK fully
qualified function names and the Bedrock tool names would fail if the
function name had an underscore.

Bedrock now allows "-" in tool names, so we can remove the custom logic
and just use the default.

Gemini also has rules on how tools are named. It doesn't recommend using
"-". The solution was to use "_" just like Bedrock. To address the bug
mentioned above, the solution is to use double underscores.

### Description

<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->
1. Remove Bedrock custom fully qualified function names.
2. Use double underscores for Gemini fully qualified function names.

TODO: Add a guide for SK function/plugin naming conventions.

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [x] The code builds clean without any errors or warnings
- [x] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [x] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

Author: TaoChenOSU

python/samples/concepts/setup/chat_completion_services.py

@@ -213,15 +213,14 @@ def get_bedrock_chat_completion_service_and_request_settings() -> tuple[
     """
     from semantic_kernel.connectors.ai.bedrock import BedrockChatCompletion, BedrockChatPromptExecutionSettings
 
-    chat_service = BedrockChatCompletion(service_id=service_id, model_id="cohere.command-r-v1:0")
+    chat_service = BedrockChatCompletion(service_id=service_id, model_id="anthropic.claude-3-sonnet-20240229-v1:0")
     request_settings = BedrockChatPromptExecutionSettings(
         # For model specific settings, specify them in the extension_data dictionary.
         # For example, for Cohere Command specific settings, refer to:
-        # https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-cohere-command-r-plus.html
+        # https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-anthropic-claude-messages.html
         service_id=service_id,
         extension_data={
-            "presence_penalty": 0.5,
-            "seed": 5,
+            "temperature": 0.8,
         },
     )
 

python/semantic_kernel/connectors/ai/bedrock/services/bedrock_chat_completion.py

@@ -21,7 +21,6 @@
 from semantic_kernel.connectors.ai.bedrock.services.model_provider.utils import (
     MESSAGE_CONVERTERS,
     finish_reason_from_bedrock_to_semantic_kernel,
-    format_bedrock_function_name_to_kernel_function_fully_qualified_name,
     remove_none_recursively,
     update_settings_from_function_choice_configuration,
 )
@@ -254,9 +253,7 @@ def _create_chat_message_content(self, response: dict[str, Any]) -> ChatMessageC
                 items.append(
                     FunctionCallContent(
                         id=content["toolUse"]["toolUseId"],
-                        name=format_bedrock_function_name_to_kernel_function_fully_qualified_name(
-                            content["toolUse"]["name"]
-                        ),
+                        name=content["toolUse"]["name"],
                         arguments=content["toolUse"]["input"],
                     )
                 )
@@ -323,9 +320,7 @@ def _parse_content_block_start_event(self, event: dict[str, Any]) -> StreamingCh
             items.append(
                 FunctionCallContent(
                     id=event["contentBlockStart"]["start"]["toolUse"]["toolUseId"],
-                    name=format_bedrock_function_name_to_kernel_function_fully_qualified_name(
-                        event["contentBlockStart"]["start"]["toolUse"]["name"]
-                    ),
+                    name=event["contentBlockStart"]["start"]["toolUse"]["name"],
                 )
             )
 

python/semantic_kernel/connectors/ai/bedrock/services/model_provider/utils.py

@@ -6,7 +6,6 @@
 
 from semantic_kernel.connectors.ai.bedrock.bedrock_prompt_execution_settings import BedrockChatPromptExecutionSettings
 from semantic_kernel.connectors.ai.function_choice_behavior import FunctionChoiceType
-from semantic_kernel.const import DEFAULT_FULLY_QUALIFIED_NAME_SEPARATOR
 from semantic_kernel.contents.chat_message_content import ChatMessageContent
 from semantic_kernel.contents.function_call_content import FunctionCallContent
 from semantic_kernel.contents.function_result_content import FunctionResultContent
@@ -102,7 +101,7 @@ def _format_assistant_message(message: ChatMessageContent) -> dict[str, Any]:
             contents.append({
                 "toolUse": {
                     "toolUseId": item.id,
-                    "name": item.custom_fully_qualified_name(BEDROCK_FUNCTION_NAME_SEPARATOR),
+                    "name": item.name,
                     "input": item.arguments
                     if isinstance(item.arguments, Mapping)
                     else json.loads(item.arguments or "{}"),
@@ -157,19 +156,6 @@ def _format_tool_message(message: ChatMessageContent) -> dict[str, Any]:
     AuthorRole.TOOL: _format_tool_message,
 }
 
-# The separator used in the fully qualified name of the function instead of the default "-" separator.
-# This is required since Bedrock disallows "-" in the function name.
-# https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ToolSpecification.html#API_runtime_ToolSpecification_Contents
-BEDROCK_FUNCTION_NAME_SEPARATOR = "_"
-
-
-def format_bedrock_function_name_to_kernel_function_fully_qualified_name(bedrock_function_name: str) -> str:
-    """Format the Bedrock function name to the kernel function fully qualified name."""
-    if BEDROCK_FUNCTION_NAME_SEPARATOR in bedrock_function_name:
-        plugin_name, function_name = bedrock_function_name.split(BEDROCK_FUNCTION_NAME_SEPARATOR, 1)
-        return f"{plugin_name}{DEFAULT_FULLY_QUALIFIED_NAME_SEPARATOR}{function_name}"
-    return bedrock_function_name
-
 
 def update_settings_from_function_choice_configuration(
     function_choice_configuration: "FunctionCallChoiceConfiguration",
@@ -198,16 +184,14 @@ def update_settings_from_function_choice_configuration(
             else:
                 settings.tool_choice = {
                     "tool": {
-                        "name": function_choice_configuration.available_functions[0].custom_fully_qualified_name(
-                            BEDROCK_FUNCTION_NAME_SEPARATOR
-                        ),
+                        "name": function_choice_configuration.available_functions[0].fully_qualified_name,
                     }
                 }
 
         settings.tools = [
             {
                 "toolSpec": {
-                    "name": function.custom_fully_qualified_name(BEDROCK_FUNCTION_NAME_SEPARATOR),
+                    "name": function.fully_qualified_name,
                     "description": function.description or "",
                     "inputSchema": {
                         "json": {

python/semantic_kernel/connectors/ai/google/shared_utils.py

@@ -38,7 +38,9 @@ def filter_system_message(chat_history: ChatHistory) -> str | None:
 # The separator used in the fully qualified name of the function instead of the default "-" separator.
 # This is required since Gemini doesn't work well with "-" in the function name.
 # https://ai.google.dev/gemini-api/docs/function-calling#function_declarations
-GEMINI_FUNCTION_NAME_SEPARATOR = "_"
+# Using double underscore to avoid situations where the function name already contains a single underscore.
+# For example, we may incorrect split a function name with a single score when the function doesn't have a plugin name.
+GEMINI_FUNCTION_NAME_SEPARATOR = "__"
 
 
 def format_gemini_function_name_to_kernel_function_fully_qualified_name(gemini_function_name: str) -> str:

python/tests/integration/completions/chat_completion_test_base.py

@@ -160,7 +160,7 @@ def services(self) -> dict[str, tuple[ServiceType | None, type[PromptExecutionSe
                 BedrockChatPromptExecutionSettings,
             ),
             "bedrock_anthropic_claude": (
-                self._try_create_bedrock_chat_completion_client("anthropic.claude-3-5-sonnet-20240620-v1:0"),
+                self._try_create_bedrock_chat_completion_client("anthropic.claude-3-sonnet-20240229-v1:0"),
                 BedrockChatPromptExecutionSettings,
             ),
             "bedrock_cohere_command": (