Merge pull request #70 from textkernel/match-v2-env

Better Match v2 environment handling

Author: sovren-jwesson

src/Textkernel.Tx.SDK.Examples/MatchV2/UploadAndSearchDocuments.cs

@@ -31,7 +31,7 @@ public async Task Run(TxClient client)
                     TaxonomyVersion = "V2"
                 },
                 //method #1: index a document during the parse request
-                IndexingOptions = new IndexingOptionsGeneric(Services.MatchV2Environment.PROD, "my-first-document")
+                IndexingOptions = new IndexingOptionsGeneric("my-first-document")
             });
 
             try

src/Textkernel.Tx.SDK.Examples/Program.cs

@@ -22,8 +22,9 @@ public static async Task Main(string[] args)
             SkillsIntelligenceIncludeCertifications = true
         });
 
-        //IExample example = new BasicParsing();
-        IExample example = new UploadAndSearchDocuments();
+        IExample example = new BasicParsing();
+        //IExample example = new BatchParsing();
+        //IExample example = new UploadAndSearchDocuments();
         await example.Run(client);
 
         Console.ReadKey();

src/Textkernel.Tx.SDK.Tests/IntegrationTests/MatchV2Tests.cs

@@ -8,28 +8,31 @@
 using Textkernel.Tx.Models.API.Matching;
 using Textkernel.Tx.Models.Matching;
 using Textkernel.Tx.Models.API.MatchV2.Request;
+using Textkernel.Tx.Models.API.Parsing;
+using Textkernel.Tx.Models;
+using System.Collections;
 
 namespace Textkernel.Tx.SDK.Tests.IntegrationTests
 {
     public class MatchV2Tests : TestBase
     {
-        private const string _documentId = "unittestci";
+        private readonly string _documentId = Guid.NewGuid().ToString();
 
         [OneTimeSetUp]
         public async Task SetupAIMatchingIndexes()
         {
             // add a document to each index
             await Client.SearchMatchV2.AddJob(_documentId, TestParsedJobTech);
             await Client.SearchMatchV2.AddCandidate(_documentId, TestParsedResume);
-            await DelayForIndexSync(10_000);
+            await DelayForIndexSync(5_000);
         }
 
         [OneTimeTearDown]
         public async Task TeardownMatchingIndexes()
         {
             await Client.SearchMatchV2.DeleteJobs([_documentId]);
             await Client.SearchMatchV2.DeleteCandidates([_documentId]);
-            await DelayForIndexSync(10_000);
+            await DelayForIndexSync(5_000);
         }
 
         [TestCase("Developer")]
@@ -65,6 +68,44 @@ public async Task TestSearch(string validSearchTerm)
             await Task.CompletedTask;
         }
 
+        [Test]
+        public async Task TestParseAndUpload()
+        {
+            Document document = GetTestFileAsDocument("resume.docx");
+            string docId = Guid.NewGuid().ToString();
+            var options = new ParseOptions()
+            {
+                ProfessionsSettings = new ProfessionsSettings()
+                {
+                    Normalize = false
+                },
+                IndexingOptions = new Models.API.Indexes.IndexingOptionsGeneric()
+                {
+                    SearchAndMatchVersion = Models.API.Indexes.SearchAndMatchVersion.V2,
+                    DocumentId = docId
+                }
+            };
+            ParseResumeResponse response = await Client.Parser.ParseResume(new ParseRequest(document, options));
+
+            Assert.True(response.Value.IndexingResponse.IsSuccess);
+
+            await DelayForIndexSync(10_000);
+
+            Options opts = new Options();
+            SearchQuery query = new SearchQuery();
+            query.QueryString = "Developer";
+            Assert.DoesNotThrow(() =>
+            {
+                var response = Client.SearchMatchV2.SearchCandidates(query, opts).Result.Value;
+                Assert.IsNotEmpty(response.ResultItems);
+                Assert.IsNotEmpty(response.ResultItems.Where(i => i.DocID == docId));
+            });
+
+            await Client.SearchMatchV2.DeleteCandidates([docId]);
+
+            await DelayForIndexSync(5_000);
+        }
+
         //[Test]
         public async Task TestMatch()
         {

src/Textkernel.Tx.SDK/Models/API/Indexes/IndexDocumentRequest.cs

@@ -128,12 +128,10 @@ public IndexingOptionsGeneric(string documentId, string indexId, List<string> us
         /// <summary>
         /// Create options to upload a document with Match V2
         /// </summary>
-        /// <param name="env">The target environment where the document will be uploaded</param>
         /// <param name="documentId">The id to assign to the new document. This is restricted to alphanumeric with dashes and underscores.</param>
         /// <param name="roles">The list of roles that are allowed to retrieve the document. If not set, <c>["all"]</c> will be used.</param>
         /// <param name="customFields">A key-value collection of custom fields.</param>
         public IndexingOptionsGeneric(
-            MatchV2Environment env,
             string documentId,
             List<string> roles = null,
             Dictionary<string, string> customFields = null)
@@ -142,7 +140,6 @@ public IndexingOptionsGeneric(
             Roles = roles;
             CustomFields = customFields;
             DocumentId = documentId;
-            SearchAndMatchEnvironment = env;
         }
 
         /// <summary>
@@ -174,12 +171,12 @@ public IndexingOptionsGeneric(
         public List<string> UserDefinedTags { get; set; }
 
         /// <summary>
-        /// The target environment where the document will be uploaded
+        /// The target environment where the document will be uploaded. This will be set from <see cref="EnvironmentSettings.MatchV2Environment"/> if needed.
         /// </summary>
         /// <remarks>
-        /// Only use when <see cref="SearchAndMatchVersion"/> = <see cref="SearchAndMatchVersion.V2"/>
+        /// Only used when <see cref="SearchAndMatchVersion"/> = <see cref="SearchAndMatchVersion.V2"/>
         /// </remarks>
-        public MatchV2Environment SearchAndMatchEnvironment { get; set; }
+        public MatchV2Environment SearchAndMatchEnvironment { get; internal set; }
 
         /// <summary>
         /// The list of roles that are allowed to retrieve the document. If not set, <c>["all"]</c> will be used.

…ernel.Tx.SDK/Clients/FormatterService.cs …rnel.Tx.SDK/Services/FormatterService.cssrc/Textkernel.Tx.SDK/Clients/FormatterService.cs renamed to src/Textkernel.Tx.SDK/Services/FormatterService.cs src/Textkernel.Tx.SDK/Clients/FormatterService.cs renamed to src/Textkernel.Tx.SDK/Services/FormatterService.cs

@@ -18,7 +18,10 @@ namespace Textkernel.Tx.Services
     /// </summary>
     internal class FormatterService : ServiceBase, IFormatterService
     {
-        internal FormatterService(HttpClient httpClient) : base(httpClient) { }
+        internal FormatterService(HttpClient httpClient, EnvironmentSettings settings)
+            : base(httpClient, settings)
+        {
+        }
 
         /// <inheritdoc />
         public async Task<FormatResumeResponse> FormatResume(FormatResumeRequest request)

…kernel.Tx.SDK/Clients/GeocoderService.cs …ernel.Tx.SDK/Services/GeocoderService.cssrc/Textkernel.Tx.SDK/Clients/GeocoderService.cs renamed to src/Textkernel.Tx.SDK/Services/GeocoderService.cs src/Textkernel.Tx.SDK/Clients/GeocoderService.cs renamed to src/Textkernel.Tx.SDK/Services/GeocoderService.cs

@@ -23,7 +23,7 @@ namespace Textkernel.Tx.Services
     /// </summary>
     internal class GeocoderService : ServiceBase, IGeocoderService
     {
-        internal GeocoderService(HttpClient httpClient) : base(httpClient) { }
+        internal GeocoderService(HttpClient httpClient, EnvironmentSettings settings) : base(httpClient, settings) { }
 
         private async Task<GeocodeResumeResponse> InternalGeocode(ParsedResume resume, GeocodeCredentials geocodeCredentials, Address address = null)
         {
@@ -112,6 +112,8 @@ public async Task<GeocodeJobResponse> Geocode(ParsedJob job, Address address, Ge
 
         private async Task<GeocodeAndIndexResumeResponse> InternalGeocodeAndIndex(ParsedResume resume, GeocodeCredentials geocodeCredentials, IndexingOptionsGeneric indexingOptions, bool indexIfGeocodeFails, Address address = null, GeoCoordinates coordinates = null)
         {
+            SetEnvironment(indexingOptions);
+
             GeocodeAndIndexResumeRequest requestBody = new GeocodeAndIndexResumeRequest
             {
                 ResumeData = resume,
@@ -146,6 +148,8 @@ private async Task<GeocodeAndIndexResumeResponse> InternalGeocodeAndIndex(Parsed
 
         private async Task<GeocodeAndIndexJobResponse> InternalGeocodeAndIndex(ParsedJob job, GeocodeCredentials geocodeCredentials, IndexingOptionsGeneric indexingOptions, bool indexIfGeocodeFails, Address address = null, GeoCoordinates coordinates = null)
         {
+            SetEnvironment(indexingOptions);
+
             GeocodeAndIndexJobRequest requestBody = new GeocodeAndIndexJobRequest
             {
                 JobData = job,