Skip to content
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

Semantic Kernel Completions Fixes #1302

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Semantic Kernel Completions Fixes #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8a8c54
Added filters. Updated FLLM agent template JSON.
saimachi Jul 30, 2024
374b7c8
Code changes to support completion request.
saimachi Jul 30, 2024
eeaa31f
Artifact updates.
saimachi Jul 30, 2024
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
2 changes: 1 addition & 1 deletion .../quick-start/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"display_name": null,
"description": null,
"cost_center": null,
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"version": "0.0",
"deployment_name": "completions",
"model_parameters": {
Expand Down
2 changes: 1 addition & 1 deletion ...y/quick-start/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"display_name": null,
"description": null,
"cost_center": null,
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"version": "0.0",
"deployment_name": "embeddings",
"model_parameters": {
Expand Down
2 changes: 1 addition & 1 deletion deploy/quick-start/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"max_history": 5
},
"gatekeeper": {
"use_system_setting": false,
"use_system_setting": true,
"options": []
},
"orchestration_settings": {
Expand Down
5 changes: 3 additions & 2 deletions ...quick-start/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "api-endpoint",
"name": "AzureOpenAI",
"object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"display_name": null,
"description": null,
"cost_center": null,
Expand All @@ -13,5 +13,6 @@
"url": "${env:AZURE_OPENAI_ENDPOINT}",
"url_exceptions": [],
"timeout_seconds": 60,
"retry_strategy_name": "ExponentialBackoff"
"retry_strategy_name": "ExponentialBackoff",
"provider": "microsoft"
}
2 changes: 1 addition & 1 deletion deploy/standard/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"display_name": null,
"description": null,
"cost_center": null,
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"version": "0.0",
"deployment_name": "completions",
"model_parameters": {
Expand Down
2 changes: 1 addition & 1 deletion deploy/standard/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"display_name": null,
"description": null,
"cost_center": null,
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"endpoint_object_id": "/instances/${env:FOUNDATIONALLM_INSTANCE_ID}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"version": "0.0",
"deployment_name": "embeddings",
"model_parameters": {
Expand Down
2 changes: 1 addition & 1 deletion deploy/standard/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"max_history": 5
},
"gatekeeper": {
"use_system_setting": false,
"use_system_setting": true,
"options": []
},
"orchestration_settings": {
Expand Down
5 changes: 3 additions & 2 deletions ...oy/standard/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "api-endpoint",
"name": "AzureOpenAI",
"object_id": "/instances/{{instanceId}}/providers/FoundationaLLM.Configuration/apiEndpoints/AzureOpenAI",
"object_id": "/instances/{{instanceId}}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations/AzureOpenAI",
"display_name": null,
"description": null,
"cost_center": null,
Expand All @@ -13,5 +13,6 @@
"url": "{{openAiEndpointUri}}",
"url_exceptions": [],
"timeout_seconds": 60,
"retry_strategy_name": "ExponentialBackoff"
"retry_strategy_name": "ExponentialBackoff",
"provider": "microsoft"
}
16 changes: 14 additions & 2 deletions src/dotnet/Common/Constants/Configuration/AppConfigurationKeyFilters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,13 @@ public static partial class AppConfigurationKeyFilters
/// </summary>
public const string FoundationaLLM_APIEndpoints_AuthorizationAPI =
"FoundationaLLM:APIEndpoints:AuthorizationAPI:*";


/// <summary>
/// Filter for the key used to store the Azure Application Insights connection string.
/// </summary>
public const string FoundationaLLM_APIEndpoints_CoreAPI_AppInsightsConnectionString =
"FoundationaLLM:APIEndpoints:CoreAPI:AppInsightsConnectionString";

/// <summary>
/// Filter for the configuration section used to identify the main Core API settings.
/// </summary>
Expand All @@ -88,7 +94,13 @@ public static partial class AppConfigurationKeyFilters
/// </summary>
public const string FoundationaLLM_APIEndpoints_CoreAPI_Configuration_CosmosDB =
"FoundationaLLM:APIEndpoints:CoreAPI:Configuration:CosmosDB:*";


/// <summary>
/// Filter for the configuration section used to identify the system Gatekeeper options for Core API.
/// </summary>
public const string FoundationaLLM_APIEndpoints_CoreAPI_Configuration_BypassGatekeeper =
"FoundationaLLM:APIEndpoints:CoreAPI:Configuration:BypassGatekeeper";

/// <summary>
/// Filter for the configuration section used to identify the authentication settings for the Core Worker service.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/Common/Models/Orchestration/LLMCompletionRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public TextEmbeddingProfile? TextEmbeddingProfile
if (_textEmbeddingProfile != null)
return _textEmbeddingProfile;

EnsureIsValid();
Validate();

if (!_hasTextEmbeddingProfile)
return null;
Expand Down Expand Up @@ -332,7 +332,7 @@ public List<IndexingProfile>? IndexingProfiles
if (_indexingProfiles != null)
return _indexingProfiles;

EnsureIsValid();
Validate();

if (!_hasIndexingProfiles)
return null;
Expand Down
5 changes: 5 additions & 0 deletions src/dotnet/CoreAPI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,16 @@ public static void Main(string[] args)
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Instance);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Configuration);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Branding);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_AuthorizationAPI);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_CoreAPI_Configuration_CosmosDB);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_CoreAPI_Configuration_Entra);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_CoreAPI_AppInsightsConnectionString);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_CoreAPI_Configuration_BypassGatekeeper);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints_OrchestrationAPI);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Agent_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Attachment_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_AIModel_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Configuration_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Events_Profiles_CoreAPI);
}));
if (builder.Environment.IsDevelopment())
Expand Down
1 change: 1 addition & 0 deletions src/dotnet/OrchestrationAPI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public static void Main(string[] args)
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_DataSource_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Attachment_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_AIModel_Storage);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Prompt_Storage);

options.Select(AppConfigurationKeyFilters.FoundationaLLM_Events_Profiles_OrchestrationAPI);
}));
Expand Down
1 change: 1 addition & 0 deletions src/dotnet/SemanticKernelAPI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public static void Main(string[] args)
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Configuration);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_APIEndpoints);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_Events_Profiles_VectorizationAPI);
options.Select(AppConfigurationKeyFilters.FoundationaLLM_ResourceProviders_Configuration_Storage);
}));
if (builder.Environment.IsDevelopment())
builder.Configuration.AddJsonFile("appsettings.development.json", true, true);
Expand Down
Loading