Skip to content

Commit

Permalink
Use non-experimental model name for 2.0
Browse files Browse the repository at this point in the history
Updated the flash-exp model references to drop the `-exp` suffix. Also
switched each of these to use a model selector where it wasn't already
configured.

I haven't added any extra models to notebooks with the selector as I
figure they should be tested, and I didn't do that, but we can do it in
future updates if we wish.
  • Loading branch information
markmcd committed Feb 4, 2025
1 parent 31f9d8a commit c085ad6
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/LiveAPI_plotting_and_mapping.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"outputs": [],
"source": [
"uri = f\"wss://generativelanguage.googleapis.com/ws/google.ai.generativelanguage.v1alpha.GenerativeService.BidiGenerateContent?key={GOOGLE_API_KEY}\"\n",
"model = \"models/gemini-2.0-flash-exp\""
"model = \"models/gemini-2.0-flash\" # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/Search_grounding_for_research_report.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
},
"outputs": [],
"source": [
"MODEL_ID = \"gemini-2.0-flash-exp\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash-latest\",\"gemini-2.0-flash-exp\"] {\"allow-input\":true}"
"MODEL_ID = \"gemini-2.0-flash\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash-latest\",\"gemini-2.0-flash\"] {\"allow-input\":true, isTemplate: true}"
]
},
{
Expand Down
18 changes: 9 additions & 9 deletions examples/Spatial_understanding_3d.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
},
"outputs": [],
"source": [
"model_name = \"gemini-2.0-flash-exp\""
"model_name = \"gemini-2.0-flash\" # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down Expand Up @@ -281,7 +281,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -1026,7 +1026,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -1301,7 +1301,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -1567,7 +1567,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -1643,7 +1643,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -3446,7 +3446,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -4068,7 +4068,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down Expand Up @@ -4683,7 +4683,7 @@
"\n",
"# Analyze the image using Gemini\n",
"image_response = client.models.generate_content(\n",
" model='gemini-2.0-flash-exp',\n",
" model=model_name,\n",
" contents=[\n",
" img,\n",
" \"\"\"\n",
Expand Down
2 changes: 1 addition & 1 deletion gemini-2/live_api_starter.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
},
"outputs": [],
"source": [
"MODEL = \"gemini-2.0-flash-exp\""
"MODEL = \"gemini-2.0-flash\" # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion gemini-2/live_api_tool_use.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
},
"outputs": [],
"source": [
"model_name = \"gemini-2.0-flash-exp\""
"model_name = \"gemini-2.0-flash\" # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions gemini-2/websockets/live_api_starter.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
},
"outputs": [],
"source": [
"MODEL = 'models/gemini-2.0-flash-exp'\n",
"MODEL = 'gemini-2.0-flash' # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}\n",
"\n",
"HOST='generativelanguage.googleapis.com'\n",
"\n",
Expand Down Expand Up @@ -293,7 +293,7 @@
" logger.debug(\"set_up\")\n",
" await self.ws.send(json.dumps({\n",
" 'setup' : {\n",
" \"model\": MODEL,\n",
" \"model\": f\"models/{MODEL}\",\n",
" \"tools\": self.tools\n",
" }\n",
" }))\n",
Expand Down
4 changes: 2 additions & 2 deletions gemini-2/websockets/live_api_streaming_in_colab.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@
"\n",
"HOST = 'generativelanguage.googleapis.com' # @param {type:'string'}\n",
"API_KEY = GOOGLE_API_KEY\n",
"MODEL = 'models/gemini-2.0-flash-exp' # @param {type:'string'}\n",
"MODEL = 'gemini-2.0-flash' # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}\n",
"INITIAL_REQUEST_TEXT = \"what's up?\" # @param {type:'string'}\n",
"\n",
"\n",
Expand Down Expand Up @@ -769,7 +769,7 @@
"\n",
" initial_request = {\n",
" 'setup': {\n",
" 'model': MODEL,\n",
" 'model': f'models/{MODEL}',\n",
" },\n",
" }\n",
" await conn.send(json.dumps(initial_request))\n",
Expand Down
4 changes: 2 additions & 2 deletions gemini-2/websockets/live_api_tool_use.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"source": [
"uri = f\"wss://generativelanguage.googleapis.com/ws/google.ai.generativelanguage.v1alpha.GenerativeService.BidiGenerateContent?key={GOOGLE_API_KEY}\"\n",
"\n",
"model = \"models/gemini-2.0-flash-exp\""
"model = \"models/gemini-2.0-flash\" # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down Expand Up @@ -227,7 +227,7 @@
"async def setup(ws, modality, tools):\n",
" setup = {\n",
" \"setup\": {\n",
" \"model\": model,\n",
" \"model\": f\"models/{model}\",\n",
" \"tools\": tools,\n",
" \"generation_config\": {\n",
" \"response_modalities\": [modality]\n",
Expand Down
4 changes: 2 additions & 2 deletions quickstarts/Get_started.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
},
"outputs": [],
"source": [
"MODEL_ID = \"gemini-2.0-flash-exp\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash-002\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash-exp\"] {\"allow-input\":true}"
"MODEL_ID = \"gemini-2.0-flash\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash-002\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash\"] {\"allow-input\":true, isTemplate:true}"
]
},
{
Expand Down Expand Up @@ -269,7 +269,7 @@
"source": [
"## Send multimodal prompts\n",
"\n",
"Use Gemini 2.0 model (`gemini-2.0-flash-exp`), a multimodal model that supports multimodal prompts. You can include text, [PDF documents](../quickstarts/PDF_Files.ipynb), images, [audio](../quickstarts/Audio.ipynb) and [video](../quickstarts/Video.ipynb) in your prompt requests and get text or code responses."
"Use Gemini 2.0 model (`gemini-2.0-flash`), a multimodal model that supports multimodal prompts. You can include text, [PDF documents](../quickstarts/PDF_Files.ipynb), images, [audio](../quickstarts/Audio.ipynb) and [video](../quickstarts/Video.ipynb) in your prompt requests and get text or code responses."
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions quickstarts/Get_started_thinking.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
}
],
"source": [
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash-exp\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"\n",
"response = client.models.generate_content(\n",
" model=model_name,\n",
Expand Down Expand Up @@ -456,7 +456,7 @@
}
],
"source": [
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash-exp\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"\n",
"response = client.models.generate_content(\n",
" model=model_name,\n",
Expand Down Expand Up @@ -609,7 +609,7 @@
}
],
"source": [
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash-exp\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"model_name = \"gemini-2.0-flash-thinking-exp-01-21\" # @param [\"gemini-1.5-flash-8b\",\"gemini-1.5-flash\",\"gemini-1.5-pro\",\"gemini-2.0-flash\", \"gemini-2.0-flash-thinking-exp-01-21\"] {\"allow-input\":true}\n",
"\n",
"response = client.models.generate_content_stream(\n",
" model=model_name,\n",
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Search_Grounding.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"\n",
"client = genai.Client(http_options={'api_version': 'v1alpha'})\n",
"\n",
"MODEL = 'gemini-2.0-flash-exp'"
"MODEL = 'gemini-2.0-flash' # @param ['gemini-2.0-flash'] {allow-input: true, isTemplate: true}"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Spatial_understanding.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
},
"outputs": [],
"source": [
"model_name = \"gemini-2.0-flash-exp\" # @param [\"gemini-1.5-flash-001\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash-exp\"] {\"allow-input\":true}"
"model_name = \"gemini-2.0-flash\" # @param [\"gemini-1.5-flash-001\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash\"] {\"allow-input\":true, isTemplate:true}"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Video_understanding.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
},
"outputs": [],
"source": [
"model_name = \"gemini-2.0-flash-exp\" # @param [\"gemini-1.5-flash-001\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash-exp\"] {\"allow-input\":true}"
"model_name = \"gemini-2.0-flash\" # @param [\"gemini-1.5-flash-001\",\"gemini-1.5-pro-002\",\"gemini-2.0-flash\"] {\"allow-input\":true, isTemplate:true}"
]
},
{
Expand Down

0 comments on commit c085ad6

Please sign in to comment.