Skip to content

Commit 29cdd2f

Browse files
ZhidaLiuragovadaritujhamsjingyizhu99danieljurek
authored
Merge release machinelearningservices microsoft.machine learning services 2025 01 01 preview (#32541)
* Copy files from preview/2024-10-01-preview Copied the files in a separate commit. This allows reviewers to easily diff subsequent changes against the previous spec. * Update version to preview/2025-01-01-preview Updated the API version from preview/2024-10-01-preview to preview/2025-01-01-preview. * Added tag for 2025-01-01-preview in readme file * Making updates to ActualCapacityInfo for Inference Group Status (#32002) * Add ActualCapacityInfo contract changes to 2025 preview * Making updates to ActualCapacityInfo for Group Status * Add quota apis to MFE 20250101-preview (#31885) * Add quota apis * add location in swagger * add list available quota * add AvailableQuotaArmPaginatedResult * add location param * location param in examples * replace with location parameters * Removes azure-resource-manager-schemas from SDK automation. It can be re-added without reverting this commit. (#30893) (#31918) This change produces an extra warning but no obvious new errors. --------- Co-authored-by: Daniel Jurek <[email protected]> * Prettier Gate fixes for Jan 25 preview (#31864) Co-authored-by: ZhidaLiu <[email protected]> * [MFE][2025-01-01-preview] Add deferred safety to serverless endpoints (#32030) * Update mfe.json to add new content safety level property * prettier * more prettier * Update createOrUpdate.json with contentsafetylevel * Update get.json * Update list.json * Update update.json * Update EnvironmentVersion with vulnerabilities object (#32075) * Update mfe.json * Update mfe.json * Update mfe.json * Update mfe.json * Update mfe.json * Update mfe.json * Update mfe.json * Update mfe.json * Add parent job name (#32106) * add parent job name add parent job name * prettier prettier * prettier prettier * Correct tag format (#32141) * [MFE] Add AAD Auth Modes to Serverless Endpoint (#32100) * add aad auth mode and cherrypick * prettier * remove getStatus change * reset mfe, add back aad auth * revert getStatus * prettier cmd * update mfe * prettier * cherrypick commit 1fc2fa1 * add newline back * add newline back * Lint diff fixes for Jan 25 preview (#31939) * Lint diff fixes for Jan 25 preview * Update tag * Keep tag format consistent with other versions * resolve merge conflicts --------- Co-authored-by: ZhidaLiu <[email protected]> * Release distillation changes (#32186) * Distillation ARM changes * Fix CSPell check * Fixed Prettier Failures * Fixed Model Validation * Updated PromptSetting description * Added Only Distillation Changes * Added definitions * removed unwanted changes * Ran Prettier * Updated swagger based on Vienna review * Updated Examples * Updated Description for Prompt Setting * Reorganized as per review comments * Updated examples * Ran Prettier * Handled review comments * Added Suppression.yaml file * Updated syntax * Fixed syntax * Added Suppressions in readme --------- Co-authored-by: Qiaoqiao Zhang <[email protected]> * Fix typo in vuln contract (#32280) * Add the property irewallPublicIpAddress in ManagedNetworkSettings (#32123) * Fix issue caused by rebase * updated mfe.json (#32543) * add more suppression for lint diff error that we can't fix (#32603) --------- Co-authored-by: ragovada <[email protected]> Co-authored-by: ritujhams <[email protected]> Co-authored-by: jingyizhu99 <[email protected]> Co-authored-by: Daniel Jurek <[email protected]> Co-authored-by: ragovada <[email protected]> Co-authored-by: liangjason87 <[email protected]> Co-authored-by: vizhur <[email protected]> Co-authored-by: marici7274 <[email protected]> Co-authored-by: Karishma Daga <[email protected]> Co-authored-by: vikasagrawal-ms <[email protected]> Co-authored-by: Qiaoqiao Zhang <[email protected]> Co-authored-by: haoranqian <[email protected]> Co-authored-by: sarajag <[email protected]>
1 parent cee0831 commit 29cdd2f

File tree

324 files changed

+61134
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+61134
-1
lines changed

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/CapabilityHost/createOrUpdate.json

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "test-rg",
5+
"workspaceName": "my-aml-workspace",
6+
"name": "capabilityHostName",
7+
"api-version": "2025-01-01-preview",
8+
"body": {
9+
"properties": {
10+
"customerSubnet": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
11+
}
12+
}
13+
},
14+
"responses": {
15+
"200": {
16+
"headers": {},
17+
"body": {
18+
"id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.MachineLearningServices/workspaces/my-aml-workspace/capabilityHosts/capabilityHostName",
19+
"name": "capabilityHostName",
20+
"type": "Microsoft.MachineLearningServices/workspaces/capabilityHosts",
21+
"properties": {
22+
"description": "string",
23+
"tags": {
24+
"string": "string"
25+
},
26+
"customerSubnet": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
27+
"provisioningState": "Succeeded"
28+
},
29+
"systemData": {
30+
"createdAt": "2020-01-01T12:34:56.999+00:22",
31+
"createdBy": "string",
32+
"createdByType": "ManagedIdentity",
33+
"lastModifiedAt": "2020-01-01T12:34:56.999+00:22",
34+
"lastModifiedBy": "string",
35+
"lastModifiedByType": "ManagedIdentity"
36+
}
37+
}
38+
},
39+
"201": {
40+
"headers": {
41+
"Location": "example_location"
42+
},
43+
"body": {
44+
"id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.MachineLearningServices/workspaces/my-aml-workspace/capabilityHosts/capabilityHostName",
45+
"name": "capabilityHostName",
46+
"type": "Microsoft.MachineLearningServices/workspaces/capabilityHosts",
47+
"properties": {
48+
"description": "string",
49+
"tags": {
50+
"string": "string"
51+
},
52+
"customerSubnet": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
53+
"provisioningState": "Succeeded"
54+
},
55+
"systemData": {
56+
"createdAt": "2020-01-01T12:34:56.999+00:22",
57+
"createdBy": "string",
58+
"createdByType": "ManagedIdentity",
59+
"lastModifiedAt": "2020-01-01T12:34:56.999+00:22",
60+
"lastModifiedBy": "string",
61+
"lastModifiedByType": "ManagedIdentity"
62+
}
63+
}
64+
}
65+
}
66+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/CapabilityHost/delete.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "test-rg",
5+
"workspaceName": "my-aml-workspace",
6+
"name": "capabilityHostName",
7+
"api-version": "2025-01-01-preview"
8+
},
9+
"responses": {
10+
"202": {
11+
"headers": {
12+
"Location": "location_header_to_poll"
13+
}
14+
},
15+
"204": {}
16+
}
17+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/CapabilityHost/get.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "test-rg",
5+
"workspaceName": "my-aml-workspace",
6+
"name": "capabilityHostName",
7+
"api-version": "2025-01-01-preview"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.MachineLearningServices/workspaces/my-aml-workspace/capabilityHosts/capabilityHostName",
14+
"name": "capabilityHostName",
15+
"type": "Microsoft.MachineLearningServices/workspaces/capabilityHosts",
16+
"properties": {
17+
"description": "string",
18+
"tags": {
19+
"string": "string"
20+
},
21+
"customerSubnet": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
22+
"provisioningState": "Succeeded"
23+
},
24+
"systemData": {
25+
"createdAt": "2020-01-01T12:34:56.999+00:22",
26+
"createdBy": "string",
27+
"createdByType": "ManagedIdentity",
28+
"lastModifiedAt": "2020-01-01T12:34:56.999+00:22",
29+
"lastModifiedBy": "string",
30+
"lastModifiedByType": "ManagedIdentity"
31+
}
32+
}
33+
}
34+
}
35+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/Compute/createOrUpdate/AKSCompute.json

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2025-01-01-preview",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"description": "some compute",
12+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
13+
"computeType": "AKS",
14+
"properties": {
15+
"agentCount": 4
16+
}
17+
}
18+
}
19+
},
20+
"responses": {
21+
"200": {
22+
"body": {
23+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
24+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
25+
"name": "compute123",
26+
"location": "eastus",
27+
"properties": {
28+
"description": "some compute",
29+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
30+
"computeType": "AKS",
31+
"provisioningState": "Succeeded",
32+
"properties": {
33+
"agentCount": 4
34+
}
35+
}
36+
}
37+
},
38+
"201": {
39+
"body": {
40+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
41+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
42+
"name": "compute123",
43+
"location": "eastus",
44+
"properties": {
45+
"description": "some compute",
46+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
47+
"computeType": "AKS",
48+
"provisioningState": "Updating"
49+
}
50+
},
51+
"headers": {
52+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
53+
}
54+
}
55+
}
56+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/Compute/createOrUpdate/AmlCompute.json

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2025-01-01-preview",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AmlCompute",
12+
"description": "some compute",
13+
"properties": {
14+
"scaleSettings": {
15+
"maxNodeCount": 4,
16+
"minNodeCount": 4,
17+
"nodeIdleTimeBeforeScaleDown": "PT5M"
18+
}
19+
}
20+
}
21+
}
22+
},
23+
"responses": {
24+
"200": {
25+
"body": {
26+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
27+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
28+
"name": "compute123",
29+
"location": "eastus2",
30+
"properties": {
31+
"description": "some compute",
32+
"createdOn": "2021-04-01T22:00:00.0000000+00:00",
33+
"modifiedOn": "2021-04-01T22:00:00.0000000+00:00",
34+
"computeType": "AmlCompute",
35+
"provisioningState": "Succeeded",
36+
"properties": {
37+
"vmSize": "STANDARD_NC6",
38+
"vmPriority": "Dedicated",
39+
"osType": "Windows",
40+
"virtualMachineImage": null,
41+
"isolatedNetwork": false,
42+
"subnet": {
43+
"id": "test-subnet-resource-id"
44+
},
45+
"scaleSettings": {
46+
"maxNodeCount": 1,
47+
"minNodeCount": 0,
48+
"nodeIdleTimeBeforeScaleDown": "PT5M"
49+
},
50+
"remoteLoginPortPublicAccess": "Enabled",
51+
"allocationState": "Resizing",
52+
"allocationStateTransitionTime": "2017-09-27T22:28:08.998Z",
53+
"errors": null,
54+
"currentNodeCount": 0,
55+
"targetNodeCount": 1,
56+
"nodeStateCounts": {
57+
"preparingNodeCount": 0,
58+
"runningNodeCount": 0,
59+
"idleNodeCount": 0,
60+
"unusableNodeCount": 0,
61+
"leavingNodeCount": 0,
62+
"preemptedNodeCount": 0
63+
},
64+
"enableNodePublicIp": true
65+
}
66+
}
67+
}
68+
},
69+
"201": {
70+
"body": {
71+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
72+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
73+
"name": "compute123",
74+
"location": "eastus2",
75+
"properties": {
76+
"description": "some compute",
77+
"computeType": "AmlCompute",
78+
"provisioningState": "Updating"
79+
}
80+
},
81+
"headers": {
82+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
83+
}
84+
}
85+
}
86+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/Compute/createOrUpdate/BasicAKSCompute.json

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2025-01-01-preview",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AKS"
12+
}
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
19+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
20+
"name": "compute123",
21+
"location": "eastus",
22+
"properties": {
23+
"computeType": "AKS",
24+
"provisioningState": "Creating"
25+
}
26+
}
27+
},
28+
"201": {
29+
"body": {
30+
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
31+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
32+
"name": "compute123",
33+
"location": "eastus",
34+
"properties": {
35+
"computeType": "AKS",
36+
"provisioningState": "Creating"
37+
}
38+
},
39+
"headers": {
40+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
41+
}
42+
}
43+
}
44+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2025-01-01-preview/examples/Compute/createOrUpdate/BasicAmlCompute.json

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2025-01-01-preview",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AmlCompute",
12+
"properties": {
13+
"vmSize": "STANDARD_NC6",
14+
"vmPriority": "Dedicated",
15+
"osType": "Windows",
16+
"virtualMachineImage": {
17+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/galleries/myImageGallery/images/myImageDefinition/versions/0.0.1"
18+
},
19+
"isolatedNetwork": false,
20+
"scaleSettings": {
21+
"maxNodeCount": 1,
22+
"minNodeCount": 0,
23+
"nodeIdleTimeBeforeScaleDown": "PT5M"
24+
},
25+
"remoteLoginPortPublicAccess": "NotSpecified",
26+
"enableNodePublicIp": true
27+
}
28+
}
29+
}
30+
},
31+
"responses": {
32+
"200": {
33+
"body": {
34+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
35+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
36+
"name": "compute123",
37+
"location": "eastus",
38+
"properties": {
39+
"computeType": "AmlCompute",
40+
"provisioningState": "Creating"
41+
}
42+
}
43+
},
44+
"201": {
45+
"body": {
46+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
47+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
48+
"name": "compute123",
49+
"location": "eastus",
50+
"properties": {
51+
"computeType": "AmlCompute",
52+
"provisioningState": "Creating"
53+
}
54+
},
55+
"headers": {
56+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
57+
}
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)