[WRP] 2024-07-01-preview change (#29861)

* Add changes for 07-01-preview * add missing properties * rename example * rename example * Update Schema * Update type dicriminator * Fix errors * Error fix * Update example and readme * run prettier * Rename to fix some schema name conflict * Update suppressions * Update comment feedbacks * run prettier
Azure · Jul 23, 2024 · c61c6ff · c61c6ff
1 parent a43edac
commit c61c6ff
Show file tree

Hide file tree

Showing 14 changed files with 850 additions and 291 deletions.
diff --git a/...chineLearningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/create.json b/...chineLearningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/create.json
@@ -8,6 +8,7 @@
     "api-version": "2024-07-01-preview",
     "body": {
       "properties": {
+        "type": "Azure.OpenAI",
         "model": {
           "format": "OpenAI",
           "name": "text-davinci-003",
@@ -30,6 +31,7 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
         "properties": {
+          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",

diff --git a/....MachineLearningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/get.json b/....MachineLearningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/get.json
@@ -20,6 +20,7 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
         "properties": {
+          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",

diff --git a/...rningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/getDeployments.json b/...rningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/getDeployments.json
@@ -21,6 +21,7 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
             "properties": {
+              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",

diff --git a/...rningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/getInWorkspace.json b/...rningServices/preview/2024-07-01-preview/examples/Endpoint/Deployment/getInWorkspace.json
@@ -20,6 +20,7 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
             "properties": {
+              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",

diff --git a/...osoft.MachineLearningServices/preview/2024-07-01-preview/examples/Endpoint/getModels.json b/...osoft.MachineLearningServices/preview/2024-07-01-preview/examples/Endpoint/getModels.json
@@ -11,18 +11,14 @@
       "body": {
         "value": [
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.ada",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "rateLimits": [
                   {
@@ -65,23 +61,17 @@
             },
             "format": "OpenAI",
             "name": "ada",
-            "version": "1",
-            "source": null,
-            "callRateLimit": null
+            "version": "1"
           },
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.babbage",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "rateLimits": [
                   {

diff --git a/...ces/preview/2024-07-01-preview/examples/WorkspaceConnection/RaiBlocklistItem/addBulk.json b/...ces/preview/2024-07-01-preview/examples/WorkspaceConnection/RaiBlocklistItem/addBulk.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "test-rg",
+    "workspaceName": "aml-workspace-name",
+    "connectionName": "testConnection",
+    "raiBlocklistName": "raiBlocklistName",
+    "api-version": "2024-07-01-preview",
+    "body": [
+      {
+        "name": "myblocklistitem1",
+        "properties": {
+          "pattern": "^[a-z0-9_-]{2,16}$",
+          "isRegex": true
+        }
+      },
+      {
+        "name": "myblocklistitem2",
+        "properties": {
+          "pattern": "blockwords",
+          "isRegex": false
+        }
+      }
+    ]
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "myblocklist",
+        "properties": {
+          "description": "Brief description of the blocklist"
+        },
+        "etag": "\"00000000-0000-0000-0000-000000000000\""
+      }
+    },
+    "202": {
+      "headers": {
+        "Location": "example_location"
+      }
+    }
+  }
+}
diff --git a/.../preview/2024-07-01-preview/examples/WorkspaceConnection/RaiBlocklistItem/deleteBulk.json b/.../preview/2024-07-01-preview/examples/WorkspaceConnection/RaiBlocklistItem/deleteBulk.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "test-rg",
+    "workspaceName": "aml-workspace-name",
+    "connectionName": "testConnection",
+    "raiBlocklistName": "raiBlocklistName",
+    "api-version": "2024-07-01-preview",
+    "body": [
+      "myblocklistitem1",
+      "myblocklistitem2"
+    ]
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/...ingServices/preview/2024-07-01-preview/examples/WorkspaceConnection/createDeployment.json b/...ingServices/preview/2024-07-01-preview/examples/WorkspaceConnection/createDeployment.json
@@ -8,6 +8,7 @@
     "api-version": "2024-07-01-preview",
     "body": {
       "properties": {
+        "type": "Azure.OpenAI",
         "model": {
           "format": "OpenAI",
           "name": "text-davinci-003",
@@ -30,6 +31,7 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
+          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
@@ -54,6 +56,7 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
+          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",

diff --git a/...arningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/getDeployment.json b/...arningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/getDeployment.json
@@ -20,6 +20,7 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
+          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",

diff --git a/...neLearningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/getModels.json b/...neLearningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/getModels.json
@@ -11,18 +11,14 @@
       "body": {
         "value": [
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.ada",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "rateLimits": [
                   {
@@ -65,23 +61,17 @@
             },
             "format": "OpenAI",
             "name": "ada",
-            "version": "1",
-            "source": null,
-            "callRateLimit": null
+            "version": "1"
           },
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.babbage",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "rateLimits": [
                   {

diff --git a/...mples/Workspace/listConnectionModels.json → ...spaceConnection/listConnectionModels.json b/...mples/Workspace/listConnectionModels.json → ...spaceConnection/listConnectionModels.json
@@ -10,18 +10,14 @@
       "body": {
         "value": [
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.ada",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "connectionIds": [
                   "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1/providers/Microsoft.MachineLearningServices/workspaces/workspace-1/connections/connection-1",
@@ -68,23 +64,17 @@
             },
             "format": "OpenAI",
             "name": "ada",
-            "version": "1",
-            "source": null,
-            "callRateLimit": null
+            "version": "1"
           },
           {
-            "baseModel": null,
             "isDefaultVersion": false,
             "skus": [
               {
                 "name": "Standard",
                 "usageName": "OpenAI.Standard.babbage",
                 "deprecationDate": "2024-03-01T00:00:00+00:00",
                 "capacity": {
-                  "minimum": null,
-                  "maximum": 10000,
-                  "step": null,
-                  "default": 120
+                  "maximum": 10000
                 },
                 "connectionIds": [
                   "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup-1/providers/Microsoft.MachineLearningServices/workspaces/workspace-1/connections/connection-1"

diff --git a/...ningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/listDeployments.json b/...ningServices/preview/2024-07-01-preview/examples/WorkspaceConnection/listDeployments.json
@@ -21,6 +21,7 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
             "properties": {
+              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",