Merge pull request #1302 from solliancenet/skm-080-appconfig-fixes

Semantic Kernel Completions Fixes
solliancenet · Jul 30, 2024 · ca6560c · ca6560c
2 parents 2b7d6f2 + eeaa31f
commit ca6560c
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 14 deletions.
diff --git a/.../quick-start/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json b/.../quick-start/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json
@@ -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": {

diff --git a/...y/quick-start/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json b/...y/quick-start/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json
@@ -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": {

diff --git a/deploy/quick-start/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json b/deploy/quick-start/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json
@@ -10,7 +10,7 @@
     "max_history": 5
   },
   "gatekeeper": {
-    "use_system_setting": false,
+    "use_system_setting": true,
     "options": []
   },
   "orchestration_settings": {

diff --git a/...quick-start/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json b/...quick-start/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json
@@ -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,
@@ -13,5 +13,6 @@
     "url": "${env:AZURE_OPENAI_ENDPOINT}",
     "url_exceptions": [],
     "timeout_seconds": 60,
-    "retry_strategy_name": "ExponentialBackoff"
+    "retry_strategy_name": "ExponentialBackoff",
+    "provider": "microsoft"
 }
diff --git a/deploy/standard/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json b/deploy/standard/data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json
@@ -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": {

diff --git a/deploy/standard/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json b/deploy/standard/data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json
@@ -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": {

diff --git a/deploy/standard/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json b/deploy/standard/data/resource-provider/FoundationaLLM.Agent/FoundationaLLM.template.json
@@ -10,7 +10,7 @@
     "max_history": 5
   },
   "gatekeeper": {
-    "use_system_setting": false,
+    "use_system_setting": true,
     "options": []
   },
   "orchestration_settings": {

diff --git a/...oy/standard/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json b/...oy/standard/data/resource-provider/FoundationaLLM.Configuration/AzureOpenAI.template.json
@@ -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,
@@ -13,5 +13,6 @@
     "url": "{{openAiEndpointUri}}",
     "url_exceptions": [],
     "timeout_seconds": 60,
-    "retry_strategy_name": "ExponentialBackoff"
+    "retry_strategy_name": "ExponentialBackoff",
+    "provider": "microsoft"
 }
diff --git a/src/dotnet/Common/Constants/Configuration/AppConfigurationKeyFilters.cs b/src/dotnet/Common/Constants/Configuration/AppConfigurationKeyFilters.cs
@@ -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>
@@ -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>

diff --git a/src/dotnet/Common/Models/Orchestration/LLMCompletionRequest.cs b/src/dotnet/Common/Models/Orchestration/LLMCompletionRequest.cs
@@ -303,7 +303,7 @@ public TextEmbeddingProfile? TextEmbeddingProfile
                 if (_textEmbeddingProfile != null)
                     return _textEmbeddingProfile;
 
-                EnsureIsValid();
+                Validate();
 
                 if (!_hasTextEmbeddingProfile)
                     return null;
@@ -332,7 +332,7 @@ public List<IndexingProfile>? IndexingProfiles
                 if (_indexingProfiles != null)
                     return _indexingProfiles;
 
-                EnsureIsValid();
+                Validate();
 
                 if (!_hasIndexingProfiles)
                     return null;

diff --git a/src/dotnet/CoreAPI/Program.cs b/src/dotnet/CoreAPI/Program.cs
@@ -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())

diff --git a/src/dotnet/OrchestrationAPI/Program.cs b/src/dotnet/OrchestrationAPI/Program.cs
@@ -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);
             }));

diff --git a/src/dotnet/SemanticKernelAPI/Program.cs b/src/dotnet/SemanticKernelAPI/Program.cs
@@ -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);