diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 36116e176b3..f29e96b89ea 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.37.0" + ".": "1.36.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 670f4d43977..d1729552ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,5 @@ # Changelog -## [1.37.0](https://github.com/googleapis/java-genai/compare/v1.36.0...v1.37.0) (2026-01-30) - - -### Features - -* Support distillation tuning ([cec1b88](https://github.com/googleapis/java-genai/commit/cec1b88ab5a8d5cb801f4db19ce73f3f01732c70)) -* Support OSS Tuning in GenAI SDK ([868d8ed](https://github.com/googleapis/java-genai/commit/868d8edee6a449937ed8b74f909071d8496fc68f)) - - -### Bug Fixes - -* Add metadata in batch inlined response ([c80dd07](https://github.com/googleapis/java-genai/commit/c80dd070d9f23ec6463e7e704f003ffb4dba354c)) - ## [1.36.0](https://github.com/googleapis/java-genai/compare/v1.35.0...v1.36.0) (2026-01-22) diff --git a/README.md b/README.md index 32a36d075a4..f940e678114 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you're using Maven, add the following to your dependencies: com.google.genai google-genai - 1.37.0 + 1.36.0 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 50335f595f5..bb9ce4bee1d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ com.google.genai.examples google-genai-examples - 1.37.0 + 1.37.0-SNAPSHOT google-genai-examples @@ -13,7 +13,7 @@ 1.8 1.8 - 1.37.0 + 1.37.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 15964304043..90a90201ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.genai google-genai google-genai - 1.37.0 + 1.37.0-SNAPSHOT jar Java idiomatic SDK for the Gemini Developer APIs and Vertex AI APIs. diff --git a/src/main/java/com/google/genai/ApiClient.java b/src/main/java/com/google/genai/ApiClient.java index 974bfd21d63..a8cad6d94d9 100644 --- a/src/main/java/com/google/genai/ApiClient.java +++ b/src/main/java/com/google/genai/ApiClient.java @@ -55,7 +55,7 @@ public abstract class ApiClient { // {x-version-update-start:google-genai:released} - private static final String SDK_VERSION = "1.37.0"; + private static final String SDK_VERSION = "1.36.0"; // {x-version-update-end:google-genai:released} private static final Logger logger = Logger.getLogger(ApiClient.class.getName()); diff --git a/src/main/java/com/google/genai/AsyncBatches.java b/src/main/java/com/google/genai/AsyncBatches.java index cde207a8922..a77c46ea915 100644 --- a/src/main/java/com/google/genai/AsyncBatches.java +++ b/src/main/java/com/google/genai/AsyncBatches.java @@ -49,6 +49,7 @@ public AsyncBatches(ApiClient apiClient) { CompletableFuture privateCreate( String model, BatchJobSource src, CreateBatchJobConfig config) { + BuiltRequest builtRequest = batches.buildRequestForPrivateCreate(model, src, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -62,6 +63,7 @@ CompletableFuture privateCreate( CompletableFuture privateCreateEmbeddings( String model, EmbeddingsBatchJobSource src, CreateEmbeddingsBatchJobConfig config) { + BuiltRequest builtRequest = batches.buildRequestForPrivateCreateEmbeddings(model, src, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -83,6 +85,7 @@ CompletableFuture privateCreateEmbeddings( * @return A {@link BatchJob} object that contains the info of the batch job. */ public CompletableFuture get(String name, GetBatchJobConfig config) { + BuiltRequest builtRequest = batches.buildRequestForGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -103,6 +106,7 @@ public CompletableFuture get(String name, GetBatchJobConfig config) { * @param config A {@link CancelBatchJobConfig} for configuring the cancel request. */ public CompletableFuture cancel(String name, CancelBatchJobConfig config) { + BuiltRequest builtRequest = batches.buildRequestForCancel(name, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -113,6 +117,7 @@ public CompletableFuture cancel(String name, CancelBatchJobConfig config) } CompletableFuture privateList(ListBatchJobsConfig config) { + BuiltRequest builtRequest = batches.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -133,6 +138,7 @@ CompletableFuture privateList(ListBatchJobsConfig config) * @param config A {@link DeleteBatchJobConfig} for configuring the delete request. */ public CompletableFuture delete(String name, DeleteBatchJobConfig config) { + BuiltRequest builtRequest = batches.buildRequestForDelete(name, config); return this.apiClient .asyncRequest( diff --git a/src/main/java/com/google/genai/AsyncCaches.java b/src/main/java/com/google/genai/AsyncCaches.java index e06059191ba..7fdb067aca5 100644 --- a/src/main/java/com/google/genai/AsyncCaches.java +++ b/src/main/java/com/google/genai/AsyncCaches.java @@ -52,6 +52,7 @@ public AsyncCaches(ApiClient apiClient) { * @return A {@link CachedContent} object that contains the info of the created resource. */ public CompletableFuture create(String model, CreateCachedContentConfig config) { + BuiltRequest builtRequest = caches.buildRequestForCreate(model, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -71,6 +72,7 @@ public CompletableFuture create(String model, CreateCachedContent * @return A {@link CachedContent} object that contains the info of the cached content. */ public CompletableFuture get(String name, GetCachedContentConfig config) { + BuiltRequest builtRequest = caches.buildRequestForGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -90,6 +92,7 @@ public CompletableFuture get(String name, GetCachedContentConfig */ public CompletableFuture delete( String name, DeleteCachedContentConfig config) { + BuiltRequest builtRequest = caches.buildRequestForDelete(name, config); return this.apiClient .asyncRequest( @@ -110,6 +113,7 @@ public CompletableFuture delete( * @return A {@link CachedContent} object that contains the info of the updated resource. */ public CompletableFuture update(String name, UpdateCachedContentConfig config) { + BuiltRequest builtRequest = caches.buildRequestForUpdate(name, config); return this.apiClient .asyncRequest("patch", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -122,6 +126,7 @@ public CompletableFuture update(String name, UpdateCachedContentC } CompletableFuture privateList(ListCachedContentsConfig config) { + BuiltRequest builtRequest = caches.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) diff --git a/src/main/java/com/google/genai/AsyncDocuments.java b/src/main/java/com/google/genai/AsyncDocuments.java index 37397094b60..fbc2917edf1 100644 --- a/src/main/java/com/google/genai/AsyncDocuments.java +++ b/src/main/java/com/google/genai/AsyncDocuments.java @@ -42,6 +42,7 @@ public AsyncDocuments(ApiClient apiClient) { } public CompletableFuture get(String name, GetDocumentConfig config) { + BuiltRequest builtRequest = documents.buildRequestForGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -54,6 +55,7 @@ public CompletableFuture get(String name, GetDocumentConfig config) { } public CompletableFuture delete(String name, DeleteDocumentConfig config) { + BuiltRequest builtRequest = documents.buildRequestForDelete(name, config); return this.apiClient .asyncRequest( @@ -65,6 +67,7 @@ public CompletableFuture delete(String name, DeleteDocumentConfig config) } CompletableFuture privateList(String parent, ListDocumentsConfig config) { + BuiltRequest builtRequest = documents.buildRequestForPrivateList(parent, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) diff --git a/src/main/java/com/google/genai/AsyncFileSearchStores.java b/src/main/java/com/google/genai/AsyncFileSearchStores.java index eaa6d2677d7..e73048c53c0 100644 --- a/src/main/java/com/google/genai/AsyncFileSearchStores.java +++ b/src/main/java/com/google/genai/AsyncFileSearchStores.java @@ -59,6 +59,7 @@ public AsyncFileSearchStores(ApiClient apiClient) { } public CompletableFuture create(CreateFileSearchStoreConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForCreate(config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -71,6 +72,7 @@ public CompletableFuture create(CreateFileSearchStoreConfig con } public CompletableFuture get(String name, GetFileSearchStoreConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -83,6 +85,7 @@ public CompletableFuture get(String name, GetFileSearchStoreCon } public CompletableFuture delete(String name, DeleteFileSearchStoreConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForDelete(name, config); return this.apiClient .asyncRequest( @@ -94,6 +97,7 @@ public CompletableFuture delete(String name, DeleteFileSearchStoreConfig c } CompletableFuture privateList(ListFileSearchStoresConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -107,6 +111,7 @@ CompletableFuture privateList(ListFileSearchStores CompletableFuture privateUploadToFileSearchStore( String fileSearchStoreName, UploadToFileSearchStoreConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForPrivateUploadToFileSearchStore(fileSearchStoreName, config); return this.apiClient @@ -122,6 +127,7 @@ CompletableFuture privateUploadToFileS public CompletableFuture importFile( String fileSearchStoreName, String fileName, ImportFileConfig config) { + BuiltRequest builtRequest = fileSearchStores.buildRequestForImportFile(fileSearchStoreName, fileName, config); return this.apiClient diff --git a/src/main/java/com/google/genai/AsyncFiles.java b/src/main/java/com/google/genai/AsyncFiles.java index 80aa229ce93..3cb7dcd8ac1 100644 --- a/src/main/java/com/google/genai/AsyncFiles.java +++ b/src/main/java/com/google/genai/AsyncFiles.java @@ -50,6 +50,7 @@ public AsyncFiles(ApiClient apiClient) { } CompletableFuture privateList(ListFilesConfig config) { + BuiltRequest builtRequest = files.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -62,6 +63,7 @@ CompletableFuture privateList(ListFilesConfig config) { } CompletableFuture privateCreate(File file, CreateFileConfig config) { + BuiltRequest builtRequest = files.buildRequestForPrivateCreate(file, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -81,6 +83,7 @@ CompletableFuture privateCreate(File file, CreateFileConfig * @return A File object representing the file. */ public CompletableFuture get(String name, GetFileConfig config) { + BuiltRequest builtRequest = files.buildRequestForGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) @@ -100,6 +103,7 @@ public CompletableFuture get(String name, GetFileConfig config) { * @return The DeleteFileResponse, the response for the delete method. */ public CompletableFuture delete(String name, DeleteFileConfig config) { + BuiltRequest builtRequest = files.buildRequestForDelete(name, config); return this.apiClient .asyncRequest( diff --git a/src/main/java/com/google/genai/AsyncModels.java b/src/main/java/com/google/genai/AsyncModels.java index d4ee0b2f946..acf704c9352 100644 --- a/src/main/java/com/google/genai/AsyncModels.java +++ b/src/main/java/com/google/genai/AsyncModels.java @@ -25,39 +25,53 @@ import com.google.genai.Common.BuiltRequest; import com.google.genai.errors.GenAiIOException; import com.google.genai.types.ComputeTokensConfig; +import com.google.genai.types.ComputeTokensParameters; import com.google.genai.types.ComputeTokensResponse; import com.google.genai.types.Content; import com.google.genai.types.CountTokensConfig; +import com.google.genai.types.CountTokensParameters; import com.google.genai.types.CountTokensResponse; import com.google.genai.types.DeleteModelConfig; +import com.google.genai.types.DeleteModelParameters; import com.google.genai.types.DeleteModelResponse; import com.google.genai.types.EditImageConfig; +import com.google.genai.types.EditImageParameters; import com.google.genai.types.EditImageResponse; import com.google.genai.types.EmbedContentConfig; +import com.google.genai.types.EmbedContentParameters; import com.google.genai.types.EmbedContentResponse; import com.google.genai.types.GenerateContentConfig; +import com.google.genai.types.GenerateContentParameters; import com.google.genai.types.GenerateContentResponse; import com.google.genai.types.GenerateImagesConfig; +import com.google.genai.types.GenerateImagesParameters; import com.google.genai.types.GenerateImagesResponse; import com.google.genai.types.GenerateVideosConfig; import com.google.genai.types.GenerateVideosOperation; +import com.google.genai.types.GenerateVideosParameters; import com.google.genai.types.GenerateVideosSource; import com.google.genai.types.GetModelConfig; +import com.google.genai.types.GetModelParameters; import com.google.genai.types.Image; import com.google.genai.types.ListModelsConfig; +import com.google.genai.types.ListModelsParameters; import com.google.genai.types.ListModelsResponse; import com.google.genai.types.Model; import com.google.genai.types.Part; import com.google.genai.types.RecontextImageConfig; +import com.google.genai.types.RecontextImageParameters; import com.google.genai.types.RecontextImageResponse; import com.google.genai.types.RecontextImageSource; import com.google.genai.types.ReferenceImage; import com.google.genai.types.ReferenceImageAPI; import com.google.genai.types.SegmentImageConfig; +import com.google.genai.types.SegmentImageParameters; import com.google.genai.types.SegmentImageResponse; import com.google.genai.types.SegmentImageSource; import com.google.genai.types.UpdateModelConfig; +import com.google.genai.types.UpdateModelParameters; import com.google.genai.types.UpscaleImageAPIConfig; +import com.google.genai.types.UpscaleImageAPIParameters; import com.google.genai.types.UpscaleImageConfig; import com.google.genai.types.UpscaleImageResponse; import com.google.genai.types.Video; @@ -81,6 +95,18 @@ public AsyncModels(ApiClient apiClient) { CompletableFuture privateGenerateContent( String model, List contents, GenerateContentConfig config) { + GenerateContentParameters.Builder parameterBuilder = GenerateContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateGenerateContent(model, contents, config); return this.apiClient @@ -88,32 +114,57 @@ CompletableFuture privateGenerateContent( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateGenerateContent(res, config); + return models.processResponseForPrivateGenerateContent(res, config, parameterNode); } }); } CompletableFuture> privateGenerateContentStream( String model, List contents, GenerateContentConfig config) { + GenerateContentParameters.Builder parameterBuilder = GenerateContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateGenerateContentStream(model, contents, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { - return models.processResponseForPrivateGenerateContentStream(response, config); + return models.processResponseForPrivateGenerateContentStream( + response, config, parameterNode); }); } CompletableFuture privateEmbedContent( String model, List contents, EmbedContentConfig config) { + EmbedContentParameters.Builder parameterBuilder = EmbedContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateEmbedContent(model, contents, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateEmbedContent(res, config); + return models.processResponseForPrivateEmbedContent(res, config, parameterNode); } }); } @@ -121,13 +172,25 @@ CompletableFuture privateEmbedContent( /** Asynchronously private method for generating images. */ CompletableFuture privateGenerateImages( String model, String prompt, GenerateImagesConfig config) { + GenerateImagesParameters.Builder parameterBuilder = GenerateImagesParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateGenerateImages(model, prompt, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateGenerateImages(res, config); + return models.processResponseForPrivateGenerateImages(res, config, parameterNode); } }); } @@ -138,6 +201,21 @@ CompletableFuture privateEditImage( String prompt, List referenceImages, EditImageConfig config) { + EditImageParameters.Builder parameterBuilder = EditImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(referenceImages)) { + parameterBuilder.referenceImages(referenceImages); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateEditImage(model, prompt, referenceImages, config); return this.apiClient @@ -145,7 +223,7 @@ CompletableFuture privateEditImage( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateEditImage(res, config); + return models.processResponseForPrivateEditImage(res, config, parameterNode); } }); } @@ -153,6 +231,21 @@ CompletableFuture privateEditImage( /** Asynchronously private method for upscaling an image. */ CompletableFuture privateUpscaleImage( String model, Image image, String upscaleFactor, UpscaleImageAPIConfig config) { + UpscaleImageAPIParameters.Builder parameterBuilder = UpscaleImageAPIParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(image)) { + parameterBuilder.image(image); + } + if (!Common.isZero(upscaleFactor)) { + parameterBuilder.upscaleFactor(upscaleFactor); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateUpscaleImage(model, image, upscaleFactor, config); return this.apiClient @@ -160,7 +253,7 @@ CompletableFuture privateUpscaleImage( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateUpscaleImage(res, config); + return models.processResponseForPrivateUpscaleImage(res, config, parameterNode); } }); } @@ -187,13 +280,25 @@ CompletableFuture privateUpscaleImage( */ public CompletableFuture recontextImage( String model, RecontextImageSource source, RecontextImageConfig config) { + RecontextImageParameters.Builder parameterBuilder = RecontextImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForRecontextImage(model, source, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForRecontextImage(res, config); + return models.processResponseForRecontextImage(res, config, parameterNode); } }); } @@ -213,13 +318,25 @@ public CompletableFuture recontextImage( */ public CompletableFuture segmentImage( String model, SegmentImageSource source, SegmentImageConfig config) { + SegmentImageParameters.Builder parameterBuilder = SegmentImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForSegmentImage(model, source, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForSegmentImage(res, config); + return models.processResponseForSegmentImage(res, config, parameterNode); } }); } @@ -230,25 +347,40 @@ public CompletableFuture segmentImage( * @example ```java Model model = client.models.get("gemini-2.0-flash"); ``` */ public CompletableFuture get(String model, GetModelConfig config) { + GetModelParameters.Builder parameterBuilder = GetModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForGet(model, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForGet(res, config); + return models.processResponseForGet(res, config, parameterNode); } }); } CompletableFuture privateList(ListModelsConfig config) { + ListModelsParameters.Builder parameterBuilder = ListModelsParameters.builder(); + + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateList(res, config); + return models.processResponseForPrivateList(res, config, parameterNode); } }); } @@ -265,13 +397,22 @@ CompletableFuture privateList(ListModelsConfig config) { * description") .build()); ``` */ public CompletableFuture update(String model, UpdateModelConfig config) { + UpdateModelParameters.Builder parameterBuilder = UpdateModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForUpdate(model, config); return this.apiClient .asyncRequest("patch", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForUpdate(res, config); + return models.processResponseForUpdate(res, config, parameterNode); } }); } @@ -282,6 +423,15 @@ public CompletableFuture update(String model, UpdateModelConfig config) { * @example ```java Model model = client.models.delete("tunedModels/12345"); ``` */ public CompletableFuture delete(String model, DeleteModelConfig config) { + DeleteModelParameters.Builder parameterBuilder = DeleteModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForDelete(model, config); return this.apiClient .asyncRequest( @@ -289,7 +439,7 @@ public CompletableFuture delete(String model, DeleteModelCo .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForDelete(res, config); + return models.processResponseForDelete(res, config, parameterNode); } }); } @@ -306,13 +456,25 @@ public CompletableFuture delete(String model, DeleteModelCo */ public CompletableFuture countTokens( String model, List contents, CountTokensConfig config) { + CountTokensParameters.Builder parameterBuilder = CountTokensParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForCountTokens(model, contents, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForCountTokens(res, config); + return models.processResponseForCountTokens(res, config, parameterNode); } }); } @@ -329,13 +491,25 @@ public CompletableFuture countTokens( */ public CompletableFuture computeTokens( String model, List contents, ComputeTokensConfig config) { + ComputeTokensParameters.Builder parameterBuilder = ComputeTokensParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForComputeTokens(model, contents, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForComputeTokens(res, config); + return models.processResponseForComputeTokens(res, config, parameterNode); } }); } @@ -348,6 +522,27 @@ CompletableFuture privateGenerateVideos( Video video, GenerateVideosSource source, GenerateVideosConfig config) { + GenerateVideosParameters.Builder parameterBuilder = GenerateVideosParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(image)) { + parameterBuilder.image(image); + } + if (!Common.isZero(video)) { + parameterBuilder.video(video); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = models.buildRequestForPrivateGenerateVideos(model, prompt, image, video, source, config); return this.apiClient @@ -355,7 +550,7 @@ CompletableFuture privateGenerateVideos( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return models.processResponseForPrivateGenerateVideos(res, config); + return models.processResponseForPrivateGenerateVideos(res, config, parameterNode); } }); } diff --git a/src/main/java/com/google/genai/AsyncOperations.java b/src/main/java/com/google/genai/AsyncOperations.java index 7c3ac5a65f3..5a6057332db 100644 --- a/src/main/java/com/google/genai/AsyncOperations.java +++ b/src/main/java/com/google/genai/AsyncOperations.java @@ -39,6 +39,7 @@ public AsyncOperations(ApiClient apiClient) { CompletableFuture privateGetVideosOperation( String operationName, GetOperationConfig config) { + BuiltRequest builtRequest = operations.buildRequestForPrivateGetVideosOperation(operationName, config); return this.apiClient @@ -53,6 +54,7 @@ CompletableFuture privateGetVideosOperation( CompletableFuture privateFetchPredictVideosOperation( String operationName, String resourceName, FetchPredictOperationConfig config) { + BuiltRequest builtRequest = operations.buildRequestForPrivateFetchPredictVideosOperation( operationName, resourceName, config); diff --git a/src/main/java/com/google/genai/AsyncTunings.java b/src/main/java/com/google/genai/AsyncTunings.java index 5e19914fff9..9d22ab6bd83 100644 --- a/src/main/java/com/google/genai/AsyncTunings.java +++ b/src/main/java/com/google/genai/AsyncTunings.java @@ -23,11 +23,15 @@ import com.google.genai.Common.BuiltRequest; import com.google.genai.errors.GenAiIOException; import com.google.genai.types.CancelTuningJobConfig; +import com.google.genai.types.CancelTuningJobParameters; import com.google.genai.types.CancelTuningJobResponse; import com.google.genai.types.CreateTuningJobConfig; +import com.google.genai.types.CreateTuningJobParametersPrivate; import com.google.genai.types.GetTuningJobConfig; +import com.google.genai.types.GetTuningJobParameters; import com.google.genai.types.JobState; import com.google.genai.types.ListTuningJobsConfig; +import com.google.genai.types.ListTuningJobsParameters; import com.google.genai.types.ListTuningJobsResponse; import com.google.genai.types.PreTunedModel; import com.google.genai.types.TuningDataset; @@ -48,25 +52,40 @@ public AsyncTunings(ApiClient apiClient) { } CompletableFuture privateGet(String name, GetTuningJobConfig config) { + GetTuningJobParameters.Builder parameterBuilder = GetTuningJobParameters.builder(); + + if (!Common.isZero(name)) { + parameterBuilder.name(name); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = tunings.buildRequestForPrivateGet(name, config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return tunings.processResponseForPrivateGet(res, config); + return tunings.processResponseForPrivateGet(res, config, parameterNode); } }); } CompletableFuture privateList(ListTuningJobsConfig config) { + ListTuningJobsParameters.Builder parameterBuilder = ListTuningJobsParameters.builder(); + + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = tunings.buildRequestForPrivateList(config); return this.apiClient .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return tunings.processResponseForPrivateList(res, config); + return tunings.processResponseForPrivateList(res, config, parameterNode); } }); } @@ -80,13 +99,22 @@ CompletableFuture privateList(ListTuningJobsConfig confi */ public CompletableFuture cancel( String name, CancelTuningJobConfig config) { + CancelTuningJobParameters.Builder parameterBuilder = CancelTuningJobParameters.builder(); + + if (!Common.isZero(name)) { + parameterBuilder.name(name); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = tunings.buildRequestForCancel(name, config); return this.apiClient .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()) .thenApplyAsync( response -> { try (ApiResponse res = response) { - return tunings.processResponseForCancel(res, config); + return tunings.processResponseForCancel(res, config, parameterNode); } }); } @@ -96,6 +124,22 @@ CompletableFuture privateTune( PreTunedModel preTunedModel, TuningDataset trainingDataset, CreateTuningJobConfig config) { + CreateTuningJobParametersPrivate.Builder parameterBuilder = + CreateTuningJobParametersPrivate.builder(); + + if (!Common.isZero(baseModel)) { + parameterBuilder.baseModel(baseModel); + } + if (!Common.isZero(preTunedModel)) { + parameterBuilder.preTunedModel(preTunedModel); + } + if (!Common.isZero(trainingDataset)) { + parameterBuilder.trainingDataset(trainingDataset); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = tunings.buildRequestForPrivateTune(baseModel, preTunedModel, trainingDataset, config); return this.apiClient @@ -103,7 +147,7 @@ CompletableFuture privateTune( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return tunings.processResponseForPrivateTune(res, config); + return tunings.processResponseForPrivateTune(res, config, parameterNode); } }); } @@ -113,6 +157,22 @@ CompletableFuture privateTuneMldev( PreTunedModel preTunedModel, TuningDataset trainingDataset, CreateTuningJobConfig config) { + CreateTuningJobParametersPrivate.Builder parameterBuilder = + CreateTuningJobParametersPrivate.builder(); + + if (!Common.isZero(baseModel)) { + parameterBuilder.baseModel(baseModel); + } + if (!Common.isZero(preTunedModel)) { + parameterBuilder.preTunedModel(preTunedModel); + } + if (!Common.isZero(trainingDataset)) { + parameterBuilder.trainingDataset(trainingDataset); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = tunings.buildRequestForPrivateTuneMldev(baseModel, preTunedModel, trainingDataset, config); return this.apiClient @@ -120,7 +180,7 @@ CompletableFuture privateTuneMldev( .thenApplyAsync( response -> { try (ApiResponse res = response) { - return tunings.processResponseForPrivateTuneMldev(res, config); + return tunings.processResponseForPrivateTuneMldev(res, config, parameterNode); } }); } diff --git a/src/main/java/com/google/genai/Models.java b/src/main/java/com/google/genai/Models.java index 2ccb6e7f1de..7ad1b638d11 100644 --- a/src/main/java/com/google/genai/Models.java +++ b/src/main/java/com/google/genai/Models.java @@ -135,7 +135,7 @@ void videoGenerationReferenceTypeMldevEnumValidate(Object enumValue) { } @ExcludeFromGeneratedCoverageReport - ObjectNode blobToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode blobToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"data"}) != null) { Common.setValueByPath( @@ -159,7 +159,7 @@ ObjectNode blobToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode candidateFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode candidateFromMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"content"}) != null) { Common.setValueByPath( @@ -175,7 +175,8 @@ ObjectNode candidateFromMldev(JsonNode fromObject, ObjectNode parentObject) { citationMetadataFromMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"citationMetadata"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"tokenCount"}) != null) { @@ -238,7 +239,8 @@ ObjectNode candidateFromMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode citationMetadataFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode citationMetadataFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"citationSources"}) != null) { Common.setValueByPath( @@ -252,7 +254,7 @@ ObjectNode citationMetadataFromMldev(JsonNode fromObject, ObjectNode parentObjec @ExcludeFromGeneratedCoverageReport ObjectNode computeTokensParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -273,7 +275,8 @@ ObjectNode computeTokensParametersToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode computeTokensResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode computeTokensResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -293,7 +296,8 @@ ObjectNode computeTokensResponseFromVertex(JsonNode fromObject, ObjectNode paren } @ExcludeFromGeneratedCoverageReport - ObjectNode contentEmbeddingFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode contentEmbeddingFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"values"}) != null) { Common.setValueByPath( @@ -309,14 +313,16 @@ ObjectNode contentEmbeddingFromVertex(JsonNode fromObject, ObjectNode parentObje contentEmbeddingStatisticsFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"statistics"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode contentEmbeddingStatisticsFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode contentEmbeddingStatisticsFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"truncated"}) != null) { Common.setValueByPath( @@ -336,7 +342,7 @@ ObjectNode contentEmbeddingStatisticsFromVertex(JsonNode fromObject, ObjectNode } @ExcludeFromGeneratedCoverageReport - ObjectNode contentToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode contentToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"parts"}) != null) { ArrayNode keyArray = (ArrayNode) Common.getValueByPath(fromObject, new String[] {"parts"}); @@ -344,7 +350,7 @@ ObjectNode contentToMldev(JsonNode fromObject, ObjectNode parentObject) { ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(partToMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(partToMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"parts"}, result); } @@ -360,7 +366,8 @@ ObjectNode contentToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode controlReferenceConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode controlReferenceConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"controlType"}) != null) { Common.setValueByPath( @@ -380,7 +387,8 @@ ObjectNode controlReferenceConfigToVertex(JsonNode fromObject, ObjectNode parent } @ExcludeFromGeneratedCoverageReport - ObjectNode countTokensConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode countTokensConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"systemInstruction"}))) { @@ -401,7 +409,8 @@ ObjectNode countTokensConfigToMldev(JsonNode fromObject, ObjectNode parentObject } @ExcludeFromGeneratedCoverageReport - ObjectNode countTokensConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode countTokensConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"systemInstruction"}) != null) { @@ -418,7 +427,7 @@ ObjectNode countTokensConfigToVertex(JsonNode fromObject, ObjectNode parentObjec ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(toolToVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add(toolToVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"tools"}, result); } @@ -430,7 +439,8 @@ ObjectNode countTokensConfigToVertex(JsonNode fromObject, ObjectNode parentObjec generationConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"generationConfig"})), - toObject)); + toObject, + rootObject)); } return toObject; @@ -438,7 +448,7 @@ ObjectNode countTokensConfigToVertex(JsonNode fromObject, ObjectNode parentObjec @ExcludeFromGeneratedCoverageReport ObjectNode countTokensParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -456,7 +466,7 @@ ObjectNode countTokensParametersToMldev( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(contentToMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(contentToMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"contents"}, result); } @@ -466,7 +476,8 @@ ObjectNode countTokensParametersToMldev( countTokensConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; @@ -474,7 +485,7 @@ ObjectNode countTokensParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode countTokensParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -496,14 +507,16 @@ ObjectNode countTokensParametersToVertex( countTokensConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode countTokensResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode countTokensResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -530,7 +543,8 @@ ObjectNode countTokensResponseFromMldev(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode countTokensResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode countTokensResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -551,7 +565,7 @@ ObjectNode countTokensResponseFromVertex(JsonNode fromObject, ObjectNode parentO @ExcludeFromGeneratedCoverageReport ObjectNode deleteModelParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -566,7 +580,7 @@ ObjectNode deleteModelParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode deleteModelParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -580,7 +594,8 @@ ObjectNode deleteModelParametersToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode deleteModelResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode deleteModelResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -593,7 +608,8 @@ ObjectNode deleteModelResponseFromMldev(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode deleteModelResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode deleteModelResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -606,7 +622,8 @@ ObjectNode deleteModelResponseFromVertex(JsonNode fromObject, ObjectNode parentO } @ExcludeFromGeneratedCoverageReport - ObjectNode editImageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode editImageConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"outputGcsUri"}) != null) { @@ -733,7 +750,7 @@ ObjectNode editImageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) @ExcludeFromGeneratedCoverageReport ObjectNode editImageParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -757,7 +774,8 @@ ObjectNode editImageParametersToVertex( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(referenceImageAPIToVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + referenceImageAPIToVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"instances[0]", "referenceImages"}, result); } @@ -767,14 +785,16 @@ ObjectNode editImageParametersToVertex( editImageConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode editImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode editImageResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -790,7 +810,8 @@ ObjectNode editImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObj ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedImages"}, result); } @@ -799,7 +820,8 @@ ObjectNode editImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode embedContentConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode embedContentConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"taskType"}) != null) { @@ -835,7 +857,8 @@ ObjectNode embedContentConfigToMldev(JsonNode fromObject, ObjectNode parentObjec } @ExcludeFromGeneratedCoverageReport - ObjectNode embedContentConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode embedContentConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"taskType"}) != null) { @@ -878,7 +901,7 @@ ObjectNode embedContentConfigToVertex(JsonNode fromObject, ObjectNode parentObje @ExcludeFromGeneratedCoverageReport ObjectNode embedContentParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -901,7 +924,8 @@ ObjectNode embedContentParametersToMldev( embedContentConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } Common.setValueByPath( @@ -914,7 +938,7 @@ ObjectNode embedContentParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode embedContentParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -937,14 +961,16 @@ ObjectNode embedContentParametersToVertex( embedContentConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode embedContentResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode embedContentResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -971,7 +997,8 @@ ObjectNode embedContentResponseFromMldev(JsonNode fromObject, ObjectNode parentO } @ExcludeFromGeneratedCoverageReport - ObjectNode embedContentResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode embedContentResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -988,7 +1015,8 @@ ObjectNode embedContentResponseFromVertex(JsonNode fromObject, ObjectNode parent ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(contentEmbeddingFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + contentEmbeddingFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"embeddings"}, result); } @@ -1004,7 +1032,7 @@ ObjectNode embedContentResponseFromVertex(JsonNode fromObject, ObjectNode parent } @ExcludeFromGeneratedCoverageReport - ObjectNode endpointFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode endpointFromVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"endpoint"}) != null) { Common.setValueByPath( @@ -1024,7 +1052,7 @@ ObjectNode endpointFromVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode fileDataToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode fileDataToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"displayName"}))) { throw new IllegalArgumentException("displayName parameter is not supported in Gemini API."); @@ -1048,7 +1076,8 @@ ObjectNode fileDataToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode functionCallToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode functionCallToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"id"}) != null) { Common.setValueByPath( @@ -1081,7 +1110,8 @@ ObjectNode functionCallToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode functionCallingConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode functionCallingConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"allowedFunctionNames"}) != null) { Common.setValueByPath( @@ -1107,7 +1137,8 @@ ObjectNode functionCallingConfigToMldev(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode functionDeclarationToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode functionDeclarationToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"description"}) != null) { Common.setValueByPath( @@ -1160,7 +1191,7 @@ ObjectNode functionDeclarationToVertex(JsonNode fromObject, ObjectNode parentObj @ExcludeFromGeneratedCoverageReport ObjectNode generateContentConfigToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"systemInstruction"}) != null) { @@ -1171,7 +1202,8 @@ ObjectNode generateContentConfigToMldev( JsonSerializable.toJsonNode( Transformers.tContent( Common.getValueByPath(fromObject, new String[] {"systemInstruction"}))), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"temperature"}) != null) { @@ -1288,7 +1320,7 @@ ObjectNode generateContentConfigToMldev( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(safetySettingToMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(safetySettingToMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"safetySettings"}, result); } @@ -1301,7 +1333,9 @@ ObjectNode generateContentConfigToMldev( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(toolToMldev(JsonSerializable.toJsonNode(Transformers.tTool(item)), toObject)); + result.add( + toolToMldev( + JsonSerializable.toJsonNode(Transformers.tTool(item)), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"tools"}, result); } @@ -1313,7 +1347,8 @@ ObjectNode generateContentConfigToMldev( toolConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"toolConfig"})), - toObject)); + toObject, + rootObject)); } if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"labels"}))) { @@ -1369,7 +1404,8 @@ ObjectNode generateContentConfigToMldev( imageConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"imageConfig"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"enableEnhancedCivicAnswers"}) != null) { @@ -1389,7 +1425,7 @@ ObjectNode generateContentConfigToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode generateContentConfigToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"systemInstruction"}) != null) { @@ -1527,7 +1563,9 @@ ObjectNode generateContentConfigToVertex( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(toolToVertex(JsonSerializable.toJsonNode(Transformers.tTool(item)), toObject)); + result.add( + toolToVertex( + JsonSerializable.toJsonNode(Transformers.tTool(item)), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"tools"}, result); } @@ -1597,7 +1635,8 @@ ObjectNode generateContentConfigToVertex( imageConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"imageConfig"})), - toObject)); + toObject, + rootObject)); } if (!Common.isZero( @@ -1618,7 +1657,7 @@ ObjectNode generateContentConfigToVertex( @ExcludeFromGeneratedCoverageReport ObjectNode generateContentParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -1636,7 +1675,7 @@ ObjectNode generateContentParametersToMldev( ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(contentToMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(contentToMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"contents"}, result); } @@ -1649,7 +1688,8 @@ ObjectNode generateContentParametersToMldev( apiClient, JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject)); + toObject, + rootObject)); } return toObject; @@ -1657,7 +1697,7 @@ ObjectNode generateContentParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode generateContentParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -1682,14 +1722,16 @@ ObjectNode generateContentParametersToVertex( apiClient, JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateContentResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateContentResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -1705,7 +1747,7 @@ ObjectNode generateContentResponseFromMldev(JsonNode fromObject, ObjectNode pare ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(candidateFromMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(candidateFromMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"candidates"}, result); } @@ -1742,7 +1784,8 @@ ObjectNode generateContentResponseFromMldev(JsonNode fromObject, ObjectNode pare } @ExcludeFromGeneratedCoverageReport - ObjectNode generateContentResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateContentResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -1797,7 +1840,8 @@ ObjectNode generateContentResponseFromVertex(JsonNode fromObject, ObjectNode par } @ExcludeFromGeneratedCoverageReport - ObjectNode generateImagesConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateImagesConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"outputGcsUri"}))) { @@ -1910,7 +1954,8 @@ ObjectNode generateImagesConfigToMldev(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode generateImagesConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateImagesConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"outputGcsUri"}) != null) { @@ -2037,7 +2082,7 @@ ObjectNode generateImagesConfigToVertex(JsonNode fromObject, ObjectNode parentOb @ExcludeFromGeneratedCoverageReport ObjectNode generateImagesParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -2059,7 +2104,8 @@ ObjectNode generateImagesParametersToMldev( generateImagesConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; @@ -2067,7 +2113,7 @@ ObjectNode generateImagesParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode generateImagesParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -2089,14 +2135,16 @@ ObjectNode generateImagesParametersToVertex( generateImagesConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateImagesResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateImagesResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -2112,7 +2160,8 @@ ObjectNode generateImagesResponseFromMldev(JsonNode fromObject, ObjectNode paren ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageFromMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageFromMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedImages"}, result); } @@ -2126,14 +2175,16 @@ ObjectNode generateImagesResponseFromMldev(JsonNode fromObject, ObjectNode paren JsonSerializable.toJsonNode( Common.getValueByPath( fromObject, new String[] {"positivePromptSafetyAttributes"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateImagesResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateImagesResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -2149,7 +2200,8 @@ ObjectNode generateImagesResponseFromVertex(JsonNode fromObject, ObjectNode pare ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedImages"}, result); } @@ -2163,14 +2215,16 @@ ObjectNode generateImagesResponseFromVertex(JsonNode fromObject, ObjectNode pare JsonSerializable.toJsonNode( Common.getValueByPath( fromObject, new String[] {"positivePromptSafetyAttributes"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"numberOfVideos"}) != null) { @@ -2249,7 +2303,8 @@ ObjectNode generateVideosConfigToMldev(JsonNode fromObject, ObjectNode parentObj imageToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"lastFrame"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"referenceImages"}) != null) { @@ -2260,7 +2315,8 @@ ObjectNode generateVideosConfigToMldev(JsonNode fromObject, ObjectNode parentObj for (JsonNode item : keyArray) { result.add( - videoGenerationReferenceImageToMldev(JsonSerializable.toJsonNode(item), toObject)); + videoGenerationReferenceImageToMldev( + JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"instances[0]", "referenceImages"}, result); } @@ -2278,7 +2334,8 @@ ObjectNode generateVideosConfigToMldev(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"numberOfVideos"}) != null) { @@ -2372,7 +2429,8 @@ ObjectNode generateVideosConfigToVertex(JsonNode fromObject, ObjectNode parentOb imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"lastFrame"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"referenceImages"}) != null) { @@ -2383,7 +2441,8 @@ ObjectNode generateVideosConfigToVertex(JsonNode fromObject, ObjectNode parentOb for (JsonNode item : keyArray) { result.add( - videoGenerationReferenceImageToVertex(JsonSerializable.toJsonNode(item), toObject)); + videoGenerationReferenceImageToVertex( + JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"instances[0]", "referenceImages"}, result); } @@ -2394,7 +2453,8 @@ ObjectNode generateVideosConfigToVertex(JsonNode fromObject, ObjectNode parentOb new String[] {"instances[0]", "mask"}, videoGenerationMaskToVertex( JsonSerializable.toJsonNode(Common.getValueByPath(fromObject, new String[] {"mask"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"compressionQuality"}) != null) { @@ -2408,7 +2468,8 @@ ObjectNode generateVideosConfigToVertex(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosOperationFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosOperationFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"name"}) != null) { Common.setValueByPath( @@ -2447,14 +2508,16 @@ ObjectNode generateVideosOperationFromMldev(JsonNode fromObject, ObjectNode pare JsonSerializable.toJsonNode( Common.getValueByPath( fromObject, new String[] {"response", "generateVideoResponse"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosOperationFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosOperationFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"name"}) != null) { Common.setValueByPath( @@ -2491,7 +2554,8 @@ ObjectNode generateVideosOperationFromVertex(JsonNode fromObject, ObjectNode par generateVideosResponseFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"response"})), - toObject)); + toObject, + rootObject)); } return toObject; @@ -2499,7 +2563,7 @@ ObjectNode generateVideosOperationFromVertex(JsonNode fromObject, ObjectNode par @ExcludeFromGeneratedCoverageReport ObjectNode generateVideosParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -2523,7 +2587,8 @@ ObjectNode generateVideosParametersToMldev( imageToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"video"}) != null) { @@ -2533,7 +2598,8 @@ ObjectNode generateVideosParametersToMldev( videoToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"video"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"source"}) != null) { @@ -2541,7 +2607,8 @@ ObjectNode generateVideosParametersToMldev( generateVideosSourceToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"source"})), - toObject); + toObject, + rootObject); } if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { @@ -2549,7 +2616,8 @@ ObjectNode generateVideosParametersToMldev( generateVideosConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; @@ -2557,7 +2625,7 @@ ObjectNode generateVideosParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode generateVideosParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -2581,7 +2649,8 @@ ObjectNode generateVideosParametersToVertex( imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"video"}) != null) { @@ -2591,7 +2660,8 @@ ObjectNode generateVideosParametersToVertex( videoToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"video"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"source"}) != null) { @@ -2599,7 +2669,8 @@ ObjectNode generateVideosParametersToVertex( generateVideosSourceToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"source"})), - toObject); + toObject, + rootObject); } if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { @@ -2607,14 +2678,16 @@ ObjectNode generateVideosParametersToVertex( generateVideosConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"generatedSamples"}) != null) { ArrayNode keyArray = @@ -2623,7 +2696,8 @@ ObjectNode generateVideosResponseFromMldev(JsonNode fromObject, ObjectNode paren ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedVideoFromMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedVideoFromMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedVideos"}, result); } @@ -2646,7 +2720,8 @@ ObjectNode generateVideosResponseFromMldev(JsonNode fromObject, ObjectNode paren } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"videos"}) != null) { ArrayNode keyArray = (ArrayNode) Common.getValueByPath(fromObject, new String[] {"videos"}); @@ -2654,7 +2729,8 @@ ObjectNode generateVideosResponseFromVertex(JsonNode fromObject, ObjectNode pare ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedVideoFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedVideoFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedVideos"}, result); } @@ -2677,7 +2753,8 @@ ObjectNode generateVideosResponseFromVertex(JsonNode fromObject, ObjectNode pare } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosSourceToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosSourceToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"prompt"}) != null) { Common.setValueByPath( @@ -2693,7 +2770,8 @@ ObjectNode generateVideosSourceToMldev(JsonNode fromObject, ObjectNode parentObj imageToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"video"}) != null) { @@ -2703,14 +2781,16 @@ ObjectNode generateVideosSourceToMldev(JsonNode fromObject, ObjectNode parentObj videoToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"video"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generateVideosSourceToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generateVideosSourceToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"prompt"}) != null) { Common.setValueByPath( @@ -2726,7 +2806,8 @@ ObjectNode generateVideosSourceToVertex(JsonNode fromObject, ObjectNode parentOb imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"video"}) != null) { @@ -2736,14 +2817,16 @@ ObjectNode generateVideosSourceToVertex(JsonNode fromObject, ObjectNode parentOb videoToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"video"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generatedImageFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generatedImageFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"_self"}) != null) { Common.setValueByPath( @@ -2752,7 +2835,8 @@ ObjectNode generatedImageFromMldev(JsonNode fromObject, ObjectNode parentObject) imageFromMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"raiFilteredReason"}) != null) { @@ -2769,14 +2853,16 @@ ObjectNode generatedImageFromMldev(JsonNode fromObject, ObjectNode parentObject) safetyAttributesFromMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generatedImageFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generatedImageFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"_self"}) != null) { Common.setValueByPath( @@ -2785,7 +2871,8 @@ ObjectNode generatedImageFromVertex(JsonNode fromObject, ObjectNode parentObject imageFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"raiFilteredReason"}) != null) { @@ -2802,7 +2889,8 @@ ObjectNode generatedImageFromVertex(JsonNode fromObject, ObjectNode parentObject safetyAttributesFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"prompt"}) != null) { @@ -2816,7 +2904,8 @@ ObjectNode generatedImageFromVertex(JsonNode fromObject, ObjectNode parentObject } @ExcludeFromGeneratedCoverageReport - ObjectNode generatedImageMaskFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generatedImageMaskFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"_self"}) != null) { Common.setValueByPath( @@ -2825,7 +2914,8 @@ ObjectNode generatedImageMaskFromVertex(JsonNode fromObject, ObjectNode parentOb imageFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"labels"}) != null) { @@ -2839,7 +2929,8 @@ ObjectNode generatedImageMaskFromVertex(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode generatedVideoFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generatedVideoFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"video"}) != null) { Common.setValueByPath( @@ -2848,14 +2939,16 @@ ObjectNode generatedVideoFromMldev(JsonNode fromObject, ObjectNode parentObject) videoFromMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"video"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generatedVideoFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generatedVideoFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"_self"}) != null) { Common.setValueByPath( @@ -2864,14 +2957,16 @@ ObjectNode generatedVideoFromVertex(JsonNode fromObject, ObjectNode parentObject videoFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode generationConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode generationConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"modelSelectionConfig"}) != null) { Common.setValueByPath( @@ -3038,7 +3133,7 @@ ObjectNode generationConfigToVertex(JsonNode fromObject, ObjectNode parentObject @ExcludeFromGeneratedCoverageReport ObjectNode getModelParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -3053,7 +3148,7 @@ ObjectNode getModelParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode getModelParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -3067,7 +3162,7 @@ ObjectNode getModelParametersToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode googleMapsToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode googleMapsToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"authConfig"}))) { throw new IllegalArgumentException("authConfig parameter is not supported in Gemini API."); @@ -3084,7 +3179,8 @@ ObjectNode googleMapsToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode googleSearchToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode googleSearchToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"excludeDomains"}))) { throw new IllegalArgumentException( @@ -3107,7 +3203,7 @@ ObjectNode googleSearchToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageConfigToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"aspectRatio"}) != null) { Common.setValueByPath( @@ -3143,7 +3239,8 @@ ObjectNode imageConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"aspectRatio"}) != null) { Common.setValueByPath( @@ -3184,7 +3281,7 @@ ObjectNode imageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageFromMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"bytesBase64Encoded"}) != null) { @@ -3206,7 +3303,7 @@ ObjectNode imageFromMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageFromVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"gcsUri"}) != null) { Common.setValueByPath( @@ -3234,7 +3331,7 @@ ObjectNode imageFromVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"gcsUri"}))) { throw new IllegalArgumentException("gcsUri parameter is not supported in Gemini API."); @@ -3258,7 +3355,7 @@ ObjectNode imageToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode imageToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode imageToVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"gcsUri"}) != null) { Common.setValueByPath( @@ -3286,7 +3383,7 @@ ObjectNode imageToVertex(JsonNode fromObject, ObjectNode parentObject) { @ExcludeFromGeneratedCoverageReport ObjectNode listModelsConfigToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"pageSize"}) != null) { @@ -3323,7 +3420,7 @@ ObjectNode listModelsConfigToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode listModelsConfigToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"pageSize"}) != null) { @@ -3360,7 +3457,7 @@ ObjectNode listModelsConfigToVertex( @ExcludeFromGeneratedCoverageReport ObjectNode listModelsParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { JsonNode unused = @@ -3368,7 +3465,8 @@ ObjectNode listModelsParametersToMldev( apiClient, JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; @@ -3376,7 +3474,7 @@ ObjectNode listModelsParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode listModelsParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { JsonNode unused = @@ -3384,14 +3482,16 @@ ObjectNode listModelsParametersToVertex( apiClient, JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode listModelsResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode listModelsResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -3416,7 +3516,7 @@ ObjectNode listModelsResponseFromMldev(JsonNode fromObject, ObjectNode parentObj ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(modelFromMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(modelFromMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"models"}, result); } @@ -3425,7 +3525,8 @@ ObjectNode listModelsResponseFromMldev(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode listModelsResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode listModelsResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -3450,7 +3551,7 @@ ObjectNode listModelsResponseFromVertex(JsonNode fromObject, ObjectNode parentOb ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(modelFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add(modelFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"models"}, result); } @@ -3459,7 +3560,8 @@ ObjectNode listModelsResponseFromVertex(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode maskReferenceConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode maskReferenceConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"maskMode"}) != null) { Common.setValueByPath( @@ -3486,7 +3588,7 @@ ObjectNode maskReferenceConfigToVertex(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode modelFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode modelFromMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"name"}) != null) { Common.setValueByPath( @@ -3583,7 +3685,7 @@ ObjectNode modelFromMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode modelFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode modelFromVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"name"}) != null) { Common.setValueByPath( @@ -3620,7 +3722,7 @@ ObjectNode modelFromVertex(JsonNode fromObject, ObjectNode parentObject) { ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(endpointFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add(endpointFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"endpoints"}, result); } @@ -3639,7 +3741,8 @@ ObjectNode modelFromVertex(JsonNode fromObject, ObjectNode parentObject) { tunedModelInfoFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"defaultCheckpointId"}) != null) { @@ -3660,7 +3763,7 @@ ObjectNode modelFromVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"mediaResolution"}) != null) { Common.setValueByPath( @@ -3690,7 +3793,8 @@ ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject) { fileDataToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"fileData"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"functionCall"}) != null) { @@ -3700,7 +3804,8 @@ ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject) { functionCallToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"functionCall"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"functionResponse"}) != null) { @@ -3717,7 +3822,8 @@ ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject) { blobToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"inlineData"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"text"}) != null) { @@ -3752,7 +3858,8 @@ ObjectNode partToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode productImageToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode productImageToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"productImage"}) != null) { Common.setValueByPath( @@ -3761,14 +3868,16 @@ ObjectNode productImageToVertex(JsonNode fromObject, ObjectNode parentObject) { imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"productImage"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode recontextImageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode recontextImageConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"numberOfImages"}) != null) { @@ -3853,7 +3962,7 @@ ObjectNode recontextImageConfigToVertex(JsonNode fromObject, ObjectNode parentOb @ExcludeFromGeneratedCoverageReport ObjectNode recontextImageParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -3868,7 +3977,8 @@ ObjectNode recontextImageParametersToVertex( recontextImageSourceToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"source"})), - toObject); + toObject, + rootObject); } if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { @@ -3876,14 +3986,16 @@ ObjectNode recontextImageParametersToVertex( recontextImageConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode recontextImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode recontextImageResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"predictions"}) != null) { ArrayNode keyArray = @@ -3892,7 +4004,8 @@ ObjectNode recontextImageResponseFromVertex(JsonNode fromObject, ObjectNode pare ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedImages"}, result); } @@ -3901,7 +4014,8 @@ ObjectNode recontextImageResponseFromVertex(JsonNode fromObject, ObjectNode pare } @ExcludeFromGeneratedCoverageReport - ObjectNode recontextImageSourceToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode recontextImageSourceToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"prompt"}) != null) { Common.setValueByPath( @@ -3917,7 +4031,8 @@ ObjectNode recontextImageSourceToVertex(JsonNode fromObject, ObjectNode parentOb imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"personImage"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"productImages"}) != null) { @@ -3927,7 +4042,7 @@ ObjectNode recontextImageSourceToVertex(JsonNode fromObject, ObjectNode parentOb ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(productImageToVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add(productImageToVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(parentObject, new String[] {"instances[0]", "productImages"}, result); } @@ -3936,7 +4051,8 @@ ObjectNode recontextImageSourceToVertex(JsonNode fromObject, ObjectNode parentOb } @ExcludeFromGeneratedCoverageReport - ObjectNode referenceImageAPIToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode referenceImageAPIToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"referenceImage"}) != null) { Common.setValueByPath( @@ -3945,7 +4061,8 @@ ObjectNode referenceImageAPIToVertex(JsonNode fromObject, ObjectNode parentObjec imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"referenceImage"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"referenceId"}) != null) { @@ -3969,7 +4086,8 @@ ObjectNode referenceImageAPIToVertex(JsonNode fromObject, ObjectNode parentObjec maskReferenceConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"maskImageConfig"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"controlImageConfig"}) != null) { @@ -3979,7 +4097,8 @@ ObjectNode referenceImageAPIToVertex(JsonNode fromObject, ObjectNode parentObjec controlReferenceConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"controlImageConfig"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"styleImageConfig"}) != null) { @@ -4000,7 +4119,8 @@ ObjectNode referenceImageAPIToVertex(JsonNode fromObject, ObjectNode parentObjec } @ExcludeFromGeneratedCoverageReport - ObjectNode safetyAttributesFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode safetyAttributesFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"safetyAttributes", "categories"}) != null) { @@ -4028,7 +4148,8 @@ ObjectNode safetyAttributesFromMldev(JsonNode fromObject, ObjectNode parentObjec } @ExcludeFromGeneratedCoverageReport - ObjectNode safetyAttributesFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode safetyAttributesFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"safetyAttributes", "categories"}) != null) { @@ -4056,7 +4177,8 @@ ObjectNode safetyAttributesFromVertex(JsonNode fromObject, ObjectNode parentObje } @ExcludeFromGeneratedCoverageReport - ObjectNode safetySettingToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode safetySettingToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"category"}) != null) { Common.setValueByPath( @@ -4080,7 +4202,8 @@ ObjectNode safetySettingToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode scribbleImageToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode scribbleImageToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"image"}) != null) { Common.setValueByPath( @@ -4089,14 +4212,16 @@ ObjectNode scribbleImageToVertex(JsonNode fromObject, ObjectNode parentObject) { imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode segmentImageConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode segmentImageConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"mode"}) != null) { @@ -4146,7 +4271,7 @@ ObjectNode segmentImageConfigToVertex(JsonNode fromObject, ObjectNode parentObje @ExcludeFromGeneratedCoverageReport ObjectNode segmentImageParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -4161,7 +4286,8 @@ ObjectNode segmentImageParametersToVertex( segmentImageSourceToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"source"})), - toObject); + toObject, + rootObject); } if (Common.getValueByPath(fromObject, new String[] {"config"}) != null) { @@ -4169,14 +4295,16 @@ ObjectNode segmentImageParametersToVertex( segmentImageConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode segmentImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode segmentImageResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"predictions"}) != null) { ArrayNode keyArray = @@ -4185,7 +4313,8 @@ ObjectNode segmentImageResponseFromVertex(JsonNode fromObject, ObjectNode parent ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageMaskFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageMaskFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedMasks"}, result); } @@ -4194,7 +4323,8 @@ ObjectNode segmentImageResponseFromVertex(JsonNode fromObject, ObjectNode parent } @ExcludeFromGeneratedCoverageReport - ObjectNode segmentImageSourceToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode segmentImageSourceToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"prompt"}) != null) { Common.setValueByPath( @@ -4210,7 +4340,8 @@ ObjectNode segmentImageSourceToVertex(JsonNode fromObject, ObjectNode parentObje imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"scribbleImage"}) != null) { @@ -4220,14 +4351,15 @@ ObjectNode segmentImageSourceToVertex(JsonNode fromObject, ObjectNode parentObje scribbleImageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"scribbleImage"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode toolConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode toolConfigToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"retrievalConfig"}) != null) { Common.setValueByPath( @@ -4243,14 +4375,15 @@ ObjectNode toolConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { functionCallingConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"functionCallingConfig"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode toolToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode toolToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"retrieval"}))) { throw new IllegalArgumentException("retrieval parameter is not supported in Gemini API."); @@ -4296,7 +4429,8 @@ ObjectNode toolToMldev(JsonNode fromObject, ObjectNode parentObject) { googleMapsToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"googleMaps"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"googleSearch"}) != null) { @@ -4306,7 +4440,8 @@ ObjectNode toolToMldev(JsonNode fromObject, ObjectNode parentObject) { googleSearchToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"googleSearch"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"googleSearchRetrieval"}) != null) { @@ -4327,7 +4462,7 @@ ObjectNode toolToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode toolToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode toolToVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"retrieval"}) != null) { Common.setValueByPath( @@ -4368,7 +4503,8 @@ ObjectNode toolToVertex(JsonNode fromObject, ObjectNode parentObject) { ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(functionDeclarationToVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + functionDeclarationToVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"functionDeclarations"}, result); } @@ -4405,7 +4541,8 @@ ObjectNode toolToVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode tunedModelInfoFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode tunedModelInfoFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath( fromObject, new String[] {"labels", "google-vertex-llm-tuning-base-model-id"}) @@ -4435,7 +4572,8 @@ ObjectNode tunedModelInfoFromVertex(JsonNode fromObject, ObjectNode parentObject } @ExcludeFromGeneratedCoverageReport - ObjectNode updateModelConfigToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode updateModelConfigToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"displayName"}) != null) { @@ -4463,7 +4601,8 @@ ObjectNode updateModelConfigToMldev(JsonNode fromObject, ObjectNode parentObject } @ExcludeFromGeneratedCoverageReport - ObjectNode updateModelConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode updateModelConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"displayName"}) != null) { @@ -4492,7 +4631,7 @@ ObjectNode updateModelConfigToVertex(JsonNode fromObject, ObjectNode parentObjec @ExcludeFromGeneratedCoverageReport ObjectNode updateModelParametersToMldev( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -4507,7 +4646,8 @@ ObjectNode updateModelParametersToMldev( updateModelConfigToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; @@ -4515,7 +4655,7 @@ ObjectNode updateModelParametersToMldev( @ExcludeFromGeneratedCoverageReport ObjectNode updateModelParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -4530,14 +4670,16 @@ ObjectNode updateModelParametersToVertex( updateModelConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode upscaleImageAPIConfigToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode upscaleImageAPIConfigToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"outputGcsUri"}) != null) { @@ -4622,7 +4764,7 @@ ObjectNode upscaleImageAPIConfigToVertex(JsonNode fromObject, ObjectNode parentO @ExcludeFromGeneratedCoverageReport ObjectNode upscaleImageAPIParametersToVertex( - ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject) { + ApiClient apiClient, JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"model"}) != null) { Common.setValueByPath( @@ -4639,7 +4781,8 @@ ObjectNode upscaleImageAPIParametersToVertex( imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"upscaleFactor"}) != null) { @@ -4654,14 +4797,16 @@ ObjectNode upscaleImageAPIParametersToVertex( upscaleImageAPIConfigToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"config"})), - toObject); + toObject, + rootObject); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode upscaleImageResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode upscaleImageResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -4677,7 +4822,8 @@ ObjectNode upscaleImageResponseFromVertex(JsonNode fromObject, ObjectNode parent ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add( + generatedImageFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"generatedImages"}, result); } @@ -4686,7 +4832,7 @@ ObjectNode upscaleImageResponseFromVertex(JsonNode fromObject, ObjectNode parent } @ExcludeFromGeneratedCoverageReport - ObjectNode videoFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoFromMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"uri"}) != null) { Common.setValueByPath( @@ -4711,7 +4857,7 @@ ObjectNode videoFromMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode videoFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoFromVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"gcsUri"}) != null) { Common.setValueByPath( @@ -4739,7 +4885,8 @@ ObjectNode videoFromVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode videoGenerationMaskToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoGenerationMaskToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"image"}) != null) { Common.setValueByPath( @@ -4748,7 +4895,8 @@ ObjectNode videoGenerationMaskToVertex(JsonNode fromObject, ObjectNode parentObj imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"maskMode"}) != null) { @@ -4762,7 +4910,8 @@ ObjectNode videoGenerationMaskToVertex(JsonNode fromObject, ObjectNode parentObj } @ExcludeFromGeneratedCoverageReport - ObjectNode videoGenerationReferenceImageToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoGenerationReferenceImageToMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"image"}) != null) { Common.setValueByPath( @@ -4771,7 +4920,8 @@ ObjectNode videoGenerationReferenceImageToMldev(JsonNode fromObject, ObjectNode imageToMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"referenceType"}) != null) { @@ -4787,7 +4937,8 @@ ObjectNode videoGenerationReferenceImageToMldev(JsonNode fromObject, ObjectNode } @ExcludeFromGeneratedCoverageReport - ObjectNode videoGenerationReferenceImageToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoGenerationReferenceImageToVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"image"}) != null) { Common.setValueByPath( @@ -4796,7 +4947,8 @@ ObjectNode videoGenerationReferenceImageToVertex(JsonNode fromObject, ObjectNode imageToVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"image"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"referenceType"}) != null) { @@ -4810,7 +4962,7 @@ ObjectNode videoGenerationReferenceImageToVertex(JsonNode fromObject, ObjectNode } @ExcludeFromGeneratedCoverageReport - ObjectNode videoToMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoToMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"uri"}) != null) { Common.setValueByPath( @@ -4835,7 +4987,7 @@ ObjectNode videoToMldev(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode videoToVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode videoToVertex(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"uri"}) != null) { Common.setValueByPath( @@ -4881,10 +5033,10 @@ BuiltRequest buildRequestForPrivateGenerateContent( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = generateContentParametersToVertex(this.apiClient, parameterNode, null); + body = generateContentParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:generateContent", body.get("_url")); } else { - body = generateContentParametersToMldev(this.apiClient, parameterNode, null); + body = generateContentParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:generateContent", body.get("_url")); } else { @@ -4910,7 +5062,7 @@ BuiltRequest buildRequestForPrivateGenerateContent( /** A shared processResponse function for both sync and async methods. */ GenerateContentResponse processResponseForPrivateGenerateContent( - ApiResponse response, GenerateContentConfig config) { + ApiResponse response, GenerateContentConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -4938,11 +5090,11 @@ GenerateContentResponse processResponseForPrivateGenerateContent( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = generateContentResponseFromVertex(responseNode, null); + responseNode = generateContentResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = generateContentResponseFromMldev(responseNode, null); + responseNode = generateContentResponseFromMldev(responseNode, null, parameterNode); } GenerateContentResponse sdkResponse = @@ -4960,12 +5112,24 @@ GenerateContentResponse processResponseForPrivateGenerateContent( GenerateContentResponse privateGenerateContent( String model, List contents, GenerateContentConfig config) { + GenerateContentParameters.Builder parameterBuilder = GenerateContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateGenerateContent(model, contents, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateGenerateContent(response, config); + return processResponseForPrivateGenerateContent(response, config, parameterNode); } } @@ -4989,10 +5153,10 @@ BuiltRequest buildRequestForPrivateGenerateContentStream( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = generateContentParametersToVertex(this.apiClient, parameterNode, null); + body = generateContentParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:streamGenerateContent?alt=sse", body.get("_url")); } else { - body = generateContentParametersToMldev(this.apiClient, parameterNode, null); + body = generateContentParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:streamGenerateContent?alt=sse", body.get("_url")); } else { @@ -5018,7 +5182,7 @@ BuiltRequest buildRequestForPrivateGenerateContentStream( /** A shared processResponse function for both sync and async methods. */ ResponseStream processResponseForPrivateGenerateContentStream( - ApiResponse response, GenerateContentConfig config) { + ApiResponse response, GenerateContentConfig config, JsonNode parameterNode) { String converterName; if (this.apiClient.vertexAI()) { @@ -5027,18 +5191,30 @@ ResponseStream processResponseForPrivateGenerateContent converterName = "generateContentResponseFromMldev"; } return new ResponseStream( - GenerateContentResponse.class, response, this, converterName, false, true); + GenerateContentResponse.class, response, this, converterName, true, true); } ResponseStream privateGenerateContentStream( String model, List contents, GenerateContentConfig config) { + GenerateContentParameters.Builder parameterBuilder = GenerateContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateGenerateContentStream(model, contents, config); ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions()); - return processResponseForPrivateGenerateContentStream(response, config); + return processResponseForPrivateGenerateContentStream(response, config, parameterNode); } /** A shared buildRequest method for both sync and async methods. */ @@ -5061,10 +5237,10 @@ BuiltRequest buildRequestForPrivateEmbedContent( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = embedContentParametersToVertex(this.apiClient, parameterNode, null); + body = embedContentParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { - body = embedContentParametersToMldev(this.apiClient, parameterNode, null); + body = embedContentParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:batchEmbedContents", body.get("_url")); } else { @@ -5090,7 +5266,7 @@ BuiltRequest buildRequestForPrivateEmbedContent( /** A shared processResponse function for both sync and async methods. */ EmbedContentResponse processResponseForPrivateEmbedContent( - ApiResponse response, EmbedContentConfig config) { + ApiResponse response, EmbedContentConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5102,11 +5278,11 @@ EmbedContentResponse processResponseForPrivateEmbedContent( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = embedContentResponseFromVertex(responseNode, null); + responseNode = embedContentResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = embedContentResponseFromMldev(responseNode, null); + responseNode = embedContentResponseFromMldev(responseNode, null, parameterNode); } EmbedContentResponse sdkResponse = @@ -5124,12 +5300,24 @@ EmbedContentResponse processResponseForPrivateEmbedContent( EmbedContentResponse privateEmbedContent( String model, List contents, EmbedContentConfig config) { + EmbedContentParameters.Builder parameterBuilder = EmbedContentParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateEmbedContent(model, contents, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateEmbedContent(response, config); + return processResponseForPrivateEmbedContent(response, config, parameterNode); } } @@ -5153,10 +5341,10 @@ BuiltRequest buildRequestForPrivateGenerateImages( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = generateImagesParametersToVertex(this.apiClient, parameterNode, null); + body = generateImagesParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { - body = generateImagesParametersToMldev(this.apiClient, parameterNode, null); + body = generateImagesParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:predict", body.get("_url")); } else { @@ -5182,7 +5370,7 @@ BuiltRequest buildRequestForPrivateGenerateImages( /** A shared processResponse function for both sync and async methods. */ GenerateImagesResponse processResponseForPrivateGenerateImages( - ApiResponse response, GenerateImagesConfig config) { + ApiResponse response, GenerateImagesConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5194,11 +5382,11 @@ GenerateImagesResponse processResponseForPrivateGenerateImages( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = generateImagesResponseFromVertex(responseNode, null); + responseNode = generateImagesResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = generateImagesResponseFromMldev(responseNode, null); + responseNode = generateImagesResponseFromMldev(responseNode, null, parameterNode); } GenerateImagesResponse sdkResponse = @@ -5217,12 +5405,24 @@ GenerateImagesResponse processResponseForPrivateGenerateImages( /** Private method for generating images. */ GenerateImagesResponse privateGenerateImages( String model, String prompt, GenerateImagesConfig config) { + GenerateImagesParameters.Builder parameterBuilder = GenerateImagesParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateGenerateImages(model, prompt, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateGenerateImages(response, config); + return processResponseForPrivateGenerateImages(response, config, parameterNode); } } @@ -5252,7 +5452,7 @@ BuiltRequest buildRequestForPrivateEditImage( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = editImageParametersToVertex(this.apiClient, parameterNode, null); + body = editImageParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { throw new UnsupportedOperationException( @@ -5277,7 +5477,7 @@ BuiltRequest buildRequestForPrivateEditImage( /** A shared processResponse function for both sync and async methods. */ EditImageResponse processResponseForPrivateEditImage( - ApiResponse response, EditImageConfig config) { + ApiResponse response, EditImageConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5289,7 +5489,7 @@ EditImageResponse processResponseForPrivateEditImage( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = editImageResponseFromVertex(responseNode, null); + responseNode = editImageResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -5316,13 +5516,28 @@ EditImageResponse privateEditImage( String prompt, List referenceImages, EditImageConfig config) { + EditImageParameters.Builder parameterBuilder = EditImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(referenceImages)) { + parameterBuilder.referenceImages(referenceImages); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateEditImage(model, prompt, referenceImages, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateEditImage(response, config); + return processResponseForPrivateEditImage(response, config, parameterNode); } } @@ -5349,7 +5564,7 @@ BuiltRequest buildRequestForPrivateUpscaleImage( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = upscaleImageAPIParametersToVertex(this.apiClient, parameterNode, null); + body = upscaleImageAPIParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { throw new UnsupportedOperationException( @@ -5374,7 +5589,7 @@ BuiltRequest buildRequestForPrivateUpscaleImage( /** A shared processResponse function for both sync and async methods. */ UpscaleImageResponse processResponseForPrivateUpscaleImage( - ApiResponse response, UpscaleImageAPIConfig config) { + ApiResponse response, UpscaleImageAPIConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5386,7 +5601,7 @@ UpscaleImageResponse processResponseForPrivateUpscaleImage( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = upscaleImageResponseFromVertex(responseNode, null); + responseNode = upscaleImageResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -5410,13 +5625,28 @@ UpscaleImageResponse processResponseForPrivateUpscaleImage( /** Private method for upscaling an image. */ UpscaleImageResponse privateUpscaleImage( String model, Image image, String upscaleFactor, UpscaleImageAPIConfig config) { + UpscaleImageAPIParameters.Builder parameterBuilder = UpscaleImageAPIParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(image)) { + parameterBuilder.image(image); + } + if (!Common.isZero(upscaleFactor)) { + parameterBuilder.upscaleFactor(upscaleFactor); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateUpscaleImage(model, image, upscaleFactor, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateUpscaleImage(response, config); + return processResponseForPrivateUpscaleImage(response, config, parameterNode); } } @@ -5440,7 +5670,7 @@ BuiltRequest buildRequestForRecontextImage( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = recontextImageParametersToVertex(this.apiClient, parameterNode, null); + body = recontextImageParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { throw new UnsupportedOperationException( @@ -5465,7 +5695,7 @@ BuiltRequest buildRequestForRecontextImage( /** A shared processResponse function for both sync and async methods. */ RecontextImageResponse processResponseForRecontextImage( - ApiResponse response, RecontextImageConfig config) { + ApiResponse response, RecontextImageConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5477,7 +5707,7 @@ RecontextImageResponse processResponseForRecontextImage( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = recontextImageResponseFromVertex(responseNode, null); + responseNode = recontextImageResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -5510,12 +5740,24 @@ RecontextImageResponse processResponseForRecontextImage( */ public RecontextImageResponse recontextImage( String model, RecontextImageSource source, RecontextImageConfig config) { + RecontextImageParameters.Builder parameterBuilder = RecontextImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForRecontextImage(model, source, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForRecontextImage(response, config); + return processResponseForRecontextImage(response, config, parameterNode); } } @@ -5539,7 +5781,7 @@ BuiltRequest buildRequestForSegmentImage( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = segmentImageParametersToVertex(this.apiClient, parameterNode, null); + body = segmentImageParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predict", body.get("_url")); } else { throw new UnsupportedOperationException( @@ -5564,7 +5806,7 @@ BuiltRequest buildRequestForSegmentImage( /** A shared processResponse function for both sync and async methods. */ SegmentImageResponse processResponseForSegmentImage( - ApiResponse response, SegmentImageConfig config) { + ApiResponse response, SegmentImageConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5576,7 +5818,7 @@ SegmentImageResponse processResponseForSegmentImage( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = segmentImageResponseFromVertex(responseNode, null); + responseNode = segmentImageResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -5602,12 +5844,24 @@ SegmentImageResponse processResponseForSegmentImage( */ public SegmentImageResponse segmentImage( String model, SegmentImageSource source, SegmentImageConfig config) { + SegmentImageParameters.Builder parameterBuilder = SegmentImageParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForSegmentImage(model, source, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForSegmentImage(response, config); + return processResponseForSegmentImage(response, config, parameterNode); } } @@ -5627,10 +5881,10 @@ BuiltRequest buildRequestForGet(String model, GetModelConfig config) { ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = getModelParametersToVertex(this.apiClient, parameterNode, null); + body = getModelParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{name}", body.get("_url")); } else { - body = getModelParametersToMldev(this.apiClient, parameterNode, null); + body = getModelParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{name}", body.get("_url")); } else { @@ -5655,7 +5909,7 @@ BuiltRequest buildRequestForGet(String model, GetModelConfig config) { } /** A shared processResponse function for both sync and async methods. */ - Model processResponseForGet(ApiResponse response, GetModelConfig config) { + Model processResponseForGet(ApiResponse response, GetModelConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5667,11 +5921,11 @@ Model processResponseForGet(ApiResponse response, GetModelConfig config) { JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = modelFromVertex(responseNode, null); + responseNode = modelFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = modelFromMldev(responseNode, null); + responseNode = modelFromMldev(responseNode, null, parameterNode); } return JsonSerializable.fromJsonNode(responseNode, Model.class); @@ -5683,12 +5937,21 @@ Model processResponseForGet(ApiResponse response, GetModelConfig config) { * @example ```java Model model = client.models.get("gemini-2.0-flash"); ``` */ public Model get(String model, GetModelConfig config) { + GetModelParameters.Builder parameterBuilder = GetModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForGet(model, config); try (ApiResponse response = this.apiClient.request( "get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForGet(response, config); + return processResponseForGet(response, config, parameterNode); } } @@ -5705,10 +5968,10 @@ BuiltRequest buildRequestForPrivateList(ListModelsConfig config) { ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = listModelsParametersToVertex(this.apiClient, parameterNode, null); + body = listModelsParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{models_url}", body.get("_url")); } else { - body = listModelsParametersToMldev(this.apiClient, parameterNode, null); + body = listModelsParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{models_url}", body.get("_url")); } else { @@ -5733,7 +5996,8 @@ BuiltRequest buildRequestForPrivateList(ListModelsConfig config) { } /** A shared processResponse function for both sync and async methods. */ - ListModelsResponse processResponseForPrivateList(ApiResponse response, ListModelsConfig config) { + ListModelsResponse processResponseForPrivateList( + ApiResponse response, ListModelsConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5745,11 +6009,11 @@ ListModelsResponse processResponseForPrivateList(ApiResponse response, ListModel JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = listModelsResponseFromVertex(responseNode, null); + responseNode = listModelsResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = listModelsResponseFromMldev(responseNode, null); + responseNode = listModelsResponseFromMldev(responseNode, null, parameterNode); } ListModelsResponse sdkResponse = @@ -5766,12 +6030,18 @@ ListModelsResponse processResponseForPrivateList(ApiResponse response, ListModel } ListModelsResponse privateList(ListModelsConfig config) { + ListModelsParameters.Builder parameterBuilder = ListModelsParameters.builder(); + + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateList(config); try (ApiResponse response = this.apiClient.request( "get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateList(response, config); + return processResponseForPrivateList(response, config, parameterNode); } } @@ -5791,10 +6061,10 @@ BuiltRequest buildRequestForUpdate(String model, UpdateModelConfig config) { ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = updateModelParametersToVertex(this.apiClient, parameterNode, null); + body = updateModelParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}", body.get("_url")); } else { - body = updateModelParametersToMldev(this.apiClient, parameterNode, null); + body = updateModelParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{name}", body.get("_url")); } else { @@ -5819,7 +6089,8 @@ BuiltRequest buildRequestForUpdate(String model, UpdateModelConfig config) { } /** A shared processResponse function for both sync and async methods. */ - Model processResponseForUpdate(ApiResponse response, UpdateModelConfig config) { + Model processResponseForUpdate( + ApiResponse response, UpdateModelConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5831,11 +6102,11 @@ Model processResponseForUpdate(ApiResponse response, UpdateModelConfig config) { JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = modelFromVertex(responseNode, null); + responseNode = modelFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = modelFromMldev(responseNode, null); + responseNode = modelFromMldev(responseNode, null, parameterNode); } return JsonSerializable.fromJsonNode(responseNode, Model.class); @@ -5853,12 +6124,21 @@ Model processResponseForUpdate(ApiResponse response, UpdateModelConfig config) { * description") .build()); ``` */ public Model update(String model, UpdateModelConfig config) { + UpdateModelParameters.Builder parameterBuilder = UpdateModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForUpdate(model, config); try (ApiResponse response = this.apiClient.request( "patch", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForUpdate(response, config); + return processResponseForUpdate(response, config, parameterNode); } } @@ -5878,10 +6158,10 @@ BuiltRequest buildRequestForDelete(String model, DeleteModelConfig config) { ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = deleteModelParametersToVertex(this.apiClient, parameterNode, null); + body = deleteModelParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{name}", body.get("_url")); } else { - body = deleteModelParametersToMldev(this.apiClient, parameterNode, null); + body = deleteModelParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{name}", body.get("_url")); } else { @@ -5906,7 +6186,8 @@ BuiltRequest buildRequestForDelete(String model, DeleteModelConfig config) { } /** A shared processResponse function for both sync and async methods. */ - DeleteModelResponse processResponseForDelete(ApiResponse response, DeleteModelConfig config) { + DeleteModelResponse processResponseForDelete( + ApiResponse response, DeleteModelConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -5918,11 +6199,11 @@ DeleteModelResponse processResponseForDelete(ApiResponse response, DeleteModelCo JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = deleteModelResponseFromVertex(responseNode, null); + responseNode = deleteModelResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = deleteModelResponseFromMldev(responseNode, null); + responseNode = deleteModelResponseFromMldev(responseNode, null, parameterNode); } DeleteModelResponse sdkResponse = @@ -5944,12 +6225,21 @@ DeleteModelResponse processResponseForDelete(ApiResponse response, DeleteModelCo * @example ```java Model model = client.models.delete("tunedModels/12345"); ``` */ public DeleteModelResponse delete(String model, DeleteModelConfig config) { + DeleteModelParameters.Builder parameterBuilder = DeleteModelParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForDelete(model, config); try (ApiResponse response = this.apiClient.request( "delete", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForDelete(response, config); + return processResponseForDelete(response, config, parameterNode); } } @@ -5973,10 +6263,10 @@ BuiltRequest buildRequestForCountTokens( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = countTokensParametersToVertex(this.apiClient, parameterNode, null); + body = countTokensParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:countTokens", body.get("_url")); } else { - body = countTokensParametersToMldev(this.apiClient, parameterNode, null); + body = countTokensParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:countTokens", body.get("_url")); } else { @@ -6002,7 +6292,7 @@ BuiltRequest buildRequestForCountTokens( /** A shared processResponse function for both sync and async methods. */ CountTokensResponse processResponseForCountTokens( - ApiResponse response, CountTokensConfig config) { + ApiResponse response, CountTokensConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -6014,11 +6304,11 @@ CountTokensResponse processResponseForCountTokens( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = countTokensResponseFromVertex(responseNode, null); + responseNode = countTokensResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = countTokensResponseFromMldev(responseNode, null); + responseNode = countTokensResponseFromMldev(responseNode, null, parameterNode); } CountTokensResponse sdkResponse = @@ -6046,12 +6336,24 @@ CountTokensResponse processResponseForCountTokens( */ public CountTokensResponse countTokens( String model, List contents, CountTokensConfig config) { + CountTokensParameters.Builder parameterBuilder = CountTokensParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForCountTokens(model, contents, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForCountTokens(response, config); + return processResponseForCountTokens(response, config, parameterNode); } } @@ -6075,7 +6377,7 @@ BuiltRequest buildRequestForComputeTokens( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = computeTokensParametersToVertex(this.apiClient, parameterNode, null); + body = computeTokensParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:computeTokens", body.get("_url")); } else { throw new UnsupportedOperationException( @@ -6100,7 +6402,7 @@ BuiltRequest buildRequestForComputeTokens( /** A shared processResponse function for both sync and async methods. */ ComputeTokensResponse processResponseForComputeTokens( - ApiResponse response, ComputeTokensConfig config) { + ApiResponse response, ComputeTokensConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -6112,7 +6414,7 @@ ComputeTokensResponse processResponseForComputeTokens( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = computeTokensResponseFromVertex(responseNode, null); + responseNode = computeTokensResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -6145,12 +6447,24 @@ ComputeTokensResponse processResponseForComputeTokens( */ public ComputeTokensResponse computeTokens( String model, List contents, ComputeTokensConfig config) { + ComputeTokensParameters.Builder parameterBuilder = ComputeTokensParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(contents)) { + parameterBuilder.contents(contents); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForComputeTokens(model, contents, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForComputeTokens(response, config); + return processResponseForComputeTokens(response, config, parameterNode); } } @@ -6188,10 +6502,10 @@ BuiltRequest buildRequestForPrivateGenerateVideos( ObjectNode body; String path; if (this.apiClient.vertexAI()) { - body = generateVideosParametersToVertex(this.apiClient, parameterNode, null); + body = generateVideosParametersToVertex(this.apiClient, parameterNode, null, parameterNode); path = Common.formatMap("{model}:predictLongRunning", body.get("_url")); } else { - body = generateVideosParametersToMldev(this.apiClient, parameterNode, null); + body = generateVideosParametersToMldev(this.apiClient, parameterNode, null, parameterNode); if (body.get("_url") != null) { path = Common.formatMap("{model}:predictLongRunning", body.get("_url")); } else { @@ -6217,7 +6531,7 @@ BuiltRequest buildRequestForPrivateGenerateVideos( /** A shared processResponse function for both sync and async methods. */ GenerateVideosOperation processResponseForPrivateGenerateVideos( - ApiResponse response, GenerateVideosConfig config) { + ApiResponse response, GenerateVideosConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -6229,11 +6543,11 @@ GenerateVideosOperation processResponseForPrivateGenerateVideos( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = generateVideosOperationFromVertex(responseNode, null); + responseNode = generateVideosOperationFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = generateVideosOperationFromMldev(responseNode, null); + responseNode = generateVideosOperationFromMldev(responseNode, null, parameterNode); } return JsonSerializable.fromJsonNode(responseNode, GenerateVideosOperation.class); @@ -6247,13 +6561,34 @@ GenerateVideosOperation privateGenerateVideos( Video video, GenerateVideosSource source, GenerateVideosConfig config) { + GenerateVideosParameters.Builder parameterBuilder = GenerateVideosParameters.builder(); + + if (!Common.isZero(model)) { + parameterBuilder.model(model); + } + if (!Common.isZero(prompt)) { + parameterBuilder.prompt(prompt); + } + if (!Common.isZero(image)) { + parameterBuilder.image(image); + } + if (!Common.isZero(video)) { + parameterBuilder.video(video); + } + if (!Common.isZero(source)) { + parameterBuilder.source(source); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateGenerateVideos(model, prompt, image, video, source, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateGenerateVideos(response, config); + return processResponseForPrivateGenerateVideos(response, config, parameterNode); } } diff --git a/src/main/java/com/google/genai/Tunings.java b/src/main/java/com/google/genai/Tunings.java index 704dff8a529..e6bccb56b73 100644 --- a/src/main/java/com/google/genai/Tunings.java +++ b/src/main/java/com/google/genai/Tunings.java @@ -86,7 +86,8 @@ ObjectNode cancelTuningJobParametersToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode cancelTuningJobResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode cancelTuningJobResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -99,7 +100,8 @@ ObjectNode cancelTuningJobResponseFromMldev(JsonNode fromObject, ObjectNode pare } @ExcludeFromGeneratedCoverageReport - ObjectNode cancelTuningJobResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode cancelTuningJobResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -612,7 +614,8 @@ ObjectNode createTuningJobParametersPrivateToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode evaluationConfigFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode evaluationConfigFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"metrics"}) != null) { Common.setValueByPath( @@ -785,7 +788,8 @@ ObjectNode listTuningJobsParametersToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode listTuningJobsResponseFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode listTuningJobsResponseFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -808,7 +812,7 @@ ObjectNode listTuningJobsResponseFromMldev(JsonNode fromObject, ObjectNode paren ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(tuningJobFromMldev(JsonSerializable.toJsonNode(item), toObject)); + result.add(tuningJobFromMldev(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"tuningJobs"}, result); } @@ -817,7 +821,8 @@ ObjectNode listTuningJobsResponseFromMldev(JsonNode fromObject, ObjectNode paren } @ExcludeFromGeneratedCoverageReport - ObjectNode listTuningJobsResponseFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode listTuningJobsResponseFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -840,7 +845,7 @@ ObjectNode listTuningJobsResponseFromVertex(JsonNode fromObject, ObjectNode pare ArrayNode result = objectMapper.createArrayNode(); for (JsonNode item : keyArray) { - result.add(tuningJobFromVertex(JsonSerializable.toJsonNode(item), toObject)); + result.add(tuningJobFromVertex(JsonSerializable.toJsonNode(item), toObject, rootObject)); } Common.setValueByPath(toObject, new String[] {"tuningJobs"}, result); } @@ -849,7 +854,8 @@ ObjectNode listTuningJobsResponseFromVertex(JsonNode fromObject, ObjectNode pare } @ExcludeFromGeneratedCoverageReport - ObjectNode tunedModelFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode tunedModelFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"name"}) != null) { Common.setValueByPath( @@ -959,7 +965,7 @@ ObjectNode tuningDatasetToVertex( } @ExcludeFromGeneratedCoverageReport - ObjectNode tuningJobFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode tuningJobFromMldev(JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -1031,14 +1037,16 @@ ObjectNode tuningJobFromMldev(JsonNode fromObject, ObjectNode parentObject) { tunedModelFromMldev( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"_self"})), - toObject)); + toObject, + rootObject)); } return toObject; } @ExcludeFromGeneratedCoverageReport - ObjectNode tuningJobFromVertex(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode tuningJobFromVertex( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -1173,7 +1181,8 @@ ObjectNode tuningJobFromVertex(JsonNode fromObject, ObjectNode parentObject) { evaluationConfigFromVertex( JsonSerializable.toJsonNode( Common.getValueByPath(fromObject, new String[] {"evaluationConfig"})), - toObject)); + toObject, + rootObject)); } if (Common.getValueByPath(fromObject, new String[] {"customBaseModel"}) != null) { @@ -1236,7 +1245,8 @@ ObjectNode tuningJobFromVertex(JsonNode fromObject, ObjectNode parentObject) { } @ExcludeFromGeneratedCoverageReport - ObjectNode tuningOperationFromMldev(JsonNode fromObject, ObjectNode parentObject) { + ObjectNode tuningOperationFromMldev( + JsonNode fromObject, ObjectNode parentObject, JsonNode rootObject) { ObjectNode toObject = JsonSerializable.objectMapper().createObjectNode(); if (Common.getValueByPath(fromObject, new String[] {"sdkHttpResponse"}) != null) { Common.setValueByPath( @@ -1341,7 +1351,8 @@ BuiltRequest buildRequestForPrivateGet(String name, GetTuningJobConfig config) { } /** A shared processResponse function for both sync and async methods. */ - TuningJob processResponseForPrivateGet(ApiResponse response, GetTuningJobConfig config) { + TuningJob processResponseForPrivateGet( + ApiResponse response, GetTuningJobConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -1353,11 +1364,11 @@ TuningJob processResponseForPrivateGet(ApiResponse response, GetTuningJobConfig JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = tuningJobFromVertex(responseNode, null); + responseNode = tuningJobFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = tuningJobFromMldev(responseNode, null); + responseNode = tuningJobFromMldev(responseNode, null, parameterNode); } TuningJob sdkResponse = JsonSerializable.fromJsonNode(responseNode, TuningJob.class); @@ -1373,12 +1384,21 @@ TuningJob processResponseForPrivateGet(ApiResponse response, GetTuningJobConfig } TuningJob privateGet(String name, GetTuningJobConfig config) { + GetTuningJobParameters.Builder parameterBuilder = GetTuningJobParameters.builder(); + + if (!Common.isZero(name)) { + parameterBuilder.name(name); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateGet(name, config); try (ApiResponse response = this.apiClient.request( "get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateGet(response, config); + return processResponseForPrivateGet(response, config, parameterNode); } } @@ -1424,7 +1444,7 @@ BuiltRequest buildRequestForPrivateList(ListTuningJobsConfig config) { /** A shared processResponse function for both sync and async methods. */ ListTuningJobsResponse processResponseForPrivateList( - ApiResponse response, ListTuningJobsConfig config) { + ApiResponse response, ListTuningJobsConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -1436,11 +1456,11 @@ ListTuningJobsResponse processResponseForPrivateList( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = listTuningJobsResponseFromVertex(responseNode, null); + responseNode = listTuningJobsResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = listTuningJobsResponseFromMldev(responseNode, null); + responseNode = listTuningJobsResponseFromMldev(responseNode, null, parameterNode); } ListTuningJobsResponse sdkResponse = @@ -1457,12 +1477,18 @@ ListTuningJobsResponse processResponseForPrivateList( } ListTuningJobsResponse privateList(ListTuningJobsConfig config) { + ListTuningJobsParameters.Builder parameterBuilder = ListTuningJobsParameters.builder(); + + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateList(config); try (ApiResponse response = this.apiClient.request( "get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateList(response, config); + return processResponseForPrivateList(response, config, parameterNode); } } @@ -1511,7 +1537,7 @@ BuiltRequest buildRequestForCancel(String name, CancelTuningJobConfig config) { /** A shared processResponse function for both sync and async methods. */ CancelTuningJobResponse processResponseForCancel( - ApiResponse response, CancelTuningJobConfig config) { + ApiResponse response, CancelTuningJobConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -1523,11 +1549,11 @@ CancelTuningJobResponse processResponseForCancel( JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = cancelTuningJobResponseFromVertex(responseNode, null); + responseNode = cancelTuningJobResponseFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { - responseNode = cancelTuningJobResponseFromMldev(responseNode, null); + responseNode = cancelTuningJobResponseFromMldev(responseNode, null, parameterNode); } CancelTuningJobResponse sdkResponse = @@ -1551,12 +1577,21 @@ CancelTuningJobResponse processResponseForCancel( * @param config A {@link CancelTuningJobConfig} for configuring the cancel request. */ public CancelTuningJobResponse cancel(String name, CancelTuningJobConfig config) { + CancelTuningJobParameters.Builder parameterBuilder = CancelTuningJobParameters.builder(); + + if (!Common.isZero(name)) { + parameterBuilder.name(name); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForCancel(name, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForCancel(response, config); + return processResponseForCancel(response, config, parameterNode); } } @@ -1611,7 +1646,8 @@ BuiltRequest buildRequestForPrivateTune( } /** A shared processResponse function for both sync and async methods. */ - TuningJob processResponseForPrivateTune(ApiResponse response, CreateTuningJobConfig config) { + TuningJob processResponseForPrivateTune( + ApiResponse response, CreateTuningJobConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -1623,7 +1659,7 @@ TuningJob processResponseForPrivateTune(ApiResponse response, CreateTuningJobCon JsonNode responseNode = JsonSerializable.stringToJsonNode(responseString); if (this.apiClient.vertexAI()) { - responseNode = tuningJobFromVertex(responseNode, null); + responseNode = tuningJobFromVertex(responseNode, null, parameterNode); } if (!this.apiClient.vertexAI()) { @@ -1648,13 +1684,29 @@ TuningJob privateTune( PreTunedModel preTunedModel, TuningDataset trainingDataset, CreateTuningJobConfig config) { + CreateTuningJobParametersPrivate.Builder parameterBuilder = + CreateTuningJobParametersPrivate.builder(); + + if (!Common.isZero(baseModel)) { + parameterBuilder.baseModel(baseModel); + } + if (!Common.isZero(preTunedModel)) { + parameterBuilder.preTunedModel(preTunedModel); + } + if (!Common.isZero(trainingDataset)) { + parameterBuilder.trainingDataset(trainingDataset); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateTune(baseModel, preTunedModel, trainingDataset, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateTune(response, config); + return processResponseForPrivateTune(response, config, parameterNode); } } @@ -1714,7 +1766,7 @@ BuiltRequest buildRequestForPrivateTuneMldev( /** A shared processResponse function for both sync and async methods. */ TuningOperation processResponseForPrivateTuneMldev( - ApiResponse response, CreateTuningJobConfig config) { + ApiResponse response, CreateTuningJobConfig config, JsonNode parameterNode) { ResponseBody responseBody = response.getBody(); String responseString; try { @@ -1731,7 +1783,7 @@ TuningOperation processResponseForPrivateTuneMldev( } if (!this.apiClient.vertexAI()) { - responseNode = tuningOperationFromMldev(responseNode, null); + responseNode = tuningOperationFromMldev(responseNode, null, parameterNode); } TuningOperation sdkResponse = @@ -1752,13 +1804,29 @@ TuningOperation privateTuneMldev( PreTunedModel preTunedModel, TuningDataset trainingDataset, CreateTuningJobConfig config) { + CreateTuningJobParametersPrivate.Builder parameterBuilder = + CreateTuningJobParametersPrivate.builder(); + + if (!Common.isZero(baseModel)) { + parameterBuilder.baseModel(baseModel); + } + if (!Common.isZero(preTunedModel)) { + parameterBuilder.preTunedModel(preTunedModel); + } + if (!Common.isZero(trainingDataset)) { + parameterBuilder.trainingDataset(trainingDataset); + } + if (!Common.isZero(config)) { + parameterBuilder.config(config); + } + JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build()); BuiltRequest builtRequest = buildRequestForPrivateTuneMldev(baseModel, preTunedModel, trainingDataset, config); try (ApiResponse response = this.apiClient.request( "post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())) { - return processResponseForPrivateTuneMldev(response, config); + return processResponseForPrivateTuneMldev(response, config, parameterNode); } } diff --git a/versions.txt b/versions.txt index fc027d41991..218b836cb1d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-genai:1.37.0:1.37.0 +google-genai:1.36.0:1.37.0-SNAPSHOT