From 7a8609bbdf7054f53042e26d47b531794669ca6c Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 15:11:22 -0700 Subject: [PATCH 01/11] Added Azure Object Anchors error code field to IngestionProperties --- .../examples/GetIngestionJob.json | 1 + .../preview/0.2-preview.0/mr-aoa.json | 34 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json index 91fb7844bae5..24741837f8c5 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json @@ -13,6 +13,7 @@ "body": { "clientErrorDetails": "string", "serverErrorDetails": "string", + "errorCode": "NO_ERROR", "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "outputModelUri": "string", "jobStatus": "NotStarted", diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json index 633c77eaac53..2cba74c28314 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json @@ -167,6 +167,29 @@ } }, "definitions": { + "ConversionErrorCode": { + "enum": [ + "UNKNOWN", + "NO_ERROR", + "SERVICE_ERROR", + "INVALID_ASSET_URI", + "INVALID_JOB_ID", + "INVALID_GRAVITY", + "INVALID_SCALE", + "ASSET_SIZE_TOO_LARGE", + "ASSET_DIMENSIONS_OUT_OF_BOUNDS", + "ZERO_FACES", + "INVALID_FACE_VERTICES", + "ZERO_TRAJECTORIES_GENERATED", + "TOO_MANY_RIG_POSES", + "ASSET_CANNOT_BE_CONVERTED" + ], + "type": "string", + "x-ms-enum": { + "name": "ConversionErrorCode", + "modelAsString": false + } + }, "JobStatus": { "enum": [ "NotStarted", @@ -334,7 +357,7 @@ } }, "IngestionProperties": { - "description": "Represents the status of an AOA ingestion job.", + "description": "Represents the status of an AOA asset conversion job.", "type": "object", "properties": { "clientErrorDetails": { @@ -347,9 +370,12 @@ "type": "string", "readOnly": true }, + "errorCode": { + "$ref": "#/definitions/ConversionErrorCode" + }, "jobId": { "format": "uuid", - "description": "Identifier for the AOA Ingestion Job.", + "description": "Identifier for the AOA asset conversion job.", "type": "string", "readOnly": true }, @@ -368,12 +394,12 @@ }, "inputAssetUri": { "format": "uri", - "description": "The Uri to the Asset to be ingested by the AOA Ingestion Service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", "type": "string" }, "accountId": { "format": "uuid", - "description": "Identifier for the Account owning the AOA Ingestion Job.", + "description": "Identifier for the Account owning the asset conversion job.", "type": "string", "readOnly": true }, From b7fb5fb5b541169915898b24954754de813465f9 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 15:13:25 -0700 Subject: [PATCH 02/11] Fixed spacing in example --- .../preview/0.2-preview.0/examples/GetIngestionJob.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json index 24741837f8c5..f0c0db834c6f 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json @@ -13,7 +13,7 @@ "body": { "clientErrorDetails": "string", "serverErrorDetails": "string", - "errorCode": "NO_ERROR", + "errorCode": "NO_ERROR", "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "outputModelUri": "string", "jobStatus": "NotStarted", From b0256ec81a456d0e4a8a601ed533849f387362c5 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 15:35:33 -0700 Subject: [PATCH 03/11] Moved changes to new version --- .../examples/GetIngestionJob.json | 1 - .../preview/0.2-preview.0/mr-aoa.json | 34 +- .../examples/CreateIngestionJob.json | 158 ++++++ .../examples/GetBlobUploadEndpoint.json | 17 + .../examples/GetIngestionJob.json | 92 ++++ .../preview/0.2-preview.1/mr-aoa.json | 477 ++++++++++++++++++ .../mixedreality/data-plane/readme.md | 9 + 7 files changed, 757 insertions(+), 31 deletions(-) create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json index f0c0db834c6f..91fb7844bae5 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json @@ -13,7 +13,6 @@ "body": { "clientErrorDetails": "string", "serverErrorDetails": "string", - "errorCode": "NO_ERROR", "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "outputModelUri": "string", "jobStatus": "NotStarted", diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json index 2cba74c28314..633c77eaac53 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json @@ -167,29 +167,6 @@ } }, "definitions": { - "ConversionErrorCode": { - "enum": [ - "UNKNOWN", - "NO_ERROR", - "SERVICE_ERROR", - "INVALID_ASSET_URI", - "INVALID_JOB_ID", - "INVALID_GRAVITY", - "INVALID_SCALE", - "ASSET_SIZE_TOO_LARGE", - "ASSET_DIMENSIONS_OUT_OF_BOUNDS", - "ZERO_FACES", - "INVALID_FACE_VERTICES", - "ZERO_TRAJECTORIES_GENERATED", - "TOO_MANY_RIG_POSES", - "ASSET_CANNOT_BE_CONVERTED" - ], - "type": "string", - "x-ms-enum": { - "name": "ConversionErrorCode", - "modelAsString": false - } - }, "JobStatus": { "enum": [ "NotStarted", @@ -357,7 +334,7 @@ } }, "IngestionProperties": { - "description": "Represents the status of an AOA asset conversion job.", + "description": "Represents the status of an AOA ingestion job.", "type": "object", "properties": { "clientErrorDetails": { @@ -370,12 +347,9 @@ "type": "string", "readOnly": true }, - "errorCode": { - "$ref": "#/definitions/ConversionErrorCode" - }, "jobId": { "format": "uuid", - "description": "Identifier for the AOA asset conversion job.", + "description": "Identifier for the AOA Ingestion Job.", "type": "string", "readOnly": true }, @@ -394,12 +368,12 @@ }, "inputAssetUri": { "format": "uri", - "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "description": "The Uri to the Asset to be ingested by the AOA Ingestion Service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", "type": "string" }, "accountId": { "format": "uuid", - "description": "Identifier for the Account owning the asset conversion job.", + "description": "Identifier for the Account owning the AOA Ingestion Job.", "type": "string", "readOnly": true }, diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json new file mode 100644 index 000000000000..533363280683 --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json @@ -0,0 +1,158 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.0", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw", + "body": { + "assetFileType": "string", + "inputAssetUri": "string", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + }, + "responses": { + "201": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "clientErrorDetails": "string", + "serverErrorDetails": "string", + "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "outputModelUri": "string", + "jobStatus": "NotStarted", + "assetFileType": "string", + "inputAssetUri": "string", + "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json new file mode 100644 index 000000000000..2a78c96fd32c --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.0", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "responses": { + "200": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "inputAssetUri": "string" + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json new file mode 100644 index 000000000000..f0c0db834c6f --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json @@ -0,0 +1,92 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.0", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "responses": { + "200": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "clientErrorDetails": "string", + "serverErrorDetails": "string", + "errorCode": "NO_ERROR", + "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "outputModelUri": "string", + "jobStatus": "NotStarted", + "assetFileType": "string", + "inputAssetUri": "string", + "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json new file mode 100644 index 000000000000..2cba74c28314 --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -0,0 +1,477 @@ +{ + "swagger": "2.0", + "info": { + "title": "AOA front end APIs", + "description": "Azure Object Anchors front end APIs.", + "version": "0.2-preview.0" + }, + "paths": { + "/accounts/{accountId}/jobs/{jobId}": { + "put": { + "tags": [ + "IngestionJob" + ], + "summary": "Creates a job request.", + "operationId": "IngestionJob_Create", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/JobIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "body", + "description": "The Azure Object Anchors ingestion request.", + "schema": { + "$ref": "#/definitions/IngestionProperties" + } + } + ], + "responses": { + "201": { + "description": "Success", + "schema": { + "$ref": "#/definitions/IngestionProperties" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "IngestionJob_Create": { + "$ref": "examples/CreateIngestionJob.json" + } + } + }, + "get": { + "tags": [ + "IngestionJob" + ], + "summary": "Gets the status of a job request.", + "operationId": "IngestionJob_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/JobIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/IngestionProperties" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "IngestionJob_Get": { + "$ref": "examples/GetIngestionJob.json" + } + } + } + }, + "/accounts/{accountId}/blobUploadEndpoint": { + "get": { + "tags": [ + "Storage" + ], + "summary": "Gets a blob upload uri.", + "operationId": "BlobUploadEndpoint_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/UploadLocation" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "BlobUploadEndpoint_Get": { + "$ref": "examples/GetBlobUploadEndpoint.json" + } + } + } + } + }, + "definitions": { + "ConversionErrorCode": { + "enum": [ + "UNKNOWN", + "NO_ERROR", + "SERVICE_ERROR", + "INVALID_ASSET_URI", + "INVALID_JOB_ID", + "INVALID_GRAVITY", + "INVALID_SCALE", + "ASSET_SIZE_TOO_LARGE", + "ASSET_DIMENSIONS_OUT_OF_BOUNDS", + "ZERO_FACES", + "INVALID_FACE_VERTICES", + "ZERO_TRAJECTORIES_GENERATED", + "TOO_MANY_RIG_POSES", + "ASSET_CANNOT_BE_CONVERTED" + ], + "type": "string", + "x-ms-enum": { + "name": "ConversionErrorCode", + "modelAsString": false + } + }, + "JobStatus": { + "enum": [ + "NotStarted", + "Running", + "Succeeded", + "Failed", + "Cancelled" + ], + "type": "string", + "x-ms-enum": { + "name": "JobStatus", + "modelAsString": false + } + }, + "Vector3": { + "required": [ + "x", + "y", + "z" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + } + } + }, + "Quaternion": { + "required": [ + "x", + "y", + "z", + "w" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + }, + "w": { + "format": "float", + "type": "number" + }, + "isIdentity": { + "type": "boolean", + "readOnly": true + } + } + }, + "Pose": { + "required": [ + "rotation", + "translation" + ], + "type": "object", + "properties": { + "rotation": { + "$ref": "#/definitions/Quaternion" + }, + "translation": { + "$ref": "#/definitions/Vector3" + } + } + }, + "Vector4": { + "required": [ + "x", + "y", + "z", + "w" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + }, + "w": { + "format": "float", + "type": "number" + } + } + }, + "IngestionConfiguration": { + "description": "Represents an ingestion configuration.", + "required": [ + "gravity", + "scale" + ], + "type": "object", + "properties": { + "dimensions": { + "$ref": "#/definitions/Vector3", + "x-nullable": true + }, + "boundingBoxCenter": { + "$ref": "#/definitions/Vector3", + "x-nullable": true + }, + "gravity": { + "$ref": "#/definitions/Vector3" + }, + "keyFrameIndexes": { + "description": "Indices of Key Frames.", + "type": "array", + "x-nullable": true, + "items": { + "format": "int32", + "type": "integer" + } + }, + "gtTrajectory": { + "description": "Ground truth trajectory.", + "type": "array", + "items": { + "$ref": "#/definitions/Pose" + } + }, + "principalAxis": { + "$ref": "#/definitions/Quaternion", + "x-nullable": true + }, + "scale": { + "format": "float", + "description": "Scale of transformation of asset units into meter space.", + "type": "number" + }, + "supportingPlane": { + "$ref": "#/definitions/Vector4", + "x-nullable": true + }, + "testTrajectory": { + "description": "Test Trajectory.", + "type": "array", + "items": { + "$ref": "#/definitions/Pose" + } + } + } + }, + "IngestionProperties": { + "description": "Represents the status of an AOA asset conversion job.", + "type": "object", + "properties": { + "clientErrorDetails": { + "description": "Information about the cause of a ClientError JobStatus.", + "type": "string", + "readOnly": true + }, + "serverErrorDetails": { + "description": "Information about the cause of a ServerError JobStatus.", + "type": "string", + "readOnly": true + }, + "errorCode": { + "$ref": "#/definitions/ConversionErrorCode" + }, + "jobId": { + "format": "uuid", + "description": "Identifier for the AOA asset conversion job.", + "type": "string", + "readOnly": true + }, + "outputModelUri": { + "format": "uri", + "description": "The URI for downloading the generated AOA Model", + "type": "string", + "readOnly": true + }, + "jobStatus": { + "$ref": "#/definitions/JobStatus" + }, + "assetFileType": { + "description": "The file type of the original 3D asset. Examples include: \"ply\", \"obj\", \"fbx\", \"glb\", \"gltf\", etc.", + "type": "string" + }, + "inputAssetUri": { + "format": "uri", + "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "type": "string" + }, + "accountId": { + "format": "uuid", + "description": "Identifier for the Account owning the asset conversion job.", + "type": "string", + "readOnly": true + }, + "ingestionConfiguration": { + "$ref": "#/definitions/IngestionConfiguration" + } + } + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "message": { + "type": "string" + } + } + }, + "ErrorResponse": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + } + }, + "UploadLocation": { + "required": [ + "inputAssetUri" + ], + "type": "object", + "properties": { + "inputAssetUri": { + "format": "uri", + "description": "The blob upload URI where a model should be uploaded to the service for ingestion.", + "type": "string" + } + } + } + }, + "parameters": { + "AccountIdParameter": { + "in": "path", + "name": "accountId", + "description": "Identifier for the Azure Object Anchors account.", + "required": true, + "type": "string", + "format": "uuid", + "x-ms-parameter-location": "method" + }, + "JobIdParameter": { + "in": "path", + "name": "jobId", + "description": "Identifier for the Azure Object Anchors ingestion job.", + "required": true, + "type": "string", + "format": "uuid", + "x-ms-parameter-location": "method" + }, + "ClientRequestCorrelationVectorParameter": { + "in": "header", + "name": "x-mrc-cv", + "description": "The client request correlation vector, which should be set to a new value for each request.", + "type": "string", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "in": "query", + "name": "api-version", + "description": "The API version.", + "type": "string" + } + } +} diff --git a/specification/mixedreality/data-plane/readme.md b/specification/mixedreality/data-plane/readme.md index f9cdfa11af3a..61f6f410ab45 100644 --- a/specification/mixedreality/data-plane/readme.md +++ b/specification/mixedreality/data-plane/readme.md @@ -39,6 +39,15 @@ openapi-type: data-plane tag: package-2021-01-01 ``` +### Tag: package-0.2-preview.1 + +These settings apply only when `--tag=package-0.2-preview.1` is specified on the command line. + +``` yaml $(tag) == 'package-0.2-preview.1' +input-file: +- Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +``` + ### Tag: package-2021-01-01 These settings apply only when `--tag=package-2021-01-01` is specified on the command line. From 67cbbc18a2b5adf64fc0a0cebf657965176ec5bf Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 15:43:31 -0700 Subject: [PATCH 04/11] Addressed version mismatch, spacing --- .../Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json index 2cba74c28314..c2090fe8d090 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -3,7 +3,7 @@ "info": { "title": "AOA front end APIs", "description": "Azure Object Anchors front end APIs.", - "version": "0.2-preview.0" + "version": "0.2-preview.1" }, "paths": { "/accounts/{accountId}/jobs/{jobId}": { @@ -184,7 +184,7 @@ "TOO_MANY_RIG_POSES", "ASSET_CANNOT_BE_CONVERTED" ], - "type": "string", + "type": "string", "x-ms-enum": { "name": "ConversionErrorCode", "modelAsString": false From 05b4906f7f15446a6b45d1a1fd38f3869091b8b4 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 16:00:55 -0700 Subject: [PATCH 05/11] Fixed versions on examples --- .../preview/0.2-preview.1/examples/CreateIngestionJob.json | 2 +- .../preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json | 2 +- .../preview/0.2-preview.1/examples/GetIngestionJob.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json index 533363280683..27501a0f02ba 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json @@ -2,7 +2,7 @@ "parameters": { "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.0", + "api-version": "0.2-preview.1", "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw", "body": { "assetFileType": "string", diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json index 2a78c96fd32c..dd66f41b7929 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json @@ -1,7 +1,7 @@ { "parameters": { "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.0", + "api-version": "0.2-preview.1", "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" }, "responses": { diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json index f0c0db834c6f..dce85dbbce8c 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json @@ -2,7 +2,7 @@ "parameters": { "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.0", + "api-version": "0.2-preview.1", "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" }, "responses": { From f43234507ed2e65039ca5cc3b9f430b52571f4a3 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 16:04:57 -0700 Subject: [PATCH 06/11] Readonly error code --- .../Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json index c2090fe8d090..f6e831a85b72 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -371,7 +371,8 @@ "readOnly": true }, "errorCode": { - "$ref": "#/definitions/ConversionErrorCode" + "$ref": "#/definitions/ConversionErrorCode", + "readOnly": true }, "jobId": { "format": "uuid", From c0b16f07c4a46a07fc7831a1735bb290804242ea Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 16:34:47 -0700 Subject: [PATCH 07/11] Seeing if readonly error code is breaking --- .../examples/GetIngestionJob.json | 1 + .../preview/0.2-preview.0/mr-aoa.json | 35 +- .../examples/CreateIngestionJob.json | 158 ------ .../examples/GetBlobUploadEndpoint.json | 17 - .../examples/GetIngestionJob.json | 92 ---- .../preview/0.2-preview.1/mr-aoa.json | 478 ------------------ .../mixedreality/data-plane/readme.md | 9 - 7 files changed, 32 insertions(+), 758 deletions(-) delete mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json delete mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json delete mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json delete mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json index 91fb7844bae5..f0c0db834c6f 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json @@ -13,6 +13,7 @@ "body": { "clientErrorDetails": "string", "serverErrorDetails": "string", + "errorCode": "NO_ERROR", "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "outputModelUri": "string", "jobStatus": "NotStarted", diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json index 633c77eaac53..3195df8d08ce 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json @@ -167,6 +167,29 @@ } }, "definitions": { + "ConversionErrorCode": { + "enum": [ + "UNKNOWN", + "NO_ERROR", + "SERVICE_ERROR", + "INVALID_ASSET_URI", + "INVALID_JOB_ID", + "INVALID_GRAVITY", + "INVALID_SCALE", + "ASSET_SIZE_TOO_LARGE", + "ASSET_DIMENSIONS_OUT_OF_BOUNDS", + "ZERO_FACES", + "INVALID_FACE_VERTICES", + "ZERO_TRAJECTORIES_GENERATED", + "TOO_MANY_RIG_POSES", + "ASSET_CANNOT_BE_CONVERTED" + ], + "type": "string", + "x-ms-enum": { + "name": "ConversionErrorCode", + "modelAsString": false + } + }, "JobStatus": { "enum": [ "NotStarted", @@ -334,7 +357,7 @@ } }, "IngestionProperties": { - "description": "Represents the status of an AOA ingestion job.", + "description": "Represents the status of an AOA asset conversion job.", "type": "object", "properties": { "clientErrorDetails": { @@ -347,9 +370,13 @@ "type": "string", "readOnly": true }, + "errorCode": { + "$ref": "#/definitions/ConversionErrorCode", + "readOnly": true + }, "jobId": { "format": "uuid", - "description": "Identifier for the AOA Ingestion Job.", + "description": "Identifier for the AOA asset conversion job.", "type": "string", "readOnly": true }, @@ -368,12 +395,12 @@ }, "inputAssetUri": { "format": "uri", - "description": "The Uri to the Asset to be ingested by the AOA Ingestion Service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", "type": "string" }, "accountId": { "format": "uuid", - "description": "Identifier for the Account owning the AOA Ingestion Job.", + "description": "Identifier for the Account owning the asset conversion job.", "type": "string", "readOnly": true }, diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json deleted file mode 100644 index 27501a0f02ba..000000000000 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "parameters": { - "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.1", - "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw", - "body": { - "assetFileType": "string", - "inputAssetUri": "string", - "ingestionConfiguration": { - "dimensions": { - "x": 0, - "y": 0, - "z": 0 - }, - "boundingBoxCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "gravity": { - "x": 0, - "y": 0, - "z": 0 - }, - "keyFrameIndexes": [ - 0 - ], - "gtTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "principalAxis": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "scale": 0, - "supportingPlane": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "testTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ] - } - } - }, - "responses": { - "201": { - "headers": { - "ms-cv": "dKEFmka2kkSlDmp/af+sOw" - }, - "body": { - "clientErrorDetails": "string", - "serverErrorDetails": "string", - "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - "outputModelUri": "string", - "jobStatus": "NotStarted", - "assetFileType": "string", - "inputAssetUri": "string", - "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - "ingestionConfiguration": { - "dimensions": { - "x": 0, - "y": 0, - "z": 0 - }, - "boundingBoxCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "gravity": { - "x": 0, - "y": 0, - "z": 0 - }, - "keyFrameIndexes": [ - 0 - ], - "gtTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "principalAxis": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "scale": 0, - "supportingPlane": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "testTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ] - } - } - } - } -} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json deleted file mode 100644 index dd66f41b7929..000000000000 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.1", - "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" - }, - "responses": { - "200": { - "headers": { - "ms-cv": "dKEFmka2kkSlDmp/af+sOw" - }, - "body": { - "inputAssetUri": "string" - } - } - } -} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json deleted file mode 100644 index dce85dbbce8c..000000000000 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "parameters": { - "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "0.2-preview.1", - "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" - }, - "responses": { - "200": { - "headers": { - "ms-cv": "dKEFmka2kkSlDmp/af+sOw" - }, - "body": { - "clientErrorDetails": "string", - "serverErrorDetails": "string", - "errorCode": "NO_ERROR", - "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - "outputModelUri": "string", - "jobStatus": "NotStarted", - "assetFileType": "string", - "inputAssetUri": "string", - "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - "ingestionConfiguration": { - "dimensions": { - "x": 0, - "y": 0, - "z": 0 - }, - "boundingBoxCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "gravity": { - "x": 0, - "y": 0, - "z": 0 - }, - "keyFrameIndexes": [ - 0 - ], - "gtTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "principalAxis": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "scale": 0, - "supportingPlane": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "testTrajectory": [ - { - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0, - "isIdentity": true - }, - "translation": { - "x": 0, - "y": 0, - "z": 0 - } - } - ] - } - } - } - } -} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json deleted file mode 100644 index f6e831a85b72..000000000000 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +++ /dev/null @@ -1,478 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "AOA front end APIs", - "description": "Azure Object Anchors front end APIs.", - "version": "0.2-preview.1" - }, - "paths": { - "/accounts/{accountId}/jobs/{jobId}": { - "put": { - "tags": [ - "IngestionJob" - ], - "summary": "Creates a job request.", - "operationId": "IngestionJob_Create", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/AccountIdParameter" - }, - { - "$ref": "#/parameters/JobIdParameter" - }, - { - "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "in": "body", - "name": "body", - "description": "The Azure Object Anchors ingestion request.", - "schema": { - "$ref": "#/definitions/IngestionProperties" - } - } - ], - "responses": { - "201": { - "description": "Success", - "schema": { - "$ref": "#/definitions/IngestionProperties" - }, - "headers": { - "ms-cv": { - "description": "The service response correlation vector, which will be a new value for every response.", - "type": "string" - } - } - }, - "default": { - "description": "Error", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "IngestionJob_Create": { - "$ref": "examples/CreateIngestionJob.json" - } - } - }, - "get": { - "tags": [ - "IngestionJob" - ], - "summary": "Gets the status of a job request.", - "operationId": "IngestionJob_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/AccountIdParameter" - }, - { - "$ref": "#/parameters/JobIdParameter" - }, - { - "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/IngestionProperties" - }, - "headers": { - "ms-cv": { - "description": "The service response correlation vector, which will be a new value for every response.", - "type": "string" - } - } - }, - "default": { - "description": "Error", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "IngestionJob_Get": { - "$ref": "examples/GetIngestionJob.json" - } - } - } - }, - "/accounts/{accountId}/blobUploadEndpoint": { - "get": { - "tags": [ - "Storage" - ], - "summary": "Gets a blob upload uri.", - "operationId": "BlobUploadEndpoint_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/AccountIdParameter" - }, - { - "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/UploadLocation" - }, - "headers": { - "ms-cv": { - "description": "The service response correlation vector, which will be a new value for every response.", - "type": "string" - } - } - }, - "default": { - "description": "Error", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "BlobUploadEndpoint_Get": { - "$ref": "examples/GetBlobUploadEndpoint.json" - } - } - } - } - }, - "definitions": { - "ConversionErrorCode": { - "enum": [ - "UNKNOWN", - "NO_ERROR", - "SERVICE_ERROR", - "INVALID_ASSET_URI", - "INVALID_JOB_ID", - "INVALID_GRAVITY", - "INVALID_SCALE", - "ASSET_SIZE_TOO_LARGE", - "ASSET_DIMENSIONS_OUT_OF_BOUNDS", - "ZERO_FACES", - "INVALID_FACE_VERTICES", - "ZERO_TRAJECTORIES_GENERATED", - "TOO_MANY_RIG_POSES", - "ASSET_CANNOT_BE_CONVERTED" - ], - "type": "string", - "x-ms-enum": { - "name": "ConversionErrorCode", - "modelAsString": false - } - }, - "JobStatus": { - "enum": [ - "NotStarted", - "Running", - "Succeeded", - "Failed", - "Cancelled" - ], - "type": "string", - "x-ms-enum": { - "name": "JobStatus", - "modelAsString": false - } - }, - "Vector3": { - "required": [ - "x", - "y", - "z" - ], - "type": "object", - "properties": { - "x": { - "format": "float", - "type": "number" - }, - "y": { - "format": "float", - "type": "number" - }, - "z": { - "format": "float", - "type": "number" - } - } - }, - "Quaternion": { - "required": [ - "x", - "y", - "z", - "w" - ], - "type": "object", - "properties": { - "x": { - "format": "float", - "type": "number" - }, - "y": { - "format": "float", - "type": "number" - }, - "z": { - "format": "float", - "type": "number" - }, - "w": { - "format": "float", - "type": "number" - }, - "isIdentity": { - "type": "boolean", - "readOnly": true - } - } - }, - "Pose": { - "required": [ - "rotation", - "translation" - ], - "type": "object", - "properties": { - "rotation": { - "$ref": "#/definitions/Quaternion" - }, - "translation": { - "$ref": "#/definitions/Vector3" - } - } - }, - "Vector4": { - "required": [ - "x", - "y", - "z", - "w" - ], - "type": "object", - "properties": { - "x": { - "format": "float", - "type": "number" - }, - "y": { - "format": "float", - "type": "number" - }, - "z": { - "format": "float", - "type": "number" - }, - "w": { - "format": "float", - "type": "number" - } - } - }, - "IngestionConfiguration": { - "description": "Represents an ingestion configuration.", - "required": [ - "gravity", - "scale" - ], - "type": "object", - "properties": { - "dimensions": { - "$ref": "#/definitions/Vector3", - "x-nullable": true - }, - "boundingBoxCenter": { - "$ref": "#/definitions/Vector3", - "x-nullable": true - }, - "gravity": { - "$ref": "#/definitions/Vector3" - }, - "keyFrameIndexes": { - "description": "Indices of Key Frames.", - "type": "array", - "x-nullable": true, - "items": { - "format": "int32", - "type": "integer" - } - }, - "gtTrajectory": { - "description": "Ground truth trajectory.", - "type": "array", - "items": { - "$ref": "#/definitions/Pose" - } - }, - "principalAxis": { - "$ref": "#/definitions/Quaternion", - "x-nullable": true - }, - "scale": { - "format": "float", - "description": "Scale of transformation of asset units into meter space.", - "type": "number" - }, - "supportingPlane": { - "$ref": "#/definitions/Vector4", - "x-nullable": true - }, - "testTrajectory": { - "description": "Test Trajectory.", - "type": "array", - "items": { - "$ref": "#/definitions/Pose" - } - } - } - }, - "IngestionProperties": { - "description": "Represents the status of an AOA asset conversion job.", - "type": "object", - "properties": { - "clientErrorDetails": { - "description": "Information about the cause of a ClientError JobStatus.", - "type": "string", - "readOnly": true - }, - "serverErrorDetails": { - "description": "Information about the cause of a ServerError JobStatus.", - "type": "string", - "readOnly": true - }, - "errorCode": { - "$ref": "#/definitions/ConversionErrorCode", - "readOnly": true - }, - "jobId": { - "format": "uuid", - "description": "Identifier for the AOA asset conversion job.", - "type": "string", - "readOnly": true - }, - "outputModelUri": { - "format": "uri", - "description": "The URI for downloading the generated AOA Model", - "type": "string", - "readOnly": true - }, - "jobStatus": { - "$ref": "#/definitions/JobStatus" - }, - "assetFileType": { - "description": "The file type of the original 3D asset. Examples include: \"ply\", \"obj\", \"fbx\", \"glb\", \"gltf\", etc.", - "type": "string" - }, - "inputAssetUri": { - "format": "uri", - "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", - "type": "string" - }, - "accountId": { - "format": "uuid", - "description": "Identifier for the Account owning the asset conversion job.", - "type": "string", - "readOnly": true - }, - "ingestionConfiguration": { - "$ref": "#/definitions/IngestionConfiguration" - } - } - }, - "Error": { - "type": "object", - "properties": { - "code": { - "type": "string" - }, - "message": { - "type": "string" - } - } - }, - "ErrorResponse": { - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/Error" - } - } - }, - "UploadLocation": { - "required": [ - "inputAssetUri" - ], - "type": "object", - "properties": { - "inputAssetUri": { - "format": "uri", - "description": "The blob upload URI where a model should be uploaded to the service for ingestion.", - "type": "string" - } - } - } - }, - "parameters": { - "AccountIdParameter": { - "in": "path", - "name": "accountId", - "description": "Identifier for the Azure Object Anchors account.", - "required": true, - "type": "string", - "format": "uuid", - "x-ms-parameter-location": "method" - }, - "JobIdParameter": { - "in": "path", - "name": "jobId", - "description": "Identifier for the Azure Object Anchors ingestion job.", - "required": true, - "type": "string", - "format": "uuid", - "x-ms-parameter-location": "method" - }, - "ClientRequestCorrelationVectorParameter": { - "in": "header", - "name": "x-mrc-cv", - "description": "The client request correlation vector, which should be set to a new value for each request.", - "type": "string", - "x-ms-parameter-location": "method" - }, - "ApiVersionParameter": { - "in": "query", - "name": "api-version", - "description": "The API version.", - "type": "string" - } - } -} diff --git a/specification/mixedreality/data-plane/readme.md b/specification/mixedreality/data-plane/readme.md index 61f6f410ab45..f9cdfa11af3a 100644 --- a/specification/mixedreality/data-plane/readme.md +++ b/specification/mixedreality/data-plane/readme.md @@ -39,15 +39,6 @@ openapi-type: data-plane tag: package-2021-01-01 ``` -### Tag: package-0.2-preview.1 - -These settings apply only when `--tag=package-0.2-preview.1` is specified on the command line. - -``` yaml $(tag) == 'package-0.2-preview.1' -input-file: -- Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json -``` - ### Tag: package-2021-01-01 These settings apply only when `--tag=package-2021-01-01` is specified on the command line. From d6897a8626d6fa1d18f880a0722c7de51e4bb684 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Mon, 5 Apr 2021 16:38:57 -0700 Subject: [PATCH 08/11] Revert "Seeing if readonly error code is breaking" This reverts commit c0b16f07c4a46a07fc7831a1735bb290804242ea. --- .../examples/GetIngestionJob.json | 1 - .../preview/0.2-preview.0/mr-aoa.json | 35 +- .../examples/CreateIngestionJob.json | 158 ++++++ .../examples/GetBlobUploadEndpoint.json | 17 + .../examples/GetIngestionJob.json | 92 ++++ .../preview/0.2-preview.1/mr-aoa.json | 478 ++++++++++++++++++ .../mixedreality/data-plane/readme.md | 9 + 7 files changed, 758 insertions(+), 32 deletions(-) create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json create mode 100644 specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json index f0c0db834c6f..91fb7844bae5 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/examples/GetIngestionJob.json @@ -13,7 +13,6 @@ "body": { "clientErrorDetails": "string", "serverErrorDetails": "string", - "errorCode": "NO_ERROR", "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "outputModelUri": "string", "jobStatus": "NotStarted", diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json index 3195df8d08ce..633c77eaac53 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.0/mr-aoa.json @@ -167,29 +167,6 @@ } }, "definitions": { - "ConversionErrorCode": { - "enum": [ - "UNKNOWN", - "NO_ERROR", - "SERVICE_ERROR", - "INVALID_ASSET_URI", - "INVALID_JOB_ID", - "INVALID_GRAVITY", - "INVALID_SCALE", - "ASSET_SIZE_TOO_LARGE", - "ASSET_DIMENSIONS_OUT_OF_BOUNDS", - "ZERO_FACES", - "INVALID_FACE_VERTICES", - "ZERO_TRAJECTORIES_GENERATED", - "TOO_MANY_RIG_POSES", - "ASSET_CANNOT_BE_CONVERTED" - ], - "type": "string", - "x-ms-enum": { - "name": "ConversionErrorCode", - "modelAsString": false - } - }, "JobStatus": { "enum": [ "NotStarted", @@ -357,7 +334,7 @@ } }, "IngestionProperties": { - "description": "Represents the status of an AOA asset conversion job.", + "description": "Represents the status of an AOA ingestion job.", "type": "object", "properties": { "clientErrorDetails": { @@ -370,13 +347,9 @@ "type": "string", "readOnly": true }, - "errorCode": { - "$ref": "#/definitions/ConversionErrorCode", - "readOnly": true - }, "jobId": { "format": "uuid", - "description": "Identifier for the AOA asset conversion job.", + "description": "Identifier for the AOA Ingestion Job.", "type": "string", "readOnly": true }, @@ -395,12 +368,12 @@ }, "inputAssetUri": { "format": "uri", - "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "description": "The Uri to the Asset to be ingested by the AOA Ingestion Service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", "type": "string" }, "accountId": { "format": "uuid", - "description": "Identifier for the Account owning the asset conversion job.", + "description": "Identifier for the Account owning the AOA Ingestion Job.", "type": "string", "readOnly": true }, diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json new file mode 100644 index 000000000000..27501a0f02ba --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json @@ -0,0 +1,158 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.1", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw", + "body": { + "assetFileType": "string", + "inputAssetUri": "string", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + }, + "responses": { + "201": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "clientErrorDetails": "string", + "serverErrorDetails": "string", + "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "outputModelUri": "string", + "jobStatus": "NotStarted", + "assetFileType": "string", + "inputAssetUri": "string", + "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json new file mode 100644 index 000000000000..dd66f41b7929 --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetBlobUploadEndpoint.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.1", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "responses": { + "200": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "inputAssetUri": "string" + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json new file mode 100644 index 000000000000..dce85dbbce8c --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json @@ -0,0 +1,92 @@ +{ + "parameters": { + "accountId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "jobId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "0.2-preview.1", + "x-mrc-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "responses": { + "200": { + "headers": { + "ms-cv": "dKEFmka2kkSlDmp/af+sOw" + }, + "body": { + "clientErrorDetails": "string", + "serverErrorDetails": "string", + "errorCode": "NO_ERROR", + "jobId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "outputModelUri": "string", + "jobStatus": "NotStarted", + "assetFileType": "string", + "inputAssetUri": "string", + "accountId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "ingestionConfiguration": { + "dimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "boundingBoxCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "gravity": { + "x": 0, + "y": 0, + "z": 0 + }, + "keyFrameIndexes": [ + 0 + ], + "gtTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "principalAxis": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "scale": 0, + "supportingPlane": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "testTrajectory": [ + { + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0, + "isIdentity": true + }, + "translation": { + "x": 0, + "y": 0, + "z": 0 + } + } + ] + } + } + } + } +} diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json new file mode 100644 index 000000000000..f6e831a85b72 --- /dev/null +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -0,0 +1,478 @@ +{ + "swagger": "2.0", + "info": { + "title": "AOA front end APIs", + "description": "Azure Object Anchors front end APIs.", + "version": "0.2-preview.1" + }, + "paths": { + "/accounts/{accountId}/jobs/{jobId}": { + "put": { + "tags": [ + "IngestionJob" + ], + "summary": "Creates a job request.", + "operationId": "IngestionJob_Create", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/JobIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "body", + "description": "The Azure Object Anchors ingestion request.", + "schema": { + "$ref": "#/definitions/IngestionProperties" + } + } + ], + "responses": { + "201": { + "description": "Success", + "schema": { + "$ref": "#/definitions/IngestionProperties" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "IngestionJob_Create": { + "$ref": "examples/CreateIngestionJob.json" + } + } + }, + "get": { + "tags": [ + "IngestionJob" + ], + "summary": "Gets the status of a job request.", + "operationId": "IngestionJob_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/JobIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/IngestionProperties" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "IngestionJob_Get": { + "$ref": "examples/GetIngestionJob.json" + } + } + } + }, + "/accounts/{accountId}/blobUploadEndpoint": { + "get": { + "tags": [ + "Storage" + ], + "summary": "Gets a blob upload uri.", + "operationId": "BlobUploadEndpoint_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "#/parameters/ClientRequestCorrelationVectorParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/UploadLocation" + }, + "headers": { + "ms-cv": { + "description": "The service response correlation vector, which will be a new value for every response.", + "type": "string" + } + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "BlobUploadEndpoint_Get": { + "$ref": "examples/GetBlobUploadEndpoint.json" + } + } + } + } + }, + "definitions": { + "ConversionErrorCode": { + "enum": [ + "UNKNOWN", + "NO_ERROR", + "SERVICE_ERROR", + "INVALID_ASSET_URI", + "INVALID_JOB_ID", + "INVALID_GRAVITY", + "INVALID_SCALE", + "ASSET_SIZE_TOO_LARGE", + "ASSET_DIMENSIONS_OUT_OF_BOUNDS", + "ZERO_FACES", + "INVALID_FACE_VERTICES", + "ZERO_TRAJECTORIES_GENERATED", + "TOO_MANY_RIG_POSES", + "ASSET_CANNOT_BE_CONVERTED" + ], + "type": "string", + "x-ms-enum": { + "name": "ConversionErrorCode", + "modelAsString": false + } + }, + "JobStatus": { + "enum": [ + "NotStarted", + "Running", + "Succeeded", + "Failed", + "Cancelled" + ], + "type": "string", + "x-ms-enum": { + "name": "JobStatus", + "modelAsString": false + } + }, + "Vector3": { + "required": [ + "x", + "y", + "z" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + } + } + }, + "Quaternion": { + "required": [ + "x", + "y", + "z", + "w" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + }, + "w": { + "format": "float", + "type": "number" + }, + "isIdentity": { + "type": "boolean", + "readOnly": true + } + } + }, + "Pose": { + "required": [ + "rotation", + "translation" + ], + "type": "object", + "properties": { + "rotation": { + "$ref": "#/definitions/Quaternion" + }, + "translation": { + "$ref": "#/definitions/Vector3" + } + } + }, + "Vector4": { + "required": [ + "x", + "y", + "z", + "w" + ], + "type": "object", + "properties": { + "x": { + "format": "float", + "type": "number" + }, + "y": { + "format": "float", + "type": "number" + }, + "z": { + "format": "float", + "type": "number" + }, + "w": { + "format": "float", + "type": "number" + } + } + }, + "IngestionConfiguration": { + "description": "Represents an ingestion configuration.", + "required": [ + "gravity", + "scale" + ], + "type": "object", + "properties": { + "dimensions": { + "$ref": "#/definitions/Vector3", + "x-nullable": true + }, + "boundingBoxCenter": { + "$ref": "#/definitions/Vector3", + "x-nullable": true + }, + "gravity": { + "$ref": "#/definitions/Vector3" + }, + "keyFrameIndexes": { + "description": "Indices of Key Frames.", + "type": "array", + "x-nullable": true, + "items": { + "format": "int32", + "type": "integer" + } + }, + "gtTrajectory": { + "description": "Ground truth trajectory.", + "type": "array", + "items": { + "$ref": "#/definitions/Pose" + } + }, + "principalAxis": { + "$ref": "#/definitions/Quaternion", + "x-nullable": true + }, + "scale": { + "format": "float", + "description": "Scale of transformation of asset units into meter space.", + "type": "number" + }, + "supportingPlane": { + "$ref": "#/definitions/Vector4", + "x-nullable": true + }, + "testTrajectory": { + "description": "Test Trajectory.", + "type": "array", + "items": { + "$ref": "#/definitions/Pose" + } + } + } + }, + "IngestionProperties": { + "description": "Represents the status of an AOA asset conversion job.", + "type": "object", + "properties": { + "clientErrorDetails": { + "description": "Information about the cause of a ClientError JobStatus.", + "type": "string", + "readOnly": true + }, + "serverErrorDetails": { + "description": "Information about the cause of a ServerError JobStatus.", + "type": "string", + "readOnly": true + }, + "errorCode": { + "$ref": "#/definitions/ConversionErrorCode", + "readOnly": true + }, + "jobId": { + "format": "uuid", + "description": "Identifier for the AOA asset conversion job.", + "type": "string", + "readOnly": true + }, + "outputModelUri": { + "format": "uri", + "description": "The URI for downloading the generated AOA Model", + "type": "string", + "readOnly": true + }, + "jobStatus": { + "$ref": "#/definitions/JobStatus" + }, + "assetFileType": { + "description": "The file type of the original 3D asset. Examples include: \"ply\", \"obj\", \"fbx\", \"glb\", \"gltf\", etc.", + "type": "string" + }, + "inputAssetUri": { + "format": "uri", + "description": "The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API.", + "type": "string" + }, + "accountId": { + "format": "uuid", + "description": "Identifier for the Account owning the asset conversion job.", + "type": "string", + "readOnly": true + }, + "ingestionConfiguration": { + "$ref": "#/definitions/IngestionConfiguration" + } + } + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "message": { + "type": "string" + } + } + }, + "ErrorResponse": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + } + }, + "UploadLocation": { + "required": [ + "inputAssetUri" + ], + "type": "object", + "properties": { + "inputAssetUri": { + "format": "uri", + "description": "The blob upload URI where a model should be uploaded to the service for ingestion.", + "type": "string" + } + } + } + }, + "parameters": { + "AccountIdParameter": { + "in": "path", + "name": "accountId", + "description": "Identifier for the Azure Object Anchors account.", + "required": true, + "type": "string", + "format": "uuid", + "x-ms-parameter-location": "method" + }, + "JobIdParameter": { + "in": "path", + "name": "jobId", + "description": "Identifier for the Azure Object Anchors ingestion job.", + "required": true, + "type": "string", + "format": "uuid", + "x-ms-parameter-location": "method" + }, + "ClientRequestCorrelationVectorParameter": { + "in": "header", + "name": "x-mrc-cv", + "description": "The client request correlation vector, which should be set to a new value for each request.", + "type": "string", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "in": "query", + "name": "api-version", + "description": "The API version.", + "type": "string" + } + } +} diff --git a/specification/mixedreality/data-plane/readme.md b/specification/mixedreality/data-plane/readme.md index f9cdfa11af3a..61f6f410ab45 100644 --- a/specification/mixedreality/data-plane/readme.md +++ b/specification/mixedreality/data-plane/readme.md @@ -39,6 +39,15 @@ openapi-type: data-plane tag: package-2021-01-01 ``` +### Tag: package-0.2-preview.1 + +These settings apply only when `--tag=package-0.2-preview.1` is specified on the command line. + +``` yaml $(tag) == 'package-0.2-preview.1' +input-file: +- Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +``` + ### Tag: package-2021-01-01 These settings apply only when `--tag=package-2021-01-01` is specified on the command line. From e691451a518264f637374816640c9fe068f61359 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Wed, 7 Apr 2021 10:22:48 -0700 Subject: [PATCH 09/11] Model error code as string --- .../Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json index f6e831a85b72..e80509101cd7 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -187,7 +187,7 @@ "type": "string", "x-ms-enum": { "name": "ConversionErrorCode", - "modelAsString": false + "modelAsString": true } }, "JobStatus": { From 521cfe2c9b76a723157061b4cc20114f7521ea68 Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Wed, 7 Apr 2021 14:57:08 -0700 Subject: [PATCH 10/11] Renamed examples to asset conversion nomenclature --- .../{CreateIngestionJob.json => CreateAssetConversionJob.json} | 0 .../examples/{GetIngestionJob.json => GetAssetConversionJob.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/{CreateIngestionJob.json => CreateAssetConversionJob.json} (100%) rename specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/{GetIngestionJob.json => GetAssetConversionJob.json} (100%) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateAssetConversionJob.json similarity index 100% rename from specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateIngestionJob.json rename to specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/CreateAssetConversionJob.json diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetAssetConversionJob.json similarity index 100% rename from specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetIngestionJob.json rename to specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/examples/GetAssetConversionJob.json From 16bc9e4ea731d9b786fba15af00a97fe0254cc7b Mon Sep 17 00:00:00 2001 From: Jacob Stenzel Date: Wed, 7 Apr 2021 15:18:37 -0700 Subject: [PATCH 11/11] Fixed rename issues --- .../Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json index e80509101cd7..cc6c36f5c90b 100644 --- a/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json +++ b/specification/mixedreality/data-plane/Microsoft.MixedReality/preview/0.2-preview.1/mr-aoa.json @@ -63,7 +63,7 @@ }, "x-ms-examples": { "IngestionJob_Create": { - "$ref": "examples/CreateIngestionJob.json" + "$ref": "examples/CreateAssetConversionJob.json" } } }, @@ -112,7 +112,7 @@ }, "x-ms-examples": { "IngestionJob_Get": { - "$ref": "examples/GetIngestionJob.json" + "$ref": "examples/GetAssetConversionJob.json" } } }