Skip to content

Update multi recognition sdk #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
acured wants to merge 10 commits into from
Closed

Update multi recognition sdk #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e79d98c
update multiple recognition SDK.
Jan 31, 2019
e46714b
update multiple recognition SDK.
Jan 31, 2019
cdf852f
Update recognitionModel option.
Feb 27, 2019
cbe0b38
Merge branch 'UpdateMultiRecognitionSDK' of https://github.com/acured…
Feb 27, 2019
2a13c18
Change RecognitionModel from enum to string.
Mar 13, 2019
f2eaeea
Add link, Consistent with swagger.
Mar 14, 2019
e8ac2ac
rename "recognition_v01(2)" to "recognition_01(2)".
Mar 14, 2019
64358a5
update test.
Mar 14, 2019
0cc4de5
Add returnRecognitionModel parameter.
Mar 20, 2019
ec7e8e2
Update returnRecognitionModel description.
Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceDetectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace FaceSDK.Tests
{
public class FaceDetectionTests : BaseTests
{
private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
public void FaceDetectionWithAttributes()
{
Expand Down Expand Up @@ -40,7 +42,9 @@ public void FaceDetectionWithAttributes()
FaceAttributeType.Noise,
FaceAttributeType.Occlusion,
FaceAttributeType.Smile
}
},
recognitionModel: recognitionModel,
returnRecognitionModel: true
).Result;

Assert.Equal(1, faceList.Count);
Expand Down Expand Up @@ -135,6 +139,9 @@ public void FaceDetectionWithAttributes()
Assert.True(landMarks.UnderLipTop.Y > 0);
Assert.True(landMarks.UnderLipBottom.X > 0);
Assert.True(landMarks.UnderLipBottom.Y > 0);

// Ensure recognitionModel return correctly.
Assert.Equal(face.RecognitionModel, recognitionModel);
}
}
}
Expand All @@ -149,7 +156,7 @@ public void FaceDetectionNoFace()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
using (FileStream stream = new FileStream(Path.Combine("TestImages", "NoFace.jpg"), FileMode.Open))
{
IList<DetectedFace> faceList = client.Face.DetectWithStreamAsync(stream).Result;
IList<DetectedFace> faceList = client.Face.DetectWithStreamAsync(stream, recognitionModel: recognitionModel).Result;
Assert.Equal(0, faceList.Count);
}
}
Expand Down
18 changes: 10 additions & 8 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceFindSimilarTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace FaceSDK.Tests
{
public class FaceFindSimilarTests : BaseTests
{
private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
public void FaceFindSimilarFacePositive()
{
Expand All @@ -29,7 +31,7 @@ public void FaceFindSimilarFacePositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -50,15 +52,15 @@ public void FaceFindSimilarFaceListPositive()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
Guid? faceId1 = null;
string faceListId = "face-list-id";
client.FaceList.CreateAsync(faceListId, "fakeFaceList").Wait();
client.FaceList.CreateAsync(faceListId, "fakeFaceList", recognitionModel: recognitionModel).Wait();
try
{
var satyaPersistedFaceIds = AddFaceListFace(client, faceListId, "Satya");
var gatesPersistedFaceIds = AddFaceListFace(client, faceListId, "Gates");

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -84,7 +86,7 @@ public void FaceFindSimilarLargeFaceListPositive()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
Guid? faceId1 = null;
string largeFaceListId = "large-face-list-id";
client.LargeFaceList.CreateAsync(largeFaceListId, "fakeLargeFaceList").Wait();
client.LargeFaceList.CreateAsync(largeFaceListId, "fakeLargeFaceList", recognitionModel: recognitionModel).Wait();
try
{
var satyaPersistedFaceIds = AddLargeFaceListFace(client, largeFaceListId, "Satya");
Expand All @@ -96,7 +98,7 @@ public void FaceFindSimilarLargeFaceListPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -120,7 +122,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -146,7 +148,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -172,7 +174,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream).Result[0];
face = client.Face.DetectWithStreamAsync(stream, recognitionModel: recognitionModel).Result[0];
}

faceIdList.Add(face.FaceId);
Expand Down
14 changes: 8 additions & 6 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceIdentifyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace FaceSDK.Tests
{
public class FaceIdentifyTests : BaseTests
{
private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
public void FaceIdentificationPersonGroupPositive()
{
Expand All @@ -22,7 +24,7 @@ public void FaceIdentificationPersonGroupPositive()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
Guid? faceId1 = null;
string personGroupId = "person-group-id";
client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup").Wait();
client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person satyaPerson = client.PersonGroupPerson.CreateAsync(personGroupId, "Satya").Result;
Expand All @@ -36,7 +38,7 @@ public void FaceIdentificationPersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -62,7 +64,7 @@ public void FaceIdentificationLargePersonGroupPositive()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
Guid? faceId1 = null;
string largePersonGroupId = "large-person-group-id";
client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup").Wait();
client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person satyaPerson = client.LargePersonGroupPerson.CreateAsync(largePersonGroupId, "Satya").Result;
Expand All @@ -76,7 +78,7 @@ public void FaceIdentificationLargePersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -99,7 +101,7 @@ private void AddPersonGroupPersonFace(IFaceClient client, string personGroupId,
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -120,7 +122,7 @@ private void AddLargePersonGroupPersonFace(IFaceClient client, string largePerso
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand Down
26 changes: 14 additions & 12 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceVerificationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace FaceSDK.Tests
{
public class FaceVerificationTests : BaseTests
{
private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
public void FaceVerificationFacePositive()
{
Expand All @@ -23,12 +25,12 @@ public void FaceVerificationFacePositive()
Guid? faceId2 = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId1);
Expand All @@ -50,7 +52,7 @@ public void FaceVerificationPersonGroupPositive()
Guid? faceId2 = null;
string personGroupId = "person-group-id";

client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup").Wait();
client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person createPersonResult = client.PersonGroupPerson.CreateAsync(personGroupId, "David").Result;
Expand All @@ -61,7 +63,7 @@ public void FaceVerificationPersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand All @@ -87,7 +89,7 @@ public void FaceVerificationLargePersonGroupPositive()
Guid? faceId2 = null;
string largePersonGroupId = "large-person-group-id";

client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup").Wait();
client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person createPersonResult = client.LargePersonGroupPerson.CreateAsync(largePersonGroupId, "David").Result;
Expand All @@ -98,7 +100,7 @@ public void FaceVerificationLargePersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down Expand Up @@ -126,12 +128,12 @@ public void FaceVerificationFaceNegative()
Guid? faceId2 = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId1);
Expand All @@ -153,7 +155,7 @@ public void FaceVerificationPersonGroupNegative()
Guid? faceId2 = null;
string personGroupId = "person-group-id";

client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup").Wait();
client.PersonGroup.CreateAsync(personGroupId, "fakePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person createPersonResult = client.PersonGroupPerson.CreateAsync(personGroupId, "David").Result;
Expand All @@ -164,7 +166,7 @@ public void FaceVerificationPersonGroupNegative()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand All @@ -190,7 +192,7 @@ public void FaceVerificationLargePersonGroupNegative()
Guid? faceId2 = null;
string largePersonGroupId = "large-person-group-id";

client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup").Wait();
client.LargePersonGroup.CreateAsync(largePersonGroupId, "fakeLargePersonGroup", recognitionModel: recognitionModel).Wait();
try
{
Person createPersonResult = client.LargePersonGroupPerson.CreateAsync(largePersonGroupId, "David").Result;
Expand All @@ -201,7 +203,7 @@ public void FaceVerificationLargePersonGroupNegative()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down
10 changes: 6 additions & 4 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/SnapshotTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class SnapshotTests : BaseTests
// of Cognitive Service Face. We can leave it as `Guid.Empty` in the `playback` test mode.
private static readonly List<Guid> ApplyScope = new List<Guid> { Guid.Empty };

private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
public void FaceSnapshotTestFaceList()
{
Expand All @@ -29,7 +31,7 @@ public void FaceSnapshotTestFaceList()
var userdata = $"userdata{sourceFaceListId}";

IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
client.FaceList.CreateAsync(sourceFaceListId, name, userdata).Wait();
client.FaceList.CreateAsync(sourceFaceListId, name, userdata, recognitionModel: recognitionModel).Wait();

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
Expand Down Expand Up @@ -84,7 +86,7 @@ public void FaceSnapshotTestLargeFaceList()
var userdata = $"userdata{sourceLargeFacelistId}";

IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
client.LargeFaceList.CreateAsync(sourceLargeFacelistId, name, userdata).Wait();
client.LargeFaceList.CreateAsync(sourceLargeFacelistId, name, userdata, recognitionModel: recognitionModel).Wait();

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
Expand Down Expand Up @@ -145,7 +147,7 @@ public void FaceSnapshotTestLargePersonGroup()
var userdata = $"userdata{sourceLargePersonGroupId}";

IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
client.LargePersonGroup.CreateAsync(sourceLargePersonGroupId, name, userdata).Wait();
client.LargePersonGroup.CreateAsync(sourceLargePersonGroupId, name, userdata, recognitionModel: recognitionModel).Wait();

var personName = $"personName{sourceLargePersonGroupId}";
var personUserdata = $"personUserdata{sourceLargePersonGroupId}";
Expand Down Expand Up @@ -215,7 +217,7 @@ public void FaceSnapshotTestPersonGroup()
var userdata = $"userdata{sourcePersonGroupId}";

IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
client.PersonGroup.CreateAsync(sourcePersonGroupId, name, userdata).Wait();
client.PersonGroup.CreateAsync(sourcePersonGroupId, name, userdata, recognitionModel: recognitionModel).Wait();

var personName = $"personName{sourcePersonGroupId}";
var personUserdata = $"personUserdata{sourcePersonGroupId}";
Expand Down
Loading