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.

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

feat(Templates): Restructure to Reflect Custom Templates Restructuring #6730

Merged
merged 25 commits into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fdf294e
added TemplateManifest and WorkflowManifest
Elaina-Lee Mar 4, 2025
612161c
first batch of restructure
Elaina-Lee Mar 5, 2025
de8d204
updated the script
Elaina-Lee Mar 5, 2025
77d7006
fixed logic for checking multi workflow
Elaina-Lee Mar 5, 2025
be3a107
improvements
Elaina-Lee Mar 5, 2025
d845caf
fixed operation id not being picked up for builtin problem
Elaina-Lee Mar 5, 2025
cbf5d35
fixed built in info not kicking in
Elaina-Lee Mar 5, 2025
b664f3a
removed builtin operation logic
Elaina-Lee Mar 5, 2025
4a20172
fixed mock data
Elaina-Lee Mar 5, 2025
25c9a7d
removed unused function
Elaina-Lee Mar 6, 2025
77c3373
fixed createWorkflowPanel test
Elaina-Lee Mar 6, 2025
22d528c
fixed template panel tests
Elaina-Lee Mar 6, 2025
60acdfa
fixed template tests
Elaina-Lee Mar 6, 2025
2612012
removed download image
Elaina-Lee Mar 6, 2025
39e51b8
combined get manifest calls to one
Elaina-Lee Mar 6, 2025
e98a4da
fixed filter undefined isuse
Elaina-Lee Mar 6, 2025
d144153
reflected comments
Elaina-Lee Mar 6, 2025
1fb18b4
removed custom connection & brought back empty trigger row
Elaina-Lee Mar 7, 2025
ff8cdcd
fixed overwriting for viewTemplate
Elaina-Lee Mar 7, 2025
6c022cf
removed builtin from connectorRuntimeType
Elaina-Lee Mar 7, 2025
a4645cc
fixed Connection to FeaturedConnector for displaying connector
Elaina-Lee Mar 7, 2025
3579960
fixed viewTemplate test
Elaina-Lee Mar 8, 2025
c1d36d8
Fixing failing test case (#6745)
preetriti1 Mar 8, 2025
ecdbf29
Merge branch 'main' into elaina/restructureTemplates
Mar 8, 2025
b11b9c5
Cloning the manifest data before storing it in store to allow modific…
Mar 8, 2025
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
23 changes: 23 additions & 0 deletions __mocks__/templates/BasicWorkflowOnly/default/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"id": "default",
"title": "[Mock] Basic Workflow Only Template",
"summary": "This is a simple workflow only template description",
"description": "This is a basic workflow only template details description \n- point 1 \n- point 2.",
"kinds": [
"stateful",
"stateless"
],
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/BasicWorkflowOnly/workflow-light.png",
"dark": "/templates/BasicWorkflowOnly/workflow-dark.png"
},
"parameters": [],
"connections": {},
"sourceCodeUrl": "/sourceCode"
}
68 changes: 29 additions & 39 deletions __mocks__/templates/BasicWorkflowOnly/manifest.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,31 @@
{
"title": "[Mock] Basic Workflow Only Template",
"description": "This is a simple workflow only template description",
"tags": [
"Basic Workflow Only",
"try catch"
],
"skus": [
"consumption",
"standard"
],
"kinds": [
"stateful",
"stateless"
],
"detailsDescription": "This is a basic workflow only template details description \n- point 1 \n- point 2.",
"details": {
"By": "Microsoft",
"Type": "Workflow",
"Trigger": "Request",
"Category": "Mock"
},
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/BasicWorkflowOnly/workflow-light.png",
"dark": "/templates/BasicWorkflowOnly/workflow-dark.png"
},
"parameters": [],
"connections": {},
"featuredOperations": [
{
"type": "Scope"
}
],
"sourceCodeUrl": "/sourceCode"
"id": "BasicWorkflowOnly",
"title": "[Mock] Basic Workflow Only Template",
"summary": "This is a simple workflow only template description",
"skus": [
"consumption",
"standard"
],
"workflows": {
"default": {
"name": "BasicWorkflowOnly"
}
},
"featuredConnectors": [
{
"id": "connectionProviders/control",
"kind": "builtin"
}
],
"details": {
"By": "Microsoft",
"Type": "Workflow",
"Trigger": "Request",
"Category": "Mock"
},
"tags": [
"Basic Workflow Only",
"try catch"
],
"sourceCodeUrl": "/sourceCode"
}
96 changes: 44 additions & 52 deletions __mocks__/templates/SimpleAccelerator/Workflow1/manifest.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,48 @@
{
"title": "Workflow 1",
"description": "Workflow 1 description",
"prerequisites": "Workflow 1 prerequisites",
"skus": [
"standard"
],
"kinds": [
"stateful",
"stateless"
],
"detailsDescription": "Workflow 1 details description \n- point 1 \n- point 2.",
"details": {
"By": "Microsoft",
"Type": "Workflow",
"Trigger": "Request",
"Category": "AI,RAG"
},
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/SimpleAccelerator/Workflow1/workflow-light.png",
"dark": "/templates/SimpleAccelerator/Workflow1/workflow-dark.png"
},
"parameters": [
{
"name": "OpenAIEmbeddingModel_#workflowname#",
"displayName": "Azure OpenAI text embedding deployment model name",
"type": "String",
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
"required": true
"id": "Workflow1",
"title": "Workflow 1",
"summary": "Workflow 1 description",
"description": "Workflow 1 details description \n- point 1 \n- point 2.",
"prerequisites": "Workflow 1 prerequisites",
"kinds": [
"stateful",
"stateless"
],
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/SimpleAccelerator/Workflow1/workflow-light.png",
"dark": "/templates/SimpleAccelerator/Workflow1/workflow-dark.png"
},
{
"name": "OpenAIChatModel_#workflowname#",
"displayName": "Azure OpenAI chat model name",
"type": "String",
"description": "Provide the Azure OpenAI chat model name to use for chat completions.",
"required": true
}
],
"connections": {
"azuresql_#workflowname#": {
"connectorId": "/serviceProviders/sql",
"kind": "inapp"
"parameters": [
{
"name": "OpenAIEmbeddingModel_#workflowname#",
"displayName": "Azure OpenAI text embedding deployment model name",
"type": "String",
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
"required": true
},
{
"name": "OpenAIChatModel_#workflowname#",
"displayName": "Azure OpenAI chat model name",
"type": "String",
"description": "Provide the Azure OpenAI chat model name to use for chat completions.",
"required": true
}
],
"connections": {
"azuresql_#workflowname#": {
"connectorId": "/serviceProviders/sql",
"kind": "inapp"
},
"openai_#workflowname#": {
"connectorId": "/serviceProviders/openai",
"kind": "inapp"
}
},
"openai_#workflowname#": {
"connectorId": "/serviceProviders/openai",
"kind": "inapp"
}
},
"sourceCodeUrl": "/sourceCodeUrl"
"sourceCodeUrl": "/sourceCode"
}
109 changes: 48 additions & 61 deletions __mocks__/templates/SimpleAccelerator/Workflow2/manifest.json
Original file line number Diff line number Diff line change
@@ -1,65 +1,52 @@
{
"title": "Workflow 2",
"description": "Workflow 2 description",
"prerequisites": "Workflow 2 prerequisites",
"skus": [
"standard"
],
"kinds": [
"stateful",
"stateless"
],
"detailsDescription": "Workflow 2 details description \n- point 1 \n- point 2.",
"details": {
"By": "Microsoft",
"Type": "Workflow",
"Trigger": "Request",
"Category": "AI,RAG"
},
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/SimpleAccelerator/Workflow2/workflow-light.png",
"dark": "/templates/SimpleAccelerator/Workflow2/workflow-dark.png"
},
"parameters": [
{
"name": "OpenAIEmbeddingModel_#workflowname#",
"displayName": "Azure OpenAI text embedding deployment model name",
"type": "String",
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
"required": true
"id": "Workflow2",
"title": "Workflow 2",
"summary": "Workflow 2 description",
"description": "Workflow 2 details description \n- point 1 \n- point 2.",
"prerequisites": "Workflow 2 prerequisites",
"kinds": [
"stateful",
"stateless"
],
"artifacts": [
{
"type": "workflow",
"file": "workflow.json"
}
],
"images": {
"light": "/templates/SimpleAccelerator/Workflow2/workflow-light.png",
"dark": "/templates/SimpleAccelerator/Workflow2/workflow-dark.png"
},
{
"name": "BlobPath_#workflowname#",
"displayName": "Blob Path",
"type": "String",
"description": "Provide the Azure Blob container name from where to get your document.",
"required": true
}
],
"connections": {
"azuresql_#workflowname#": {
"connectorId": "/serviceProviders/sql",
"kind": "inapp"
"parameters": [
{
"name": "OpenAIEmbeddingModel_#workflowname#",
"displayName": "Azure OpenAI text embedding deployment model name",
"type": "String",
"description": "Provide the Azure OpenAI embedding model to generate vector embeddings.",
"required": true
},
{
"name": "BlobPath_#workflowname#",
"displayName": "Blob Path",
"type": "String",
"description": "Provide the Azure Blob container name from where to get your document.",
"required": true
}
],
"connections": {
"azuresql_#workflowname#": {
"connectorId": "/serviceProviders/sql",
"kind": "inapp"
},
"openai_#workflowname#": {
"connectorId": "/serviceProviders/openai",
"kind": "inapp"
},
"azureblob_#workflowname#": {
"connectorId": "/serviceProviders/AzureBlob",
"kind": "inapp"
}
},
"openai_#workflowname#": {
"connectorId": "/serviceProviders/openai",
"kind": "inapp"
},
"azureblob_#workflowname#": {
"connectorId": "/serviceProviders/AzureBlob",
"kind": "inapp"
}
},
"featuredOperations": [
{
"type": "ChunkText"
}
],
"sourceCodeUrl": "/sourceCodeUrl"
"sourceCodeUrl": "/sourceCode"
}
76 changes: 37 additions & 39 deletions __mocks__/templates/SimpleAccelerator/manifest.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
{
"title": "[Mock] Simple Accelerator Template",
"description": "This is a simple accelerator description",
"skus": [
"standard"
],
"detailsDescription": "This is a simple accelerator details description \n- point 1 \n- point 2.",
"details": {
"By": "Microsoft",
"Type": "Accelerator",
"Category": "Mock"
},
"artifacts": [],
"workflows": {
"Workflow1": {
"name": "Workflow1_name"
"id": "SimpleAccelerator",
"title": "[Mock] Simple Accelerator Template",
"summary": "This is a simple accelerator description",
"description": "This is a simple accelerator details description \n- point 1 \n- point 2.",
"skus": [
"standard"
],
"workflows": {
"Workflow1": {
"name": "Workflow1_name"
},
"Workflow2": {
"name": "Workflow2_name"
}
},
"Workflow2": {
"name": "Workflow2_name"
}
},
"parameters": [],
"connections": {
"azuresql_#workflowname#": {
"connectorId": "/serviceProviders/sql",
"kind": "inapp"
"featuredConnectors": [
{
"id": "connectionProviders/dataOperationNew",
"kind": "builtin"
},
{
"id": "/serviceProviders/sql",
"kind": "inapp"
},
{
"id": "/serviceProviders/openai",
"kind": "inapp"
},
{
"id": "/serviceProviders/AzureBlob",
"kind": "inapp"
}
],
"details": {
"By": "Microsoft",
"Type": "Accelerator",
"Category": "Mock"
},
"openai_#workflowname#": {
"connectorId": "/serviceProviders/openai",
"kind": "inapp"
},
"azureblob_#workflowname#": {
"connectorId": "/serviceProviders/AzureBlob",
"kind": "inapp"
}
},
"featuredOperations": [
{
"type": "ChunkText"
}
],
"sourceCodeUrl": "/sourceCodeUrl"
"sourceCodeUrl": "/sourceCode"
}
Loading
Loading