Merged changes from main

Author: TetyanaYahodska

aiplatform/src/main/java/aiplatform/EmbeddingBatchSample.java

@@ -40,7 +40,7 @@ public static void main(String[] args) throws IOException, InterruptedException
     // Could be a BigQuery table or a Google Cloud Storage file.
     // E.g. "gs://[BUCKET]/[OUTPUT].jsonl" OR "bq://[PROJECT].[DATASET].[TABLE]"
     String outputUri = "gs://YOUR_BUCKET/embedding_batch_output";
-    String textEmbeddingModel = "textembedding-gecko@003";
+    String textEmbeddingModel = "text-embedding-005";
 
     embeddingBatchSample(project, location, inputUri, outputUri, textEmbeddingModel);
   }

aiplatform/src/main/java/aiplatform/EmbeddingModelTuningSample.java

@@ -84,7 +84,7 @@ public static PipelineJob createEmbeddingModelTuningPipelineJob(
     Matcher matcher = Pattern.compile("^(?<Location>\\w+-\\w+)").matcher(apiEndpoint);
     String location = matcher.matches() ? matcher.group("Location") : "us-central1";
     String templateUri =
-        "https://us-kfp.pkg.dev/ml-pipeline/llm-text-embedding/tune-text-embedding-model/v1.1.3";
+        "https://us-kfp.pkg.dev/ml-pipeline/llm-text-embedding/tune-text-embedding-model/v1.1.4";
     PipelineServiceSettings settings =
         PipelineServiceSettings.newBuilder().setEndpoint(apiEndpoint).build();
     try (PipelineServiceClient client = PipelineServiceClient.create(settings)) {

aiplatform/src/main/java/aiplatform/PredictTextEmbeddingsSample.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
     // https://cloud.google.com/vertex-ai/docs/generative-ai/embeddings/get-text-embeddings
     String endpoint = "us-central1-aiplatform.googleapis.com:443";
     String project = "YOUR_PROJECT_ID";
-    String model = "text-embedding-004";
+    String model = "text-embedding-005";
     predictTextEmbeddings(
         endpoint,
         project,

aiplatform/src/main/java/aiplatform/PredictTextEmbeddingsSamplePreview.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
     // https://cloud.google.com/vertex-ai/docs/generative-ai/embeddings/get-text-embeddings
     String endpoint = "us-central1-aiplatform.googleapis.com";
     String project = "YOUR_PROJECT_ID";
-    String model = "text-embedding-preview-0815";
+    String model = "text-embedding-005";
     // Calculate the embedding for a code retrieval query. Using 'CODE_RETRIEVAL_QUERY' for query.
     predictTextEmbeddings(
         endpoint,

aiplatform/src/test/java/aiplatform/EmbeddingBatchSampleTest.java

@@ -41,7 +41,7 @@ public class EmbeddingBatchSampleTest extends TestCase {
       "gs://cloud-samples-data/generative-ai/embeddings/embeddings_input.jsonl";
   private static final String GCS_OUTPUT_URI =
       String.format("gs://%s/embedding_batch_output", BUCKET_NAME);
-  private static final String MODEL_ID = "textembedding-gecko@003";
+  private static final String MODEL_ID = "text-embedding-005";
   static Storage storage;
   static Bucket bucket;
 

aiplatform/src/test/java/aiplatform/EmbeddingModelTuningSampleTest.java

@@ -53,7 +53,7 @@ public class EmbeddingModelTuningSampleTest {
 
   private static final String API_ENDPOINT = "us-central1-aiplatform.googleapis.com:443";
   private static final String PROJECT = System.getenv("UCAIP_PROJECT_ID");
-  private static final String BASE_MODEL_VERSION_ID = "text-embedding-004";
+  private static final String BASE_MODEL_VERSION_ID = "text-embedding-005";
   private static final String TASK_TYPE = "DEFAULT";
   private static final String JOB_DISPLAY_NAME = "embedding-customization-pipeline-sample";
   private static final String CORPUS = 

aiplatform/src/test/java/aiplatform/PredictTextEmbeddingsSampleTest.java

@@ -52,7 +52,7 @@ public void testPredictTextEmbeddings() throws IOException {
         PredictTextEmbeddingsSample.predictTextEmbeddings(
             APIS_ENDPOINT,
             PROJECT,
-            "text-embedding-004",
+            "text-embedding-005",
             texts,
             "QUESTION_ANSWERING",
             OptionalInt.of(5));
@@ -70,7 +70,7 @@ public void testPredictTextEmbeddingsPreview() throws IOException {
         PredictTextEmbeddingsSamplePreview.predictTextEmbeddings(
             APIS_ENDPOINT,
             PROJECT,
-            "text-embedding-preview-0815",
+            "text-embedding-005",
             texts,
             "CODE_RETRIEVAL_QUERY",
             OptionalInt.of(5));

appengine-java11/appengine-simple-jetty-main/pom.xml

@@ -21,7 +21,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <jetty.version>9.4.54.v20240208</jetty.version>
+    <jetty.version>9.4.56.v20240826</jetty.version>
   </properties>
 
   <!-- [START gae_java11_server_dependencies] -->

auth/src/main/java/UndeleteApiKey.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// [START apikeys_undelete_api_key]
+import com.google.api.apikeys.v2.ApiKeysClient;
+import com.google.api.apikeys.v2.Key;
+import com.google.api.apikeys.v2.UndeleteKeyRequest;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class UndeleteApiKey {
+
+  public static void main(String[] args)
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // TODO(developer): Replace these variables before running the sample.
+    // Project ID or project number of the Google Cloud project.
+    String projectId = "YOUR_PROJECT_ID";
+    // The API key id to undelete.
+    String keyId = "YOUR_KEY_ID";
+
+    undeleteApiKey(projectId, keyId);
+  }
+
+  // Undeletes an API key.
+  public static void undeleteApiKey(String projectId, String keyId)
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
+    try (ApiKeysClient apiKeysClient = ApiKeysClient.create()) {
+
+      // Initialize the undelete request and set the argument.
+      UndeleteKeyRequest undeleteKeyRequest = UndeleteKeyRequest.newBuilder()
+          .setName(String.format("projects/%s/locations/global/keys/%s", projectId, keyId))
+          .build();
+
+      // Make the request and wait for the operation to complete.
+      Key undeletedKey = apiKeysClient.undeleteKeyAsync(undeleteKeyRequest)
+          .get(3, TimeUnit.MINUTES);
+
+      System.out.printf("Successfully undeleted the API key: %s", undeletedKey.getName());
+    }
+  }
+}
+// [END apikeys_undelete_api_key]

auth/src/test/java/ApiKeySnippetsIT.java

@@ -36,7 +36,6 @@
 public class ApiKeySnippetsIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String CREDENTIALS = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
   private static Key API_KEY;
   private static String API_KEY_STRING;
   private ByteArrayOutputStream stdOut;
@@ -79,8 +78,15 @@ public static void cleanup()
 
     String apiKeyId = getApiKeyId(API_KEY);
     DeleteApiKey.deleteApiKey(PROJECT_ID, apiKeyId);
-    String goal = String.format("Successfully deleted the API key: %s", API_KEY.getName());
-    assertThat(stdOut.toString()).contains(goal);
+
+    UndeleteApiKey.undeleteApiKey(PROJECT_ID, apiKeyId);
+    String undeletedKey = String.format("Successfully undeleted the API key: %s",
+        API_KEY.getName());
+    assertThat(stdOut.toString()).contains(undeletedKey);
+
+    DeleteApiKey.deleteApiKey(PROJECT_ID, apiKeyId);
+    String deletedKey = String.format("Successfully deleted the API key: %s", API_KEY.getName());
+    assertThat(stdOut.toString()).contains(deletedKey);
 
     stdOut.close();
     System.setOut(out);