Merge pull request #1 from GoogleCloudPlatform/main

JDS

Author: MichaelBiegluk

.github/blunderbuss.yml

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-assign_issues:
-  - GoogleCloudPlatform/java-samples-reviewers
-
 assign_issues_by:
 - labels:
   - "api: routeoptimization"
@@ -100,9 +97,6 @@ assign_issues_by:
   to:
   - GoogleCloudPlatform/cloud-modelarmor-team
 
-assign_prs:
-  - GoogleCloudPlatform/java-samples-reviewers
-
 assign_prs_by:
 - labels:
   - "api: cloudasset"

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

@@ -41,14 +41,14 @@ 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-005";
+    String model = "gemini-embedding-001";
     predictTextEmbeddings(
         endpoint,
         project,
         model,
         List.of("banana bread?", "banana muffins?"),
         "QUESTION_ANSWERING",
-        OptionalInt.of(256));
+        OptionalInt.of(3072));
   }
 
   // Gets text embeddings from a pretrained, foundational model.
@@ -67,37 +67,40 @@ public static List<List<Float>> predictTextEmbeddings(
     EndpointName endpointName =
         EndpointName.ofProjectLocationPublisherModelName(project, location, "google", model);
 
+    List<List<Float>> floats = new ArrayList<>();
     // You can use this prediction service client for multiple requests.
     try (PredictionServiceClient client = PredictionServiceClient.create(settings)) {
-      PredictRequest.Builder request =
-          PredictRequest.newBuilder().setEndpoint(endpointName.toString());
-      if (outputDimensionality.isPresent()) {
-        request.setParameters(
-            Value.newBuilder()
-                .setStructValue(
-                    Struct.newBuilder()
-                        .putFields("outputDimensionality", valueOf(outputDimensionality.getAsInt()))
-                        .build()));
-      }
+      // gemini-embedding-001 takes one input at a time.
       for (int i = 0; i < texts.size(); i++) {
+        PredictRequest.Builder request = 
+            PredictRequest.newBuilder().setEndpoint(endpointName.toString());
+        if (outputDimensionality.isPresent()) {
+          request.setParameters(
+              Value.newBuilder()
+                  .setStructValue(
+                      Struct.newBuilder()
+                          .putFields(
+                              "outputDimensionality", valueOf(outputDimensionality.getAsInt()))
+                          .build()));
+        }
         request.addInstances(
             Value.newBuilder()
                 .setStructValue(
                     Struct.newBuilder()
                         .putFields("content", valueOf(texts.get(i)))
                         .putFields("task_type", valueOf(task))
                         .build()));
-      }
-      PredictResponse response = client.predict(request.build());
-      List<List<Float>> floats = new ArrayList<>();
-      for (Value prediction : response.getPredictionsList()) {
-        Value embeddings = prediction.getStructValue().getFieldsOrThrow("embeddings");
-        Value values = embeddings.getStructValue().getFieldsOrThrow("values");
-        floats.add(
-            values.getListValue().getValuesList().stream()
-                .map(Value::getNumberValue)
-                .map(Double::floatValue)
-                .collect(toList()));
+        PredictResponse response = client.predict(request.build());
+
+        for (Value prediction : response.getPredictionsList()) {
+          Value embeddings = prediction.getStructValue().getFieldsOrThrow("embeddings");
+          Value values = embeddings.getStructValue().getFieldsOrThrow("values");
+          floats.add(
+              values.getListValue().getValuesList().stream()
+                  .map(Value::getNumberValue)
+                  .map(Double::floatValue)
+                  .collect(toList()));
+        }
       }
       return floats;
     }

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

@@ -52,7 +52,7 @@ public void testPredictTextEmbeddings() throws IOException {
         PredictTextEmbeddingsSample.predictTextEmbeddings(
             APIS_ENDPOINT,
             PROJECT,
-            "text-embedding-005",
+            "gemini-embedding-001",
             texts,
             "QUESTION_ANSWERING",
             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.56.v20240826</jetty.version>
+    <jetty.version>9.4.57.v20241219</jetty.version>
   </properties>
 
   <!-- [START gae_java11_server_dependencies] -->

endpoints/multiple-versions/container-engine.yaml

@@ -38,7 +38,6 @@ spec:
         app: esp-echo
     spec:
       containers:
-      # [START esp]
       - name: esp
         image: gcr.io/endpoints-release/endpoints-runtime:1
         args: [
@@ -47,7 +46,6 @@ spec:
           "--service=SERVICE_NAME",
           "--version=SERVICE_CONFIG_ID",
         ]
-      # [END esp]
         ports:
           - containerPort: 8081
       - name: echo

eventarc/audit-storage/Dockerfile

@@ -28,7 +28,7 @@ RUN mvn package -DskipTests
 
 # Use Eclipse Temurin for base image.
 # https://docs.docker.com/develop/develop-images/multistage-build/#use-multi-stage-builds
-FROM eclipse-temurin:17.0.14_7-jre-alpine
+FROM eclipse-temurin:17.0.15_6-jre-alpine
 
 # Copy the jar to the production image from the builder stage.
 COPY --from=builder /app/target/audit-storage-*.jar /audit-storage.jar

eventarc/pubsub/Dockerfile

@@ -26,7 +26,7 @@ RUN mvn package -DskipTests
 
 # Use Eclipse Temurin for base image.
 # https://docs.docker.com/develop/develop-images/multistage-build/#use-multi-stage-builds
-FROM eclipse-temurin:17.0.14_7-jre-alpine
+FROM eclipse-temurin:17.0.15_6-jre-alpine
 
 # Copy the jar to the production image from the builder stage.
 COPY --from=builder /app/target/events-pubsub-*.jar /events-pubsub.jar

flexible/java-11/websocket-jetty/pom.xml

@@ -37,7 +37,7 @@
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
-    <jetty.version>9.4.54.v20240208</jetty.version>
+    <jetty.version>9.4.57.v20241219</jetty.version>
     <spring.boot.version>2.7.18</spring.boot.version>
   </properties>
 

flexible/java-17/websocket-jetty/pom.xml

@@ -37,7 +37,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.source>17</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
-    <jetty.version>9.4.54.v20240208</jetty.version>
+    <jetty.version>9.4.57.v20241219</jetty.version>
     <spring.boot.version>2.7.18</spring.boot.version>
   </properties>
 

flexible/repacking-legacy-applications/appengine-simple-jetty-main/pom.xml

@@ -38,7 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <jetty.version>9.4.56.v20240826</jetty.version>
+    <jetty.version>9.4.57.v20241219</jetty.version>
   </properties>
   <!-- [END gae_java21_properties] -->