Skip to content

Commit 7edccc5

Browse files
author
Milder Hernandez Cagua
committed
Add samples module
1 parent 60538d3 commit 7edccc5

34 files changed

Lines changed: 672 additions & 63 deletions

‎java/external-api-test/src/main/java/InlineFunctionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.microsoft.semantickernel.builders.SKBuilders;
1010
import com.microsoft.semantickernel.textcompletion.CompletionFunctionDefinition;
1111
import com.microsoft.semantickernel.textcompletion.CompletionSKContext;
12-
import com.microsoft.semantickernel.textcompletion.CompletionSkFunction;
12+
import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
1313
import com.microsoft.semantickernel.textcompletion.TextCompletion;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
@@ -87,7 +87,7 @@ public static void main(String[] args) throws IOException {
8787
0,
8888
new ArrayList<>());
8989

90-
CompletionSkFunction summarize = kernel.registerSemanticFunction(summarizeDefinition);
90+
CompletionSKFunction summarize = kernel.registerSemanticFunction(summarizeDefinition);
9191

9292
String text =
9393
"Demo (ancient Greek poet)\n"

‎java/external-api-test/src/main/java/InlineFunctionWithPreBuiltSkillTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.microsoft.semantickernel.builders.SKBuilders;
1010
import com.microsoft.semantickernel.textcompletion.CompletionFunctionDefinition;
1111
import com.microsoft.semantickernel.textcompletion.CompletionSKContext;
12-
import com.microsoft.semantickernel.textcompletion.CompletionSkFunction;
12+
import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
1313
import com.microsoft.semantickernel.textcompletion.TextCompletion;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
@@ -117,7 +117,7 @@ public static void main(String[] args) throws IOException {
117117
.setKernelConfig(kernelConfig)
118118
.build();
119119

120-
CompletionSkFunction summarize = kernel.getSkillCollection().getFunction("summarize", CompletionSkFunction.class);
120+
CompletionSKFunction summarize = kernel.getSkillCollection().getFunction("summarize", CompletionSKFunction.class);
121121

122122
Mono<CompletionSKContext> result = summarize.invokeAsync(TEXT_TO_SUMMARIZE);
123123

‎java/openai-sdk/src/main/java/com/microsoft/openai/OpenAIAsyncClientImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.azure.core.exception.HttpResponseException;
88
import com.azure.core.exception.ResourceModifiedException;
99
import com.azure.core.exception.ResourceNotFoundException;
10+
import com.azure.core.http.HttpHeaderName;
1011
import com.azure.core.http.HttpPipeline;
1112
import com.azure.core.http.HttpPipelineBuilder;
1213
import com.azure.core.http.policy.CookiePolicy;
@@ -68,7 +69,7 @@ public Mono<Embeddings> getEmbeddings(
6869
BinaryData.fromObject(embeddingsOptions),
6970
new RequestOptions()
7071
.addHeader(
71-
"Authorization", "Bearer " + this.apiKey),
72+
HttpHeaderName.AUTHORIZATION, "Bearer " + this.apiKey),
7273
context))
7374
.flatMap(FluxUtil::toMono)
7475
.map(protocolMethodData -> protocolMethodData.toObject(Embeddings.class));
@@ -86,7 +87,7 @@ public Mono<Completions> getCompletions(
8687
BinaryData.fromObject(completionsOptions),
8788
new RequestOptions()
8889
.addHeader(
89-
"Authorization", "Bearer " + this.apiKey),
90+
HttpHeaderName.AUTHORIZATION, "Bearer " + this.apiKey),
9091
context))
9192
.flatMap(FluxUtil::toMono)
9293
.map(protocolMethodData -> protocolMethodData.toObject(Completions.class));
@@ -104,7 +105,7 @@ public Mono<ChatCompletions> getChatCompletions(
104105
BinaryData.fromObject(chatCompletionsOptions),
105106
new RequestOptions()
106107
.addHeader(
107-
"Authorization", "Bearer " + this.apiKey),
108+
HttpHeaderName.AUTHORIZATION, "Bearer " + this.apiKey),
108109
context))
109110
.flatMap(FluxUtil::toMono)
110111
.map(protocolMethodData -> protocolMethodData.toObject(ChatCompletions.class));

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/Kernel.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ ISKFunction RegisterSemanticFunction(
103103
void registerMemory(SemanticTextMemory memory);
104104

105105
/*
106+
/// <summary>
107+
/// Set the semantic memory to use
108+
/// </summary>
109+
/// <param name="memory">Semantic memory instance</param>
110+
void RegisterMemory(ISemanticTextMemory memory);
111+
106112
/// <summary>
107113
/// Run a pipeline composed of synchronous and asynchronous functions.
108114
/// </summary>

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/builders/BuildersSingleton.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package com.microsoft.semantickernel.builders;
33

44
import com.microsoft.semantickernel.Kernel;
5+
import com.microsoft.semantickernel.semanticfunctions.PromptTemplate;
56
import com.microsoft.semantickernel.skilldefinition.ReadOnlySkillCollection;
67
import com.microsoft.semantickernel.textcompletion.TextCompletion;
78

@@ -23,11 +24,16 @@ public enum BuildersSingleton {
2324
private static final String FALLBACK_SKILL_COLLECTION_BUILDER_CLASS =
2425
"com.microsoft.semantickernel.skilldefinition.DefaultReadOnlySkillCollection.Builder";
2526

27+
private static final String FALLBACK_PROMPT_TEMPLATE_BUILDER_CLASS =
28+
"com.microsoft.semantickernel.semanticfunctions.DefaultPromptTemplateBuilder";
29+
2630
private final FunctionBuilders functionBuilders;
2731
private final Kernel.InternalBuilder kernelBuilder;
2832
private final TextCompletion.Builder textCompletionBuilder;
2933
private final ReadOnlySkillCollection.Builder readOnlySkillCollection;
3034

35+
private final PromptTemplate.Builder promptTemplate;
36+
3137
BuildersSingleton() {
3238
try {
3339
functionBuilders =
@@ -43,6 +49,10 @@ public enum BuildersSingleton {
4349
ServiceLoadUtil.findServiceLoader(
4450
ReadOnlySkillCollection.Builder.class,
4551
FALLBACK_SKILL_COLLECTION_BUILDER_CLASS);
52+
promptTemplate =
53+
ServiceLoadUtil.findServiceLoader(
54+
PromptTemplate.Builder.class,
55+
FALLBACK_PROMPT_TEMPLATE_BUILDER_CLASS);
4656
} catch (Throwable e) {
4757
Logger LOGGER = LoggerFactory.getLogger(BuildersSingleton.class);
4858
LOGGER.error("Failed to discover Semantic Kernel Builders", e);
@@ -83,4 +93,6 @@ public TextCompletion.Builder getTextCompletionBuilder() {
8393
public ReadOnlySkillCollection.Builder getReadOnlySkillCollection() {
8494
return readOnlySkillCollection;
8595
}
96+
97+
public PromptTemplate.Builder getPromptTemplateBuilder() { return promptTemplate; }
8698
}

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/builders/FunctionBuilders.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package com.microsoft.semantickernel.builders;
33

44
import com.microsoft.semantickernel.planner.SequentialPlannerSKFunction;
5-
import com.microsoft.semantickernel.textcompletion.CompletionSkFunction;
5+
import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
66

77
/** Provides various builders for completion functions */
88
public interface FunctionBuilders {
@@ -11,11 +11,11 @@ static SequentialPlannerSKFunction.Builder getPlannerBuilder() {
1111
return BuildersSingleton.INST.getFunctionBuilders().plannerBuilders();
1212
}
1313

14-
static CompletionSkFunction.Builder getCompletionBuilder() {
14+
static CompletionSKFunction.Builder getCompletionBuilder() {
1515
return BuildersSingleton.INST.getFunctionBuilders().completionBuilders();
1616
}
1717

18-
CompletionSkFunction.Builder completionBuilders();
18+
CompletionSKFunction.Builder completionBuilders();
1919

2020
SequentialPlannerSKFunction.Builder plannerBuilders();
2121
}

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/builders/SKBuilders.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import com.microsoft.semantickernel.Kernel;
55
import com.microsoft.semantickernel.KernelConfig;
66
import com.microsoft.semantickernel.planner.SequentialPlannerSKFunction;
7+
import com.microsoft.semantickernel.semanticfunctions.PromptTemplate;
78
import com.microsoft.semantickernel.skilldefinition.ReadOnlySkillCollection;
8-
import com.microsoft.semantickernel.textcompletion.CompletionSkFunction;
9+
import com.microsoft.semantickernel.textcompletion.CompletionSKFunction;
910
import com.microsoft.semantickernel.textcompletion.TextCompletion;
1011

1112
public class SKBuilders {
1213

13-
public static CompletionSkFunction.Builder completionFunctions() {
14+
public static CompletionSKFunction.Builder completionFunctions() {
1415
return FunctionBuilders.getCompletionBuilder();
1516
}
1617

@@ -33,4 +34,8 @@ public static KernelConfig.Builder kernelConfig() {
3334
public static ReadOnlySkillCollection.Builder skillCollection() {
3435
return BuildersSingleton.INST.getReadOnlySkillCollection();
3536
}
37+
38+
public static PromptTemplate.Builder promptTemplate () {
39+
return BuildersSingleton.INST.getPromptTemplateBuilder();
40+
}
3641
}
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
package com.microsoft.semantickernel.extensions;
2+
3+
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.microsoft.semantickernel.builders.SKBuilders;
5+
import com.microsoft.semantickernel.semanticfunctions.PromptTemplate;
6+
import com.microsoft.semantickernel.semanticfunctions.PromptTemplateConfig;
7+
import com.microsoft.semantickernel.semanticfunctions.SemanticFunctionConfig;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
10+
import java.io.File;
11+
import java.io.IOException;
12+
import java.nio.charset.Charset;
13+
import java.nio.file.Files;
14+
import java.util.Collections;
15+
import java.util.HashMap;
16+
import java.util.Map;
17+
18+
public class KernelExtensions {
19+
private static final Logger LOGGER =
20+
LoggerFactory.getLogger(KernelExtensions.class);
21+
22+
public static Map<String, SemanticFunctionConfig> importSemanticSkillFromDirectory(
23+
String parentDirectory, String skillDirectoryName) {
24+
25+
String CONFIG_FILE = "config.json";
26+
String PROMPT_FILE = "skprompt.txt";
27+
28+
// Verify.ValidSkillName(skillDirectoryName);
29+
File skillDir = new File(parentDirectory, skillDirectoryName);
30+
// Verify.DirectoryExists(skillDir);
31+
32+
File[] files = skillDir.listFiles();
33+
if (files == null) {
34+
return Collections.unmodifiableMap(new HashMap<>());
35+
}
36+
37+
HashMap<String, SemanticFunctionConfig> skills = new HashMap<>();
38+
39+
for (File dir : files) {
40+
try {
41+
// Continue only if prompt template exists
42+
File promptPath = new File(dir, PROMPT_FILE);
43+
if (!promptPath.exists()) {
44+
continue;
45+
}
46+
47+
// Load prompt configuration. Note: the configuration is
48+
// optional.
49+
PromptTemplateConfig config = new PromptTemplateConfig("", "", null);
50+
51+
File configPath = new File(dir, CONFIG_FILE);
52+
if (configPath.exists()) {
53+
config = new ObjectMapper().readValue(configPath, PromptTemplateConfig.class);
54+
55+
// Verify.NotNull(config, $"Invalid prompt template
56+
// configuration, unable to parse {configPath}");
57+
}
58+
59+
// kernel.Log.LogTrace("Config {0}: {1}", functionName,
60+
// config.ToJson());
61+
62+
// Load prompt template
63+
PromptTemplate template = SKBuilders.promptTemplate()
64+
.build(new String(
65+
Files.readAllBytes(promptPath.toPath()),
66+
Charset.defaultCharset()),
67+
config);
68+
69+
skills.put(dir.getName(), new SemanticFunctionConfig(config, template));
70+
} catch (IOException e) {
71+
LOGGER.error("Failed to read file", e);
72+
}
73+
}
74+
75+
return skills;
76+
}
77+
}

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/semanticfunctions/PromptTemplate.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ public interface PromptTemplate {
2828
*/
2929
Mono<String> renderAsync(
3030
ReadOnlySKContext executionContext, PromptTemplateEngine promptTemplateEngine);
31+
32+
public interface Builder {
33+
public PromptTemplate build(String promptTemplate, PromptTemplateConfig config);
34+
}
3135
}

‎java/semantickernel-api/src/main/java/com/microsoft/semantickernel/textcompletion/CompletionFunctionDefinition.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
public abstract class CompletionFunctionDefinition
1010
extends SemanticFunctionDefinition<
11-
CompletionRequestSettings, CompletionSKContext, CompletionSkFunction> {
12-
public static CompletionFunctionDefinition of(Function<Kernel, CompletionSkFunction> func) {
11+
CompletionRequestSettings, CompletionSKContext, CompletionSKFunction> {
12+
public static CompletionFunctionDefinition of(Function<Kernel, CompletionSKFunction> func) {
1313
return new CompletionFunctionDefinition() {
1414
@Override
15-
protected CompletionSkFunction build(Kernel kernel) {
15+
protected CompletionSKFunction build(Kernel kernel) {
1616
return func.apply(kernel);
1717
}
1818
};

0 commit comments

Comments
 (0)