Merge pull request #2016 from solliancenet/mg-s19671

Adding app config settings for 0.9.0
solliancenet · Dec 2, 2024 · ffbe582 · ffbe582
2 parents 2a44884 + c76f122
commit ffbe582
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 29 deletions.
diff --git a/deploy/quick-start/infra/main.bicep b/deploy/quick-start/infra/main.bicep
@@ -422,6 +422,9 @@ module storage './shared/storage.bicep' = {
       {
         name: 'vectorization-state'
       }
+      {
+        name: 'external-modules-python'
+      }
     ]
     files: []
     queues: [

diff --git a/deploy/standard/config/appconfig.template.json b/deploy/standard/config/appconfig.template.json
@@ -204,17 +204,17 @@
             "tags": {}
         },
         {
-            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:CompletionResponsePollingIntervalSeconds",
-            "value": "{ \"value\": 5, \"value_exceptions\": [] }",
+            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:MaxUploadsPerMessage",
+            "value": "{ \"value\": 10, \"value_exceptions\": []}",
             "label": null,
-            "content_type": "",
+            "content_type": "application/json",
             "tags": {}
         },
         {
-            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:MaxUploadsPerMessage",
-            "value": "{ \"value\": 10, \"value_exceptions\": [] }",
+            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:CompletionResponsePollingIntervalSeconds",
+            "value": "{ \"value\": 10, \"value_exceptions\": []}",
             "label": null,
-            "content_type": "",
+            "content_type": "application/json",
             "tags": {}
         },
         {
@@ -252,6 +252,20 @@
             "content_type": "",
             "tags": {}
         },
+        {
+            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:Entra:RequireScopes",
+            "value": "true",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
+        {
+            "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:Entra:AllowACLAuthorization",
+            "value": "false",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
         {
             "key": "FoundationaLLM:APIEndpoints:CoreAPI:Configuration:CosmosDB:Endpoint",
             "value": "{{cosmosEndpoint}}",
@@ -392,6 +406,34 @@
             "content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
             "tags": {}
         },
+        {
+            "key": "FoundationaLLM:APIEndpoints:LangChainAPI:Configuration:ExternalModules:Storage:AccountName",
+            "value": "{{storageAccountAdlsName}}",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
+        {
+            "key": "FoundationaLLM:APIEndpoints:LangChainAPI:Configuration:ExternalModules:Storage:AuthenticationType",
+            "value": "AzureIdentity",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
+        {
+            "key": "FoundationaLLM:APIEndpoints:LangChainAPI:Configuration:ExternalModules:RootStorageContainer",
+            "value": "external-modules-python",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
+        {
+            "key": "FoundationaLLM:APIEndpoints:LangChainAPI:Configuration:ExternalModules:Modules",
+            "value": "",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
         {
             "key": "FoundationaLLM:APIEndpoints:SemanticKernelAPI:Essentials:APIKey",
             "value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-semantickernelapi-apikey\"}",
@@ -427,13 +469,6 @@
             "content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
             "tags": {}
         },
-        {
-            "key": "FoundationaLLM:APIEndpoints:ManagementAPI:Configuration:AllowedUploadFileExtensions",
-            "value": "c, cpp, cs, css, csv, doc, docx, gif, html, java, jpeg, jpg, js, json, md, pdf, php, png, pptx, py, rb, sh, tar, tex, ts, txt, xlsx, xml, zip",
-            "label": null,
-            "content_type": "",
-            "tags": {}
-        },
         {
             "key": "FoundationaLLM:APIEndpoints:ManagementAPI:Configuration:Entra:Instance",
             "value": "https://login.microsoftonline.com/",
@@ -469,6 +504,13 @@
             "content_type": "",
             "tags": {}
         },
+        {
+            "key": "FoundationaLLM:APIEndpoints:ManagementAPI:Configuration:AllowedUploadFileExtensions",
+            "value": "c, cpp, cs, css, csv, doc, docx, gif, html, java, jpeg, jpg, js, json, md, pdf, php, png, pptx, py, rb, sh, tar, tex, ts, txt, xlsx, xml, zip",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
         {
             "key": "FoundationaLLM:APIEndpoints:VectorizationAPI:Essentials:APIKey",
             "value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-vectorizationapi-apikey\"}",
@@ -665,13 +707,6 @@
             "content_type": "",
             "tags": {}
         },
-        {
-            "key": "FoundationaLLM:Branding:DefaultAgentWelcomeMessage",
-            "value": "Start the conversation using the text box below.",
-            "label": null,
-            "content_type": "",
-            "tags": {}
-        },
         {
             "key": "FoundationaLLM:Branding:FavIconUrl",
             "value": "favicon.ico",
@@ -707,13 +742,6 @@
             "content_type": "",
             "tags": {}
         },
-        {
-            "key": "FoundationaLLM:Branding:NoAgentsMessage",
-            "value": "No agents available. Please check with your system administrator for assistance.",
-            "label": null,
-            "content_type": "",
-            "tags": {}
-        },
         {
             "key": "FoundationaLLM:Branding:PageTitle",
             "value": "FoundationaLLM User Portal",
@@ -784,6 +812,20 @@
             "content_type": "",
             "tags": {}
         },
+        {
+            "key": "FoundationaLLM:Branding:NoAgentsMessage",
+            "value": "No agents available. Please check with your system administrator for assistance.",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
+        {
+            "key": "FoundationaLLM:Branding:DefaultAgentWelcomeMessage",
+            "value": "Start the conversation using the text box below.",
+            "label": null,
+            "content_type": "",
+            "tags": {}
+        },
         {
             "key": "FoundationaLLM:UserPortal:Authentication:Entra:Instance",
             "value": "https://login.microsoftonline.com/",

diff --git a/deploy/standard/infra/storage-rg.bicep b/deploy/standard/infra/storage-rg.bicep
@@ -85,6 +85,7 @@ module storage 'modules/storageAccount.bicep' = {
       'resource-provider'
       'vectorization-input'
       'vectorization-state'
+      'external-modules-python'
     ]
     queues: [
       'embed'

diff --git a/src/dotnet/Common/Constants/Data/AppConfiguration.json b/src/dotnet/Common/Constants/Data/AppConfiguration.json
@@ -753,7 +753,7 @@
 				"name": "RootStorageContainer",
 				"description": "The name of the root container in the Azure Storage account.",
 				"secret": "",
-				"value": "",
+				"value": "external-modules-python",
 				"content_type": "",
 				"first_version": "0.9.0"
 			},

diff --git a/src/dotnet/Common/Templates/appconfig.template.json b/src/dotnet/Common/Templates/appconfig.template.json
@@ -422,7 +422,7 @@
         },
         {
             "key": "FoundationaLLM:APIEndpoints:LangChainAPI:Configuration:ExternalModules:RootStorageContainer",
-            "value": "",
+            "value": "external-modules-python",
             "label": null,
             "content_type": "",
             "tags": {}