Skip to content

Commit 35d89cb

Browse files
n-o-u-r-h-a-nn-o-u-r-h-a-n
committed
Merge branch 'main' into chatcompletion-for-springopenai
2 parents 3c161c0 + 7d7d3d6 commit 35d89cb

File tree

69 files changed

+8053
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+8053
-486
lines changed

‎.github/workflows/pr-lint.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
Orchestration
2525
DevOps
2626
PromptRegistry
27+
Grounding
2728
headerPattern: '^(\w.+): (?:\[(\w.+)\] )?(.+)$'
2829
headerPatternCorrespondence: type, scope, subject
2930
# for available types, check:

‎core-services/document-grounding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.sap.ai.sdk</groupId>
66
<artifactId>sdk-parent</artifactId>
7-
<version>1.10.0-SNAPSHOT</version>
7+
<version>1.11.0-SNAPSHOT</version>
88
<relativePath>../../pom.xml</relativePath>
99
</parent>
1010
<artifactId>document-grounding</artifactId>

‎core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/PipelinesApi.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.sap.ai.sdk.grounding.model.GetPipelineExecutions;
99
import com.sap.ai.sdk.grounding.model.GetPipelineStatus;
1010
import com.sap.ai.sdk.grounding.model.GetPipelines;
11+
import com.sap.ai.sdk.grounding.model.ManualPipelineTrigger;
1112
import com.sap.ai.sdk.grounding.model.PipelineDocumentResponse;
1213
import com.sap.ai.sdk.grounding.model.PipelineId;
1314
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
@@ -1002,4 +1003,72 @@ public GetPipelineStatus getPipelineStatus(
10021003
localVarAuthNames,
10031004
localVarReturnType);
10041005
}
1006+
1007+
/**
1008+
* Pipeline Trigger
1009+
*
1010+
* <p>Manually trigger a pipeline
1011+
*
1012+
* <p><b>202</b> - Accepted
1013+
*
1014+
* <p><b>400</b> - The specification of the resource was incorrect
1015+
*
1016+
* @param aiResourceGroup Resource Group ID
1017+
* @param manualPipelineTrigger The value for the parameter manualPipelineTrigger
1018+
* @return An OpenApiResponse containing the status code of the HttpResponse.
1019+
* @throws OpenApiRequestException if an error occurs while attempting to invoke the API
1020+
*/
1021+
@Nonnull
1022+
public OpenApiResponse manualTriggerPipeline(
1023+
@Nonnull final String aiResourceGroup,
1024+
@Nonnull final ManualPipelineTrigger manualPipelineTrigger)
1025+
throws OpenApiRequestException {
1026+
final Object localVarPostBody = manualPipelineTrigger;
1027+
1028+
// verify the required parameter 'aiResourceGroup' is set
1029+
if (aiResourceGroup == null) {
1030+
throw new OpenApiRequestException(
1031+
"Missing the required parameter 'aiResourceGroup' when calling manualTriggerPipeline");
1032+
}
1033+
1034+
// verify the required parameter 'manualPipelineTrigger' is set
1035+
if (manualPipelineTrigger == null) {
1036+
throw new OpenApiRequestException(
1037+
"Missing the required parameter 'manualPipelineTrigger' when calling pipelineV1PipelineEndpointsTriggerPipeline");
1038+
}
1039+
1040+
final String localVarPath =
1041+
UriComponentsBuilder.fromPath("/pipelines/trigger").build().toUriString();
1042+
1043+
final MultiValueMap<String, String> localVarQueryParams =
1044+
new LinkedMultiValueMap<String, String>();
1045+
final HttpHeaders localVarHeaderParams = new HttpHeaders();
1046+
final MultiValueMap<String, Object> localVarFormParams =
1047+
new LinkedMultiValueMap<String, Object>();
1048+
1049+
if (aiResourceGroup != null)
1050+
localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
1051+
1052+
final String[] localVarAccepts = {"application/json"};
1053+
final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
1054+
final String[] localVarContentTypes = {"application/json"};
1055+
final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
1056+
1057+
final String[] localVarAuthNames = new String[] {};
1058+
1059+
final ParameterizedTypeReference<Void> localVarReturnType =
1060+
new ParameterizedTypeReference<Void>() {};
1061+
apiClient.invokeAPI(
1062+
localVarPath,
1063+
HttpMethod.POST,
1064+
localVarQueryParams,
1065+
localVarPostBody,
1066+
localVarHeaderParams,
1067+
localVarFormParams,
1068+
localVarAccept,
1069+
localVarContentType,
1070+
localVarAuthNames,
1071+
localVarReturnType);
1072+
return new OpenApiResponse(apiClient);
1073+
}
10051074
}

‎core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/VectorApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.sap.ai.sdk.grounding.model.DocumentUpdateRequest;
1010
import com.sap.ai.sdk.grounding.model.Documents;
1111
import com.sap.ai.sdk.grounding.model.DocumentsListResponse;
12-
import com.sap.ai.sdk.grounding.model.SearchResults;
1312
import com.sap.ai.sdk.grounding.model.TextSearchRequest;
13+
import com.sap.ai.sdk.grounding.model.VectorSearchResults;
1414
import com.sap.ai.sdk.grounding.model.VectorV1VectorEndpointsGetCollectionCreationStatus200Response;
1515
import com.sap.ai.sdk.grounding.model.VectorV1VectorEndpointsGetCollectionDeletionStatus200Response;
1616
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
@@ -914,11 +914,11 @@ public DocumentResponse getDocumentById(
914914
*
915915
* @param aiResourceGroup Resource Group ID
916916
* @param textSearchRequest The value for the parameter textSearchRequest
917-
* @return SearchResults
917+
* @return VectorSearchResults
918918
* @throws OpenApiRequestException if an error occurs while attempting to invoke the API
919919
*/
920920
@Nonnull
921-
public SearchResults search(
921+
public VectorSearchResults search(
922922
@Nonnull final String aiResourceGroup, @Nonnull final TextSearchRequest textSearchRequest)
923923
throws OpenApiRequestException {
924924
final Object localVarPostBody = textSearchRequest;
@@ -954,8 +954,8 @@ public SearchResults search(
954954

955955
final String[] localVarAuthNames = new String[] {};
956956

957-
final ParameterizedTypeReference<SearchResults> localVarReturnType =
958-
new ParameterizedTypeReference<SearchResults>() {};
957+
final ParameterizedTypeReference<VectorSearchResults> localVarReturnType =
958+
new ParameterizedTypeReference<VectorSearchResults>() {};
959959
return apiClient.invokeAPI(
960960
localVarPath,
961961
HttpMethod.POST,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class BaseDocument
3535
private List<TextOnlyBaseChunk> chunks = new ArrayList<>();
3636

3737
@JsonProperty("metadata")
38-
private List<DocumentKeyValueListPair> metadata = new ArrayList<>();
38+
private List<VectorDocumentKeyValueListPair> metadata = new ArrayList<>();
3939

4040
@JsonAnySetter @JsonAnyGetter
4141
private final Map<String, Object> cloudSdkCustomFields = new LinkedHashMap<>();
@@ -96,7 +96,7 @@ public void setChunks(@Nonnull final List<TextOnlyBaseChunk> chunks) {
9696
* @return The same instance of this {@link BaseDocument} class
9797
*/
9898
@Nonnull
99-
public BaseDocument metadata(@Nonnull final List<DocumentKeyValueListPair> metadata) {
99+
public BaseDocument metadata(@Nonnull final List<VectorDocumentKeyValueListPair> metadata) {
100100
this.metadata = metadata;
101101
return this;
102102
}
@@ -108,7 +108,7 @@ public BaseDocument metadata(@Nonnull final List<DocumentKeyValueListPair> metad
108108
* @return The same instance of type {@link BaseDocument}
109109
*/
110110
@Nonnull
111-
public BaseDocument addMetadataItem(@Nonnull final DocumentKeyValueListPair metadataItem) {
111+
public BaseDocument addMetadataItem(@Nonnull final VectorDocumentKeyValueListPair metadataItem) {
112112
if (this.metadata == null) {
113113
this.metadata = new ArrayList<>();
114114
}
@@ -122,7 +122,7 @@ public BaseDocument addMetadataItem(@Nonnull final DocumentKeyValueListPair meta
122122
* @return metadata The metadata of this {@link BaseDocument} instance.
123123
*/
124124
@Nonnull
125-
public List<DocumentKeyValueListPair> getMetadata() {
125+
public List<VectorDocumentKeyValueListPair> getMetadata() {
126126
return metadata;
127127
}
128128

@@ -131,7 +131,7 @@ public List<DocumentKeyValueListPair> getMetadata() {
131131
*
132132
* @param metadata The metadata of this {@link BaseDocument}
133133
*/
134-
public void setMetadata(@Nonnull final List<DocumentKeyValueListPair> metadata) {
134+
public void setMetadata(@Nonnull final List<VectorDocumentKeyValueListPair> metadata) {
135135
this.metadata = metadata;
136136
}
137137

@@ -270,15 +270,15 @@ public interface Builder1 {
270270
* @param metadata The metadata of this {@link BaseDocument}
271271
* @return The BaseDocument instance.
272272
*/
273-
BaseDocument metadata(@Nonnull final List<DocumentKeyValueListPair> metadata);
273+
BaseDocument metadata(@Nonnull final List<VectorDocumentKeyValueListPair> metadata);
274274

275275
/**
276276
* Set the metadata of this {@link BaseDocument} instance.
277277
*
278278
* @param metadata The metadata of this {@link BaseDocument}
279279
* @return The BaseDocument instance.
280280
*/
281-
default BaseDocument metadata(@Nonnull final DocumentKeyValueListPair... metadata) {
281+
default BaseDocument metadata(@Nonnull final VectorDocumentKeyValueListPair... metadata) {
282282
return metadata(Arrays.asList(metadata));
283283
}
284284
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class Collection
3838
private EmbeddingConfig embeddingConfig;
3939

4040
@JsonProperty("metadata")
41-
private List<KeyValueListPair> metadata = new ArrayList<>();
41+
private List<VectorKeyValueListPair> metadata = new ArrayList<>();
4242

4343
@JsonProperty("id")
4444
private UUID id;
@@ -119,7 +119,7 @@ public void setEmbeddingConfig(@Nonnull final EmbeddingConfig embeddingConfig) {
119119
* @return The same instance of this {@link Collection} class
120120
*/
121121
@Nonnull
122-
public Collection metadata(@Nullable final List<KeyValueListPair> metadata) {
122+
public Collection metadata(@Nullable final List<VectorKeyValueListPair> metadata) {
123123
this.metadata = metadata;
124124
return this;
125125
}
@@ -131,7 +131,7 @@ public Collection metadata(@Nullable final List<KeyValueListPair> metadata) {
131131
* @return The same instance of type {@link Collection}
132132
*/
133133
@Nonnull
134-
public Collection addMetadataItem(@Nonnull final KeyValueListPair metadataItem) {
134+
public Collection addMetadataItem(@Nonnull final VectorKeyValueListPair metadataItem) {
135135
if (this.metadata == null) {
136136
this.metadata = new ArrayList<>();
137137
}
@@ -145,7 +145,7 @@ public Collection addMetadataItem(@Nonnull final KeyValueListPair metadataItem)
145145
* @return metadata The metadata of this {@link Collection} instance.
146146
*/
147147
@Nonnull
148-
public List<KeyValueListPair> getMetadata() {
148+
public List<VectorKeyValueListPair> getMetadata() {
149149
return metadata;
150150
}
151151

@@ -155,7 +155,7 @@ public List<KeyValueListPair> getMetadata() {
155155
* @param metadata Metadata attached to collection. Useful to restrict search to a subset of
156156
* collections.
157157
*/
158-
public void setMetadata(@Nullable final List<KeyValueListPair> metadata) {
158+
public void setMetadata(@Nullable final List<VectorKeyValueListPair> metadata) {
159159
this.metadata = metadata;
160160
}
161161

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class CollectionRequest
3737
private EmbeddingConfig embeddingConfig;
3838

3939
@JsonProperty("metadata")
40-
private List<KeyValueListPair> metadata = new ArrayList<>();
40+
private List<VectorKeyValueListPair> metadata = new ArrayList<>();
4141

4242
@JsonAnySetter @JsonAnyGetter
4343
private final Map<String, Object> cloudSdkCustomFields = new LinkedHashMap<>();
@@ -116,7 +116,7 @@ public void setEmbeddingConfig(@Nonnull final EmbeddingConfig embeddingConfig) {
116116
* @return The same instance of this {@link CollectionRequest} class
117117
*/
118118
@Nonnull
119-
public CollectionRequest metadata(@Nullable final List<KeyValueListPair> metadata) {
119+
public CollectionRequest metadata(@Nullable final List<VectorKeyValueListPair> metadata) {
120120
this.metadata = metadata;
121121
return this;
122122
}
@@ -128,7 +128,7 @@ public CollectionRequest metadata(@Nullable final List<KeyValueListPair> metadat
128128
* @return The same instance of type {@link CollectionRequest}
129129
*/
130130
@Nonnull
131-
public CollectionRequest addMetadataItem(@Nonnull final KeyValueListPair metadataItem) {
131+
public CollectionRequest addMetadataItem(@Nonnull final VectorKeyValueListPair metadataItem) {
132132
if (this.metadata == null) {
133133
this.metadata = new ArrayList<>();
134134
}
@@ -142,7 +142,7 @@ public CollectionRequest addMetadataItem(@Nonnull final KeyValueListPair metadat
142142
* @return metadata The metadata of this {@link CollectionRequest} instance.
143143
*/
144144
@Nonnull
145-
public List<KeyValueListPair> getMetadata() {
145+
public List<VectorKeyValueListPair> getMetadata() {
146146
return metadata;
147147
}
148148

@@ -152,7 +152,7 @@ public List<KeyValueListPair> getMetadata() {
152152
* @param metadata Metadata attached to collection. Useful to restrict search to a subset of
153153
* collections.
154154
*/
155-
public void setMetadata(@Nullable final List<KeyValueListPair> metadata) {
155+
public void setMetadata(@Nullable final List<VectorKeyValueListPair> metadata) {
156156
this.metadata = metadata;
157157
}
158158

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919
@JsonSubTypes({
2020
@JsonSubTypes.Type(value = MSSharePointPipelineCreateRequest.class, name = "MSSharePoint"),
2121
@JsonSubTypes.Type(value = S3PipelineCreateRequest.class, name = "S3"),
22+
@JsonSubTypes.Type(value = SDMPipelineCreateRequest.class, name = "SDM"),
2223
@JsonSubTypes.Type(value = SFTPPipelineCreateRequest.class, name = "SFTP"),
24+
@JsonSubTypes.Type(value = WorkZonePipelineCreateRequest.class, name = "WorkZone"),
2325
@JsonSubTypes.Type(
2426
value = MSSharePointPipelineCreateRequest.class,
2527
name = "MSSharePointPipelineCreateRequest"),
2628
@JsonSubTypes.Type(value = S3PipelineCreateRequest.class, name = "S3PipelineCreateRequest"),
29+
@JsonSubTypes.Type(value = SDMPipelineCreateRequest.class, name = "SDMPipelineCreateRequest"),
2730
@JsonSubTypes.Type(value = SFTPPipelineCreateRequest.class, name = "SFTPPipelineCreateRequest"),
31+
@JsonSubTypes.Type(
32+
value = WorkZonePipelineCreateRequest.class,
33+
name = "WorkZonePipelineCreateRequest"),
2834
})
2935
public interface CreatePipeline {
3036
Object getType();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DataRepository
3838
private String title;
3939

4040
@JsonProperty("metadata")
41-
private List<KeyValueListPair> metadata = new ArrayList<>();
41+
private List<RetrievalKeyValueListPair> metadata = new ArrayList<>();
4242

4343
@JsonProperty("type")
4444
private DataRepositoryType type;
@@ -119,7 +119,7 @@ public void setTitle(@Nonnull final String title) {
119119
* @return The same instance of this {@link DataRepository} class
120120
*/
121121
@Nonnull
122-
public DataRepository metadata(@Nullable final List<KeyValueListPair> metadata) {
122+
public DataRepository metadata(@Nullable final List<RetrievalKeyValueListPair> metadata) {
123123
this.metadata = metadata;
124124
return this;
125125
}
@@ -131,7 +131,7 @@ public DataRepository metadata(@Nullable final List<KeyValueListPair> metadata)
131131
* @return The same instance of type {@link DataRepository}
132132
*/
133133
@Nonnull
134-
public DataRepository addMetadataItem(@Nonnull final KeyValueListPair metadataItem) {
134+
public DataRepository addMetadataItem(@Nonnull final RetrievalKeyValueListPair metadataItem) {
135135
if (this.metadata == null) {
136136
this.metadata = new ArrayList<>();
137137
}
@@ -146,7 +146,7 @@ public DataRepository addMetadataItem(@Nonnull final KeyValueListPair metadataIt
146146
* @return metadata The metadata of this {@link DataRepository} instance.
147147
*/
148148
@Nonnull
149-
public List<KeyValueListPair> getMetadata() {
149+
public List<RetrievalKeyValueListPair> getMetadata() {
150150
return metadata;
151151
}
152152

@@ -156,7 +156,7 @@ public List<KeyValueListPair> getMetadata() {
156156
* @param metadata Metadata attached to DataRepository. Useful to later limit search to a subset
157157
* of DataRepositories.
158158
*/
159-
public void setMetadata(@Nullable final List<KeyValueListPair> metadata) {
159+
public void setMetadata(@Nullable final List<RetrievalKeyValueListPair> metadata) {
160160
this.metadata = metadata;
161161
}
162162

0 commit comments

Comments
 (0)