Skip to content

Commit e8b6966

Browse files
johnoliverjohnoliver
authored
Merge pull request #170 from johnoliver/release-3
Changelog. Code format. Version bumps
2 parents 25e46c8 + c65cf68 commit e8b6966

File tree

11 files changed

+47
-44
lines changed

11 files changed

+47
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
- Add fluent returns to `ChatHistory` `addXMessage` methods.
66
- Add user agent opt-out for OpenAI requests by setting the property `semantic-kernel.useragent-disable` to `true`.
77
- Add several convenience `invokePromptAsync` methods to `Kernel`.
8+
- Allow Handlebars templates to call Javabean getters to extract data from invocation arguments.
9+
- Improve thread safety of `ChatHistory`.
10+
11+
#### Experimental Changes
12+
13+
- Add JDBC vector store
814

915
#### Non-API Changes
1016

11-
- Add custom type Conversion example, CustomTypes_Example
17+
- Add custom type Conversion example, `CustomTypes_Example`
18+
- Dependency updates and pom cleanup
19+
- Documentation updates
1220

1321
# 1.2.0
1422

‎aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIChatCompletion.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,15 +357,16 @@ private Mono<ChatMessages> internalChatMessageContentsAsync(
357357
// If we don't want to attempt to invoke any functions
358358
// Or if we are auto-invoking, but we somehow end up with other than 1 choice even though only 1 was requested
359359
if (autoInvokeAttempts == 0 || responseMessages.size() != 1) {
360-
List<OpenAIChatMessageContent<?>> chatMessageContents = getChatMessageContentsAsync(completions);
360+
List<OpenAIChatMessageContent<?>> chatMessageContents = getChatMessageContentsAsync(
361+
completions);
361362
return Mono.just(messages.addChatMessage(chatMessageContents));
362363
}
363364
// Or if there are no tool calls to be done
364365
ChatResponseMessage response = responseMessages.get(0);
365366
List<ChatCompletionsToolCall> toolCalls = response.getToolCalls();
366367
if (toolCalls == null || toolCalls.isEmpty()) {
367368
List<OpenAIChatMessageContent<?>> chatMessageContents = getChatMessageContentsAsync(
368-
completions);
369+
completions);
369370
return Mono.just(messages.addChatMessage(chatMessageContents));
370371
}
371372

@@ -603,8 +604,7 @@ private List<OpenAIChatMessageContent<?>> getChatMessageContentsAsync(
603604
.filter(Objects::nonNull)
604605
.collect(Collectors.toList());
605606

606-
List<OpenAIChatMessageContent<?>> chatMessageContent =
607-
responseMessages
607+
List<OpenAIChatMessageContent<?>> chatMessageContent = responseMessages
608608
.stream()
609609
.map(response -> {
610610
try {

‎api-test/integration-tests/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56

67
<parent>
@@ -65,18 +66,18 @@
6566
<dependency>
6667
<groupId>org.xerial</groupId>
6768
<artifactId>sqlite-jdbc</artifactId>
68-
<version>3.44.1.0</version>
69+
<version>3.46.0.0</version>
6970
</dependency>
7071
<dependency>
71-
<groupId>mysql</groupId>
72-
<artifactId>mysql-connector-java</artifactId>
73-
<version>8.0.33</version>
72+
<groupId>com.mysql</groupId>
73+
<artifactId>mysql-connector-j</artifactId>
74+
<version>9.0.0</version>
7475
<scope>test</scope>
7576
</dependency>
7677
<dependency>
7778
<groupId>org.postgresql</groupId>
7879
<artifactId>postgresql</artifactId>
79-
<version>42.7.2</version> <!-- Use the latest version -->
80+
<version>42.7.3</version> <!-- Use the latest version -->
8081
</dependency>
8182

8283
<dependency>
@@ -103,7 +104,6 @@
103104
<dependency>
104105
<groupId>org.wiremock</groupId>
105106
<artifactId>wiremock</artifactId>
106-
<version>3.3.1</version>
107107
<scope>test</scope>
108108
</dependency>
109109
</dependencies>

‎pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,19 @@
147147
<artifactId>spotbugs-annotations</artifactId>
148148
<version>${spotbugs.version}</version>
149149
</dependency>
150+
151+
<dependency>
152+
<groupId>org.wiremock</groupId>
153+
<artifactId>wiremock</artifactId>
154+
<version>3.9.1</version>
155+
<scope>test</scope>
156+
</dependency>
157+
<dependency>
158+
<groupId>org.mockito</groupId>
159+
<artifactId>mockito-junit-jupiter</artifactId>
160+
<version>5.12.0</version>
161+
<scope>test</scope>
162+
</dependency>
150163
</dependencies>
151164
</dependencyManagement>
152165

‎samples/semantickernel-concepts/semantickernel-syntax-examples/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@
8585
<dependency>
8686
<groupId>com.google.cloud</groupId>
8787
<artifactId>google-cloud-vertexai</artifactId>
88-
<version>1.1.0</version>
88+
<version>1.6.0</version>
8989
<scope>compile</scope>
9090
</dependency>
9191

9292
<dependency>
93-
<groupId>mysql</groupId>
94-
<artifactId>mysql-connector-java</artifactId>
95-
<version>8.0.33</version>
93+
<groupId>com.mysql</groupId>
94+
<artifactId>mysql-connector-j</artifactId>
95+
<version>9.0.0</version>
9696
</dependency>
9797
</dependencies>
9898

‎samples/semantickernel-demos/booking-agent-m365/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.microsoft.graph</groupId>
5454
<artifactId>microsoft-graph</artifactId>
55-
<version>6.5.1</version>
55+
<version>6.13.0</version>
5656
</dependency>
5757
</dependencies>
5858

‎samples/semantickernel-demos/semantickernel-spring-starter/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,29 @@
3939
<dependency>
4040
<groupId>org.springframework.boot</groupId>
4141
<artifactId>spring-boot-test</artifactId>
42-
<version>3.2.1</version>
42+
<version>3.3.2</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.assertj</groupId>
4747
<artifactId>assertj-core</artifactId>
48-
<version>3.25.1</version>
48+
<version>3.26.3</version>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.springframework.boot</groupId>
5353
<artifactId>spring-boot-autoconfigure</artifactId>
54-
<version>3.2.1</version>
54+
<version>3.3.2</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.springframework.boot</groupId>
5858
<artifactId>spring-boot</artifactId>
59-
<version>3.2.1</version>
59+
<version>3.3.1</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.springframework</groupId>
6363
<artifactId>spring-test</artifactId>
64-
<version>6.1.2</version>
64+
<version>6.1.10</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>org.junit.jupiter</groupId>
7474
<artifactId>junit-jupiter-api</artifactId>
75-
<version>5.10.1</version>
75+
<version>5.10.3</version>
7676
<scope>test</scope>
7777
</dependency>
7878
</dependencies>

‎samples/semantickernel-sample-plugins/semantickernel-openapi-plugin/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,6 @@
6868
<groupId>com.microsoft.semantic-kernel</groupId>
6969
<artifactId>semantickernel-aiservices-openai</artifactId>
7070
</dependency>
71-
<dependency>
72-
<groupId>org.apache.logging.log4j</groupId>
73-
<artifactId>log4j-api</artifactId>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.apache.logging.log4j</groupId>
78-
<artifactId>log4j-core</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.apache.logging.log4j</groupId>
83-
<artifactId>log4j-slf4j2-impl</artifactId>
84-
<scope>test</scope>
85-
</dependency>
8671
<dependency>
8772
<groupId>org.junit.jupiter</groupId>
8873
<artifactId>junit-jupiter-api</artifactId>

‎semantickernel-api/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<dependency>
6868
<groupId>org.wiremock</groupId>
6969
<artifactId>wiremock</artifactId>
70-
<version>3.3.1</version>
7170
<scope>test</scope>
7271
</dependency>
7372
<!-- Required for Android -->
@@ -80,7 +79,6 @@
8079
<dependency>
8180
<groupId>org.mockito</groupId>
8281
<artifactId>mockito-junit-jupiter</artifactId>
83-
<version>5.11.0</version>
8482
<scope>test</scope>
8583
</dependency>
8684

‎semantickernel-api/src/main/java/com/microsoft/semantickernel/services/chatcompletion/ChatHistory.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public Optional<ChatMessageContent<?>> getLastMessage() {
6969
if (chatMessageContents.isEmpty()) {
7070
return Optional.empty();
7171
}
72-
return Optional.of(((ConcurrentLinkedQueue<ChatMessageContent<?>>)chatMessageContents).peek());
72+
return Optional
73+
.of(((ConcurrentLinkedQueue<ChatMessageContent<?>>) chatMessageContents).peek());
7374
}
7475

7576
/**

0 commit comments

Comments
 (0)