Skip to content

Commit 971bdb4

Browse files
Elaina-LeeElaina-Lee
authored
feat(Templates): Restructure to Reflect Custom Templates Restructuring (#6730)
* added TemplateManifest and WorkflowManifest * first batch of restructure * updated the script * fixed logic for checking multi workflow * improvements * fixed operation id not being picked up for builtin problem * fixed built in info not kicking in * removed builtin operation logic * fixed mock data * removed unused function * fixed createWorkflowPanel test * fixed template panel tests * fixed template tests * removed download image * combined get manifest calls to one * fixed filter undefined isuse * reflected comments * removed custom connection & brought back empty trigger row * fixed overwriting for viewTemplate * removed builtin from connectorRuntimeType * fixed Connection to FeaturedConnector for displaying connector
1 parent 79b02a1 commit 971bdb4

File tree

40 files changed

+863
-751
lines changed

40 files changed

+863
-751
lines changed

‎__mocks__/templates/BasicWorkflowOnly/default/manifest.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"id": "default",
3+
"title": "[Mock] Basic Workflow Only Template",
4+
"summary": "This is a simple workflow only template description",
5+
"description": "This is a basic workflow only template details description \n- point 1 \n- point 2.",
6+
"kinds": [
7+
"stateful",
8+
"stateless"
9+
],
10+
"artifacts": [
11+
{
12+
"type": "workflow",
13+
"file": "workflow.json"
14+
}
15+
],
16+
"images": {
17+
"light": "/templates/BasicWorkflowOnly/workflow-light.png",
18+
"dark": "/templates/BasicWorkflowOnly/workflow-dark.png"
19+
},
20+
"parameters": [],
21+
"connections": {},
22+
"sourceCodeUrl": "/sourceCode"
23+
}

‎__mocks__/templates/BasicWorkflowOnly/workflow.json ‎__mocks__/templates/BasicWorkflowOnly/default/workflow.json

File renamed without changes.

‎__mocks__/templates/BasicWorkflowOnly/manifest.json

+29-39
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,31 @@
11
{
2-
"title": "[Mock] Basic Workflow Only Template",
3-
"description": "This is a simple workflow only template description",
4-
"tags": [
5-
"Basic Workflow Only",
6-
"try catch"
7-
],
8-
"skus": [
9-
"consumption",
10-
"standard"
11-
],
12-
"kinds": [
13-
"stateful",
14-
"stateless"
15-
],
16-
"detailsDescription": "This is a basic workflow only template details description \n- point 1 \n- point 2.",
17-
"details": {
18-
"By": "Microsoft",
19-
"Type": "Workflow",
20-
"Trigger": "Request",
21-
"Category": "Mock"
22-
},
23-
"artifacts": [
24-
{
25-
"type": "workflow",
26-
"file": "workflow.json"
27-
}
28-
],
29-
"images": {
30-
"light": "/templates/BasicWorkflowOnly/workflow-light.png",
31-
"dark": "/templates/BasicWorkflowOnly/workflow-dark.png"
32-
},
33-
"parameters": [],
34-
"connections": {},
35-
"featuredOperations": [
36-
{
37-
"type": "Scope"
38-
}
39-
],
40-
"sourceCodeUrl": "/sourceCode"
2+
"id": "BasicWorkflowOnly",
3+
"title": "[Mock] Basic Workflow Only Template",
4+
"summary": "This is a simple workflow only template description",
5+
"skus": [
6+
"consumption",
7+
"standard"
8+
],
9+
"workflows": {
10+
"default": {
11+
"name": "BasicWorkflowOnly"
12+
}
13+
},
14+
"featuredConnectors": [
15+
{
16+
"id": "connectionProviders/control",
17+
"kind": "builtin"
18+
}
19+
],
20+
"details": {
21+
"By": "Microsoft",
22+
"Type": "Workflow",
23+
"Trigger": "Request",
24+
"Category": "Mock"
25+
},
26+
"tags": [
27+
"Basic Workflow Only",
28+
"try catch"
29+
],
30+
"sourceCodeUrl": "/sourceCode"
4131
}

‎__mocks__/templates/SimpleAccelerator/Workflow1/manifest.json

+44-52
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,48 @@
11
{
2-
"title": "Workflow 1",
3-
"description": "Workflow 1 description",
4-
"prerequisites": "Workflow 1 prerequisites",
5-
"skus": [
6-
"standard"
7-
],
8-
"kinds": [
9-
"stateful",
10-
"stateless"
11-
],
12-
"detailsDescription": "Workflow 1 details description \n- point 1 \n- point 2.",
13-
"details": {
14-
"By": "Microsoft",
15-
"Type": "Workflow",
16-
"Trigger": "Request",
17-
"Category": "AI,RAG"
18-
},
19-
"artifacts": [
20-
{
21-
"type": "workflow",
22-
"file": "workflow.json"
23-
}
24-
],
25-
"images": {
26-
"light": "/templates/SimpleAccelerator/Workflow1/workflow-light.png",
27-
"dark": "/templates/SimpleAccelerator/Workflow1/workflow-dark.png"
28-
},
29-
"parameters": [
30-
{
31-
"name": "OpenAIEmbeddingModel_#workflowname#",
32-
"displayName": "Azure OpenAI text embedding deployment model name",
33-
"type": "String",
34-
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
35-
"required": true
2+
"id": "Workflow1",
3+
"title": "Workflow 1",
4+
"summary": "Workflow 1 description",
5+
"description": "Workflow 1 details description \n- point 1 \n- point 2.",
6+
"prerequisites": "Workflow 1 prerequisites",
7+
"kinds": [
8+
"stateful",
9+
"stateless"
10+
],
11+
"artifacts": [
12+
{
13+
"type": "workflow",
14+
"file": "workflow.json"
15+
}
16+
],
17+
"images": {
18+
"light": "/templates/SimpleAccelerator/Workflow1/workflow-light.png",
19+
"dark": "/templates/SimpleAccelerator/Workflow1/workflow-dark.png"
3620
},
37-
{
38-
"name": "OpenAIChatModel_#workflowname#",
39-
"displayName": "Azure OpenAI chat model name",
40-
"type": "String",
41-
"description": "Provide the Azure OpenAI chat model name to use for chat completions.",
42-
"required": true
43-
}
44-
],
45-
"connections": {
46-
"azuresql_#workflowname#": {
47-
"connectorId": "/serviceProviders/sql",
48-
"kind": "inapp"
21+
"parameters": [
22+
{
23+
"name": "OpenAIEmbeddingModel_#workflowname#",
24+
"displayName": "Azure OpenAI text embedding deployment model name",
25+
"type": "String",
26+
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
27+
"required": true
28+
},
29+
{
30+
"name": "OpenAIChatModel_#workflowname#",
31+
"displayName": "Azure OpenAI chat model name",
32+
"type": "String",
33+
"description": "Provide the Azure OpenAI chat model name to use for chat completions.",
34+
"required": true
35+
}
36+
],
37+
"connections": {
38+
"azuresql_#workflowname#": {
39+
"connectorId": "/serviceProviders/sql",
40+
"kind": "inapp"
41+
},
42+
"openai_#workflowname#": {
43+
"connectorId": "/serviceProviders/openai",
44+
"kind": "inapp"
45+
}
4946
},
50-
"openai_#workflowname#": {
51-
"connectorId": "/serviceProviders/openai",
52-
"kind": "inapp"
53-
}
54-
},
55-
"sourceCodeUrl": "/sourceCodeUrl"
47+
"sourceCodeUrl": "/sourceCode"
5648
}

‎__mocks__/templates/SimpleAccelerator/Workflow2/manifest.json

+48-61
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,52 @@
11
{
2-
"title": "Workflow 2",
3-
"description": "Workflow 2 description",
4-
"prerequisites": "Workflow 2 prerequisites",
5-
"skus": [
6-
"standard"
7-
],
8-
"kinds": [
9-
"stateful",
10-
"stateless"
11-
],
12-
"detailsDescription": "Workflow 2 details description \n- point 1 \n- point 2.",
13-
"details": {
14-
"By": "Microsoft",
15-
"Type": "Workflow",
16-
"Trigger": "Request",
17-
"Category": "AI,RAG"
18-
},
19-
"artifacts": [
20-
{
21-
"type": "workflow",
22-
"file": "workflow.json"
23-
}
24-
],
25-
"images": {
26-
"light": "/templates/SimpleAccelerator/Workflow2/workflow-light.png",
27-
"dark": "/templates/SimpleAccelerator/Workflow2/workflow-dark.png"
28-
},
29-
"parameters": [
30-
{
31-
"name": "OpenAIEmbeddingModel_#workflowname#",
32-
"displayName": "Azure OpenAI text embedding deployment model name",
33-
"type": "String",
34-
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
35-
"required": true
2+
"id": "Workflow2",
3+
"title": "Workflow 2",
4+
"summary": "Workflow 2 description",
5+
"description": "Workflow 2 details description \n- point 1 \n- point 2.",
6+
"prerequisites": "Workflow 2 prerequisites",
7+
"kinds": [
8+
"stateful",
9+
"stateless"
10+
],
11+
"artifacts": [
12+
{
13+
"type": "workflow",
14+
"file": "workflow.json"
15+
}
16+
],
17+
"images": {
18+
"light": "/templates/SimpleAccelerator/Workflow2/workflow-light.png",
19+
"dark": "/templates/SimpleAccelerator/Workflow2/workflow-dark.png"
3620
},
37-
{
38-
"name": "BlobPath_#workflowname#",
39-
"displayName": "Blob Path",
40-
"type": "String",
41-
"description": "Provide the Azure Blob container name from where to get your document.",
42-
"required": true
43-
}
44-
],
45-
"connections": {
46-
"azuresql_#workflowname#": {
47-
"connectorId": "/serviceProviders/sql",
48-
"kind": "inapp"
21+
"parameters": [
22+
{
23+
"name": "OpenAIEmbeddingModel_#workflowname#",
24+
"displayName": "Azure OpenAI text embedding deployment model name",
25+
"type": "String",
26+
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
27+
"required": true
28+
},
29+
{
30+
"name": "BlobPath_#workflowname#",
31+
"displayName": "Blob Path",
32+
"type": "String",
33+
"description": "Provide the Azure Blob container name from where to get your document.",
34+
"required": true
35+
}
36+
],
37+
"connections": {
38+
"azuresql_#workflowname#": {
39+
"connectorId": "/serviceProviders/sql",
40+
"kind": "inapp"
41+
},
42+
"openai_#workflowname#": {
43+
"connectorId": "/serviceProviders/openai",
44+
"kind": "inapp"
45+
},
46+
"azureblob_#workflowname#": {
47+
"connectorId": "/serviceProviders/AzureBlob",
48+
"kind": "inapp"
49+
}
4950
},
50-
"openai_#workflowname#": {
51-
"connectorId": "/serviceProviders/openai",
52-
"kind": "inapp"
53-
},
54-
"azureblob_#workflowname#": {
55-
"connectorId": "/serviceProviders/AzureBlob",
56-
"kind": "inapp"
57-
}
58-
},
59-
"featuredOperations": [
60-
{
61-
"type": "ChunkText"
62-
}
63-
],
64-
"sourceCodeUrl": "/sourceCodeUrl"
51+
"sourceCodeUrl": "/sourceCode"
6552
}

‎__mocks__/templates/SimpleAccelerator/manifest.json

+37-39
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
{
2-
"title": "[Mock] Simple Accelerator Template",
3-
"description": "This is a simple accelerator description",
4-
"skus": [
5-
"standard"
6-
],
7-
"detailsDescription": "This is a simple accelerator details description \n- point 1 \n- point 2.",
8-
"details": {
9-
"By": "Microsoft",
10-
"Type": "Accelerator",
11-
"Category": "Mock"
12-
},
13-
"artifacts": [],
14-
"workflows": {
15-
"Workflow1": {
16-
"name": "Workflow1_name"
2+
"id": "SimpleAccelerator",
3+
"title": "[Mock] Simple Accelerator Template",
4+
"summary": "This is a simple accelerator description",
5+
"description": "This is a simple accelerator details description \n- point 1 \n- point 2.",
6+
"skus": [
7+
"standard"
8+
],
9+
"workflows": {
10+
"Workflow1": {
11+
"name": "Workflow1_name"
12+
},
13+
"Workflow2": {
14+
"name": "Workflow2_name"
15+
}
1716
},
18-
"Workflow2": {
19-
"name": "Workflow2_name"
20-
}
21-
},
22-
"parameters": [],
23-
"connections": {
24-
"azuresql_#workflowname#": {
25-
"connectorId": "/serviceProviders/sql",
26-
"kind": "inapp"
17+
"featuredConnectors": [
18+
{
19+
"id": "connectionProviders/dataOperationNew",
20+
"kind": "builtin"
21+
},
22+
{
23+
"id": "/serviceProviders/sql",
24+
"kind": "inapp"
25+
},
26+
{
27+
"id": "/serviceProviders/openai",
28+
"kind": "inapp"
29+
},
30+
{
31+
"id": "/serviceProviders/AzureBlob",
32+
"kind": "inapp"
33+
}
34+
],
35+
"details": {
36+
"By": "Microsoft",
37+
"Type": "Accelerator",
38+
"Category": "Mock"
2739
},
28-
"openai_#workflowname#": {
29-
"connectorId": "/serviceProviders/openai",
30-
"kind": "inapp"
31-
},
32-
"azureblob_#workflowname#": {
33-
"connectorId": "/serviceProviders/AzureBlob",
34-
"kind": "inapp"
35-
}
36-
},
37-
"featuredOperations": [
38-
{
39-
"type": "ChunkText"
40-
}
41-
],
42-
"sourceCodeUrl": "/sourceCodeUrl"
40+
"sourceCodeUrl": "/sourceCode"
4341
}

0 commit comments

Comments
 (0)