From c755d53bfe1368aea2594b8baa1815f4c2011c8f Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:01:13 -0600 Subject: [PATCH 01/15] Update samples to use right API key name --- samples/rest/cache.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/rest/cache.sh b/samples/rest/cache.sh index 218b5e4b1..8df687886 100644 --- a/samples/rest/cache.sh +++ b/samples/rest/cache.sh @@ -34,7 +34,7 @@ echo '{ "ttl": "300s" }' > request.json -curl -X POST "https://generativelanguage.googleapis.com/v1beta/cachedContents?key=$GOOGLE_API_KEY" \ +curl -X POST "https://generativelanguage.googleapis.com/v1beta/cachedContents?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d @request.json \ > cache.json @@ -43,7 +43,7 @@ CACHE_NAME=$(cat cache.json | grep '"name":' | cut -d '"' -f 4 | head -n 1) echo "[START cache_generate_content]" # [START cache_generate_content] -curl -X POST "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-001:generateContent?key=$GOOGLE_API_KEY" \ +curl -X POST "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-001:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{ "contents": [ @@ -62,22 +62,22 @@ rm a11.txt request.json echo "[START cache_list]" # [START cache_list] -curl "https://generativelanguage.googleapis.com/v1beta/cachedContents?key=$GOOGLE_API_KEY" +curl "https://generativelanguage.googleapis.com/v1beta/cachedContents?key=$GEMINI_API_KEY" # [END cache_list] echo "[START cache_get]" # [START cache_get] -curl "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GOOGLE_API_KEY" +curl "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GEMINI_API_KEY" # [END cache_get] echo "[START cache_update]" # [START cache_update] -curl -X PATCH "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GOOGLE_API_KEY" \ +curl -X PATCH "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{"ttl": "600s"}' # [END cache_update] echo "[START cache_delete]" # [START cache_delete] -curl -X DELETE "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GOOGLE_API_KEY" -# [END cache_delete] \ No newline at end of file +curl -X DELETE "https://generativelanguage.googleapis.com/v1beta/$CACHE_NAME?key=$GEMINI_API_KEY" +# [END cache_delete] From b95301a00420ff1ac853a68a8af4ee366290583a Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:01:45 -0600 Subject: [PATCH 02/15] Update chat.sh --- samples/rest/chat.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/rest/chat.sh b/samples/rest/chat.sh index 78e6f9917..8079a8071 100644 --- a/samples/rest/chat.sh +++ b/samples/rest/chat.sh @@ -5,7 +5,7 @@ MEDIA_DIR=$(realpath ${SCRIPT_DIR}/../../third_party) echo "[START chat]" # [START chat] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -25,7 +25,7 @@ curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:ge echo "[START chat_streaming]" # [START chat_streaming] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -53,7 +53,7 @@ else B64FLAGS="-w0" fi -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -90,4 +90,4 @@ curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:st } ] }' 2> /dev/null | grep "text" -# [END chat_streaming_with_images] \ No newline at end of file +# [END chat_streaming_with_images] From 83ae0087918455a885250035c3cfb281baf28b1e Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:02:13 -0600 Subject: [PATCH 03/15] Update code_execution.sh --- samples/rest/code_execution.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rest/code_execution.sh b/samples/rest/code_execution.sh index 44fbf679c..f134e728f 100644 --- a/samples/rest/code_execution.sh +++ b/samples/rest/code_execution.sh @@ -2,7 +2,7 @@ set -eu echo "[START code_execution_basic]" # [START code_execution_basic] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d ' {"tools": [{"code_execution": {}}], "contents": { @@ -16,7 +16,7 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:g echo "[START code_execution_chat]" # [START code_execution_chat] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{"tools": [{"code_execution": {}}], "contents": [ From 0d3df0fab151089e8a202031e946ecf31f2fce20 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:02:34 -0600 Subject: [PATCH 04/15] Update chat.sh --- samples/rest/chat.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/rest/chat.sh b/samples/rest/chat.sh index 8079a8071..0243e4152 100644 --- a/samples/rest/chat.sh +++ b/samples/rest/chat.sh @@ -5,7 +5,7 @@ MEDIA_DIR=$(realpath ${SCRIPT_DIR}/../../third_party) echo "[START chat]" # [START chat] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -25,7 +25,7 @@ curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:ge echo "[START chat_streaming]" # [START chat_streaming] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -53,7 +53,7 @@ else B64FLAGS="-w0" fi -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ From 4403e02848df7939b0ee0b0f7ae0d02fb46110aa Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:03:09 -0600 Subject: [PATCH 05/15] Update configure_model_parameters.sh --- samples/rest/configure_model_parameters.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/samples/rest/configure_model_parameters.sh b/samples/rest/configure_model_parameters.sh index bd8d9d4c6..2e6e31b35 100644 --- a/samples/rest/configure_model_parameters.sh +++ b/samples/rest/configure_model_parameters.sh @@ -2,21 +2,15 @@ set -eu echo "[START configure_model_parameters]" # [START configure_model_parameters] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ "contents": [{ "parts":[ - {"text": "Write a story about a magic backpack."} + {"text": "Explain how AI works"} ] }], - "safetySettings": [ - { - "category": "HARM_CATEGORY_DANGEROUS_CONTENT", - "threshold": "BLOCK_ONLY_HIGH" - } - ], "generationConfig": { "stopSequences": [ "Title" From 624a96297efe0654e806d8dd0d9143e0f024f60e Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:03:38 -0600 Subject: [PATCH 06/15] Update controlled_generation.sh --- samples/rest/controlled_generation.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rest/controlled_generation.sh b/samples/rest/controlled_generation.sh index 533870649..352b435de 100644 --- a/samples/rest/controlled_generation.sh +++ b/samples/rest/controlled_generation.sh @@ -2,7 +2,7 @@ set -eu echo "json_controlled_generation" # [START json_controlled_generation] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{ "contents": [{ @@ -27,7 +27,7 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:g echo "json_no_schema" # [START json_no_schema] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{ "contents": [{ From 2b71a8bd1afe7417461c60ea00010ccf327fe856 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:04:18 -0600 Subject: [PATCH 07/15] Update count_tokens.sh --- samples/rest/count_tokens.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/rest/count_tokens.sh b/samples/rest/count_tokens.sh index e69fd6d1c..3c6be6719 100644 --- a/samples/rest/count_tokens.sh +++ b/samples/rest/count_tokens.sh @@ -19,14 +19,14 @@ fi echo "[START tokens_context_window]" # [START tokens_context_window] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro?key=$GOOGLE_API_KEY > model.json +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro?key=$GEMINI_API_KEY > model.json jq .inputTokenLimit model.json jq .outputTokenLimit model.json # [END tokens_context_window] echo "[START tokens_text_only]" # [START tokens_text_only] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:countTokens?key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:countTokens?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -40,7 +40,7 @@ curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:co echo "[START tokens_chat]" # [START tokens_chat] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:countTokens?key=$GOOGLE_API_KEY \ +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:countTokens?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -57,7 +57,7 @@ curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:co echo "[START tokens_multimodal_image_inline]" # [START tokens_multimodal_image_inline] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:countTokens?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:countTokens?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -285,4 +285,4 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-lat ' > tools_output.json jq .usageMetadata.totalTokenCount tools_output.json -# [END tokens_tools] \ No newline at end of file +# [END tokens_tools] From ebf7c756b8a3bddc117f5d320cf423fc4ea8edb8 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:04:40 -0600 Subject: [PATCH 08/15] Update embed.sh --- samples/rest/embed.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/rest/embed.sh b/samples/rest/embed.sh index 26fa11d44..49f6ddfcb 100644 --- a/samples/rest/embed.sh +++ b/samples/rest/embed.sh @@ -2,7 +2,7 @@ set -eu echo "[START embed_content]" # [START embed_content] -curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004:embedContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004:embedContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{"model": "models/text-embedding-004", "content": { @@ -12,7 +12,7 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004 echo "[START batch_embed_contents]" # [START batch_embed_contents] -curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004:batchEmbedContents?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004:batchEmbedContents?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{"requests": [{ "model": "models/text-embedding-004", @@ -29,4 +29,4 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/text-embedding-004 "content": { "parts":[{ "text": "How does the brain work?"}]}, }, ]}' 2> /dev/null | grep -C 5 values -# [END batch_embed_contents] \ No newline at end of file +# [END batch_embed_contents] From 941596c87129544877f68e500e4d883107ceda51 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:05:34 -0600 Subject: [PATCH 09/15] Update files.sh --- samples/rest/files.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/rest/files.sh b/samples/rest/files.sh index 8f292c4f6..dd72db3b1 100644 --- a/samples/rest/files.sh +++ b/samples/rest/files.sh @@ -22,7 +22,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -45,7 +45,7 @@ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -75,7 +75,7 @@ echo file_uri=$file_uri echo "[START files_delete]" # [START files_delete] -curl --request "DELETE" https://generativelanguage.googleapis.com/v1beta/files/$name?key=$GOOGLE_API_KEY +curl --request "DELETE" https://generativelanguage.googleapis.com/v1beta/files/$name?key=$GEMINI_API_KEY # [END files_delete] # [END files_create_text] @@ -90,7 +90,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -113,7 +113,7 @@ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -143,7 +143,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -166,7 +166,7 @@ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -191,7 +191,7 @@ DISPLAY_NAME=VIDEO_PATH # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -227,7 +227,7 @@ do done # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -252,7 +252,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -296,5 +296,5 @@ echo "[START files_list]" # [START files_list] echo "My files: " -curl "https://generativelanguage.googleapis.com/v1beta/files?key=$GOOGLE_API_KEY" -# [END files_list] \ No newline at end of file +curl "https://generativelanguage.googleapis.com/v1beta/files?key=$GEMINI_API_KEY" +# [END files_list] From 95856bce0cccca02c4688662fbdf3dd2d1376a20 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:05:57 -0600 Subject: [PATCH 10/15] Update function_calling.sh --- samples/rest/function_calling.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/rest/function_calling.sh b/samples/rest/function_calling.sh index c6479811a..a0e0fa28d 100644 --- a/samples/rest/function_calling.sh +++ b/samples/rest/function_calling.sh @@ -34,7 +34,7 @@ cat > tools.json << EOF } EOF -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-latest:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d @<(echo ' { From 4ab3e54609b0420f8eae10534baa0568299b95e2 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:06:15 -0600 Subject: [PATCH 11/15] Update models.sh --- samples/rest/models.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rest/models.sh b/samples/rest/models.sh index a03d5585b..465d627d8 100644 --- a/samples/rest/models.sh +++ b/samples/rest/models.sh @@ -2,10 +2,10 @@ set -eu echo "[START models_list]" # [START models_list] -curl https://generativelanguage.googleapis.com/v1beta/models?key=$GOOGLE_API_KEY +curl https://generativelanguage.googleapis.com/v1beta/models?key=$GEMINI_API_KEY # [END models_list] echo "[START models_get]" # [START models_get] -curl https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash?key=$GOOGLE_API_KEY +curl https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash?key=$GEMINI_API_KEY # [END models_get] From b60cf68d4f585b120197abc78ea9e5302ce3ea55 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:06:37 -0600 Subject: [PATCH 12/15] Update safety_settings.sh --- samples/rest/safety_settings.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rest/safety_settings.sh b/samples/rest/safety_settings.sh index 713d25c06..a087307db 100644 --- a/samples/rest/safety_settings.sh +++ b/samples/rest/safety_settings.sh @@ -10,7 +10,7 @@ echo "[START safety_settings]" "parts":[{ "text": "'I support Martians Soccer Club and I think Jupiterians Football Club sucks! Write a ironic phrase about them.'"}]}]}' > request.json - curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ + curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d @request.json 2> /dev/null @@ -27,7 +27,7 @@ echo "[START safety_settings_multi]" "parts":[{ "text": "'I support Martians Soccer Club and I think Jupiterians Football Club sucks! Write a ironic phrase about them.'"}]}]}' > request.json - curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ + curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d @request.json 2> /dev/null From e2d2ce95963c637bb0e7217cb6fb0c337439e7d8 Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:06:50 -0600 Subject: [PATCH 13/15] Update system_instruction.sh --- samples/rest/system_instruction.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rest/system_instruction.sh b/samples/rest/system_instruction.sh index 1e4c36d6c..44f77ea04 100644 --- a/samples/rest/system_instruction.sh +++ b/samples/rest/system_instruction.sh @@ -2,7 +2,7 @@ set -eu echo "[START system_instruction]" # [START system_instruction] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d '{ "system_instruction": { "parts": @@ -10,4 +10,4 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:g "contents": { "parts": { "text": "Hello there"}}}' -# [END system_instruction] \ No newline at end of file +# [END system_instruction] From 9ed049d13bd3497f98a920929e1635666e4fb00c Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:08:58 -0600 Subject: [PATCH 14/15] Update text_generation.sh --- samples/rest/text_generation.sh | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/samples/rest/text_generation.sh b/samples/rest/text_generation.sh index 8cfadd688..fc21e7d00 100755 --- a/samples/rest/text_generation.sh +++ b/samples/rest/text_generation.sh @@ -19,7 +19,7 @@ BASE_URL="https://generativelanguage.googleapis.com" echo "[START text_gen_text_only_prompt]" # [START text_gen_text_only_prompt] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -31,7 +31,7 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:g echo "[START text_gen_text_only_prompt_streaming]" # [START text_gen_text_only_prompt_streaming] -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=${GOOGLE_API_KEY}" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=${GEMINI_API_KEY}" \ -H 'Content-Type: application/json' \ --no-buffer \ -d '{ "contents":[{"parts":[{"text": "Write a story about a magic backpack."}]}]}' @@ -64,7 +64,7 @@ cat > "$TEMP_JSON" << EOF } EOF -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d "@$TEMP_JSON" 2> /dev/null @@ -88,7 +88,7 @@ cat > "$TEMP_JSON" << EOF } EOF -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d "@$TEMP_JSON" 2> /dev/null @@ -129,7 +129,7 @@ cat > "$TEMP_JSON" << EOF EOF # Make the API request using the JSON file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d "@$TEMP_JSON" 2> /dev/null > response.json @@ -162,7 +162,7 @@ cat > "$TEMP_JSON" << EOF EOF # Make the API request using the JSON file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d "@$TEMP_JSON" 2> /dev/null > response.json @@ -181,7 +181,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -203,7 +203,7 @@ curl "${upload_url}" \ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -231,7 +231,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -253,7 +253,7 @@ curl "${upload_url}" \ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -277,7 +277,7 @@ DISPLAY_NAME=VIDEO # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D "${tmp_header_file}" \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -314,7 +314,7 @@ do state=$(jq ".file.state" file_info.json) done -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -340,7 +340,7 @@ DISPLAY_NAME=VIDEO_PATH # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -374,7 +374,7 @@ do state=$(jq ".file.state" file_info.json) done -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -401,7 +401,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -424,7 +424,7 @@ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -453,7 +453,7 @@ tmp_header_file=upload-header.tmp # Initial resumable request defining metadata. # The upload url is in the response headers dump them to a file. -curl "${BASE_URL}/upload/v1beta/files?key=${GOOGLE_API_KEY}" \ +curl "${BASE_URL}/upload/v1beta/files?key=${GEMINI_API_KEY}" \ -D upload-header.tmp \ -H "X-Goog-Upload-Protocol: resumable" \ -H "X-Goog-Upload-Command: start" \ @@ -476,7 +476,7 @@ file_uri=$(jq ".file.uri" file_info.json) echo file_uri=$file_uri # Now generate content using that file -curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:streamGenerateContent?alt=sse&key=$GOOGLE_API_KEY" \ +curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?alt=sse&key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -X POST \ -d '{ @@ -489,4 +489,4 @@ curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:s cat response.json echo -# [END text_gen_multimodal_pdf_streaming] \ No newline at end of file +# [END text_gen_multimodal_pdf_streaming] From e1ea5cd85f3a41baa14f91b995424f54917b0f8a Mon Sep 17 00:00:00 2001 From: Logan Kilpatrick Date: Fri, 7 Mar 2025 15:09:21 -0600 Subject: [PATCH 15/15] Update tuned_models.sh --- samples/rest/tuned_models.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/rest/tuned_models.sh b/samples/rest/tuned_models.sh index 5594734f6..0e32f97a0 100644 --- a/samples/rest/tuned_models.sh +++ b/samples/rest/tuned_models.sh @@ -2,7 +2,7 @@ set -eu echo "[START tuned_models_create]" # [START tuned_models_create] -curl -X POST "https://generativelanguage.googleapis.com/v1beta/tunedModels?key=$GOOGLE_API_KEY" \ +curl -X POST "https://generativelanguage.googleapis.com/v1beta/tunedModels?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ -d ' { @@ -77,7 +77,7 @@ tuning_done=false while [[ "$tuning_done" != "true" ]]; do sleep 5 - curl -X GET "https://generativelanguage.googleapis.com/v1/${operation}?key=$GOOGLE_API_KEY" \ + curl -X GET "https://generativelanguage.googleapis.com/v1/${operation}?key=$GEMINI_API_KEY" \ -H 'Content-Type: application/json' \ 2> /dev/null > tuning_operation.json @@ -90,7 +90,7 @@ done # Or get the TunedModel and check it's state. The model is ready to use if the state is active. modelname=$(cat tunemodel.json | jq ".metadata.tunedModel" | tr -d '"') -curl -X GET https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GOOGLE_API_KEY \ +curl -X GET https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' > tuned_model.json cat tuned_model.json | jq ".state" @@ -99,7 +99,7 @@ cat tuned_model.json | jq ".state" echo "[START tuned_models_generate_content]" # [START tuned_models_generate_content] -curl -X POST https://generativelanguage.googleapis.com/v1beta/$modelname:generateContent?key=$GOOGLE_API_KEY \ +curl -X POST https://generativelanguage.googleapis.com/v1beta/$modelname:generateContent?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' \ -d '{ "contents": [{ @@ -112,7 +112,7 @@ curl -X POST https://generativelanguage.googleapis.com/v1beta/$modelname:generat echo "[START tuned_models_get]" # [START tuned_models_get] -curl -X GET https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GOOGLE_API_KEY \ +curl -X GET https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' | grep state # [END tuned_models_get] @@ -130,7 +130,7 @@ jq .tunedModels[].name < tuned_models.json page_token=$(jq .nextPageToken < tuned_models.json | tr -d '"') if [[ "$page_token" != "null"" ]]; then -curl -X GET https://generativelanguage.googleapis.com/v1beta/tunedModels?page_size=5\&page_token=${page_token}?key=$GOOGLE_API_KEY \ +curl -X GET https://generativelanguage.googleapis.com/v1beta/tunedModels?page_size=5\&page_token=${page_token}?key=$GEMINI_API_KEY \ -H "Content-Type: application/json" > tuned_models2.json jq .tunedModels[].name < tuned_models.json fi @@ -138,6 +138,6 @@ fi echo "[START tuned_models_delete]" # [START tuned_models_delete] -curl -X DELETE https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GOOGLE_API_KEY \ +curl -X DELETE https://generativelanguage.googleapis.com/v1beta/${modelname}?key=$GEMINI_API_KEY \ -H 'Content-Type: application/json' -# [END tuned_models_delete] \ No newline at end of file +# [END tuned_models_delete]