From 4cb8550897e758453f682361868ac2925025c73f Mon Sep 17 00:00:00 2001
From: Sameer Kankute <sameer@berri.ai>
Date: Fri, 6 Feb 2026 18:29:14 +0530
Subject: [PATCH] Fix merge conflicts

---
 ...odel_prices_and_context_window_backup.json | 48 +------------------
 model_prices_and_context_window.json          |  2 +-
 .../test_claude_opus_4_6_config.py            |  6 ---
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index ee618b93b60..e80a671ce08 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -992,7 +992,7 @@
         "supports_vision": true,
         "tool_use_system_prompt_tokens": 346
     },
-    "us.anthropic.claude-opus-4-6-v1": {
+    "us.anthropic.claude-opus-4-6-v1:0": {
         "cache_creation_input_token_cost": 6.875e-06,
         "cache_creation_input_token_cost_above_200k_tokens": 1.375e-05,
         "cache_read_input_token_cost": 5.5e-07,
@@ -3368,29 +3368,6 @@
         "supports_tool_choice": true,
         "supports_vision": true
     },
-    "azure/gpt-5-search-api": {
-        "cache_read_input_token_cost": 1.25e-07,
-        "input_cost_per_token": 1.25e-06,
-        "litellm_provider": "azure",
-        "max_input_tokens": 128000,
-        "max_output_tokens": 4096,
-        "max_tokens": 4096,
-        "mode": "chat",
-        "output_cost_per_token": 1e-05,
-        "search_context_cost_per_query": {
-            "search_context_size_high": 0.05,
-            "search_context_size_low": 0.03,
-            "search_context_size_medium": 0.035
-        },
-        "supports_function_calling": true,
-        "supports_parallel_function_calling": true,
-        "supports_prompt_caching": true,
-        "supports_response_schema": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "supports_vision": true,
-        "supports_web_search": true
-    },
     "azure/gpt-5-2025-08-07": {
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
@@ -18504,29 +18481,6 @@
         "supports_service_tier": true,
         "supports_vision": true
     },
-    "gpt-5-search-api": {
-        "cache_read_input_token_cost": 1.25e-07,
-        "input_cost_per_token": 1.25e-06,
-        "litellm_provider": "openai",
-        "max_input_tokens": 128000,
-        "max_output_tokens": 4096,
-        "max_tokens": 4096,
-        "mode": "chat",
-        "output_cost_per_token": 1e-05,
-        "search_context_cost_per_query": {
-            "search_context_size_high": 0.05,
-            "search_context_size_low": 0.03,
-            "search_context_size_medium": 0.035
-        },
-        "supports_function_calling": true,
-        "supports_parallel_function_calling": true,
-        "supports_prompt_caching": true,
-        "supports_response_schema": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "supports_vision": true,
-        "supports_web_search": true
-    },
     "gpt-5.1": {
         "cache_read_input_token_cost": 1.25e-07,
         "cache_read_input_token_cost_priority": 2.5e-07,
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 6d93210502b..e80a671ce08 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -992,7 +992,7 @@
         "supports_vision": true,
         "tool_use_system_prompt_tokens": 346
     },
-    "us.anthropic.claude-opus-4-6-v1": {
+    "us.anthropic.claude-opus-4-6-v1:0": {
         "cache_creation_input_token_cost": 6.875e-06,
         "cache_creation_input_token_cost_above_200k_tokens": 1.375e-05,
         "cache_read_input_token_cost": 5.5e-07,
diff --git a/tests/test_litellm/test_claude_opus_4_6_config.py b/tests/test_litellm/test_claude_opus_4_6_config.py
index 1aedebf2918..071d0a26369 100644
--- a/tests/test_litellm/test_claude_opus_4_6_config.py
+++ b/tests/test_litellm/test_claude_opus_4_6_config.py
@@ -26,12 +26,6 @@ def test_opus_4_6_model_pricing_and_capabilities():
             "tool_use_system_prompt_tokens": 346,
             "max_input_tokens": 1000000,
         },
-        "anthropic.claude-opus-4-6-v1:0": {
-            "provider": "bedrock_converse",
-            "has_long_context_pricing": True,
-            "tool_use_system_prompt_tokens": 346,
-            "max_input_tokens": 1000000,
-        },
         "anthropic.claude-opus-4-6-v1": {
             "provider": "bedrock_converse",
             "has_long_context_pricing": True,