arize-phoenix 10.14.0__py3-none-any.whl → 10.15.0__py3-none-any.whl

phoenix/server/api/helpers/prompts/models.py

@@ -9,6 +9,7 @@ from typing_extensions import Annotated, Self, TypeAlias, TypeGuard, assert_neve
 from phoenix.db.types.db_models import UNDEFINED, DBBaseModel
 from phoenix.db.types.model_provider import ModelProvider
 from phoenix.server.api.helpers.prompts.conversions.anthropic import AnthropicToolChoiceConversion
+from phoenix.server.api.helpers.prompts.conversions.aws import AwsToolChoiceConversion
 from phoenix.server.api.helpers.prompts.conversions.openai import OpenAIToolChoiceConversion
 
 JSONSerializable = Union[None, bool, int, float, str, dict[str, Any], list[Any]]
@@ -312,6 +313,14 @@ class AnthropicToolDefinition(DBBaseModel):
     description: str = UNDEFINED
 
 
+class BedrockToolDefinition(DBBaseModel):
+    """
+    Based on https://github.com/aws/amazon-bedrock-sdk-python/blob/main/src/bedrock/types/tool_param.py#L12
+    """
+
+    toolSpec: dict[str, Any]
+
+
 class PromptOpenAIInvocationParametersContent(DBBaseModel):
     temperature: float = UNDEFINED
     max_tokens: int = UNDEFINED
@@ -397,6 +406,17 @@ class PromptAnthropicInvocationParameters(DBBaseModel):
     anthropic: PromptAnthropicInvocationParametersContent
 
 
+class PromptAwsInvocationParametersContent(DBBaseModel):
+    max_tokens: int = UNDEFINED
+    temperature: float = UNDEFINED
+    top_p: float = UNDEFINED
+
+
+class PromptAwsInvocationParameters(DBBaseModel):
+    type: Literal["aws"]
+    aws: PromptAwsInvocationParametersContent
+
+
 class PromptGoogleInvocationParametersContent(DBBaseModel):
     temperature: float = UNDEFINED
     max_output_tokens: int = UNDEFINED
@@ -421,6 +441,7 @@ PromptInvocationParameters: TypeAlias = Annotated[
         PromptDeepSeekInvocationParameters,
         PromptXAIInvocationParameters,
         PromptOllamaInvocationParameters,
+        PromptAwsInvocationParameters,
     ],
     Field(..., discriminator="type"),
 ]
@@ -443,6 +464,8 @@ def get_raw_invocation_parameters(
         return invocation_parameters.xai.model_dump()
     if isinstance(invocation_parameters, PromptOllamaInvocationParameters):
         return invocation_parameters.ollama.model_dump()
+    if isinstance(invocation_parameters, PromptAwsInvocationParameters):
+        return invocation_parameters.aws.model_dump()
     assert_never(invocation_parameters)
 
 
@@ -459,6 +482,7 @@ def is_prompt_invocation_parameters(
             PromptDeepSeekInvocationParameters,
             PromptXAIInvocationParameters,
             PromptOllamaInvocationParameters,
+            PromptAwsInvocationParameters,
         ),
     )
 
@@ -512,6 +536,11 @@ def validate_invocation_parameters(
             type="ollama",
             ollama=PromptOllamaInvocationParametersContent.model_validate(invocation_parameters),
         )
+    elif model_provider is ModelProvider.AWS:
+        return PromptAwsInvocationParameters(
+            type="aws",
+            aws=PromptAwsInvocationParametersContent.model_validate(invocation_parameters),
+        )
     assert_never(model_provider)
 
 
@@ -530,12 +559,16 @@ def normalize_tools(
     ):
         openai_tools = [OpenAIToolDefinition.model_validate(schema) for schema in schemas]
         tools = [_openai_to_prompt_tool(openai_tool) for openai_tool in openai_tools]
+    elif model_provider is ModelProvider.AWS:
+        bedrock_tools = [BedrockToolDefinition.model_validate(schema) for schema in schemas]
+        tools = [_bedrock_to_prompt_tool(bedrock_tool) for bedrock_tool in bedrock_tools]
     elif model_provider is ModelProvider.ANTHROPIC:
         anthropic_tools = [AnthropicToolDefinition.model_validate(schema) for schema in schemas]
         tools = [_anthropic_to_prompt_tool(anthropic_tool) for anthropic_tool in anthropic_tools]
     else:
         raise ValueError(f"Unsupported model provider: {model_provider}")
     ans = PromptTools(type="tools", tools=tools)
+
     if tool_choice is not None:
         if (
             model_provider is ModelProvider.OPENAI
@@ -545,6 +578,8 @@ def normalize_tools(
             or model_provider is ModelProvider.OLLAMA
         ):
             ans.tool_choice = OpenAIToolChoiceConversion.from_openai(tool_choice)  # type: ignore[arg-type]
+        elif model_provider is ModelProvider.AWS:
+            ans.tool_choice = AwsToolChoiceConversion.from_aws(tool_choice)  # type: ignore[arg-type]
         elif model_provider is ModelProvider.ANTHROPIC:
             choice, disable_parallel_tool_calls = AnthropicToolChoiceConversion.from_anthropic(
                 tool_choice  # type: ignore[arg-type]
@@ -571,6 +606,10 @@ def denormalize_tools(
         denormalized_tools = [_prompt_to_openai_tool(tool) for tool in tools.tools]
         if tools.tool_choice:
             tool_choice = OpenAIToolChoiceConversion.to_openai(tools.tool_choice)
+    elif model_provider is ModelProvider.AWS:
+        denormalized_tools = [_prompt_to_bedrock_tool(tool) for tool in tools.tools]
+        if tools.tool_choice:
+            tool_choice = OpenAIToolChoiceConversion.to_openai(tools.tool_choice)
     elif model_provider is ModelProvider.ANTHROPIC:
         denormalized_tools = [_prompt_to_anthropic_tool(tool) for tool in tools.tools]
         if tools.tool_choice and tools.tool_choice.type != "none":
@@ -614,6 +653,19 @@ def _prompt_to_openai_tool(
     )
 
 
+def _bedrock_to_prompt_tool(
+    tool: BedrockToolDefinition,
+) -> PromptToolFunction:
+    return PromptToolFunction(
+        type="function",
+        function=PromptToolFunctionDefinition(
+            name=tool.toolSpec["name"],
+            description=tool.toolSpec["description"],
+            parameters=tool.toolSpec["inputSchema"]["json"],
+        ),
+    )
+
+
 def _anthropic_to_prompt_tool(
     tool: AnthropicToolDefinition,
 ) -> PromptToolFunction:
@@ -636,3 +688,18 @@ def _prompt_to_anthropic_tool(
         name=function.name,
         description=function.description,
     )
+
+
+def _prompt_to_bedrock_tool(
+    tool: PromptToolFunction,
+) -> BedrockToolDefinition:
+    function = tool.function
+    return BedrockToolDefinition(
+        toolSpec={
+            "name": function.name,
+            "description": function.description,
+            "inputSchema": {
+                "json": function.parameters,
+            },
+        }
+    )

phoenix/server/api/input_types/GenerativeModelInput.py

@@ -17,3 +17,5 @@ class GenerativeModelInput:
     """ The endpoint to use for the model. Only required for Azure OpenAI models. """
     api_version: Optional[str] = UNSET
     """ The API version to use for the model. """
+    region: Optional[str] = UNSET
+    """ The region to use for the model. """

phoenix/server/api/types/GenerativeProvider.py

@@ -17,6 +17,7 @@ class GenerativeProviderKey(Enum):
     DEEPSEEK = "DeepSeek"
     XAI = "xAI"
     OLLAMA = "Ollama"
+    AWS = "AWS Bedrock"
 
 
 @strawberry.type
@@ -38,6 +39,7 @@ class GenerativeProvider:
         GenerativeProviderKey.DEEPSEEK: ["deepseek"],
         GenerativeProviderKey.XAI: ["grok"],
         GenerativeProviderKey.OLLAMA: ["llama", "mistral", "codellama", "phi", "qwen", "gemma"],
+        GenerativeProviderKey.AWS: ["nova", "titan"],
     }
 
     attribute_provider_to_generative_provider_map: ClassVar[dict[str, GenerativeProviderKey]] = {
@@ -45,6 +47,7 @@ class GenerativeProvider:
         OpenInferenceLLMProviderValues.ANTHROPIC.value: GenerativeProviderKey.ANTHROPIC,
         OpenInferenceLLMProviderValues.AZURE.value: GenerativeProviderKey.AZURE_OPENAI,
         OpenInferenceLLMProviderValues.GOOGLE.value: GenerativeProviderKey.GOOGLE,
+        OpenInferenceLLMProviderValues.AWS.value: GenerativeProviderKey.AWS,
         # Note: DeepSeek uses OpenAI compatibility but we can't duplicate the key in the dict
         # The provider will be determined through model name prefix matching instead
         # Note: xAI uses OpenAI compatibility but we can't duplicate the key in the dict
@@ -58,26 +61,36 @@ class GenerativeProvider:
     E.x. OpenAI requires a single API key
     """
     model_provider_to_credential_requirements_map: ClassVar[
-        dict[GenerativeProviderKey, GenerativeProviderCredentialConfig]
+        dict[GenerativeProviderKey, list[GenerativeProviderCredentialConfig]]
     ] = {
-        GenerativeProviderKey.AZURE_OPENAI: GenerativeProviderCredentialConfig(
-            env_var_name="AZURE_OPENAI_API_KEY", is_required=True
-        ),
-        GenerativeProviderKey.ANTHROPIC: GenerativeProviderCredentialConfig(
-            env_var_name="ANTHROPIC_API_KEY", is_required=True
-        ),
-        GenerativeProviderKey.OPENAI: GenerativeProviderCredentialConfig(
-            env_var_name="OPENAI_API_KEY", is_required=True
-        ),
-        GenerativeProviderKey.GOOGLE: GenerativeProviderCredentialConfig(
-            env_var_name="GEMINI_API_KEY", is_required=True
-        ),
-        GenerativeProviderKey.DEEPSEEK: GenerativeProviderCredentialConfig(
-            env_var_name="DEEPSEEK_API_KEY", is_required=True
-        ),
-        GenerativeProviderKey.XAI: GenerativeProviderCredentialConfig(
-            env_var_name="XAI_API_KEY", is_required=True
-        ),
+        GenerativeProviderKey.AZURE_OPENAI: [
+            GenerativeProviderCredentialConfig(
+                env_var_name="AZURE_OPENAI_API_KEY", is_required=True
+            )
+        ],
+        GenerativeProviderKey.ANTHROPIC: [
+            GenerativeProviderCredentialConfig(env_var_name="ANTHROPIC_API_KEY", is_required=True)
+        ],
+        GenerativeProviderKey.OPENAI: [
+            GenerativeProviderCredentialConfig(env_var_name="OPENAI_API_KEY", is_required=True)
+        ],
+        GenerativeProviderKey.GOOGLE: [
+            GenerativeProviderCredentialConfig(env_var_name="GEMINI_API_KEY", is_required=True)
+        ],
+        GenerativeProviderKey.DEEPSEEK: [
+            GenerativeProviderCredentialConfig(env_var_name="DEEPSEEK_API_KEY", is_required=True)
+        ],
+        GenerativeProviderKey.XAI: [
+            GenerativeProviderCredentialConfig(env_var_name="XAI_API_KEY", is_required=True)
+        ],
+        GenerativeProviderKey.OLLAMA: [],
+        GenerativeProviderKey.AWS: [
+            GenerativeProviderCredentialConfig(env_var_name="AWS_ACCESS_KEY_ID", is_required=True),
+            GenerativeProviderCredentialConfig(
+                env_var_name="AWS_SECRET_ACCESS_KEY", is_required=True
+            ),
+            GenerativeProviderCredentialConfig(env_var_name="AWS_SESSION_TOKEN", is_required=False),
+        ],
     }
 
     @strawberry.field
@@ -110,7 +123,7 @@ class GenerativeProvider:
         credential_requirements = self.model_provider_to_credential_requirements_map.get(self.key)
         if credential_requirements is None:
             return []
-        return [credential_requirements]
+        return self.model_provider_to_credential_requirements_map[self.key]
 
     @strawberry.field(description="Whether the credentials are set on the server for the provider")  # type: ignore
     async def credentials_set(self) -> bool:

phoenix/server/static/.vite/manifest.json

@@ -1,28 +1,28 @@
 {
-  "_components-CUUWyAMo.js": {
-    "file": "assets/components-CUUWyAMo.js",
+  "_components-SpUMF1qV.js": {
+    "file": "assets/components-SpUMF1qV.js",
     "name": "components",
     "imports": [
-      "_vendor-Bfsiga8H.js",
-      "_pages-C4V07ozl.js",
-      "_vendor-arizeai-CQOWsrzm.js",
-      "_vendor-codemirror-CrcGVhB2.js",
+      "_vendor-DCZoBorz.js",
+      "_pages-YX47cEoQ.js",
+      "_vendor-arizeai-Ckci3irT.js",
+      "_vendor-codemirror-BODM513D.js",
       "_vendor-three-C5WAXd5r.js"
     ]
   },
-  "_pages-C4V07ozl.js": {
-    "file": "assets/pages-C4V07ozl.js",
+  "_pages-YX47cEoQ.js": {
+    "file": "assets/pages-YX47cEoQ.js",
     "name": "pages",
     "imports": [
-      "_vendor-Bfsiga8H.js",
-      "_vendor-arizeai-CQOWsrzm.js",
-      "_components-CUUWyAMo.js",
-      "_vendor-codemirror-CrcGVhB2.js",
-      "_vendor-recharts-Yyg3G-Rq.js"
+      "_vendor-DCZoBorz.js",
+      "_vendor-arizeai-Ckci3irT.js",
+      "_components-SpUMF1qV.js",
+      "_vendor-codemirror-BODM513D.js",
+      "_vendor-recharts-C9O2a-N3.js"
     ]
   },
-  "_vendor-Bfsiga8H.js": {
-    "file": "assets/vendor-Bfsiga8H.js",
+  "_vendor-DCZoBorz.js": {
+    "file": "assets/vendor-DCZoBorz.js",
     "name": "vendor",
     "imports": [
       "_vendor-three-C5WAXd5r.js"
@@ -35,33 +35,33 @@
     "file": "assets/vendor-WIZid84E.css",
     "src": "_vendor-WIZid84E.css"
   },
-  "_vendor-arizeai-CQOWsrzm.js": {
-    "file": "assets/vendor-arizeai-CQOWsrzm.js",
+  "_vendor-arizeai-Ckci3irT.js": {
+    "file": "assets/vendor-arizeai-Ckci3irT.js",
     "name": "vendor-arizeai",
     "imports": [
-      "_vendor-Bfsiga8H.js"
+      "_vendor-DCZoBorz.js"
     ]
   },
-  "_vendor-codemirror-CrcGVhB2.js": {
-    "file": "assets/vendor-codemirror-CrcGVhB2.js",
+  "_vendor-codemirror-BODM513D.js": {
+    "file": "assets/vendor-codemirror-BODM513D.js",
     "name": "vendor-codemirror",
     "imports": [
-      "_vendor-Bfsiga8H.js",
-      "_vendor-shiki-OPjag7Hm.js"
+      "_vendor-DCZoBorz.js",
+      "_vendor-shiki-Dq54rRC7.js"
     ]
   },
-  "_vendor-recharts-Yyg3G-Rq.js": {
-    "file": "assets/vendor-recharts-Yyg3G-Rq.js",
+  "_vendor-recharts-C9O2a-N3.js": {
+    "file": "assets/vendor-recharts-C9O2a-N3.js",
     "name": "vendor-recharts",
     "imports": [
-      "_vendor-Bfsiga8H.js"
+      "_vendor-DCZoBorz.js"
     ]
   },
-  "_vendor-shiki-OPjag7Hm.js": {
-    "file": "assets/vendor-shiki-OPjag7Hm.js",
+  "_vendor-shiki-Dq54rRC7.js": {
+    "file": "assets/vendor-shiki-Dq54rRC7.js",
     "name": "vendor-shiki",
     "imports": [
-      "_vendor-Bfsiga8H.js"
+      "_vendor-DCZoBorz.js"
     ]
   },
   "_vendor-three-C5WAXd5r.js": {
@@ -69,19 +69,19 @@
     "name": "vendor-three"
   },
   "index.tsx": {
-    "file": "assets/index-qiubV_74.js",
+    "file": "assets/index-DIlhmbjB.js",
     "name": "index",
     "src": "index.tsx",
     "isEntry": true,
     "imports": [
-      "_vendor-Bfsiga8H.js",
-      "_vendor-arizeai-CQOWsrzm.js",
-      "_pages-C4V07ozl.js",
-      "_components-CUUWyAMo.js",
+      "_vendor-DCZoBorz.js",
+      "_vendor-arizeai-Ckci3irT.js",
+      "_pages-YX47cEoQ.js",
+      "_components-SpUMF1qV.js",
       "_vendor-three-C5WAXd5r.js",
-      "_vendor-codemirror-CrcGVhB2.js",
-      "_vendor-shiki-OPjag7Hm.js",
-      "_vendor-recharts-Yyg3G-Rq.js"
+      "_vendor-codemirror-BODM513D.js",
+      "_vendor-shiki-Dq54rRC7.js",
+      "_vendor-recharts-C9O2a-N3.js"
     ]
   }
 }