[FormRecognizer] Preview 1: fix modelId not being set in operation (bug fix) (#11477)

Author: kinelski

sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClient.cs

@@ -242,7 +242,7 @@ public virtual RecognizeCustomFormsOperation StartRecognizeCustomForms(string mo
             ContentType contentType = recognizeOptions.ContentType ?? DetectContentType(formFileStream, nameof(formFileStream));
 
             ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = ServiceClient.RestClient.AnalyzeWithCustomModel(guid, contentType, formFileStream, includeTextDetails: recognizeOptions.IncludeTextContent, cancellationToken);
-            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, modelId, response.Headers.OperationLocation);
+            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation);
         }
 
         /// <summary>
@@ -266,7 +266,7 @@ public virtual RecognizeCustomFormsOperation StartRecognizeCustomFormsFromUri(st
 
             SourcePath_internal sourcePath = new SourcePath_internal(formFileUri.ToString());
             ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = ServiceClient.RestClient.AnalyzeWithCustomModel(guid, includeTextDetails: recognizeOptions.IncludeTextContent, sourcePath, cancellationToken);
-            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, modelId, response.Headers.OperationLocation);
+            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation);
         }
 
         /// <summary>
@@ -290,7 +290,7 @@ public virtual async Task<RecognizeCustomFormsOperation> StartRecognizeCustomFor
             ContentType contentType = recognizeOptions.ContentType ?? DetectContentType(formFileStream, nameof(formFileStream));
 
             ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await ServiceClient.RestClient.AnalyzeWithCustomModelAsync(guid, contentType, formFileStream, includeTextDetails: recognizeOptions.IncludeTextContent, cancellationToken).ConfigureAwait(false);
-            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, modelId, response.Headers.OperationLocation);
+            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation);
         }
 
         /// <summary>
@@ -314,7 +314,7 @@ public virtual async Task<RecognizeCustomFormsOperation> StartRecognizeCustomFor
 
             SourcePath_internal sourcePath = new SourcePath_internal(formFileUri.ToString());
             ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await ServiceClient.RestClient.AnalyzeWithCustomModelAsync(guid, includeTextDetails: recognizeOptions.IncludeTextContent, sourcePath, cancellationToken).ConfigureAwait(false);
-            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, modelId, response.Headers.OperationLocation);
+            return new RecognizeCustomFormsOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation);
         }
 
         #endregion

sdk/formrecognizer/Azure.AI.FormRecognizer/src/RecognizeCustomFormsOperation.cs

@@ -33,6 +33,9 @@ public class RecognizeCustomFormsOperation : Operation<IReadOnlyList<RecognizedF
         /// <summary>The id of the model to use for recognizing form values.</summary>
         private readonly string _modelId;
 
+        /// <summary>An ID representing the operation that can be used along with <see cref="_modelId"/> to poll for the status of the long-running operation.</summary>
+        private readonly string _resultId;
+
         /// <inheritdoc/>
         public override string Id { get; }
 
@@ -60,17 +63,24 @@ public override ValueTask<Response<IReadOnlyList<RecognizedForm>>> WaitForComple
         /// </summary>
         /// <param name="operations"></param>
         /// <param name="diagnostics"></param>
-        /// <param name="modelId"></param>
         /// <param name="operationLocation"></param>
-        internal RecognizeCustomFormsOperation(ServiceClient operations, ClientDiagnostics diagnostics, string modelId, string operationLocation)
+        internal RecognizeCustomFormsOperation(ServiceClient operations, ClientDiagnostics diagnostics, string operationLocation)
         {
             _serviceClient = operations;
             _diagnostics = diagnostics;
-            _modelId = modelId;
 
-            // TODO: Add validation here
+            // TODO: Use regex to parse ids.
+            // https://github.com/Azure/azure-sdk-for-net/issues/11505
+
+            // TODO: Add validation here (should we store _resuldId and _modelId as GUIDs?)
             // https://github.com/Azure/azure-sdk-for-net/issues/10385
-            Id = operationLocation.Split('/').Last();
+
+            string[] substrs = operationLocation.Split('/');
+
+            _resultId = substrs[substrs.Length - 1];
+            _modelId = substrs[substrs.Length - 3];
+
+            Id = string.Join("/", substrs, substrs.Length - 3, 3);
         }
 
         /// <summary>
@@ -80,9 +90,26 @@ internal RecognizeCustomFormsOperation(ServiceClient operations, ClientDiagnosti
         /// <param name="client">The client used to check for completion.</param>
         public RecognizeCustomFormsOperation(string operationId, FormRecognizerClient client)
         {
-            Id = operationId;
             _serviceClient = client.ServiceClient;
             _diagnostics = client.Diagnostics;
+
+            // TODO: Use regex to parse ids.
+            // https://github.com/Azure/azure-sdk-for-net/issues/11505
+
+            // TODO: Add validation here (should we store _resuldId and _modelId as GUIDs?)
+            // https://github.com/Azure/azure-sdk-for-net/issues/10385
+
+            string[] substrs = operationId.Split('/');
+
+            if (substrs.Length < 3)
+            {
+                throw new ArgumentException($"Invalid {operationId}. It should be formatted as: '{{modelId}}/analyzeresults/{{resultId}}'.", operationId);
+            }
+
+            _resultId = substrs.Last();
+            _modelId = substrs.First();
+
+            Id = operationId;
         }
 
         /// <summary>
@@ -105,8 +132,8 @@ private async ValueTask<Response> UpdateStatusAsync(bool async, CancellationToke
             if (!_hasCompleted)
             {
                 Response<AnalyzeOperationResult_internal> update = async
-                    ? await _serviceClient.GetAnalyzeFormResultAsync(new Guid(_modelId), new Guid(Id), cancellationToken).ConfigureAwait(false)
-                    : _serviceClient.GetAnalyzeFormResult(new Guid(_modelId), new Guid(Id), cancellationToken);
+                    ? await _serviceClient.GetAnalyzeFormResultAsync(new Guid(_modelId), new Guid(_resultId), cancellationToken).ConfigureAwait(false)
+                    : _serviceClient.GetAnalyzeFormResult(new Guid(_modelId), new Guid(_resultId), cancellationToken);
 
                 // TODO: Add reasonable null checks.