Skip to content

Commit b321102

Browse files
Jonas-IsrJonas-Isr
committed
Merge branch 'main' into orch-local-prompt-templates
# Conflicts: # sample-code/spring-app/src/main/resources/static/index.html
2 parents eab011b + dad524c commit b321102

File tree

520 files changed

+5823
-3412
lines changed

Some content is hidden

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

520 files changed

+5823
-3412
lines changed

‎.github/workflows/spec-update.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
;;
9494
prompt-registry)
9595
API_URL="$API_BASE_URL/AI/prompt-registry/contents/src/spec/prompt-registry.yaml?ref=$REF"
96-
FILE_PATH='prompt-registry/src/main/resources/spec/prompt-registry.yaml'
96+
FILE_PATH='core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml'
9797
;;
9898
esac
9999

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@
2828
### Environment ###
2929
*.env
3030

31-
.openapi-generator
31+
.openapi-generator
32+
33+
# sub-module spotbugs
34+
**/.pipeline/spotbugs.xml
35+
**/.pipeline/spotbugs-exclusions.xml

‎.pipeline/checkstyle-suppressions.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
<suppress files="[/\\]core[/\\]model[/\\]" checks=".*"/>
1111
<suppress files="[/\\]openai[/\\]generated[/\\]model[/\\]" checks=".*"/>
1212
<suppress files="[/\\]orchestration[/\\]model[/\\]" checks=".*"/>
13-
<suppress files="[/\\]grounding[/\\]api[/\\]" checks=".*"/>
13+
<suppress files="[/\\]grounding[/\\]client[/\\]" checks=".*"/>
1414
<suppress files="[/\\]grounding[/\\]model[/\\]" checks=".*"/>
15+
<suppress files="[/\\]registry[/\\]client[/\\]" checks=".*"/>
16+
<suppress files="[/\\]registry[/\\]model[/\\]" checks=".*"/>
1517
<!-- Suppress TODOs -->
16-
<suppress files="OpenAiChatMessage.java" checks="TodoComment" lines="257,7" />
18+
<suppress files="OpenAiChatMessage.java" checks="TodoComment" lines="261,7" />
1719
<suppress files="ChatCompletionResponseMessage.java" checks="TodoComment" lines="53,34" />
1820
<suppress files="CreateChatCompletionRequest.java" checks="TodoComment" lines="73,47" />
1921
</suppressions>

‎.pipeline/checkstyle.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<property name="checkFirstSentence" value="false"/>
3535
<property name="severity" value="info"/>
3636
</module>
37-
<module name="JavadocVariable">
38-
<property name="scope" value="protected"/>
39-
<property name="severity" value="info"/>
40-
</module>
4137
<module name="MissingJavadocMethod">
4238
<property name="scope" value="protected"/>
4339
<property name="severity" value="info"/>
@@ -47,7 +43,7 @@
4743
<property name="severity" value="info"/>
4844
</module>
4945
<module name="JavadocMethod">
50-
<property name="accessModifiers" value="protected"/>
46+
<property name="accessModifiers" value="protected, public"/>
5147
<property name="allowedAnnotations" value="Override"/>
5248
<property name="severity" value="info"/>
5349
</module>
@@ -56,7 +52,7 @@
5652
<property name="severity" value="info"/>
5753
</module>
5854
<module name="JavadocVariable">
59-
<property name="scope" value="protected"/>
55+
<property name="accessModifiers" value="protected, public"/>
6056
<property name="severity" value="info"/>
6157
</module>
6258
<module name="IllegalCatch">

‎.pipeline/spotbugs-exclusions.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<Package name="com.sap.ai.sdk.orchestration.model"/>
88
<Package name="com.sap.ai.sdk.grounding.client"/>
99
<Package name="com.sap.ai.sdk.grounding.model"/>
10+
<Package name="com.sap.ai.sdk.foundationmodels.openai.generated.model"/>
11+
<Package name="com.sap.ai.sdk.prompt.registry.model"/>
12+
<Package name="com.sap.ai.sdk.prompt.registry.client"/>
1013
</Or>
1114
</Match>
1215
<Match>

document-grounding/pom.xml renamed to core-services/document-grounding/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<parent>
55
<groupId>com.sap.ai.sdk</groupId>
66
<artifactId>sdk-parent</artifactId>
7-
<version>1.6.0-SNAPSHOT</version>
7+
<version>1.7.0-SNAPSHOT</version>
8+
<relativePath>../../pom.xml</relativePath>
89
</parent>
910
<artifactId>document-grounding</artifactId>
1011
<name>Document Grounding Client</name>
@@ -30,7 +31,7 @@
3031
</developer>
3132
</developers>
3233
<properties>
33-
<project.rootdir>${project.basedir}/../</project.rootdir>
34+
<project.rootdir>${project.basedir}/../../</project.rootdir>
3435
<coverage.complexity>80%</coverage.complexity>
3536
<coverage.line>71%</coverage.line>
3637
<coverage.instruction>85%</coverage.instruction>
@@ -118,7 +119,6 @@
118119
<artifactId>openapi-generator-maven-plugin</artifactId>
119120
<configuration>
120121
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
121-
<apiMaturity>beta</apiMaturity>
122122
<enableOneOfAnyOfGeneration>true</enableOneOfAnyOfGeneration>
123123
<compileScope>COMPILE</compileScope>
124124
<deleteOutputDirectory>true</deleteOutputDirectory>

document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java renamed to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java

File renamed without changes.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*
3030
* <p>SAP AI Core - API Specification AI Data Management api's
3131
*/
32-
@Beta
3332
public class PipelinesApi extends AbstractOpenApiService {
3433
/**
3534
* Instantiates this API class to invoke operations on the Document Grounding Pipeline API.

document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java renamed to core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/client/RetrievalApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*
2929
* <p>SAP AI Core - API Specification AI Data Management api's
3030
*/
31-
@Beta
3231
public class RetrievalApi extends AbstractOpenApiService {
3332
/**
3433
* Instantiates this API class to invoke operations on the Document Grounding Pipeline API.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
*
3838
* <p>SAP AI Core - API Specification AI Data Management api's
3939
*/
40-
@Beta
4140
public class VectorApi extends AbstractOpenApiService {
4241
/**
4342
* Instantiates this API class to invoke operations on the Document Grounding Pipeline API.

0 commit comments

Comments
 (0)