Merge branch 'develop'

Author: Chris Park

README.md

@@ -82,6 +82,15 @@ The samples use the following procedure:
 
 See [examples](examples) for more request samples.
 
+## Docker ##
+A Docker image for running the examples against the compiled source library is available on Docker Hub.
+
+Command: `docker run -e API_KEY=api-key -v "<binding root directory>:/source" rosetteapi/docker-python`
+
+Additional environment settings:
+`-e ALT_URL=<alternative URL>`
+`-e FILENAME=<single filename>`
+
 API Documentation
 -----------------
 

docker/Dockerfile

@@ -14,7 +14,7 @@
 def run(key, altUrl='https://api.rosette.com/rest/v1/'):
     # Create an API instance
     api = API(user_key=key, service_url=altUrl)
-    relationships_text_data = "The Ghostbusters movie was filmed in Boston."
+    relationships_text_data = "Bill Gates, Microsoft's former CEO, is a philanthropist."
     params = DocumentParameters()
     params["content"] = relationships_text_data
     api.setOption('accuracyMode', 'PRECISION')

docker/README.md

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+"""
+Example code to call Rosette API to get the syntactic dependencies of a document (at a given URL).
+"""
+
+import argparse
+import json
+import os
+
+from rosette.api import API, DocumentParameters
+
+
+def run(key, altUrl='https://api.rosette.com/rest/v1/'):
+    syntax_dependencies_data = "Yoshinori Ohsumi, a Japanese cell biologist, was awarded the Nobel Prize in Physiology or Medicine on Monday."
+    params = DocumentParameters()
+    params["content"] = syntax_dependencies_data
+    params["genre"] = "social-media"
+    # Create an API instance
+    api = API(user_key=key, service_url=altUrl)
+    return api.syntax_dependencies(params)
+
+
+parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, description='Calls the ' + os.path.splitext(os.path.basename(__file__))[0] + ' endpoint')
+parser.add_argument('-k', '--key', help='Rosette API Key', required=True)
+parser.add_argument('-u', '--url', help="Alternative API URL", default='https://api.rosette.com/rest/v1/')
+
+if __name__ == '__main__':
+    args = parser.parse_args()
+    result = run(args.key, args.url)
+    print(json.dumps(result, indent=2, ensure_ascii=False, sort_keys=True).encode("utf8"))

docker/run_python.sh

@@ -16,4 +16,4 @@
 limitations under the License.
 """
 
-__version__ = '1.3.0'
+__version__ = '1.4.0'

docker/tox.ini

@@ -28,7 +28,7 @@
 import re
 import warnings
 
-_BINDING_VERSION = '1.3.0'
+_BINDING_VERSION = '1.4.0'
 _GZIP_BYTEARRAY = bytearray([0x1F, 0x8b, 0x08])
 
 _IsPy3 = sys.version_info[0] == 3
@@ -522,7 +522,6 @@ def __init__(
         if (refresh_duration < 0):
             refresh_duration = 0
 
-        self.num_retries = retries
         self.connection_refresh_duration = refresh_duration
         self.options = {}
         self.customHeaders = {}
@@ -538,8 +537,6 @@ def _set_pool_size(self):
 
     def _make_request(self, op, url, data, headers):
         """
-        Handles the actual request, retrying if a 429 is encountered
-
         @param op: POST or GET
         @param url: endpoing URL
         @param data: request data
@@ -556,43 +553,39 @@ def _make_request(self, op, url, data, headers):
         session = requests.Session()
         prepared_request = session.prepare_request(request)
 
-        for i in range(self.num_retries + 1):
-            try:
-                response = session.send(prepared_request)
-                status = response.status_code
-                rdata = response.content
-                dict_headers = dict(response.headers)
-                response_headers = {"responseHeaders": dict_headers}
-                if 'x-rosetteapi-concurrency' in dict_headers:
-                    if dict_headers['x-rosetteapi-concurrency'] != self.maxPoolSize:
-                        self.maxPoolSize = dict_headers['x-rosetteapi-concurrency']
-                        self._set_pool_size()
-
-                if status == 200:
-                    return rdata, status, response_headers
-                if status == 429:
-                    code = status
-                    message = "{0} ({1})".format(rdata, i)
-                    time.sleep(self.connection_refresh_duration)
-                    continue
-                if rdata is not None:
-                    try:
-                        the_json = _my_loads(rdata, response_headers)
-                        if 'message' in the_json:
-                            message = the_json['message']
-                        if "code" in the_json:
-                            code = the_json['code']
-                        else:
-                            code = status
-                        raise RosetteException(code, message, url)
-
-                    except:
-                        raise
-            except requests.exceptions.RequestException as e:
-                raise RosetteException(
-                    e.message,
-                    "Unable to establish connection to the Rosette API server",
-                    url)
+        try:
+            response = session.send(prepared_request)
+            status = response.status_code
+            rdata = response.content
+            dict_headers = dict(response.headers)
+            response_headers = {"responseHeaders": dict_headers}
+            if 'x-rosetteapi-concurrency' in dict_headers:
+                if dict_headers['x-rosetteapi-concurrency'] != self.maxPoolSize:
+                    self.maxPoolSize = dict_headers['x-rosetteapi-concurrency']
+                    self._set_pool_size()
+
+            if status == 200:
+                return rdata, status, response_headers
+            if rdata is not None:
+                try:
+                    the_json = _my_loads(rdata, response_headers)
+                    if 'message' in the_json:
+                        message = the_json['message']
+                    if "code" in the_json:
+                        code = the_json['code']
+                    else:
+                        code = status
+                        if not message:
+                            message = rdata
+                    raise RosetteException(code, message, url)
+
+                except:
+                    raise
+        except requests.exceptions.RequestException as e:
+            raise RosetteException(
+                e.message,
+                "Unable to establish connection to the Rosette API server",
+                url)
 
         raise RosetteException(code, message, url)
 
@@ -841,3 +834,11 @@ def text_embedding(self, parameters):
         @type parameters: L{DocumentParameters} or L{str}
         @return: A python dictionary containing the results of text embedding."""
         return EndpointCaller(self, "text-embedding").call(parameters)
+
+    def syntax_dependencies(self, parameters):
+        """
+        Create an L{EndpointCaller} to identify the syntactic dependencies in the texts
+        to which it is applied and call it.
+        @type parameters: L{DocumentParameters} or L{str}
+        @return: A python dictionary containing the results of syntactic dependencies identification"""
+        return EndpointCaller(self, "syntax/dependencies").call(parameters)