Commit Graph

132 Commits

Author SHA1 Message Date
Alan Orth d36be5ee50 contrib: Update systemd unit files for refactor 2018-10-28 11:14:21 +02:00
Alan Orth 2f45d27554 dspace_statistics_api/app.py: remove unused code
This was added accidentally when I refactored. I was trying to see
if I could use Falcon's on_exit() hook.
2018-10-28 11:14:21 +02:00
Alan Orth b8356f7a87 Add "application" alias to API object
By default gunicorn looks for an "application" object to run, so this
saves us having to type api:app.
2018-10-28 11:14:21 +02:00
Alan Orth 2136dc79ce Remove shebang from indexer.py
This is run as a Python module now so does not need a shebang.
2018-10-28 11:14:21 +02:00
Alan Orth ed60120cef Remove executable bit from indexer.py
Now it is run as a Python module.
2018-10-28 11:14:21 +02:00
Alan Orth c027f01b48 Refactor project structure
This follows guidance from several well-known Python best practices
guides. Basically, the idea is create a package for the application
that is comprised of several re-usable modules.

See: https://docs.python-guide.org/writing/structure/
See: https://realpython.com/python-application-layouts/
2018-10-28 11:14:21 +02:00
Alan Orth 754663f062
CHANGELOG.md: Add changes for version 0.5.2 2018-10-28 11:12:27 +02:00
Alan Orth 507699e58a
requirements.txt: Update libraries
Switch to a personal fork of SolrClient so that we can use kazoo 2.5.0
and get rid of the error about the 'async' keyword on Python 3.7. Also
this bumps some of the other libraries to their latest versions.
2018-10-28 11:09:47 +02:00
Alan Orth a016916995
CHANGELOD.md: Add note about ujson 2018-10-24 14:15:03 +03:00
Alan Orth 6fd2827a7c
Use Python's native json instead of ujson
Falcon can optionally use ujson to speed up JSON (de)serialization,
but Falcon's already really fast and requiring ujson actually makes
deployment trickier in some cases (for example in Docker containers
that are based on Alpine Linux).

Here are some tests of Falcon 1.4.1 on Python 3.5 from my laptop:

    1. falcon...............60172 req/sec or 16.62 μs/req (36x)
    2. falcon-ext...........34186 req/sec or 29.25 μs/req (20x)
    3. bottle...............32924 req/sec or 30.37 μs/req (20x)
    4. werkzeug.............11948 req/sec or 83.70 μs/req (7x)
    5. flask.................6654 req/sec or 150.30 μs/req (4x)
    6. django................4565 req/sec or 219.04 μs/req (3x)
    7. pecan.................1672 req/sec or 598.19 μs/req (1x)

The tests were conducted with Falcon's official Docker benchmarking
tools on my Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz on Arch Linux.

See: https://github.com/falconry/falcon/tree/master/docker
2018-10-24 14:08:23 +03:00
Alan Orth 62142eb79e
CHANGELOG.md: Move unreleased changes to v0.5.0 2018-10-24 12:02:42 +03:00
Alan Orth fda0321942
CHANGELOG.md: Add note about Solr in API component 2018-10-24 12:01:47 +03:00
Alan Orth 963aa245c8
app.py: Don't initialize Solr connection
We only need Solr in the indexing component, not for the API itself.
2018-10-24 11:59:50 +03:00
Alan Orth 568ff2eebb
CHANGELOG.md: Add note about nginx configuration 2018-10-23 14:56:44 +03:00
Alan Orth deecb8a10b
README.md: Add example nginx configuration 2018-10-23 14:55:36 +03:00
Alan Orth 12f45d7c08
contrib: Adjust example path 2018-10-23 14:34:29 +03:00
Alan Orth f65089f9ce
CHANGELOG.md: Update and move to 0.4.3 release 2018-10-17 09:51:44 +03:00
Alan Orth 1db5cf1c29
README.md: Grammar 2018-10-17 09:51:35 +03:00
Alan Orth e581c4b1aa
README.md: Improve documentation 2018-10-17 09:50:30 +03:00
Alan Orth e8d356c9ca
README.md: Add TODO about Python 3.6+ f-string syntax
They are faster.
2018-10-17 09:13:25 +03:00
Alan Orth 34a9b8d629
CHANGELOG.md: Add unreleased changes for Travis CI 2018-10-14 19:02:09 +03:00
Alan Orth 41e3d66a0e
.travis.yml: Only build master branch 2018-10-14 19:00:31 +03:00
Alan Orth 9b2a6137b4
README.md: Add Travis CI badge
For now this is only an indicator that the Python requirements can
be satisfied and installed.
2018-10-14 18:58:12 +03:00
Alan Orth 600b986f99
.travis.yml: Use Python 3.7-dev instead of 3.7
I don't think Travis supports Python 3.7 yet because the builds for
that version keep failing.
2018-10-14 18:57:30 +03:00
Alan Orth 49a7790794
.travis.yml: Move script to one line 2018-10-14 18:53:45 +03:00
Alan Orth f2deba627c
.travis.yml: Run pip install as script
Basically for now there are no tests so I just want to just check
that requirements.txt is correct and that all dependencies can be
installed.
2018-10-14 18:47:14 +03:00
Alan Orth 9323513794
README.md: Update instructions 2018-10-14 18:45:40 +03:00
Alan Orth daf15610f2
CHANGELOG.md: Update changes and move to 0.4.2 2018-10-05 00:19:18 +03:00
Alan Orth 4ede966dbb
indexer.py: Fix logic error in SQL insert
This was inserting correctly on the first run, but subsequent runs
were inserting into the incorrect column on conflict. This made it
seem like there were downloads for items where there were none.
2018-10-05 00:16:24 +03:00
Alan Orth 3580473a6d
README.md: Add TODO about JSON in PostgreSQL 2018-10-03 20:08:18 +03:00
Alan Orth 071c24535f
README.md: Add TODO about API versions 2018-10-03 11:12:18 +03:00
Alan Orth 4291aecac4
README.md: Formatting 2018-09-27 12:45:15 +03:00
Alan Orth 46bf537e88
CHANGELOG.md: Add note about cursor change 2018-09-27 11:08:42 +03:00
Alan Orth eaca5354d3
app.py: Iterate directly on cursor
We don't need to create an intermediate variable for the results of
the SQL query because psycopg2's cursor is iterable.

See: http://initd.org/psycopg/docs/cursor.html
2018-09-27 11:03:44 +03:00
Alan Orth 4600288ee4
CHANGELOG.md: Add note about ujson 2018-09-27 09:53:42 +03:00
Alan Orth 8179563378
requirements.txt: pip freeze 2018-09-27 09:53:16 +03:00
Alan Orth b14c3eef4d
indexer.py: Use ujson instead of json
Falcon optionally makes use of the ujson library to speed up media
(de)serialization, error serialization, and query string parsing.

See: https://falcon.readthedocs.io/en/stable/user/install.html
2018-09-27 09:51:40 +03:00
Alan Orth 71a789b13f
CHANGELOG.md. Add unreleased changes 2018-09-27 09:30:48 +03:00
Alan Orth c68ddacaa4
README.md: Add note about systemd units for deployment 2018-09-27 09:26:47 +03:00
Alan Orth 9c9e79769e
README.md: Add TODO 2018-09-27 09:17:45 +03:00
Alan Orth 2ad5ade556
README.md: Improve introduction 2018-09-27 09:12:52 +03:00
Alan Orth 7412a09670
README.md: Improve introduction 2018-09-27 09:07:28 +03:00
Alan Orth bb744a00b8
README.md: Add requirements 2018-09-27 08:57:27 +03:00
Alan Orth 7499b89d99
CHANGELOG.md: Move unreleased changes to v0.4.1 2018-09-27 08:15:54 +03:00
Alan Orth 2c1e4952b1
indexer.py: Remove comment
I had left this there so I could remember how to get the number of
facets, but I don't need it anymore.
2018-09-26 23:27:48 +03:00
Alan Orth 379f202c3f
CHANGELOG.md: Add unreleased changes 2018-09-26 23:26:48 +03:00
Alan Orth 560fa6056d
README.md: Remove batch inserts from TODO 2018-09-26 23:25:35 +03:00
Alan Orth 385a34e5d0
indexer.py: Use psycopg2's execute_values to batch inserts
Batch inserts are much faster than a series of individual inserts
because they drastically reduce the overhead caused by round-trip
communication with the server. My tests in development confirm:

  - cursor.execute(): 19 seconds
  - execute_values(): 14 seconds

I'm currently only working with 4,500 rows, but I will experiment
with larger data sets, as well as larger batches. For example, on
the PostgreSQL mailing list a user reports doing 10,000 rows with
a page size of 100.

See: http://initd.org/psycopg/docs/extras.html#psycopg2.extras.execute_values
See: https://github.com/psycopg/psycopg2/issues/491#issuecomment-276551038
2018-09-26 23:10:29 +03:00
Alan Orth d0ea62d2bd
database.py: Use one line for psycopg2 imports 2018-09-26 22:23:24 +03:00
Alan Orth 366ae25b8e
README.md: Add link to psycopg2 issue about batch inserts 2018-09-26 22:23:08 +03:00