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.

Sign up for GitHub

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

Fix Account Key Type and CogServices SKU Location #29025

Merged
merged 5 commits into from
Jun 11, 2024
Merged

Fix Account Key Type and CogServices SKU Location #29025

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1845433
Account Key Type
matferrari-msft May 7, 2024
d5778e9
Account key Preview Spec
matferrari-msft May 7, 2024
6ee8df9
"Sku Updates"
matferrari-msft May 7, 2024
365a992
Remove Endpoint Type from Schema
matferrari-msft May 8, 2024
251540a
Add x-ms-secret to account key property
matferrari-msft Jun 9, 2024
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
2 changes: 0 additions & 2 deletions ...chineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"api-version": "2024-04-01-preview",
"body": {
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand All @@ -31,7 +30,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
1 change: 0 additions & 1 deletion ....MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
1 change: 0 additions & 1 deletion ...rningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
1 change: 0 additions & 1 deletion ...rningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
3 changes: 0 additions & 3 deletions ...ingServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"api-version": "2024-04-01-preview",
"body": {
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand All @@ -31,7 +30,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand All @@ -56,7 +54,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
1 change: 0 additions & 1 deletion ...arningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
1 change: 0 additions & 1 deletion ...ningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"name": "text-davinci-003",
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
"properties": {
"type": "Azure.OpenAI",
"model": {
"format": "OpenAI",
"name": "text-davinci-003",
Expand Down
82 changes: 18 additions & 64 deletions ...rce-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3756,7 +3756,7 @@
],
"properties": {
"credentials": {
"$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
"$ref": "#/definitions/WorkspaceConnectionAccountKey"
}
},
"x-ms-discriminator-value": "AccountKey"
Expand Down Expand Up @@ -3928,9 +3928,6 @@
"type": "string",
"description": "The name of RAI policy."
},
"sku": {
"$ref": "#/definitions/CognitiveServicesSku"
},
"versionUpgradeOption": {
"description": "Deployment model version upgrade option.",
"type": "string",
Expand Down Expand Up @@ -4125,18 +4122,6 @@
"modelAsString": true
}
},
"ContentSafetyEndpointDeploymentResourceProperties": {
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
},
{
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
}
],
"x-ms-discriminator-value": "Azure.ContentSafety"
},
"ContentSafetyEndpointResourceProperties": {
"type": "object",
"allOf": [
Expand Down Expand Up @@ -4518,27 +4503,18 @@
}
},
"EndpointDeploymentResourceProperties": {
"required": [
"type"
],
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
}
],
"properties": {
"failureReason": {
"description": "The failure reason if the creation failed.",
"type": "string"
},
"provisioningState": {
"description": "Read-only provision state status property.",
"$ref": "#/definitions/DefaultResourceProvisioningState"
},
"type": {
"description": "Kind of the deployment.",
"minLength": 1,
"pattern": "[a-zA-Z0-9._]",
"type": "string"
}
},
"discriminator": "type"
}
},
"EndpointDeploymentResourcePropertiesBasicResource": {
"required": [
Expand All @@ -4553,6 +4529,9 @@
"properties": {
"properties": {
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
},
"sku": {
"$ref": "#/definitions/CognitiveServicesSku"
}
}
},
Expand Down Expand Up @@ -4975,15 +4954,6 @@
"modelAsString": true
}
},
"ManagedOnlineEndpointDeploymentResourceProperties": {
"type": "object",
"allOf": [
{
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
}
],
"x-ms-discriminator-value": "managedOnlineEndpoint"
},
"ManagedOnlineEndpointResourceProperties": {
"type": "object",
"allOf": [
Expand Down Expand Up @@ -5164,18 +5134,6 @@
},
"x-ms-discriminator-value": "OAuth2"
},
"OpenAIEndpointDeploymentResourceProperties": {
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
},
{
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
}
],
"x-ms-discriminator-value": "Azure.OpenAI"
},
"OpenAIEndpointResourceProperties": {
"type": "object",
"allOf": [
Expand Down Expand Up @@ -5992,18 +5950,6 @@
}
}
},
"SpeechEndpointDeploymentResourceProperties": {
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
},
{
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
}
],
"x-ms-discriminator-value": "Azure.Speech"
},
"SpeechEndpointResourceProperties": {
"type": "object",
"allOf": [
Expand Down Expand Up @@ -6279,6 +6225,14 @@
}
}
},
"WorkspaceConnectionAccountKey": {
"type": "object",
"properties": {
"key": {
"type": "string"
matferrari-msft marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
"WorkspaceConnectionUpdateParameter": {
"description": "The properties that the machine learning workspace connection will be updated with.",
"type": "object",
Expand Down
11 changes: 10 additions & 1 deletion ...-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6692,6 +6692,15 @@
},
"additionalProperties": false
},
"WorkspaceConnectionAccountKey": {
"type": "object",
"properties": {
"key": {
"type": "string"
}
},
"additionalProperties": false
},
"SASAuthTypeWorkspaceConnectionProperties": {
"type": "object",
"allOf": [
Expand Down Expand Up @@ -7103,7 +7112,7 @@
],
"properties": {
"credentials": {
"$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
"$ref": "#/definitions/WorkspaceConnectionAccountKey"
}
},
"x-ms-discriminator-value": "AccountKey"
Expand Down