Merge branch 'main' into thinking-params

Author: ibolmo

packages/proxy/schema/model_list.json

@@ -1875,8 +1875,11 @@
     "format": "google",
     "flavor": "chat",
     "multimodal": true,
+<<<<<<< HEAD
     "reasoning": true,
     "reasoning_budget": true,
+=======
+>>>>>>> main
     "input_cost_per_mil_tokens": 0.15,
     "output_cost_per_mil_tokens": 0.6,
     "experimental": false,
@@ -1953,6 +1956,19 @@
     "output_cost_per_mil_tokens": 0,
     "experimental": true
   },
+<<<<<<< HEAD
+=======
+  "gemini-2.0-pro-exp-02-05": {
+    "format": "google",
+    "flavor": "chat",
+    "multimodal": true,
+    "input_cost_per_mil_tokens": 1.25,
+    "output_cost_per_mil_tokens": 10,
+    "experimental": true,
+    "deprecated": true,
+    "parent": "gemini-2.5-pro-preview-03-25"
+  },
+>>>>>>> main
   "gemini-exp-1206": {
     "format": "google",
     "flavor": "chat",
@@ -2764,8 +2780,11 @@
     "flavor": "chat",
     "displayName": "Gemini 2.5 Flash Preview",
     "multimodal": true,
+<<<<<<< HEAD
     "reasoning": true,
     "reasoning_budget": true,
+=======
+>>>>>>> main
     "input_cost_per_mil_tokens": 0.15,
     "output_cost_per_mil_tokens": 0.6
   },
@@ -2774,8 +2793,11 @@
     "flavor": "chat",
     "displayName": "Gemini 2.5 Flash Preview",
     "multimodal": true,
+<<<<<<< HEAD
     "reasoning": true,
     "reasoning_budget": true,
+=======
+>>>>>>> main
     "input_cost_per_mil_tokens": 0.15,
     "output_cost_per_mil_tokens": 0.6,
     "parent": "publishers/google/models/gemini-2.5-flash-preview-05-20"