Use syntaxnet-wrapper

Migrates to Docker installation

Author: Tpt

.gitmodules

@@ -0,0 +1,9 @@
+FROM gliacloud/syntaxnet
+
+COPY * /usr/src/api/
+RUN cd /usr/src/api && pip install -r requirements.txt
+
+ENV PORT 7000
+EXPOSE $PORT
+
+CMD cd /usr/src/api && gunicorn flask_server:app

Dockerfile

@@ -3,49 +3,18 @@ SyntaxNet API
 
 A small HTTP API for SyntaxNet under Apache 2 Licence.
 Live version at [http://syntaxnet.askplatyp.us](http://syntaxnet.askplatyp.us).
+It relies on [https://github.com/livingbio/syntaxnet_wrapper](syntaxnet_wrapper).
 
-Currently only provides a way to call Parsey trained with universal dependencies.
-
-The API documentation is availlable as a Swagger API description in the swagger.yaml file.
-
-Are available languages with the following Universal Dependencies training sets:
-
-* grc: Ancient_Greek-PROIEL
-* eu: Basque
-* bg: Bulgarian
-* zh: Chinese
-* hr: Croatian
-* cs: Czech
-* da: Danish
-* nl: Dutch
-* en: English
-* et: Estonian
-* fi: Finnish
-* fr: French
-* gl: Galician
-* de: German
-* el: Greek
-* he: Hebrew
-* hi: Hindi
-* hu: Hungarian
-* id: Indonesian
-* it: Italian
-* la: Latin-PROIEL
-* no: Norwegian
-* pl: Polish
-* pt: Portuguese
-* sl: Slovenian
-* es: Spanish
-* sv: Swedish
+Currently only provides a way to call Parsey McParseface and it universal dependencies version.
 
 ## Install
 
-On Debian/Ubuntu
+Docker is currently the only supported installation way:
 
 ```
-git clone --recursive --recurse-submodules https://github.com/askplatypus/syntaxnet-api
+git clone https://github.com/askplatypus/syntaxnet-api
 cd syntaxnet-api
-sh install-syntaxnet-debian.sh
-pip3 install -r requirements.txt
-python3 flask_server.py
+docker build . -t syntaxnet-api
 ```
+
+It creates a new Docker image called `syntaxnet-api` exposing the service on port 7000.

README.md

@@ -1,5 +1,5 @@
 """
-Copyright 2016 Thomas Pellissier Tanon All Rights Reserved.
+Copyright 2016-2017 Thomas Pellissier Tanon All Rights Reserved.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -14,40 +14,38 @@
 
 from flask import Flask, request, jsonify, redirect
 from flask_swaggerui import build_static_blueprint, render_swaggerui
-from werkzeug.exceptions import BadRequest
-
-import parsey
+from syntaxnet_wrapper import parser, language_code_to_model_name
+from werkzeug.exceptions import BadRequest, InternalServerError
 
 # Flask setup
-_flask_app = Flask(__name__)
+app = Flask(__name__)
 logging.basicConfig(level=logging.INFO)
 
 
-@_flask_app.route('/')
+@app.route('/')
 def _root():
  return redirect('/v1')
 
 
-@_flask_app.route('/v1')
+@app.route('/v1')
 def _v1():
  return render_swaggerui(swagger_spec_path='/v1/swagger.json')
 
 
-@_flask_app.route('/v1/parsey-universal-full', methods=['POST'])
+@app.route('/v1/parsey-universal-full', methods=['POST'])
 def _parsey_universal_full_handler():
  text = request.get_data()
  language_code = request.headers.get('Content-Language', 'en').lower()
- print(text)
- print(language_code)
-
  try:
- conllu = parsey.parsey_universal_full_conllu(text, language_code)
- return _flask_app.response_class(conllu, mimetype='text/plain; charset=utf-8')
+ conllu = parser[language_code].query(text, returnRaw=True)
+ if conllu is None:
+ raise InternalServerError('Bad SyntaxNet output')
+ return app.response_class(conllu, mimetype='text/plain; charset=utf-8')
  except ValueError as e:
  raise BadRequest(e)
 
 
-@_flask_app.route('/v1/swagger.json')
+@app.route('/v1/swagger.json')
 def _v1_spec():
  return jsonify({
  'swagger': '2.0',
@@ -83,7 +81,7 @@ def _v1_spec():
  'description': 'The text language.',
  'required': True,
  'type': 'string',
- 'enum': sorted(parsey.available_languages.keys())
+ 'enum': sorted(language_code_to_model_name.keys())
  }
  ],
  'consumes': [
@@ -106,6 +104,7 @@ def _v1_spec():
  })
 
 
-_flask_app.register_blueprint(build_static_blueprint('swaggerui', __name__))
+app.register_blueprint(build_static_blueprint('swaggerui', __name__))
 
-_flask_app.run(port=7000)
+if __name__ == '__main__':
+ app.run(port=7000)