Skip to content

Commit c4e5b93

Browse files
committed
Merge branch 'main' into fix/prompt-registry/export-endpoint-file-converter
2 parents ea903a6 + a157593 commit c4e5b93

File tree

25 files changed

+320
-80
lines changed

25 files changed

+320
-80
lines changed

.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ updates:
66
directory: '/'
77
schedule:
88
interval: weekly
9-
time: '02:00'
9+
time: '23:00'
1010
timezone: 'Europe/Berlin'
1111
open-pull-requests-limit: 5
1212
commit-message:

.github/workflows/dependabot-automerge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Dependabot Auto-Merge"
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '00 04 * * Mon' # trigger every Monday at 04:00 a.m., as our dependabot is configured to raise PRs every Monday at 2:00 a.m.
6+
- cron: '00 01 * * Tue' # trigger every Tuesday at 01:00 a.m., as our dependabot is configured to raise PRs every Monday at 23:00 p.m.
77

88
env:
99
DEPENDABOT_GROUPS: |

core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/S3PipelineMinimalResponse.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void setType(@Nonnull final TypeEnum type) {
207207
*/
208208
@Nonnull
209209
public S3PipelineMinimalResponse _configuration(
210-
@Nonnull final S3ConfigurationMinimal _configuration) {
210+
@Nullable final S3ConfigurationMinimal _configuration) {
211211
this._configuration = _configuration;
212212
return this;
213213
}
@@ -227,7 +227,7 @@ public S3ConfigurationMinimal getConfiguration() {
227227
*
228228
* @param _configuration The _configuration of this {@link S3PipelineMinimalResponse}
229229
*/
230-
public void setConfiguration(@Nonnull final S3ConfigurationMinimal _configuration) {
230+
public void setConfiguration(@Nullable final S3ConfigurationMinimal _configuration) {
231231
this._configuration = _configuration;
232232
}
233233

@@ -377,14 +377,7 @@ private String toIndentedString(final java.lang.Object o) {
377377
*/
378378
public static Builder create() {
379379
return (id) ->
380-
(status) ->
381-
(type) ->
382-
(_configuration) ->
383-
new S3PipelineMinimalResponse()
384-
.id(id)
385-
.status(status)
386-
.type(type)
387-
._configuration(_configuration);
380+
(status) -> (type) -> new S3PipelineMinimalResponse().id(id).status(status).type(type);
388381
}
389382

390383
/** Builder helper class. */
@@ -415,19 +408,8 @@ public interface Builder2 {
415408
* Set the type of this {@link S3PipelineMinimalResponse} instance.
416409
*
417410
* @param type The type of this {@link S3PipelineMinimalResponse}
418-
* @return The S3PipelineMinimalResponse builder.
419-
*/
420-
Builder3 type(@Nonnull final TypeEnum type);
421-
}
422-
423-
/** Builder helper class. */
424-
public interface Builder3 {
425-
/**
426-
* Set the _configuration of this {@link S3PipelineMinimalResponse} instance.
427-
*
428-
* @param _configuration The _configuration of this {@link S3PipelineMinimalResponse}
429411
* @return The S3PipelineMinimalResponse instance.
430412
*/
431-
S3PipelineMinimalResponse _configuration(@Nonnull final S3ConfigurationMinimal _configuration);
413+
S3PipelineMinimalResponse type(@Nonnull final TypeEnum type);
432414
}
433415
}

core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/SFTPPipelineMinimalResponse.java

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public void setType(@Nonnull final TypeEnum type) {
208208
*/
209209
@Nonnull
210210
public SFTPPipelineMinimalResponse _configuration(
211-
@Nonnull final SFTPConfigurationMinimal _configuration) {
211+
@Nullable final SFTPConfigurationMinimal _configuration) {
212212
this._configuration = _configuration;
213213
return this;
214214
}
@@ -228,7 +228,7 @@ public SFTPConfigurationMinimal getConfiguration() {
228228
*
229229
* @param _configuration The _configuration of this {@link SFTPPipelineMinimalResponse}
230230
*/
231-
public void setConfiguration(@Nonnull final SFTPConfigurationMinimal _configuration) {
231+
public void setConfiguration(@Nullable final SFTPConfigurationMinimal _configuration) {
232232
this._configuration = _configuration;
233233
}
234234

@@ -380,14 +380,7 @@ private String toIndentedString(final java.lang.Object o) {
380380
*/
381381
public static Builder create() {
382382
return (id) ->
383-
(status) ->
384-
(type) ->
385-
(_configuration) ->
386-
new SFTPPipelineMinimalResponse()
387-
.id(id)
388-
.status(status)
389-
.type(type)
390-
._configuration(_configuration);
383+
(status) -> (type) -> new SFTPPipelineMinimalResponse().id(id).status(status).type(type);
391384
}
392385

393386
/** Builder helper class. */
@@ -418,20 +411,8 @@ public interface Builder2 {
418411
* Set the type of this {@link SFTPPipelineMinimalResponse} instance.
419412
*
420413
* @param type The type of this {@link SFTPPipelineMinimalResponse}
421-
* @return The SFTPPipelineMinimalResponse builder.
422-
*/
423-
Builder3 type(@Nonnull final TypeEnum type);
424-
}
425-
426-
/** Builder helper class. */
427-
public interface Builder3 {
428-
/**
429-
* Set the _configuration of this {@link SFTPPipelineMinimalResponse} instance.
430-
*
431-
* @param _configuration The _configuration of this {@link SFTPPipelineMinimalResponse}
432414
* @return The SFTPPipelineMinimalResponse instance.
433415
*/
434-
SFTPPipelineMinimalResponse _configuration(
435-
@Nonnull final SFTPConfigurationMinimal _configuration);
416+
SFTPPipelineMinimalResponse type(@Nonnull final TypeEnum type);
436417
}
437418
}

core-services/document-grounding/src/main/resources/spec/grounding.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,6 @@ components:
16521652
- type: object
16531653
required:
16541654
- type
1655-
- configuration
16561655
properties:
16571656
type:
16581657
type: string
@@ -1670,7 +1669,6 @@ components:
16701669
- type: object
16711670
required:
16721671
- type
1673-
- configuration
16741672
properties:
16751673
type:
16761674
type: string

core/src/main/java/com/sap/ai/sdk/core/AiCoreServiceKeyAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public List<ServiceBinding> getServiceBindings() throws ServiceBindingAccessExce
5252
throw new ServiceBindingAccessException("Failed to load service key from environment", e);
5353
}
5454
if (serviceKey == null) {
55-
log.debug("No service key found in environment variable {}", ENV_VAR_KEY);
55+
log.debug("No service key found in environment variable {}.", ENV_VAR_KEY);
5656
return List.of();
5757
}
5858
final String logMessage =

core/src/main/java/com/sap/ai/sdk/core/DeploymentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void reloadDeployments(@Nonnull final String resourceGroup) {
4646
try {
4747
val apiClient = new DeploymentApi(service);
4848
val deployments = new HashSet<>(apiClient.query(resourceGroup).getResources());
49-
log.info("Found {} deployments in resource group '{}'", deployments.size(), resourceGroup);
49+
log.info("Found {} deployments in resource group '{}'.", deployments.size(), resourceGroup);
5050
cache.put(resourceGroup, deployments);
5151
} catch (final RuntimeException e) {
5252
throw new DeploymentResolutionException(

core/src/main/java/com/sap/ai/sdk/core/common/ClientResponseHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private T parseSuccess(@Nonnull final ClassicHttpResponse response) throws E {
9191
try {
9292
return objectMapper.readValue(content, successType);
9393
} catch (final JsonProcessingException e) {
94-
log.error("Failed to parse response to type {}", successType);
94+
log.error("Failed to parse response to type {}.", successType);
9595
throw exceptionFactory.build("Failed to parse response", e).setHttpResponse(response);
9696
}
9797
}

core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public Stream<D> handleStreamingResponse(@Nonnull final ClassicHttpResponse resp
8585
}
8686
return objectMapper.treeToValue(jsonNode, successType);
8787
} catch (final IOException e) {
88-
log.error("Failed to parse delta chunk to type {}", successType);
88+
log.error("Failed to parse delta chunk to type {}.", successType);
8989
final String message = "Failed to parse delta chunk";
9090
throw exceptionFactory.build(message, e).setHttpResponse(response);
9191
}

core/src/main/java/com/sap/ai/sdk/core/common/IterableStreamConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class IterableStreamConverter<T> implements Iterator<T> {
3535
static final int BUFFER_SIZE = 8192;
3636

3737
private static final String ERR_CONTENT = "Failed to read response content.";
38-
private static final String ERR_INTERRUPTED = "Parsing response content was interrupted";
39-
private static final String ERR_CLOSE = "Could not close input stream with error: {} (ignored)";
38+
private static final String ERR_INTERRUPTED = "Parsing response content was interrupted.";
39+
private static final String ERR_CLOSE = "Could not close input stream with error: {} (ignored).";
4040

4141
/** Read next entry for Stream or {@code null} when no further entry can be read. */
4242
private final Callable<T> readHandler;
@@ -70,7 +70,7 @@ public boolean hasNext() {
7070
} catch (final Exception e) {
7171
isDone = true;
7272
stopHandler.run();
73-
log.debug("Reading next element failed with error {})", e.getClass().getSimpleName());
73+
log.debug("Reading next element failed with error {}.", e.getClass().getSimpleName());
7474
throw errorHandler.apply(e);
7575
}
7676
return !isDone;

0 commit comments

Comments
 (0)