Skip to content

Commit c4d4cf2

Browse files
marcominervamarcominerva
committed
Merge commit
2 parents 5a3a77f + b67dfe7 commit c4d4cf2

Some content is hidden

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

41 files changed

+720
-136
lines changed

‎.github/_typos.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ extend-exclude = [
1515
"encoder.json",
1616
"appsettings.development.json",
1717
"appsettings.Development.json",
18-
"AzureAISearchFilteringTest.cs"
18+
"AzureAISearchFilteringTest.cs",
19+
"KernelMemory.sln.DotSettings"
1920
]
2021

2122
[default.extend-words]

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<!-- Central version prefix - applies to all nuget packages. -->
5-
<Version>0.90.0</Version>
5+
<Version>0.91.0</Version>
66

77
<!-- C# lang version, https://learn.microsoft.com/dotnet/csharp/whats-new -->
88
<LangVersion>12</LangVersion>

‎Directory.Packages.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.6" />
6+
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.7" />
77
<PackageVersion Include="Azure.AI.ContentSafety" Version="1.0.0" />
88
<PackageVersion Include="Azure.AI.FormRecognizer" Version="4.1.0" />
99
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
@@ -28,7 +28,7 @@
2828
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.30.0" />
2929
<PackageVersion Include="Moq" Version="4.20.72" />
3030
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
31-
<PackageVersion Include="OllamaSharp" Version="4.0.2" />
31+
<PackageVersion Include="OllamaSharp" Version="4.0.3" />
3232
<PackageVersion Include="PdfPig" Version="0.1.9" />
3333
<PackageVersion Include="Polly.Core" Version="8.4.2" />
3434
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
@@ -56,10 +56,10 @@
5656
</ItemGroup>
5757
<!-- Semantic Kernel -->
5858
<ItemGroup>
59-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.25.0" />
60-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.25.0" />
61-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.25.0" />
62-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.25.0" />
59+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.26.0" />
60+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.26.0" />
61+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.26.0" />
62+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.26.0" />
6363
</ItemGroup>
6464
<!-- Documentation -->
6565
<ItemGroup>
@@ -103,7 +103,7 @@
103103
<PrivateAssets>all</PrivateAssets>
104104
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
105105
</PackageVersion>
106-
<PackageVersion Include="Xunit.DependencyInjection" Version="9.5.0" />
106+
<PackageVersion Include="Xunit.DependencyInjection" Version="9.6.0" />
107107
<PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
108108
</ItemGroup>
109109
</Project>

‎KernelMemory.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureQueues", "extensions\A
187187
EndProject
188188
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAIDocIntel", "extensions\AzureAIDocIntel\AzureAIDocIntel.csproj", "{CFE7C192-2561-40CC-8592-136293451EC1}"
189189
EndProject
190-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureOpenAI", "extensions\AzureOpenAI\AzureOpenAI.csproj", "{93FA6DD6-D0B2-4751-8680-3F959E1F7AF2}"
190+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureOpenAI", "extensions\AzureOpenAI\AzureOpenAI\AzureOpenAI.csproj", "{93FA6DD6-D0B2-4751-8680-3F959E1F7AF2}"
191191
EndProject
192192
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAISearch.TestApplication", "extensions\AzureAISearch\AzureAISearch.TestApplication\AzureAISearch.TestApplication.csproj", "{11445C36-1B94-4AFB-AC23-976C94924603}"
193193
EndProject
@@ -331,6 +331,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAIContentSafety", "ext
331331
EndProject
332332
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KernelMemory", "extensions\KM\KernelMemory\KernelMemory.csproj", "{AB097B62-5A0B-4D74-9F8B-A41FE8241447}"
333333
EndProject
334+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureOpenAI.FunctionalTests", "extensions\AzureOpenAI\AzureOpenAI.FunctionalTests\AzureOpenAI.FunctionalTests.csproj", "{8E907766-4A7D-46E2-B5E3-EB2994B1AA54}"
335+
EndProject
334336
Global
335337
GlobalSection(SolutionConfigurationPlatforms) = preSolution
336338
Debug|Any CPU = Debug|Any CPU
@@ -613,6 +615,9 @@ Global
613615
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Debug|Any CPU.Build.0 = Debug|Any CPU
614616
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.ActiveCfg = Release|Any CPU
615617
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.Build.0 = Release|Any CPU
618+
{8E907766-4A7D-46E2-B5E3-EB2994B1AA54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
619+
{8E907766-4A7D-46E2-B5E3-EB2994B1AA54}.Debug|Any CPU.Build.0 = Debug|Any CPU
620+
{8E907766-4A7D-46E2-B5E3-EB2994B1AA54}.Release|Any CPU.ActiveCfg = Release|Any CPU
616621
EndGlobalSection
617622
GlobalSection(SolutionProperties) = preSolution
618623
HideSolutionNode = FALSE
@@ -711,6 +716,7 @@ Global
711716
{82670921-FDCD-4672-84BD-4353F5AC24A0} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
712717
{58E65B3F-EFF0-401A-AC76-A49835AE0220} = {155DA079-E267-49AF-973A-D1D44681970F}
713718
{AB097B62-5A0B-4D74-9F8B-A41FE8241447} = {155DA079-E267-49AF-973A-D1D44681970F}
719+
{8E907766-4A7D-46E2-B5E3-EB2994B1AA54} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
714720
EndGlobalSection
715721
GlobalSection(ExtensibilityGlobals) = postSolution
716722
SolutionGuid = {CC136C62-115C-41D1-B414-F9473EFF6EA8}

‎applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<ProjectReference Include="..\..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
36+
<ProjectReference Include="..\..\..\extensions\AzureOpenAI\AzureOpenAI\AzureOpenAI.csproj" />
3737
<ProjectReference Include="..\..\evaluation\Evaluation.csproj" />
3838
</ItemGroup>
3939

‎applications/tests/Evaluation.Tests/appsettings.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,22 @@
9696
"MaxRetries": 10
9797
},
9898
"LlamaSharp": {
99-
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
100-
"ModelPath": "",
101-
// Max number of tokens supported by the model
102-
"MaxTokenTotal": 4096
103-
// Optional parameters
104-
// "GpuLayerCount": 32,
105-
// "Seed": 1337,
99+
"TextModel": {
100+
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
101+
"ModelPath": "",
102+
// Max number of tokens supported by the model
103+
"MaxTokenTotal": 4096
104+
// Optional parameters
105+
// "GpuLayerCount": 32,
106+
},
107+
"EmbeddingModel": {
108+
// path to file, e.g. "nomic-embed-text-v1.5.Q8_0.gguf"
109+
"ModelPath": "",
110+
// Max number of tokens supported by the model
111+
"MaxTokenTotal": 4096
112+
// Optional parameters
113+
// "GpuLayerCount": 32,
114+
}
106115
}
107116
},
108117
"DataIngestion": {

‎examples/001-dotnet-WebClient/file9-settings.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,22 @@
6565
"MaxRetries": 10
6666
},
6767
"LlamaSharp": {
68-
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
69-
"ModelPath": "",
70-
// Max number of tokens supported by the model
71-
"MaxTokenTotal": 4096
72-
// Optional parameters
73-
// "GpuLayerCount": 32,
74-
// "Seed": 1337,
68+
"TextModel": {
69+
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
70+
"ModelPath": "",
71+
// Max number of tokens supported by the model
72+
"MaxTokenTotal": 4096
73+
// Optional parameters
74+
// "GpuLayerCount": 32,
75+
},
76+
"EmbeddingModel": {
77+
// path to file, e.g. "nomic-embed-text-v1.5.Q8_0.gguf"
78+
"ModelPath": "",
79+
// Max number of tokens supported by the model
80+
"MaxTokenTotal": 4096
81+
// Optional parameters
82+
// "GpuLayerCount": 32,
83+
}
7584
},
7685
"AzureAIDocIntel": {
7786
// "APIKey" or "AzureIdentity".

‎examples/002-dotnet-Serverless/appsettings.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,22 @@
120120
// "Endpoint": "https://s3.amazonaws.com"
121121
},
122122
"LlamaSharp": {
123-
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
124-
"ModelPath": "",
125-
// Max number of tokens supported by the model
126-
"MaxTokenTotal": 4096
127-
// Optional parameters
128-
// "GpuLayerCount": 32,
129-
// "Seed": 1337,
123+
"TextModel": {
124+
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
125+
"ModelPath": "",
126+
// Max number of tokens supported by the model
127+
"MaxTokenTotal": 4096
128+
// Optional parameters
129+
// "GpuLayerCount": 32,
130+
},
131+
"EmbeddingModel": {
132+
// path to file, e.g. "nomic-embed-text-v1.5.Q8_0.gguf"
133+
"ModelPath": "",
134+
// Max number of tokens supported by the model
135+
"MaxTokenTotal": 4096
136+
// Optional parameters
137+
// "GpuLayerCount": 32,
138+
}
130139
}
131140
},
132141
"DataIngestion": {

‎examples/002-dotnet-Serverless/file9-settings.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,22 @@
6565
"MaxRetries": 10
6666
},
6767
"LlamaSharp": {
68-
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
69-
"ModelPath": "",
70-
// Max number of tokens supported by the model
71-
"MaxTokenTotal": 4096
72-
// Optional parameters
73-
// "GpuLayerCount": 32,
74-
// "Seed": 1337,
68+
"TextModel": {
69+
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
70+
"ModelPath": "",
71+
// Max number of tokens supported by the model
72+
"MaxTokenTotal": 4096
73+
// Optional parameters
74+
// "GpuLayerCount": 32,
75+
},
76+
"EmbeddingModel": {
77+
// path to file, e.g. "nomic-embed-text-v1.5.Q8_0.gguf"
78+
"ModelPath": "",
79+
// Max number of tokens supported by the model
80+
"MaxTokenTotal": 4096
81+
// Optional parameters
82+
// "GpuLayerCount": 32,
83+
}
7584
},
7685
"AzureAIDocIntel": {
7786
// "APIKey" or "AzureIdentity".

‎examples/105-dotnet-serverless-llamasharp/appsettings.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,22 @@
1515
"KernelMemory": {
1616
"Services": {
1717
"LlamaSharp": {
18-
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
19-
"ModelPath": "",
20-
// Max number of tokens supported by the model
21-
"MaxTokenTotal": 4096
22-
// Optional parameters
23-
// "GpuLayerCount": 32,
24-
// "Seed": 1337,
18+
"TextModel": {
19+
// path to file, e.g. "llama-2-7b-chat.Q6_K.gguf"
20+
"ModelPath": "",
21+
// Max number of tokens supported by the model
22+
"MaxTokenTotal": 4096
23+
// Optional parameters
24+
// "GpuLayerCount": 32,
25+
},
26+
"EmbeddingModel": {
27+
// path to file, e.g. "nomic-embed-text-v1.5.Q8_0.gguf"
28+
"ModelPath": "",
29+
// Max number of tokens supported by the model
30+
"MaxTokenTotal": 4096
31+
// Optional parameters
32+
// "GpuLayerCount": 32,
33+
}
2534
},
2635
"AzureOpenAIEmbedding": {
2736
// "ApiKey" or "AzureIdentity"

0 commit comments

Comments
 (0)