feat: [Orchestration] Support for Orchestration config persistence #697
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| package com.sap.ai.sdk.prompt.registry; | ||
|
|
||
| import static com.sap.ai.sdk.core.JacksonConfiguration.getDefaultObjectMapper; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonSubTypes; | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; | ||
| import com.google.common.collect.Iterables; | ||
| import com.sap.ai.sdk.core.AiCoreService; | ||
| import com.sap.ai.sdk.prompt.registry.client.OrchestrationConfigsApi; | ||
| import com.sap.ai.sdk.prompt.registry.model.AzureContentSafetyInputFilterConfig; | ||
| import com.sap.ai.sdk.prompt.registry.model.AzureContentSafetyOutputFilterConfig; | ||
| import com.sap.ai.sdk.prompt.registry.model.InputFilterConfig; | ||
| import com.sap.ai.sdk.prompt.registry.model.LlamaGuard38bFilterConfig; | ||
| import com.sap.ai.sdk.prompt.registry.model.OutputFilterConfig; | ||
| import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor; | ||
| import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient; | ||
| import javax.annotation.Nonnull; | ||
| import lombok.AccessLevel; | ||
| import lombok.NoArgsConstructor; | ||
| import org.springframework.http.client.BufferingClientHttpRequestFactory; | ||
| import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; | ||
| import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; | ||
| import org.springframework.http.converter.yaml.MappingJackson2YamlHttpMessageConverter; | ||
| import org.springframework.web.client.RestTemplate; | ||
|
|
||
| /** | ||
| * Client for managing Orchestration Configurations in the Prompt Registry service. | ||
| * | ||
| * @since 1.14.0 | ||
| */ | ||
| public class OrchestrationConfigClient extends OrchestrationConfigsApi { | ||
|
|
||
| /** | ||
| * Instantiates a client to manage Orchestration Configurations on the Prompt Registry service. | ||
| * | ||
| * @since 1.14.0 | ||
| */ | ||
| public OrchestrationConfigClient() { | ||
| this(new AiCoreService()); | ||
| } | ||
|
|
||
| /** | ||
| * Instantiates a client to manage Orchestration Configurations on the Prompt Registry service. | ||
| * | ||
| * @param aiCoreService The configured connectivity instance to AI Core | ||
| * @since 1.14.0 | ||
| */ | ||
| public OrchestrationConfigClient(@Nonnull final AiCoreService aiCoreService) { | ||
| super(addMixin(aiCoreService)); | ||
| } | ||
|
|
||
| @Nonnull | ||
| private static ApiClient addMixin(@Nonnull final AiCoreService service) { | ||
| final var destination = service.getBaseDestination(); | ||
| final var httpRequestFactory = new HttpComponentsClientHttpRequestFactory(); | ||
| httpRequestFactory.setHttpClient(ApacheHttpClient5Accessor.getHttpClient(destination)); | ||
|
|
||
| final var rt = new RestTemplate(); | ||
| Iterables.filter(rt.getMessageConverters(), MappingJackson2HttpMessageConverter.class) | ||
| .forEach( | ||
| converter -> | ||
| converter.setObjectMapper( | ||
| getDefaultObjectMapper() | ||
| .addMixIn(OutputFilterConfig.class, JacksonMixin.OutputFilter.class) | ||
| .addMixIn(InputFilterConfig.class, JacksonMixin.InputFilter.class))); | ||
| final var yamlMapper = new ObjectMapper(new YAMLFactory()); | ||
| yamlMapper | ||
| .addMixIn(OutputFilterConfig.class, JacksonMixin.OutputFilter.class) | ||
| .addMixIn(InputFilterConfig.class, JacksonMixin.InputFilter.class); | ||
| Iterables.filter(rt.getMessageConverters(), MappingJackson2YamlHttpMessageConverter.class) | ||
| .forEach(converter -> converter.setObjectMapper(yamlMapper)); | ||
|
|
||
| rt.setRequestFactory(new BufferingClientHttpRequestFactory(httpRequestFactory)); | ||
|
|
||
| return new ApiClient(rt).setBasePath(destination.asHttp().getUri().toString()); | ||
| } | ||
|
|
||
| @NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
| private static class JacksonMixin { | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.EXISTING_PROPERTY, | ||
| property = "type", | ||
| visible = true) | ||
| @JsonSubTypes({ | ||
| @JsonSubTypes.Type(value = LlamaGuard38bFilterConfig.class, name = "llama_guard_3_8b"), | ||
| @JsonSubTypes.Type( | ||
| value = AzureContentSafetyOutputFilterConfig.class, | ||
| name = "azure_content_safety") | ||
| }) | ||
| interface OutputFilter {} | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.EXISTING_PROPERTY, | ||
| property = "type", | ||
| visible = true) | ||
| @JsonSubTypes({ | ||
| @JsonSubTypes.Type(value = LlamaGuard38bFilterConfig.class, name = "llama_guard_3_8b"), | ||
| @JsonSubTypes.Type( | ||
| value = AzureContentSafetyInputFilterConfig.class, | ||
| name = "azure_content_safety") | ||
| }) | ||
| interface InputFilter {} | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package com.sap.ai.sdk.prompt.registry; | ||
|
|
||
| import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.github.tomakehurst.wiremock.junit5.WireMockExtension; | ||
| import com.sap.ai.sdk.core.AiCoreService; | ||
| import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination; | ||
| import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestination; | ||
| import java.util.UUID; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| public class OrchestrationConfigClientTest { | ||
| @RegisterExtension | ||
| private static final WireMockExtension WM = | ||
| WireMockExtension.newInstance().options(wireMockConfig().dynamicPort()).build(); | ||
|
|
||
| private static OrchestrationConfigClient client; | ||
|
|
||
| @BeforeEach | ||
| void setup() { | ||
| final HttpDestination destination = DefaultHttpDestination.builder(WM.baseUrl()).build(); | ||
| final AiCoreService service = new AiCoreService().withBaseDestination(destination); | ||
| client = new OrchestrationConfigClient(service); | ||
| } | ||
|
|
||
| @Test | ||
| void testPipelines() { | ||
| final var result = client.listOrchestrationConfigs(); | ||
| assertThat(result.getCount()).isEqualTo(2); | ||
| assertThat(result.getResources()).hasSize(2); | ||
| final var template = result.getResources().get(0); | ||
| assertThat(template.getId()).isEqualTo(UUID.fromString("62e8638a-ae87-4bd5-9027-a0bc67db1609")); | ||
| assertThat(template.getName()).isEqualTo("test-config-for-OrchestrationTest"); | ||
| assertThat(template.getVersion()).isEqualTo("0.0.1"); | ||
| assertThat(template.getScenario()).isEqualTo("sdk-test-scenario"); | ||
| assertThat(template.getCreationTimestamp()).isEqualTo("2025-12-19T16:24:27.442000"); | ||
| assertThat(template.getManagedBy()).isEqualTo("imperative"); | ||
| assertThat(template.isIsVersionHead()).isEqualTo(true); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "request": { | ||
| "method": "GET", | ||
| "url": "/v2/registry/v2/orchestrationConfigs" | ||
| }, | ||
| "response": { | ||
| "status": 200, | ||
| "headers": { | ||
| "Content-Type": "application/json" | ||
| }, | ||
| "jsonBody": { | ||
| "count": 2, | ||
| "resources": [ | ||
| { | ||
| "id": "62e8638a-ae87-4bd5-9027-a0bc67db1609", | ||
| "name": "test-config-for-OrchestrationTest", | ||
| "version": "0.0.1", | ||
| "scenario": "sdk-test-scenario", | ||
| "creation_timestamp": "2025-12-19T16:24:27.442000", | ||
| "managed_by": "imperative", | ||
| "is_version_head": true | ||
| }, | ||
| { | ||
| "id": "f9f2875a-4c92-471b-a403-51a50e70fe52", | ||
| "name": "test-config", | ||
| "version": "0.0.1", | ||
| "scenario": "sdk-test-scenario", | ||
| "creation_timestamp": "2025-12-19T16:33:05.607000", | ||
| "managed_by": "imperative", | ||
| "is_version_head": true | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Major/Discussion)
I don't think we want to extend a custom class from generated code. Did we do that before? Is there no other way to apply mixins? Otherwise this has a code smell; we're introducing hand-written public API code for the sake of a workaround.