Skip to content

Commit 12dec65

Browse files
committed
Merge branch 'develop'
2 parents 808a366 + be47380 commit 12dec65

18 files changed

+1967
-21
lines changed

CI.Jenkinsfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ node ("docker-light") {
6363
mono /opt/sonar-scanner/SonarScanner.MSBuild.exe end /d:sonar.login=\"${env.SONAR_AUTH_TOKEN}\" && \
6464
echo && \
6565
echo [INFO] Running unit tests && \
66-
mono ./packages/NUnit.Console.3.0.1/tools/nunit3-console.exe ./rosette_apiUnitTests/bin/Release/rosette_apiUnitTests.dll\""
66+
mono ./packages/NUnit.Console.3.0.1/tools/nunit3-console.exe ./rosette_apiUnitTests/bin/Release/rosette_apiUnitTests.dll && \
67+
echo && \
68+
echo [INFO] Re-permission files for cleanup. && \
69+
chown -R 9960:9960 /source\""
6770

6871
// TODO: Finish coverage data gathering for Sonar.
6972
///opt/maven-basis/bin/mvn --batch-mode clean install sonar:sonar $mySonarOpts\""

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
<a href="https://www.babelstreet.com/rosette"><img src="https://s3.amazonaws.com/styleguide.basistech.com/logos/rosette-logo.png" width="181" height="47" /></a>
1+
<a href="https://www.babelstreet.com/rosette"><img src="https://charts.babelstreet.com/icon.png" width="47" height="60"/></a>
2+
# Rosette by Babel Street
23

34
---
45

56
[![NuGet version](https://badge.fury.io/nu/rosette_api.svg)](https://badge.fury.io/nu/rosette_api)
67

7-
## Rosette API
8-
The Rosette Text Analytics Platform uses natural language processing, statistical modeling, and machine learning to
9-
analyze unstructured and semi-structured text across 364 language-encoding-script combinations, revealing valuable
10-
information and actionable data. Rosette provides endpoints for extracting entities and relationships, translating and
11-
comparing the similarity of names, categorizing and adding linguistic tags to text and more.
8+
Rosette uses natural language processing, statistical modeling, and machine learning to analyze unstructured and semi-structured text across hundreds of language-script combinations, revealing valuable information and actionable data. Rosette provides endpoints for extracting entities and relationships, translating and comparing the similarity of names, categorizing and adding linguistic tags to text and more. Rosette Server is the on-premises installation of Rosette, with access to Rosette's functions as RESTful web service endpoints. This solves cloud security worries and allows customization (models/indexes) as needed for your business.
9+
1210

1311
## Rosette API Access
1412
- Rosette Cloud [Sign Up](https://developer.rosette.com/signup)
@@ -32,11 +30,10 @@ in the [examples](https://github.com/rosette-api/csharp/tree/develop/rosette_api
3230

3331
#### Documentation & Support
3432
- [Binding API](https://rosette-api.github.io/csharp/)
35-
- [Rosette Platform API](https://developer.rosette.com/features-and-functions)
33+
- [Rosette Platform API](https://docs.babelstreet.com/API/en/index-en.html)
3634
- [Binding Release Notes](https://github.com/rosette-api/csharp/wiki/Release-Notes)
37-
- [Rosette Platform Release Notes](https://support.rosette.com/hc/en-us/articles/360018354971-Release-Notes)
38-
- [Binding/Rosette Platform Compatibility](https://developer.rosette.com/features-and-functions?csharp#)
39-
- [Support](https://support.rosette.com)
35+
- [Rosette Platform Release Notes](https://babelstreet.my.site.com/support/s/article/Rosette-Cloud-Release-Notes)
36+
- [Support](https://babelstreet.my.site.com/support/s/)
4037
- [Binding License: Apache 2.0](https://github.com/rosette-api/csharp/blob/develop/LICENSE.txt)
4138

4239
## Concurrency

recompile.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
3+
# step into the directory of the script
4+
cd "$(dirname "$0")"
5+
6+
7+
# compile the project
8+
nuget restore rosette_api.sln
9+
msbuild /p:Configuration=Release rosette_api.sln
10+
# if last command is empty then exit
11+
if [ $? -ne 0 ]; then
12+
exit 1
13+
fi
14+
15+
cp packages/Newtonsoft.Json.13.0.2/lib/net45/Newtonsoft.Json.dll rosette_apiExamples/.
16+
cp rosette_api/bin/Release/rosette_api.dll rosette_apiExamples/.
17+
cd rosette_apiExamples
18+
# Loop over parameters
19+
for filename in "$@"
20+
do
21+
if [ -f "${filename}.cs" ]; then
22+
echo "####> Compiling and running ${filename} example"
23+
csc "${filename}.cs" /r:rosette_api.dll /r:System.Net.Http.dll /r:System.Web.Extensions.dll /r:Newtonsoft.Json.dll
24+
# if last command is empty then exit
25+
if [ $? -eq 0 ]; then
26+
mono "${filename}.exe"
27+
fi
28+
else
29+
echo "####> File ${filename}.cs not found in rosette_apiExamples directory"
30+
fi
31+
done

rosette_api/CAPI.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public enum MorphologyFeature
3232
/// <summary>C# Rosette API.
3333
/// <para>
3434
/// Primary class for interfacing with the Rosette API
35-
/// @copyright 2014-2017 Basis Technology Corporation.
35+
/// @copyright 2014-2024 Basis Technology Corporation.
3636
/// Licensed under the Apache License, Version 2.0 (the "License"); you may not use file except in compliance
3737
/// with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
3838
/// Unless required by applicable law or agreed to in writing, software distributed under the License is
@@ -678,6 +678,21 @@ public MorphologyResponse Morphology(RosetteFile file, MorphologyFeature feature
678678
return Process<MorphologyResponse>(file);
679679
}
680680

681+
/// <summary>RecordSimilarity
682+
/// <para>
683+
/// (POST)RecordSimilarity Endpoint: Returns the result of matching 2 lists of records.
684+
/// </para>
685+
/// </summary>
686+
/// <param name="request">RecordSimilarityRequest: RecordSimilarityRequest object to send</param>
687+
/// <returns>RecordSimilarityResponse containing the results of the request.
688+
/// </returns>
689+
public RecordSimilarityResponse RecordSimilarity(RecordSimilarityRequest request)
690+
{
691+
_uri = "record-similarity";
692+
693+
return GetResponse<RecordSimilarityResponse>(JsonConvert.SerializeObject(request, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
694+
}
695+
681696
/// <summary>NameSimilarity
682697
/// <para>
683698
/// (POST)NameSimilarity Endpoint: Returns the result of matching 2 names.

rosette_api/NameSimilarityResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace rosette_api
77
{
88
/// <summary>
9-
/// A class to represnt the results from the Name Similarity endpoint of the Rosette API
9+
/// A class to represent the results from the Name Similarity endpoint of the Rosette API
1010
/// </summary>
1111
[JsonObject(MemberSerialization.OptOut)]
1212
public class NameSimilarityResponse : RosetteResponse

rosette_api/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.28.0.0")]
35-
[assembly: AssemblyVersion("1.28.0.0")]
36-
[assembly: AssemblyFileVersion("1.28.0.0")]
34+
// [assembly: AssemblyVersion("1.29.0.0")]
35+
[assembly: AssemblyVersion("1.29.0.0")]
36+
[assembly: AssemblyFileVersion("1.29.0.0")]
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using Newtonsoft.Json;
3+
4+
namespace rosette_api {
5+
6+
/// <summary>
7+
/// JsonConverter for Unfielded Record Similarity objects
8+
/// </summary>
9+
public class UnfieldedRecordSimilarityConverter : JsonConverter
10+
{
11+
public override bool CanConvert(Type objectType)
12+
{
13+
return true;
14+
}
15+
16+
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
17+
{
18+
writer.WriteValue(value.ToString());
19+
}
20+
21+
public override bool CanRead
22+
{
23+
get { return false; }
24+
}
25+
26+
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
27+
{
28+
throw new NotImplementedException();
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)