From a53a598461a25e8bf1d0bd3e63c47642e3213aef Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 15 Dec 2018 22:47:28 +0100 Subject: client stuff --- megapixels/app/server/api.py | 26 +++++++++++++++++++++++++- megapixels/cli_flask.py | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'megapixels') diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py index c5e27dd2..cd2b950b 100644 --- a/megapixels/app/server/api.py +++ b/megapixels/app/server/api.py @@ -23,8 +23,10 @@ def show(name): else: return jsonify({ 'status': 404 }) -@api.route('/dataset//face', methods=['POST']) +@api.route('/dataset//face', methods=['POST']) def upload(name): + start = time.time() + dataset = get_dataset(name) file = request.files['query_img'] fn = file.filename if fn.endswith('blob'): @@ -42,6 +44,28 @@ def upload(name): # print(vec.shape) # results = db.search(vec, limit=limit) + # with the result we have an ID + # query the sql dataset for the UUID etc here + + query = { + 'timing': time.time() - start, + } + results = [] + + print(results) + return jsonify({ + 'query': query, + 'results': results, + }) + +@api.route('/dataset//name', methods=['GET']) +def name_lookup(dataset): + start = time.time() + dataset = get_dataset(name) + + # we have a query from the request query string... + # use this to do a like* query on the identities_meta table + query = { 'timing': time.time() - start, } diff --git a/megapixels/cli_flask.py b/megapixels/cli_flask.py index 369bec01..e80526c6 100644 --- a/megapixels/cli_flask.py +++ b/megapixels/cli_flask.py @@ -1,5 +1,6 @@ # -------------------------------------------------------- # wrapper for flask CLI API +# NB: python cli_flask.py run # -------------------------------------------------------- import click -- cgit v1.2.3-70-g09d2 From f1461ec2727f26dacaf21a03d8698cf3f674c2cf Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 15 Dec 2018 23:26:45 +0100 Subject: div --- megapixels/app/site/builder.py | 2 -- site/templates/layout.html | 1 - 2 files changed, 3 deletions(-) (limited to 'megapixels') diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py index 42e25768..91df54c2 100644 --- a/megapixels/app/site/builder.py +++ b/megapixels/app/site/builder.py @@ -60,8 +60,6 @@ def build_page(fn, research_posts): with open(output_fn, "w") as file: file.write(html) - print("______") - def build_research_index(research_posts): metadata, sections = parser.read_metadata('../site/content/research/index.md') template = env.get_template("page.html") diff --git a/site/templates/layout.html b/site/templates/layout.html index 986c7a3f..a9fc89d6 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -19,7 +19,6 @@ The Darkside of Datasets