diff --git a/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPrivateData.java b/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPrivateData.java deleted file mode 100644 index 7d803220b19..00000000000 --- a/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPrivateData.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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. - */ - -// package vertexai.gemini; - -// // [START generativeaionvertexai_grounding_private_data_basic] -// import com.google.cloud.vertexai.VertexAI; -// import com.google.cloud.vertexai.api.GenerateContentResponse; -// import com.google.cloud.vertexai.api.GroundingMetadata; -// import com.google.cloud.vertexai.api.Retrieval; -// import com.google.cloud.vertexai.api.Tool; -// import com.google.cloud.vertexai.api.VertexAISearch; -// import com.google.cloud.vertexai.generativeai.GenerativeModel; -// import com.google.cloud.vertexai.generativeai.ResponseHandler; -// import java.io.IOException; -// import java.util.Collections; - -// public class GroundingWithPrivateData { -// public static void main(String[] args) throws IOException { -// // TODO(developer): Replace these variables before running the sample. -// String projectId = "your-google-cloud-project-id"; -// String location = "us-central1"; -// String modelName = "gemini-2.0-flash-001"; -// String datastore = String.format( -// "projects/%s/locations/global/collections/default_collection/dataStores/%s", -// projectId, "datastore_id"); - -// groundWithPrivateData(projectId, location, modelName, datastore); -// } - -// // A request whose response will be "grounded" -// // with information found in Vertex AI Search datastores. -// public static String groundWithPrivateData(String projectId, String location, String modelName, -// String datastoreId) -// throws IOException { -// // 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 (VertexAI vertexAI = new VertexAI(projectId, location)) { -// Tool datastoreTool = Tool.newBuilder() -// .setRetrieval( -// Retrieval.newBuilder() -// .setVertexAiSearch(VertexAISearch.newBuilder().setDatastore(datastoreId)) -// .setDisableAttribution(false)) -// .build(); - -// GenerativeModel model = new GenerativeModel(modelName, vertexAI).withTools( -// Collections.singletonList(datastoreTool) -// ); - -// GenerateContentResponse response = model.generateContent( -// "How do I make an appointment to renew my driver's license?"); - -// GroundingMetadata groundingMetadata = response.getCandidates(0).getGroundingMetadata(); -// String answer = ResponseHandler.getText(response); - -// System.out.println("Answer: " + answer); -// System.out.println("Grounding metadata: " + groundingMetadata); - -// return answer; -// } -// } -// } -// // [END generativeaionvertexai_grounding_private_data_basic] \ No newline at end of file diff --git a/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPublicData.java b/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPublicData.java deleted file mode 100644 index 727dba6abc5..00000000000 --- a/vertexai/snippets/src/main/java/vertexai/gemini/GroundingWithPublicData.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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. - */ - -// package vertexai.gemini; - -// // [START generativeaionvertexai_grounding_public_data_basic] -// import com.google.cloud.vertexai.VertexAI; -// import com.google.cloud.vertexai.api.GenerateContentResponse; -// import com.google.cloud.vertexai.api.GoogleSearchRetrieval; -// import com.google.cloud.vertexai.api.GroundingMetadata; -// import com.google.cloud.vertexai.api.Tool; -// import com.google.cloud.vertexai.generativeai.GenerativeModel; -// import com.google.cloud.vertexai.generativeai.ResponseHandler; -// import java.io.IOException; -// import java.util.Collections; - -// public class GroundingWithPublicData { -// public static void main(String[] args) throws IOException { -// // TODO(developer): Replace these variables before running the sample. -// String projectId = "your-google-cloud-project-id"; -// String location = "us-central1"; -// String modelName = "gemini-2.0-flash-001"; - -// groundWithPublicData(projectId, location, modelName); -// } - -// // A request whose response will be "grounded" with information found in Google Search. -// public static String groundWithPublicData(String projectId, String location, String modelName) -// throws IOException { -// // 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 (VertexAI vertexAI = new VertexAI(projectId, location)) { -// Tool googleSearchTool = -// Tool.newBuilder() -// .setGoogleSearchRetrieval( -// // Enable using the result from this tool in detecting grounding -// GoogleSearchRetrieval.newBuilder()) -// .build(); - -// GenerativeModel model = -// new GenerativeModel(modelName, vertexAI) -// .withTools(Collections.singletonList(googleSearchTool)); - -// GenerateContentResponse response = model.generateContent("Why is the sky blue?"); - -// GroundingMetadata groundingMetadata = response.getCandidates(0).getGroundingMetadata(); -// String answer = ResponseHandler.getText(response); - -// System.out.println("Answer: " + answer); -// System.out.println("Grounding metadata: " + groundingMetadata); - -// return answer; -// } -// } -// } -// // [END generativeaionvertexai_grounding_public_data_basic] diff --git a/vertexai/snippets/src/test/java/vertexai/gemini/SnippetsIT.java b/vertexai/snippets/src/test/java/vertexai/gemini/SnippetsIT.java index a179a56ae65..1b496c48c9e 100644 --- a/vertexai/snippets/src/test/java/vertexai/gemini/SnippetsIT.java +++ b/vertexai/snippets/src/test/java/vertexai/gemini/SnippetsIT.java @@ -23,7 +23,6 @@ import com.google.cloud.testing.junit4.MultipleAttemptsRule; import com.google.gson.Gson; -import com.google.gson.annotations.SerializedName; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -31,7 +30,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.Arrays; -import java.util.Base64; import java.util.stream.Collectors; import javax.net.ssl.HttpsURLConnection; import org.junit.After; @@ -192,28 +190,6 @@ public void testVideoAudioInput() throws IOException { assertThat(output).ignoringCase().contains("Tokyo"); } - // @Test - // public void testGroundingWithPublicData() throws Exception { - // String output = - // GroundingWithPublicData.groundWithPublicData(PROJECT_ID, LOCATION, GEMINI_FLASH_1_5); - - // assertThat(output).ignoringCase().contains("Rayleigh"); - // } - - // @Test - // public void testGroundingWithPrivateData() throws Exception { - // String output = - // GroundingWithPrivateData.groundWithPrivateData( - // PROJECT_ID, - // LOCATION, - // GEMINI_FLASH, - // String.format( - // "projects/%s/locations/global/collections/default_collection/dataStores/%s", - // PROJECT_ID, DATASTORE_ID)); - - // assertThat(output).ignoringCase().contains("DMV"); - // } - @Test public void testMultimodalStreaming() throws Exception { StreamingMultimodal.streamingMultimodal(PROJECT_ID, LOCATION, GEMINI_FLASH);