Skip to content

Commit ffcf68c

Browse files
Merge branch 'main' into update-modelid
2 parents 3a34f5d + 52e317a commit ffcf68c

236 files changed

Lines changed: 8260 additions & 2434 deletions

File tree

Some content is hidden

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

‎COMMUNITY.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ Add Semantic Kernel events to your calendar - we're running two community calls
1515
* Americas timezone: download the [calendar.ics](https://aka.ms/sk-community-calendar) file.
1616
* Asia Pacific timezone: download the [calendar-APAC.ics](https://aka.ms/sk-community-calendar-apac) file.
1717

18-
To keep topics organized, please submit what you'd like us to cover here:
19-
[https://forms.office.com/r/BbXFzmmFys](https://forms.office.com/r/BbXFzmmFys)
18+
If you have any questions or if you would like to showcase your project(s), please email what you'd like us to cover here: skofficehours[at]microsoft.com.
2019

2120
If you are unable to make it live, all meetings will be recorded and posted online.
2221

‎dotnet/Directory.Packages.props‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313
<PackageVersion Include="Markdig" Version="0.34.0" />
1414
<PackageVersion Include="Handlebars.Net" Version="2.1.4" />
1515
<PackageVersion Include="JsonSchema.Net.Generation" Version="3.5.1" />
16+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.1" />
17+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
1618
<PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="11.3.5" />
19+
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
1720
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="[1.1.0, )" />
1821
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
19-
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.3.0" />
23+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
24+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
2025
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
2126
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
2227
<PackageVersion Include="System.Numerics.Tensors" Version="8.0.0" />
23-
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
28+
<PackageVersion Include="System.Text.Json" Version="8.0.1" />
2429
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2530
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
2631
<!-- Tokenizers -->
@@ -36,7 +41,7 @@
3641
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
3742
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
3843
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
39-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
44+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
4045
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
4146
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
4247
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
@@ -99,7 +104,7 @@
99104
<PrivateAssets>all</PrivateAssets>
100105
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
101106
</PackageReference>
102-
<PackageVersion Include="Roslynator.Analyzers" Version="[4.3.0]" />
107+
<PackageVersion Include="Roslynator.Analyzers" Version="[4.10.0]" />
103108
<PackageReference Include="Roslynator.Analyzers">
104109
<PrivateAssets>all</PrivateAssets>
105110
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎dotnet/SK-dotnet.sln‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,9 @@ EndProject
116116
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{3CDE10B2-AE8F-4FC4-8D55-92D4AD32E144}"
117117
ProjectSection(SolutionItems) = preProject
118118
src\InternalUtilities\src\System\EnvExtensions.cs = src\InternalUtilities\src\System\EnvExtensions.cs
119-
src\InternalUtilities\src\System\InternalTypeConverter.cs = src\InternalUtilities\src\System\InternalTypeConverter.cs
120-
src\InternalUtilities\src\System\TypeConverterFactory.cs = src\InternalUtilities\src\System\TypeConverterFactory.cs
121-
src\InternalUtilities\src\System\NonNullCollection.cs = src\InternalUtilities\src\System\NonNullCollection.cs
122119
EndProjectSection
123120
EndProject
124121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Type", "Type", "{E85EA4D0-BB7E-4DFD-882F-A76EB8C0B8FF}"
125-
ProjectSection(SolutionItems) = preProject
126-
src\InternalUtilities\src\Type\TypeExtensions.cs = src\InternalUtilities\src\Type\TypeExtensions.cs
127-
EndProjectSection
128122
EndProject
129123
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugins.Core", "src\Plugins\Plugins.Core\Plugins.Core.csproj", "{0D0C4DAD-E6BC-4504-AE3A-EEA4E35920C1}"
130124
EndProject
@@ -197,6 +191,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Experimental.Orchestration.
197191
EndProject
198192
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Experimental.Orchestration.Flow.UnitTests", "src\Experimental\Orchestration.Flow.UnitTests\Experimental.Orchestration.Flow.UnitTests.csproj", "{731CC542-8BE9-42D4-967D-99206EC2B310}"
199193
EndProject
194+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentationExamples", "samples\DocumentationExamples\DocumentationExamples.csproj", "{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}"
195+
EndProject
196+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateChatGptPlugin", "samples\CreateChatGptPlugin\Solution\CreateChatGptPlugin.csproj", "{87AB5AF5-5783-4372-9789-664895E0A2FF}"
197+
EndProject
200198
Global
201199
GlobalSection(SolutionConfigurationPlatforms) = preSolution
202200
Debug|Any CPU = Debug|Any CPU
@@ -460,6 +458,18 @@ Global
460458
{731CC542-8BE9-42D4-967D-99206EC2B310}.Publish|Any CPU.Build.0 = Debug|Any CPU
461459
{731CC542-8BE9-42D4-967D-99206EC2B310}.Release|Any CPU.ActiveCfg = Release|Any CPU
462460
{731CC542-8BE9-42D4-967D-99206EC2B310}.Release|Any CPU.Build.0 = Release|Any CPU
461+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
462+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Debug|Any CPU.Build.0 = Debug|Any CPU
463+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
464+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Publish|Any CPU.Build.0 = Debug|Any CPU
465+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Release|Any CPU.ActiveCfg = Release|Any CPU
466+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D}.Release|Any CPU.Build.0 = Release|Any CPU
467+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
468+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
469+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
470+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Publish|Any CPU.Build.0 = Debug|Any CPU
471+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
472+
{87AB5AF5-5783-4372-9789-664895E0A2FF}.Release|Any CPU.Build.0 = Release|Any CPU
463473
EndGlobalSection
464474
GlobalSection(SolutionProperties) = preSolution
465475
HideSolutionNode = FALSE
@@ -528,6 +538,8 @@ Global
528538
{B0CE8C69-EC56-4825-94AB-01CA7E8BA55B} = {A2357CF8-3BB9-45A1-93F1-B366C9B63658}
529539
{3A4B8F90-3E74-43E0-800C-84F8AA9B5BF3} = {A2357CF8-3BB9-45A1-93F1-B366C9B63658}
530540
{731CC542-8BE9-42D4-967D-99206EC2B310} = {A2357CF8-3BB9-45A1-93F1-B366C9B63658}
541+
{A8E0D3B2-49D7-4DF6-BF91-B234C1C5E25D} = {FA3720F1-C99A-49B2-9577-A940257098BF}
542+
{87AB5AF5-5783-4372-9789-664895E0A2FF} = {FA3720F1-C99A-49B2-9577-A940257098BF}
531543
EndGlobalSection
532544
GlobalSection(ExtensibilityGlobals) = postSolution
533545
SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

‎dotnet/notebooks/00-getting-started.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"#### Watch the Getting Started Quick Start [Video](https://aka.ms/SK-Getting-Started-Notebook)\n",
99
"\n",
1010
"> [!IMPORTANT]\n",
11-
"> You will need an [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download) and [Polyglot](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-interactive-vscode) to get started with this notebook using .NET Interactive."
11+
"> You will need an [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) and [Polyglot](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-interactive-vscode) to get started with this notebook using .NET Interactive."
1212
]
1313
},
1414
{

‎dotnet/notebooks/06-memory-and-embeddings.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"text into prompts to enrich them with more data. This allowed us to create a basic chat experience. \n",
1515
"\n",
1616
"However, if you solely relied on kernel arguments, you would quickly realize that eventually your prompt\n",
17-
"would grow so large that you would run into a the model's token limit. What we need is a way to persist state\n",
17+
"would grow so large that you would run into the model's token limit. What we need is a way to persist state\n",
1818
"and build both short-term and long-term memory to empower even more intelligent applications. \n",
1919
"\n",
2020
"To do this, we dive into the key concept of `Semantic Memory` in the Semantic Kernel. "

‎dotnet/notebooks/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ the Semantic Kernel. The notebooks are organized in order of increasing complexi
55

66
To run the notebooks, we recommend the following steps:
77

8-
- [Install .NET 8](https://dotnet.microsoft.com/download/dotnet/7.0)
8+
- [Install .NET 8](https://dotnet.microsoft.com/download/dotnet/8.0)
99
- [Install Visual Studio Code (VS Code)](https://code.visualstudio.com)
1010
- Launch VS Code and [install the "Polyglot" extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-interactive-vscode).
1111
Min version required: v1.0.4606021 (Dec 2023).
@@ -70,7 +70,7 @@ For a quick dive, look at the [getting started notebook](00-getting-started.ipyn
7070
You can run the notebooks also in the browser with JupyterLab. These steps
7171
should be sufficient to start:
7272

73-
Install Python 3, Pip and .NET 7 in your system, then:
73+
Install Python 3, Pip and .NET 8 in your system, then:
7474

7575
pip install jupyterlab
7676
dotnet tool install -g Microsoft.dotnet-interactive

‎dotnet/nuget/nuget-package.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
4-
<VersionPrefix>1.2.0</VersionPrefix>
4+
<VersionPrefix>1.3.0</VersionPrefix>
55

66
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
77
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
@@ -10,7 +10,7 @@
1010
<IsPackable>true</IsPackable>
1111

1212
<!-- Package validation. Baseline Version should be lower than current version. -->
13-
<PackageValidationBaselineVersion>1.2.0</PackageValidationBaselineVersion>
13+
<PackageValidationBaselineVersion>1.3.0</PackageValidationBaselineVersion>
1414
<!-- Validate assembly attributes only for Publish builds -->
1515
<NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
1616
<!-- Do not validate reference assemblies -->
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.cs]
2+
dotnet_diagnostic.CA1016.severity = none
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
**/bin
2+
**/obj
3+
local.settings.json
4+
azure-function/appsettings.json
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Semantic Kernel OpenAI plugin starter
2+
3+
This project provides starter code to create a OpenAI plugin. It includes the following components:
4+
5+
- An endpoint that serves up an ai-plugin.json file for ChatGPT to discover the plugin
6+
- A generator that automatically converts prompts into prompt endpoints
7+
- The ability to add additional native functions as endpoints to the plugin
8+
9+
## Prerequisites
10+
11+
- [.NET 6](https://dotnet.microsoft.com/download/dotnet/8.0) is required to run this starter.
12+
- [Azure Functions Core Tools](https://www.npmjs.com/package/azure-functions-core-tools) is required to run this starter.
13+
- Install the recommended extensions
14+
- [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
15+
- [Semantic Kernel Tools](https://marketplace.visualstudio.com/items?itemName=ms-semantic-kernel.semantic-kernel) (optional)
16+
17+
## Configuring the starter
18+
19+
To configure the starter, you need to provide the following information:
20+
21+
- Define the properties of the plugin in the appsettings.json file.
22+
- Enter the API key for your AI endpoint in the [local.settings.json](./azure-function/local.settings.json.example) file.
23+
24+
### Using appsettings.json
25+
26+
Configure an OpenAI endpoint
27+
28+
1. Copy [settings.json.openai-example](./azure-function/config-samples/appsettings.json.openai-example) to `./appsettings.json`
29+
1. Edit the `kernel` object to add your OpenAI endpoint configuration
30+
1. Edit the `aiPlugin` object to define the properties that get exposed in the ai-plugin.json file
31+
32+
Configure an Azure OpenAI endpoint
33+
34+
1. Copy [settings.json.azure-example](./azure-function/config-samples/appsettings.json.azure-example) to `./appsettings.json`
35+
1. Edit the `kernel` object to add your Azure OpenAI endpoint configuration
36+
1. Edit the `aiPlugin` object to define the properties that get exposed in the ai-plugin.json file
37+
38+
### Using local.settings.json
39+
40+
1. Copy [local.settings.json.example](./azure-function/local.settings.json.example) to `./azure-function/local.settings.json`
41+
1. Edit the `Values` object to add your OpenAI endpoint configuration in the `apiKey` property
42+
43+
## Running the starter
44+
45+
To run the Azure Functions application just hit `F5`.
46+
47+
To build and run the Azure Functions application from a terminal use the following commands:
48+
49+
```powershell
50+
cd azure-function
51+
dotnet build
52+
cd bin/Debug/net8.0
53+
func host start
54+
```

0 commit comments

Comments
 (0)