Merge pull request #47 from fhasanaj/RCB-416_unify_entities

Unified entities and entities/linked

Author: cp2boston

examples/entities.py

@@ -17,6 +17,9 @@ def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     entities_text_data = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS"
     params = DocumentParameters()
     params["content"] = entities_text_data
+    params["genre"] = "social-media"
+    # to improve performance, and if you don't need the QID, set this option
+    # api.setOption("linkEntities", False)
     return api.entities(params)  # entity linking is turned off
 
 parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, description='Calls the ' + os.path.splitext(os.path.basename(__file__))[0] + ' endpoint')

examples/entities_linked.py

@@ -692,22 +692,16 @@ def morphology(self, parameters, facet=MorphologyOutput.COMPLETE):
         @return: A python dictionary containing the results of morphological analysis."""
         return EndpointCaller(self, "morphology/" + facet).call(parameters)
 
-    def entities(self, parameters, resolve_entities=False):
+    def entities(self, parameters):
         """
         Create an L{EndpointCaller}  to identify named entities found in the texts
         to which it is applied and call it. Linked entity information is optional, and
         its need must be specified at the time the operator is created.
         @param parameters: An object specifying the data,
         and possible metadata, to be processed by the entity identifier.
         @type parameters: L{DocumentParameters} or L{str}
-        @param resolve_entities: Specifies whether or not linked entity information will
-        be wanted.
-        @type resolve_entities: Boolean
         @return: A python dictionary containing the results of entity extraction."""
-        if resolve_entities:
-            return EndpointCaller(self, "entities/linked").call(parameters)
-        else:
-            return EndpointCaller(self, "entities").call(parameters)
+        return EndpointCaller(self, "entities").call(parameters)
 
     def categories(self, parameters):
         """

rosette/api.py

@@ -261,21 +261,6 @@ def test_the_entities_endpoint(api, json_response, doc_params):
     httpretty.disable()
     httpretty.reset()
 
-# Test the entities/linked endpoint
-
-
-def test_the_entities_linked_endpoint(api, json_response, doc_params):
-    httpretty.enable()
-    httpretty.register_uri(httpretty.POST, "https://api.rosette.com/rest/v1/info",
-                           body=json_response, status=200, content_type="application/json")
-    httpretty.register_uri(httpretty.POST, "https://api.rosette.com/rest/v1/entities/linked",
-                           body=json_response, status=200, content_type="application/json")
-
-    result = api.entities(doc_params, True)
-    assert result["name"] == "Rosette API"
-    httpretty.disable()
-    httpretty.reset()
-
 # Test the categories endpoint