Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit 19588f0

Browse files
jgbradley1jgbradley1
committed
update portal ui experience
1 parent bd6af77 commit 19588f0

File tree

1 file changed

+137
-35
lines changed

1 file changed

+137
-35
lines changed

‎infra/managed-app/createUiDefinition.json‎

Lines changed: 137 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.1.2-preview",
55
"parameters": {
66
"config": {
7-
"isWizard": true,
7+
"isWizard": false,
88
"basics": {
99
"description": "Welcome to **[GraphRAG](https://aka.ms/graphrag)**.",
1010
"subscription": {
@@ -97,13 +97,37 @@
9797
],
9898
"required": true
9999
}
100+
},
101+
{
102+
"name": "apimPublisherName",
103+
"type": "Microsoft.Common.TextBox",
104+
"label": "API Publisher",
105+
"toolTip": "Provide the name of a person or company that will manage this API.",
106+
"defaultValue": "Microsoft",
107+
"constraints": {
108+
"required": true,
109+
"regex": "^(?!\\s*$).+",
110+
"validationMessage": "Must provide a valid name."
111+
}
112+
},
113+
{
114+
"name": "apimPublisherEmail",
115+
"type": "Microsoft.Common.TextBox",
116+
"label": "Name",
117+
"toolTip": "Provide an email address associated with a person or company that will manage this API.",
118+
"defaultValue": "publisher@microsoft.com",
119+
"constraints": {
120+
"required": true,
121+
"regex": "^(?!\\s*$).+",
122+
"validationMessage": "Must provide a valid storage account name."
123+
}
100124
}
101125
]
102126
},
103127
{
104128
"name": "aoaiSettings",
105-
"label": "OpenAI Settings",
106-
"description": "Customize Azure OpenAI model deployments:",
129+
"label": "OpenAI",
130+
"description": "Customize Azure OpenAI model settings:",
107131
"subLabel": {
108132
"preValidation": "Configure AOAI settings",
109133
"postValidation": "Complete"
@@ -156,7 +180,7 @@
156180
"type": "Microsoft.Common.TextBox",
157181
"label": "LLM Model Quota (x1000)",
158182
"placeholder": "85",
159-
"defaultValue": "",
183+
"defaultValue": "85",
160184
"toolTip": "LLM model quota to use.",
161185
"constraints": {
162186
"required": true,
@@ -191,7 +215,7 @@
191215
"type": "Microsoft.Common.TextBox",
192216
"label": "Embedding Model Quota (x1000)",
193217
"placeholder": "100",
194-
"defaultValue": "",
218+
"defaultValue": "100",
195219
"toolTip": "Embedding model quota to use.",
196220
"constraints": {
197221
"required": true,
@@ -223,29 +247,6 @@
223247
}
224248
]
225249
},
226-
{
227-
"name": "kubernetes",
228-
"label": "Kubernetes",
229-
"description": "Customize kubernetes settings:",
230-
"subLabel": {
231-
"preValidation": "Configure kubernetes settings",
232-
"postValidation": "Complete"
233-
},
234-
"elements": [
235-
{
236-
"name": "namespace",
237-
"type": "Microsoft.Common.TextBox",
238-
"label": "Namespace",
239-
"defaultValue": "graphrag",
240-
"toolTip": "Define a valid k8s namespace.",
241-
"constraints": {
242-
"required": true,
243-
"regex": "^(?!-)[a-z0-9-]{1,253}$",
244-
"validationMessage": "Only lowercase alphanumeric characters are allowed, with a maximum length of 253 characters. Cannot start with a hyphen."
245-
}
246-
}
247-
]
248-
},
249250
{
250251
"name": "networking",
251252
"label": "Networking",
@@ -266,22 +267,123 @@
266267
}
267268
}
268269
]
270+
},
271+
{
272+
"name": "advanced",
273+
"label": "Advanced",
274+
"description": "**Demo Purposes Only** <br /> Specify additional configuration settings that are required as part of the deployment process. These settings would typically be hidden from the user and hardcoded in an actual managed app.",
275+
"subLabel": {
276+
"preValidation": "Configure advanced settings",
277+
"postValidation": "Complete"
278+
},
279+
"elements": [
280+
{
281+
"name": "storageSettings",
282+
"type": "Microsoft.Common.Section",
283+
"label": "Storage",
284+
"elements": [
285+
{
286+
"name": "announcement",
287+
"type": "Microsoft.Common.TextBlock",
288+
"visible": true,
289+
"options": {
290+
"text": "Temporary access to a public storage account container is required for deployment."
291+
}
292+
},
293+
{
294+
"name": "accountName",
295+
"type": "Microsoft.Common.TextBox",
296+
"label": "Account Name",
297+
"toolTip": "Provide the name of an existing storage account with public access.",
298+
"constraints": {
299+
"required": true,
300+
"regex": "^(?!\\s*$).+",
301+
"validationMessage": "Must provide a valid storage account name."
302+
}
303+
},
304+
{
305+
"name": "accountKey",
306+
"type": "Microsoft.Common.TextBox",
307+
"label": "Account Key or SAS Token",
308+
"toolTip": "Provide a valid key or SAS token associated with the storage account.",
309+
"constraints": {
310+
"required": true,
311+
"regex": "^(?!\\s*$).+",
312+
"validationMessage": "Must provide a valid key or SAS token."
313+
}
314+
}
315+
]
316+
},
317+
{
318+
"name": "containerRegistrySettings",
319+
"type": "Microsoft.Common.Section",
320+
"label": "Container Registry",
321+
"elements": [
322+
{
323+
"name": "announcement",
324+
"type": "Microsoft.Common.TextBlock",
325+
"visible": true,
326+
"options": {
327+
"text": "Access to a container registry that contains the graphrag docker image is required for deployment."
328+
}
329+
},
330+
{
331+
"name": "endpoint",
332+
"type": "Microsoft.Common.TextBox",
333+
"label": "Registry Endpoint",
334+
"toolTip": "Provide the complete endpoint of an existing container registry that contains the graphrag docker image.",
335+
"constraints": {
336+
"required": true,
337+
"regex": "^[a-zA-Z0-9]+\\.azurecr\\.io$",
338+
"validationMessage": "Must provide a valid container registry name of the form <registry_name>.azurecr.io."
339+
}
340+
},
341+
{
342+
"name": "imageName",
343+
"type": "Microsoft.Common.TextBox",
344+
"label": "Docker Image Name",
345+
"toolTip": "Provide the name of the graphrag docker image to use.",
346+
"constraints": {
347+
"required": true,
348+
"regex": "^(?!\\s*$).+",
349+
"validationMessage": "Must provide a valid docker image name."
350+
}
351+
},
352+
{
353+
"name": "imageVersion",
354+
"type": "Microsoft.Common.TextBox",
355+
"label": "Docker Image Version",
356+
"toolTip": "Provide the version tag of the graphrag docker image to use.",
357+
"constraints": {
358+
"required": true,
359+
"regex": "^(?!\\s*$).+",
360+
"validationMessage": "Must provide a valid docker image version tag."
361+
}
362+
}
363+
]
364+
}
365+
]
269366
}
270367
],
271368
"outputs": {
272-
"resourceGroup": "[resourceGroup().name]",
273369
"location": "[location()]",
370+
"apiPublisherName": "[steps('apiSettings').apimPublisherName]",
371+
"apiPublisherEmail": "[steps('apiSettings').apimPublisherEmail]",
372+
"enablePrivateEndpoints": "[steps('networking').enablePrivateEndpoints]",
274373
"apimTier": "[steps('apiSettings').apimTier]",
275374
"llmModelName": "[steps('aoaiSettings').llmModel]",
375+
"llmModelDeploymentName": "[steps('aoaiSettings').llmModel]",
376+
"llmModelVersion": "[steps('aoaiSettings').llmModelVersion]",
276377
"llmModelQuota": "[int(steps('aoaiSettings').llmModelQuota)]",
277378
"embeddingModelName": "[steps('aoaiSettings').embeddingModel]",
278-
"embeddingModelQuota": "[int(steps('aoaiSettings').embeddingModelQuota)]",
279-
"llmModelVersion": "[steps('aoaiSettings').llmModelVersion]",
379+
"embeddingModelDeploymentName": "[steps('aoaiSettings').embeddingModel]",
280380
"embeddingModelVersion": "[steps('aoaiSettings').embeddingModelVersion]",
281-
"publicStorageAccountName": "[steps('StorageaccountSettings').StorageAccountName]",
282-
"publicStorageAccountKey": "[steps('StorageaccountSettings').StorageAccountKey]""embeddingModelVersion": "[steps('aoaiSettings').embeddingModelVersion]",
283-
"enablePrivateEndpoints": "[steps('networking').enablePrivateEndpoints]",
284-
"aksNamespace": "[steps('kubernetes').namespace]"
381+
"embeddingModelQuota": "[int(steps('aoaiSettings').embeddingModelQuota)]",
382+
"publicStorageAccountName": "[steps('advanced').storageSettings.accountName]",
383+
"publicStorageAccountKey": "[steps('advanced').storageSettings.accountKey]",
384+
"existingAcrLoginServer": "[steps('advanced').containerRegistrySettings.endpoint]",
385+
"graphragImageName": "[steps('advanced').containerRegistrySettings.imageName]",
386+
"graphragImageVersion": "[steps('advanced').containerRegistrySettings.imageVersion]"
285387
}
286388
}
287389
}

0 commit comments

Comments
 (0)