Skip to content

refactor: introduce AICoreElements constants; refactor DeploymentHandler with record #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Schmarvinius merged 7 commits into from
May 27, 2026
Merged

refactor: introduce AICoreElements constants; refactor DeploymentHandler with record #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e217a96
fix: use idiomatic patterns for error messages and stream collection
Schmarvinius May 27, 2026
c995305
refactor: use cds-maven-plugin generated interfaces for type-safe ent…
Schmarvinius May 27, 2026
077c4c3
fix: use explicit types and remove unnecessary cast in ConfigurationH…
Schmarvinius May 27, 2026
d5e493d
Merge branch 'main' into fix/33-element-constants
Schmarvinius May 27, 2026
6990539
fix: use ArtifactArgumentBinding generated interface for inputArtifac…
Schmarvinius May 27, 2026
cc34f3b
refactor: use typed data parameters in handler method signatures
Schmarvinius May 27, 2026
da0c8dd
fix: remove unused CdsData import in ConfigurationHandler
Schmarvinius May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions cds-feature-ai-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,43 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>com.sap.cds</groupId>
<artifactId>cds-maven-plugin</artifactId>
<executions>
<execution>
<id>cds.install-node</id>
<goals>
<goal>install-node</goal>
</goals>
</execution>
<execution>
<id>cds.build</id>
<goals>
<goal>cds</goal>
</goals>
<configuration>
<workingDirectory>./src/main/resources/cds/com.sap.cds/ai</workingDirectory>
<commands>
<command>build --for java --src ./ --dest ../../../../../../gen/srv</command>
</commands>
</configuration>
</execution>
<execution>
<id>cds.generate</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<basePackage>com.sap.cds.feature.aicore.generated.cds4j</basePackage>
<csnFile>${project.basedir}/src/gen/srv/src/main/resources/edmx/csn.json</csnFile>
<includes>
<include>AICore.**</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/ActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/
package com.sap.cds.feature.aicore.core.handler;

import com.sap.cds.feature.aicore.generated.cds4j.aicore.Deployments;

import com.sap.ai.sdk.core.client.DeploymentApi;
import com.sap.ai.sdk.core.model.AiDeploymentModificationRequest;
import com.sap.ai.sdk.core.model.AiDeploymentTargetStatus;
Expand Down Expand Up @@ -40,7 +42,7 @@ public void onResourceGroupForTenant(EventContext context) {
@On(event = "stop", entity = AICoreService.DEPLOYMENTS)
public void onStop(EventContext context) {
Map<String, Object> keys = asMap(context.get("keys"));
String deploymentId = (String) keys.get("id");
String deploymentId = (String) keys.get(Deployments.ID);
String resourceGroupId = resolveResourceGroup(keys);

DeploymentApi api = service.getDeploymentApi();
Expand Down
81 changes: 39 additions & 42 deletions ...e-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/ConfigurationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
import com.sap.ai.sdk.core.model.AiConfigurationBaseData;
import com.sap.ai.sdk.core.model.AiConfigurationList;
import com.sap.ai.sdk.core.model.AiParameterArgumentBinding;
import com.sap.cds.CdsData;
import com.sap.cds.feature.aicore.core.AICoreService;
import com.sap.cds.feature.aicore.core.AICoreServiceImpl;
import com.sap.cds.feature.aicore.generated.cds4j.aicore.ArtifactArgumentBinding;
import com.sap.cds.feature.aicore.generated.cds4j.aicore.Configurations;
import com.sap.cds.feature.aicore.generated.cds4j.aicore.ParameterArgumentBinding;
import com.sap.cds.feature.aicore.generated.cds4j.aicore.ParameterArgumentBindingList;
import com.sap.cds.feature.aicore.generated.cds4j.aicore.ResourceGroups;
import com.sap.cds.ql.cqn.AnalysisResult;
import com.sap.cds.ql.cqn.CqnAnalyzer;
import com.sap.cds.ql.cqn.CqnInsert;
import com.sap.cds.ql.cqn.CqnSelect;
import com.sap.cds.reflect.CdsModel;
import com.sap.cds.services.cds.CdsCreateEventContext;
Expand All @@ -22,6 +25,7 @@
import com.sap.cds.services.handler.annotations.On;
import com.sap.cds.services.handler.annotations.ServiceName;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
Expand Down Expand Up @@ -54,98 +58,91 @@ public void onRead(CdsReadEventContext context) {
keys,
values);

String id = (String) keys.get("id");
String id = (String) keys.get(Configurations.ID);
if (id != null) {
AiConfiguration config = configurationApi.get(resourceGroupId, id);
context.setResult(List.of(toMap(config, resourceGroupId)));
context.setResult(List.of(toConfigurations(config, resourceGroupId)));
} else {
String scenarioId = (String) values.get("scenarioId");
String scenarioId = (String) values.get(Configurations.SCENARIO_ID);
AiConfigurationList result =
configurationApi.query(resourceGroupId, scenarioId, null, null, null, null, null, null);
List<Map<String, Object>> results =
mapResources(result.getResources(), c -> toMap(c, resourceGroupId));
mapResources(result.getResources(), c -> toConfigurations(c, resourceGroupId));
logger.debug("ConfigurationApi.query returned {} resources", results.size());
context.setResult(results);
}
}

@On(event = CqnService.EVENT_CREATE, entity = AICoreService.CONFIGURATIONS)
public void onCreate(CdsCreateEventContext context) {
CqnInsert insert = context.getCqn();
List<Map<String, Object>> entries = insert.entries();
public void onCreate(CdsCreateEventContext context, List<Configurations> entries) {
List<Map<String, Object>> results = new ArrayList<>();

for (Map<String, Object> entry : entries) {
for (Configurations entry : entries) {
String resourceGroupId = resolveResourceGroup(entry);
String name = (String) entry.get("name");
String executableId = (String) entry.get("executableId");
String scenarioId = (String) entry.get("scenarioId");

AiConfigurationBaseData request =
AiConfigurationBaseData.create()
.name(name)
.executableId(executableId)
.scenarioId(scenarioId);
.name(entry.getName())
.executableId(entry.getExecutableId())
.scenarioId(entry.getScenarioId());

@SuppressWarnings("unchecked")
List<Map<String, Object>> paramBindings =
(List<Map<String, Object>>) entry.get("parameterBindings");
Collection<ParameterArgumentBindingList.Item> paramBindings =
entry.getParameterBindings();
if (paramBindings != null) {
List<AiParameterArgumentBinding> sdkBindings =
paramBindings.stream()
.map(
p ->
AiParameterArgumentBinding.create()
.key((String) p.get("key"))
.value((String) p.get("value")))
.key(p.getKey())
.value(p.getValue()))
.toList();
request.parameterBindings(sdkBindings);
}

var response = configurationApi.create(resourceGroupId, request);
CdsData result = CdsData.create(entry);
result.put("id", response.getId());
results.add(result);
entry.setId(response.getId());
results.add(entry);
logger.debug(
"Created configuration {} in resource group {}", response.getId(), resourceGroupId);
}
context.setResult(results);
}

private CdsData toMap(AiConfiguration config, String resourceGroupId) {
CdsData data = CdsData.create();
data.put("id", config.getId());
data.put("name", config.getName());
data.put("executableId", config.getExecutableId());
data.put("scenarioId", config.getScenarioId());
data.put("createdAt", config.getCreatedAt());
private Configurations toConfigurations(AiConfiguration config, String resourceGroupId) {
Configurations data = Configurations.create();
data.setId(config.getId());
data.setName(config.getName());
data.setExecutableId(config.getExecutableId());
data.setScenarioId(config.getScenarioId());
data.put(Configurations.CREATED_AT, config.getCreatedAt());
if (config.getParameterBindings() != null) {
List<CdsData> bindings =
List<ParameterArgumentBinding> bindings =
config.getParameterBindings().stream()
.map(
b -> {
CdsData bm = CdsData.create();
bm.put("key", b.getKey());
bm.put("value", b.getValue());
ParameterArgumentBinding bm = ParameterArgumentBinding.create();
bm.setKey(b.getKey());
bm.setValue(b.getValue());
return bm;
})
.toList();
data.put("parameterBindings", bindings);
data.put(Configurations.PARAMETER_BINDINGS, bindings);
}
if (config.getInputArtifactBindings() != null) {
List<CdsData> bindings =
List<ArtifactArgumentBinding> bindings =
config.getInputArtifactBindings().stream()
.map(
b -> {
CdsData bm = CdsData.create();
bm.put("key", b.getKey());
bm.put("artifactId", b.getArtifactId());
ArtifactArgumentBinding bm = ArtifactArgumentBinding.create();
bm.setKey(b.getKey());
bm.setArtifactId(b.getArtifactId());
return bm;
})
.toList();
data.put("inputArtifactBindings", bindings);
data.put(Configurations.INPUT_ARTIFACT_BINDINGS, bindings);
}
data.putPath("resourceGroup.resourceGroupId", resourceGroupId);
data.setResourceGroup(ResourceGroups.create(resourceGroupId));
return data;
}
}
Loading
Loading