Skip to content

Commit

Permalink
fix misalignment with service behavior around enum handling (Azure#30060
Browse files Browse the repository at this point in the history 
)

* notRunning

* AzureAISearch

* target

* Dataset

* completion action

* fix examples

* r

* y7aml example

* go

* convert

---------

Co-authored-by: Yuantao Wang <[email protected]>
  • Loading branch information
@wangyuantao
wangyuantao and Yuantao Wang authored Aug 9, 2024
1 parent e1d622f commit 956bf8c
Show file tree
Hide file tree
Showing 13 changed files with 1,397 additions and 1,236 deletions.
122 changes: 61 additions & 61 deletions ...tiveservices/data-plane/AzureOpenAI/authoring/preview/2024-05-01-preview/azureopenai.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1852,10 +1852,10 @@
"title": "OperationState",
"description": "The state of a job or item.",
"enum": [
"NotRunning",
"Running",
"Succeeded",
"Failed"
"notRunning",
"running",
"succeeded",
"failed"
],
"type": "string",
"readOnly": true,
Expand All @@ -1864,19 +1864,19 @@
"modelAsString": true,
"values": [
{
"value": "NotRunning",
"value": "notRunning",
"description": "The operation is not yet queued to be processed in the future."
},
{
"value": "Running",
"value": "running",
"description": "The operation has started to be processed."
},
{
"value": "Succeeded",
"value": "succeeded",
"description": "The operation has successfully be processed and is ready for consumption."
},
{
"value": "Failed",
"value": "failed",
"description": "The operation has completed processing with a failure and cannot be further consumed."
}
]
Expand Down Expand Up @@ -2077,21 +2077,21 @@
"type": "string",
"description": "The compute type.",
"enum": [
"serverless",
"custom"
"ServerlessCompute",
"CustomCompute"
],
"x-ms-enum": {
"name": "ComputeType",
"modelAsString": true,
"values": [
{
"name": "ServerlessCompute",
"value": "serverless",
"value": "ServerlessCompute",
"description": "Serverless user compute."
},
{
"name": "CustomCompute",
"value": "custom",
"value": "CustomCompute",
"description": "Custom user compute."
}
]
Expand All @@ -2117,7 +2117,7 @@
}
}
],
"x-ms-discriminator-value": "serverless"
"x-ms-discriminator-value": "ServerlessCompute"
},
"CustomCompute": {
"description": "Custom compute.",
Expand All @@ -2138,7 +2138,7 @@
}
}
],
"x-ms-discriminator-value": "custom"
"x-ms-discriminator-value": "CustomCompute"
},
"TargetIndex": {
"title": "TargetIndex",
Expand All @@ -2158,34 +2158,34 @@
"type": "string",
"description": "The target type.",
"enum": [
"acs",
"cosmosdb",
"pinecone"
"AzureAISearch",
"CosmosDB",
"Pinecone"
],
"x-ms-enum": {
"name": "TargetType",
"modelAsString": true,
"values": [
{
"name": "AzureSearch",
"value": "acs",
"name": "AzureAISearch",
"value": "AzureAISearch",
"description": "Azure AI Search Index."
},
{
"name": "CosmosDB",
"value": "cosmosdb",
"value": "CosmosDB",
"description": "CosmosDB Index."
},
{
"name": "Pinecone",
"value": "pinecone",
"value": "Pinecone",
"description": "Pinecone Index."
}
]
}
},
"ACSIndex": {
"description": "ACS Index.",
"AzureAISearchIndex": {
"description": "Azure AI Search Index.",
"required": [
"connectionId"
],
Expand All @@ -2198,12 +2198,12 @@
"properties": {
"connectionId": {
"type": "string",
"description": "The id of the connection pointing to the ACS Index."
"description": "The id of the connection pointing to the Azure AI Search Index."
}
}
}
],
"x-ms-discriminator-value": "acs"
"x-ms-discriminator-value": "AzureAISearch"
},
"CosmosDBIndex": {
"description": "CosmosDB Index.",
Expand Down Expand Up @@ -2232,7 +2232,7 @@
}
}
],
"x-ms-discriminator-value": "cosmosdb"
"x-ms-discriminator-value": "CosmosDB"
},
"PineconeIndex": {
"description": "Pinecone Index.",
Expand All @@ -2253,7 +2253,7 @@
}
}
],
"x-ms-discriminator-value": "pinecone"
"x-ms-discriminator-value": "Pinecone"
},
"UserComputeDatasource": {
"title": "UserComputeDatasource",
Expand All @@ -2272,21 +2272,21 @@
"type": "string",
"description": "The datasource type.",
"enum": [
"dataset",
"urls"
"Dataset",
"Urls"
],
"x-ms-enum": {
"name": "UserComputeDatasourceType",
"modelAsString": true,
"values": [
{
"name": "Dataset",
"value": "dataset",
"value": "Dataset",
"description": "Workspace Dataset."
},
{
"name": "Urls",
"value": "urls",
"value": "Urls",
"description": "URLs."
}
]
Expand All @@ -2300,7 +2300,7 @@
"datasetId",
"datasetType"
],
"x-ms-discriminator-value": "dataset",
"x-ms-discriminator-value": "Dataset",
"allOf": [
{
"$ref": "#/definitions/UserComputeDatasource"
Expand Down Expand Up @@ -2335,7 +2335,7 @@
"urls",
"embeddings"
],
"x-ms-discriminator-value": "urls",
"x-ms-discriminator-value": "Urls",
"allOf": [
{
"$ref": "#/definitions/UserComputeDatasource"
Expand Down Expand Up @@ -2382,21 +2382,21 @@
"type": "string",
"description": "The datasource type.",
"enum": [
"storage",
"urls"
"Storage",
"Urls"
],
"x-ms-enum": {
"name": "SystemComputeDatasourceType",
"modelAsString": true,
"values": [
{
"name": "Storage",
"value": "storage",
"value": "Storage",
"description": "Azure Storage Account."
},
{
"name": "Urls",
"value": "urls",
"value": "Urls",
"description": "URLs."
}
]
Expand All @@ -2410,7 +2410,7 @@
"containerName",
"embeddings"
],
"x-ms-discriminator-value": "storage",
"x-ms-discriminator-value": "Storage",
"allOf": [
{
"$ref": "#/definitions/SystemComputeDatasource"
Expand Down Expand Up @@ -2447,7 +2447,7 @@
"containerName",
"embeddings"
],
"x-ms-discriminator-value": "urls",
"x-ms-discriminator-value": "Urls",
"allOf": [
{
"$ref": "#/definitions/SystemComputeDatasource"
Expand Down Expand Up @@ -2569,39 +2569,39 @@
"type": "string",
"description": "The connection type.",
"enum": [
"endpointKey",
"connectionString",
"endpointMI",
"workspace",
"relativeConnection"
"EndpointWithKey",
"ConnectionString",
"EndpointWithManagedIdentity",
"WorkspaceConnection",
"RelativeConnection"
],
"x-ms-enum": {
"name": "ConnectionType",
"modelAsString": true,
"values": [
{
"name": "EndpointKey",
"value": "endpointKey",
"name": "EndpointWithKey",
"value": "EndpointWithKey",
"description": "Endpoint and key connection."
},
{
"name": "ConnectionString",
"value": "connectionString",
"value": "ConnectionString",
"description": "Connection string."
},
{
"name": "EndpointManagedIdentity",
"value": "endpointMI",
"name": "EndpointWithManagedIdentity",
"value": "EndpointWithManagedIdentity",
"description": "Endpoint and managed identity."
},
{
"name": "AMLWorkspace",
"value": "workspace",
"name": "WorkspaceConnection",
"value": "WorkspaceConnection",
"description": "AML Workspace connection."
},
{
"name": "RelativeDeployment",
"value": "relativeDeployment",
"name": "RelativeConnection",
"value": "RelativeConnection",
"description": "Relative deployment"
}
]
Expand Down Expand Up @@ -2631,7 +2631,7 @@
}
}
],
"x-ms-discriminator-value": "endpointKey"
"x-ms-discriminator-value": "EndpointWithKey"
},
"ConnectionStringConnection": {
"description": "Connection string connection.",
Expand All @@ -2652,7 +2652,7 @@
}
}
],
"x-ms-discriminator-value": "connectionString"
"x-ms-discriminator-value": "ConnectionString"
},
"EndpointMIConnection": {
"description": "Endpoint Managed Identity connection.",
Expand All @@ -2677,7 +2677,7 @@
}
}
],
"x-ms-discriminator-value": "endpointMI"
"x-ms-discriminator-value": "EndpointWithManagedIdentity"
},
"WorkspaceConnection": {
"description": "AML Workspace connection.",
Expand All @@ -2698,7 +2698,7 @@
}
}
],
"x-ms-discriminator-value": "workspace"
"x-ms-discriminator-value": "WorkspaceConnection"
},
"DeploymentConnection": {
"description": "Relative deployment connection.",
Expand All @@ -2707,13 +2707,13 @@
"$ref": "#/definitions/BaseConnection"
}
],
"x-ms-discriminator-value": "relativeConnection"
"x-ms-discriminator-value": "RelativeConnection"
},
"CompletionAction": {
"type": "string",
"description": "The completion action.",
"enum": [
"cleanUpAssets",
"cleanUpTempAssets",
"keepAllAssets"
],
"x-ms-enum": {
Expand All @@ -2726,8 +2726,8 @@
"description": "Will not clean up any of the intermediate assets created during the ingestion process."
},
{
"name": "cleanUpAssets",
"value": "cleanUpAssets",
"name": "cleanUpTempAssets",
"value": "cleanUpTempAssets",
"description": "Will clean up intermediate assets created during the ingestion process."
}
]
Expand Down
Loading

0 comments on commit 956bf8c

Please sign in to comment.