Skip to content

Add FunctionChoiceBehavior for OpenAI #310

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
Milder Hernandez (milderhc) merged 15 commits into from
May 1, 2025
Merged

Add FunctionChoiceBehavior for OpenAI #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03bd7ed
Remove authorName from ChatMessageContent
Apr 28, 2025
d380bb5
Merge branch 'main' of https://github.com/microsoft/semantic-kernel-j…
Apr 29, 2025
9b821db
Add FunctionChoiceBehavior implementation
Apr 29, 2025
bc61886
return Collections.unmodifiableList(functions)
Apr 29, 2025
8cd72af
Fixes
Apr 29, 2025
a222ccb
Fix retry logic
Apr 29, 2025
3c39538
Add suggestions
Apr 30, 2025
66976a9
Avoid notify thread when auto-invoke is not active
Apr 30, 2025
cbb37c6
Add @Nullable annotations
May 1, 2025
b568818
Add additional constructor for ChatHistoryAgentThread
May 1, 2025
fd33c21
Merge pull request #1 from milderhc/completion-agent
milderhc May 1, 2025
81abcbe
Fix keys of execution settings
May 1, 2025
394367f
Apply format
May 1, 2025
c535e61
Small fix
May 1, 2025
730af6c
Add Github plugin to learn resources
May 1, 2025
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
Prev Previous commit
Next Next commit
Add @nullable annotations
  • Loading branch information
Milder Hernandez Cagua
Milder Hernandez Cagua committed May 1, 2025
commit cbb37c655f34b23a6a92c0718d42739d4c7f01e0
2 changes: 1 addition & 1 deletion ...src/main/java/com/microsoft/semantickernel/agents/chatcompletion/ChatCompletionAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private ChatCompletionAgent(
@Override
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(
List<ChatMessageContent<?>> messages,
AgentThread thread,
@Nullable AgentThread thread,
@Nullable AgentInvokeOptions options
) {
return ensureThreadExistsWithMessagesAsync(messages, thread, ChatHistoryAgentThread::new)
Expand Down
15 changes: 11 additions & 4 deletions semantickernel-api/src/main/java/com/microsoft/semantickernel/agents/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import javax.annotation.Nullable;

/**
* Interface for a semantic kernel agent.
*/
Expand Down Expand Up @@ -49,7 +51,7 @@ public interface Agent {
* @param message The message to process
* @return A Mono containing the agent response
*/
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message);
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(@Nullable ChatMessageContent<?> message);

/**
* Invokes the agent with the given message and thread.
Expand All @@ -58,7 +60,8 @@ public interface Agent {
* @param thread The agent thread to use
* @return A Mono containing the agent response
*/
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message, AgentThread thread);
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(@Nullable ChatMessageContent<?> message,
@Nullable AgentThread thread);

/**
* Invokes the agent with the given message, thread, and options.
Expand All @@ -68,7 +71,9 @@ public interface Agent {
* @param options The options for invoking the agent
* @return A Mono containing the agent response
*/
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message, AgentThread thread, AgentInvokeOptions options);
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(@Nullable ChatMessageContent<?> message,
@Nullable AgentThread thread,
@Nullable AgentInvokeOptions options);

/**
* Invoke the agent with the given chat history.
Expand All @@ -78,7 +83,9 @@ public interface Agent {
* @param options The options for invoking the agent
* @return A Mono containing the agent response
*/
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(List<ChatMessageContent<?>> messages, AgentThread thread, AgentInvokeOptions options);
Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(List<ChatMessageContent<?>> messages,
@Nullable AgentThread thread,
@Nullable AgentInvokeOptions options);

/**
* Notifies the agent of a new message.
Expand Down
19 changes: 13 additions & 6 deletions semantickernel-api/src/main/java/com/microsoft/semantickernel/agents/KernelAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -169,19 +170,25 @@ protected <T extends AgentThread> Mono<T> ensureThreadExistsWithMessagesAsync(Li
}

@Override
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message) {
return invokeAsync(message, null);
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(@Nullable ChatMessageContent<?> message) {
return invokeAsync(message, null, null);
}

@Override
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message, AgentThread thread) {
return invokeAsync(message, thread, AgentInvokeOptions.builder().build());
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(@Nullable ChatMessageContent<?> message,
@Nullable AgentThread thread) {
return invokeAsync(message, thread, null);
}

@Override
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(ChatMessageContent<?> message, AgentThread thread, AgentInvokeOptions options) {
public Mono<List<AgentResponseItem<ChatMessageContent<?>>>> invokeAsync(
@Nullable ChatMessageContent<?> message,
@Nullable AgentThread thread,
@Nullable AgentInvokeOptions options) {
ArrayList<ChatMessageContent<?>> messages = new ArrayList<>();
messages.add(message);
if (message != null) {
messages.add(message);
}
return invokeAsync(messages, thread, options);
}
}