From 1855e07ea846126bc27b1419f104a024d78623c7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 28 May 2018 16:13:20 -0700 Subject: refactor python web interface to work with API backend --- python/fatcat/__init__.py | 5 + python/fatcat/api_client.py | 12 ++- python/fatcat/routes.py | 137 +++++++++++++++++----------- python/fatcat/templates/editgroup_view.html | 3 +- python/tests/api_client.py | 5 +- python/tests/fixtures.py | 21 +++-- python/tests/routes.py | 43 ++++++--- 7 files changed, 141 insertions(+), 85 deletions(-) diff --git a/python/fatcat/__init__.py b/python/fatcat/__init__.py index 0240e3e9..6a7f4620 100644 --- a/python/fatcat/__init__.py +++ b/python/fatcat/__init__.py @@ -2,10 +2,15 @@ from flask import Flask from flask_debugtoolbar import DebugToolbarExtension from config import Config +import fatcat_client toolbar = DebugToolbarExtension() app = Flask(__name__) app.config.from_object(Config) toolbar = DebugToolbarExtension(app) +conf = fatcat_client.Configuration() +conf.host = "http://localhost:9411/v0" +api = fatcat_client.DefaultApi(fatcat_client.ApiClient(conf)) + from fatcat import routes diff --git a/python/fatcat/api_client.py b/python/fatcat/api_client.py index f2fd6a1d..4c000609 100644 --- a/python/fatcat/api_client.py +++ b/python/fatcat/api_client.py @@ -23,8 +23,10 @@ class FatCatApiClient: def new_editgroup(self): rv = self.post('/v0/editgroup', data=dict( - editor=1)) - assert rv.status_code == 200 + editor_id=1)) + print(rv) + print(rv.json()) + assert rv.status_code == 201 editgroup_id = rv.json()['id'] return editgroup_id @@ -97,7 +99,7 @@ class FatCatApiClient: rv = self.post('/v0/container', data=dict( issn=container['issn'], publisher=container['publisher'])) - assert rv.status_code == 200 + assert rv.status_code == 201 container_id = rv.json()['id'] print("created container: {}".format(issn)) container['id'] = container_id @@ -117,7 +119,7 @@ class FatCatApiClient: title = meta['title'][0] rv = self.post('/v0/work', data=dict(title=title, editgroup=editgroup)) #work_type="book" - assert rv.status_code == 200 + assert rv.status_code == 201 work_id = rv.json()['id'] extra = dict(crossref={ @@ -141,7 +143,7 @@ class FatCatApiClient: pages=meta.get('page', None), editgroup=editgroup, extra=extra)) - assert rv.status_code == 200 + assert rv.status_code == 201 release_id = rv.json()['id'] def import_issn_file(self, json_file, create_containers=False, batchsize=100): diff --git a/python/fatcat/routes.py b/python/fatcat/routes.py index 7db0ff6d..a7a2081f 100644 --- a/python/fatcat/routes.py +++ b/python/fatcat/routes.py @@ -3,11 +3,26 @@ import os import json from flask import Flask, render_template, send_from_directory, request, \ url_for, abort, g, redirect, jsonify, session -from fatcat import app +from fatcat import app, api +from fatcat_client.rest import ApiException ### Views ################################################################### + +@app.route('/container/', methods=['GET']) +def container_view(ident): + try: + entity = api.get_container(ident) + except ApiException as ae: + abort(ae.status) + return render_template('container_view.html', container=entity) + +@app.route('/container/random', methods=['GET']) +def container_random(): + """Not actually random, just a dummy example""" + return redirect("/container/00000000-0000-0000-1111-000000000002") + @app.route('/container/create', methods=['GET']) def container_create_view(): return render_template('container_add.html') @@ -18,90 +33,102 @@ def container_create(): for k in request.form: if k.startswith('container_'): params[k[10:]] = request.form[k] - rv = api.api_container_create(params=params) - container = json.loads(rv.data.decode('utf-8')) - return redirect("/container/{}".format(container['id'])) + edit = api.create_container(params=params) + return redirect("/container/{}".format(edit.ident)) -@app.route('/container/', methods=['GET']) -def container_view(ident): - rv = api.api_container_get(ident) - entity = json.loads(rv.data.decode('utf-8')) - return render_template('container_view.html', container=entity) +@app.route('/creator/', methods=['GET']) +def creator_view(ident): + try: + entity = api.get_creator(ident) + except ApiException as ae: + abort(ae.status) + return render_template('creator_view.html', creator=entity) @app.route('/creator/random', methods=['GET']) def creator_random(): """Not actually random, just a dummy example""" - return redirect("/creator/f1f046a3-45c9-4b99-adce-000000000002") + return redirect("/creator/00000000-0000-0000-2222-000000000002") -@app.route('/creator/', methods=['GET']) -def creator_view(ident): - rv = api.api_creator_get(ident) - entity = json.loads(rv.data.decode('utf-8')) - return render_template('creator_view.html', creator=entity) - -@app.route('/file/', methods=['GET']) +@app.route('/file/', methods=['GET']) def file_view(ident): - rv = api.api_file_get(ident) - entity = json.loads(rv.data.decode('utf-8')) + try: + entity = api.get_file(ident) + except ApiException as ae: + abort(ae.status) return render_template('file_view.html', file=entity) -@app.route('/work/create', methods=['GET']) -def work_create(): - return render_template('work_add.html') -@app.route('/release/', methods=['GET']) +@app.route('/file/random', methods=['GET']) +def file_random(): + """Not actually random, just a dummy example""" + return redirect("/file/00000000-0000-0000-3333-000000000002") + +@app.route('/release/', methods=['GET']) def release_view(ident): - rv = api.api_release_get(ident) - entity = json.loads(rv.data.decode('utf-8')) + try: + entity = api.get_release(ident) + except ApiException as ae: + abort(ae.status) return render_template('release_view.html', release=entity) -@app.route('/release//changelog', methods=['GET']) -def release_changelog(ident): - rv = api.api_release_get(ident) - release = json.loads(rv.data.decode('utf-8')) - rv = api.api_release_changelog(ident) - changelog_entries = json.loads(rv.data.decode('utf-8')) - return render_template('release_changelog.html', release=release, - changelog_entries=changelog_entries) - @app.route('/release/random', methods=['GET']) def release_random(): """Not actually random, just a dummy example""" - return redirect("/release/f1f046a3-45c9-4b99-3333-000000000002") - -@app.route('/editgroup/', methods=['GET']) -def editgroup_view(ident): - rv = api.api_editgroup_get(ident) - entity = json.loads(rv.data.decode('utf-8')) - return render_template('editgroup_view.html', editgroup=entity) + return redirect("/release/00000000-0000-0000-4444-000000000002") + +#@app.route('/release//changelog', methods=['GET']) +#def release_changelog(ident): +# try: +# entity = api.get_release(ident) +# except ApiException as ae: +# abort(ae.status) +# try: +# entries = api.release_changelog(ident) +# except ApiException as ae: +# abort(ae.status) +# return render_template('release_changelog.html', release=entity, +# changelog_entries=entries) + +@app.route('/work/', methods=['GET']) +def work_view(ident): + try: + entity = api.get_work(ident) + except ApiException as ae: + abort(ae.status) + return render_template('work_view.html', work=entity) @app.route('/work/random', methods=['GET']) def work_random(): """Not actually random, just a dummy example""" - return redirect("/work/f1f046a3-45c9-4b99-3333-000000000002") + return redirect("/work/00000000-0000-0000-5555-000000000002") -@app.route('/work/', methods=['GET']) -def work_view(ident): - rv = api.api_work_get(ident) - entity = json.loads(rv.data.decode('utf-8')) - return render_template('work_view.html', work=entity) +@app.route('/work/create', methods=['GET']) +def work_create(): + return render_template('work_add.html') + +@app.route('/editgroup/', methods=['GET']) +def editgroup_view(ident): + try: + entity = api.get_editgroup(ident) + except ApiException as ae: + print(ae.body) + abort(ae.status) + return render_template('editgroup_view.html', editgroup=entity) @app.route('/editgroup/current', methods=['GET']) def editgroup_current(): - eg = api.get_or_create_editgroup() - return redirect('/editgroup/{}'.format(eg.id)) + raise NotImplemented() + #eg = api.get_or_create_editgroup() + #return redirect('/editgroup/{}'.format(eg.id)) @app.route('/editor/', methods=['GET']) def editor_view(username): - rv = api.api_editor_get(username) - entity = json.loads(rv.data.decode('utf-8')) + entity = api.get_editor(username) return render_template('editor_view.html', editor=entity) @app.route('/editor//changelog', methods=['GET']) def editor_changelog(username): - rv = api.api_editor_get(username) - editor = json.loads(rv.data.decode('utf-8')) - rv = api.api_editor_changelog(username) - changelog_entries = json.loads(rv.data.decode('utf-8')) + editor = api.get_editor(username) + changelog_entries = api.get_editor_changelog(username) return render_template('editor_changelog.html', editor=editor, changelog_entries=changelog_entries) diff --git a/python/fatcat/templates/editgroup_view.html b/python/fatcat/templates/editgroup_view.html index 4ed08501..06fef424 100644 --- a/python/fatcat/templates/editgroup_view.html +++ b/python/fatcat/templates/editgroup_view.html @@ -3,7 +3,8 @@

Edit Group: #{{ editgroup.id}}

-

Editor: {{ editgroup.editor.username }} +{# TODO:

Editor: {{ editgroup.editor.username }} #} +

Editor: {{ editgroup.editor_id }}

Description: {{ editgroup.description }}

Work Edits ({{ editgroup.work_edits|count }})

diff --git a/python/tests/api_client.py b/python/tests/api_client.py index 37e3da56..9d2ec302 100644 --- a/python/tests/api_client.py +++ b/python/tests/api_client.py @@ -4,8 +4,9 @@ import fatcat.api_client from fixtures import * -def test_client_health(api_client): - assert api_client.health() != None +# TODO: +#def test_client_health(api_client): +# assert api_client.health() != None def test_import_crossref(api_client): diff --git a/python/tests/fixtures.py b/python/tests/fixtures.py index 9092421f..b1682e79 100644 --- a/python/tests/fixtures.py +++ b/python/tests/fixtures.py @@ -21,15 +21,18 @@ def app(full_app): @pytest.fixture(scope="function") def api_client(full_app): - pid = os.fork() - if pid == 0: - full_app.testing = False - full_app.run(host="localhost", port=8444, debug=False) - os._exit(0) - - time.sleep(0.2) - yield fatcat.api_client.FatCatApiClient("http://localhost:8444") - os.kill(pid, signal.SIGKILL) + # TODO: + #pid = os.fork() + #if pid == 0: + # full_app.testing = False + # full_app.run(host="localhost", port=8444, debug=False) + # os._exit(0) + # + #time.sleep(0.2) + #yield fatcat.api_client.FatCatApiClient("http://localhost:8444") + #os.kill(pid, signal.SIGKILL) + + yield fatcat.api_client.FatCatApiClient("http://localhost:9411") ## Helpers ################################################################## diff --git a/python/tests/routes.py b/python/tests/routes.py index 80eb15fe..e11d024e 100644 --- a/python/tests/routes.py +++ b/python/tests/routes.py @@ -3,6 +3,7 @@ import json import tempfile import pytest import fatcat +from fatcat_client.rest import ApiException from fixtures import * @@ -17,12 +18,32 @@ def test_static_routes(app): def test_all_views(app): for route in ('work', 'release', 'creator', 'container', 'file'): print(route) - rv = app.get('/{}/1'.format(route)) - assert rv.status_code == 200 + #with pytest.raises(ApiException) as api_fail: + # rv = app.get('/{}/999999999999'.format(route)) + rv = app.get('/{}/9999999999'.format(route)) + assert rv.status_code == 400 - rv = app.get('/{}/999999999999'.format(route)) + rv = app.get('/{}/f1f046a3-45c9-ffff-ffff-ffffffffffff'.format(route)) assert rv.status_code == 404 + rv = app.get('/{}/random'.format(route)) + assert rv.status_code == 302 + + rv = app.get('/container/00000000-0000-0000-1111-000000000002'.format(route)) + assert rv.status_code == 200 + + rv = app.get('/creator/00000000-0000-0000-2222-000000000002'.format(route)) + assert rv.status_code == 200 + + rv = app.get('/file/00000000-0000-0000-3333-000000000002'.format(route)) + assert rv.status_code == 200 + + rv = app.get('/release/00000000-0000-0000-4444-000000000002'.format(route)) + assert rv.status_code == 200 + + rv = app.get('/work/00000000-0000-0000-5555-000000000002'.format(route)) + assert rv.status_code == 200 + rv = app.get('/work/random') rv = app.get(rv.location) assert rv.status_code == 200 @@ -36,26 +57,22 @@ def test_all_views(app): rv = app.get('/release/random') assert rv.status_code == 302 - rv = app.get('/release/1/changelog') - assert rv.status_code == 200 + #rv = app.get('/release/00000000-0000-0000-4444-000000000002/changelog') + #assert rv.status_code == 200 rv = app.get('/editgroup/1') assert rv.status_code == 200 rv = app.get('/editgroup/99999999') + print(rv) + print(rv.data) assert rv.status_code == 404 - rv = app.get('/editgroup/current') - assert rv.status_code == 302 + #rv = app.get('/editgroup/current') + #assert rv.status_code == 302 rv = app.get('/editor/admin') assert rv.status_code == 200 - rv = app.get('/editor/bizzaro') - assert rv.status_code == 404 - rv = app.get('/editor/admin/changelog') assert rv.status_code == 200 - - rv = app.get('/editor/bizarro/changelog') - assert rv.status_code == 404 -- cgit v1.2.3