Commit graph

2,138 commits

Author SHA1 Message Date
Simon Willison
4143e3b45c New command: datasette package - packages a docker container
Example usage:

    datasette package fivethirtyeight.db \
        --tag fivethirtyeight \
        --metadata=538-metadata.json

This will create a temporary directory, generate a Dockerfile, copy in the
SQLite database and metadata file, then build that as a new docker image and
tag that in your local Docker repository as fivethirtyeight:latest.

You can then run the image like so:

    docker run -p 8006:8001 fivethirtyeight

This will expose port 8001 in the container (the default) as port 8006 on your
host.

Closes #67
2017-11-13 08:17:35 -08:00
Simon Willison
3ef35ca8b4 serve and publish commands now take a --metadata option
If provided, the --metadata option is the path to a JSON file containing
metadata that should be displayed alongside the dataset.

    datasette /tmp/fivethirtyeight.db --metadata /tmp/metadata.json

Currently that metadata format looks like this:

    {
        "title": "Five Thirty Eight",
        "license": "CC Attribution 4.0 License",
        "license_url": "http://creativecommons.org/licenses/by/4.0/",
        "source": "fivethirtyeight/data on GitHub",
        "source_url": "https://github.com/fivethirtyeight/data"
    }

If provided, this will be used by the index template and to populate the
common footer.

The publish command also accepts this argument, and will package any provided
metadata up and include it with the resulting Docker container.

    datasette publish --metadata /tmp/metadata.json /tmp/fivethirtyeight.db

Closes #68
2017-11-13 07:20:02 -08:00
Simon Willison
ff2fb573cd datasette publish --name=now-accepts-name
Fixes #72
2017-11-12 18:12:21 -08:00
Simon Willison
2bbe9ca34a Support OPTIONS requests for CORS 2017-11-12 18:11:52 -08:00
Simon Willison
d01370f166 Show SQL and params if table has them applied 2017-11-12 15:21:39 -08:00
Simon Willison
26370b14d8 Handle table names with slashes in them
e.g. https://datasette-wdlexdiaoz.now.sh/fivethirtyeight-75d605c/bob-ross%2Felements-by-episode.csv?CABIN=1&BUSHES=1&CLOUDS=1
2017-11-12 15:17:00 -08:00
Simon Willison
4c66097d58 datasette publish now works with full paths
e.g. datasette publish /tmp/blah/database.db now does the right thing
2017-11-12 15:16:24 -08:00
Simon Willison
efecae5a11 Full path to database now works
e.g. datasette /tmp/blah.db

Previously this failed because it did not open with full path.
2017-11-12 15:01:29 -08:00
Simon Willison
db3fa4abfa Views no longer attempt to link to records
Closes #54
2017-11-12 13:29:26 -08:00
Simon Willison
59a616ca5c Move view SQL to bottom of the page
Now consistent with tables
2017-11-12 13:25:34 -08:00
Simon Willison
22851ed9f0 Table page now shows CREATE TABLE at bottom
Closes #66
2017-11-12 13:16:59 -08:00
Simon Willison
666aa03253 Improved error handling
Invalid SQL now shows a special error.html template, and is covered by tests.
2017-11-12 13:16:15 -08:00
Simon Willison
ff2ab9dc7d Views now show their SQL, are handled a bit better
Refs #66
2017-11-12 12:32:25 -08:00
Simon Willison
f4794df070 Added border-right to table cells 2017-11-12 12:19:18 -08:00
Simon Willison
8acdc2fd14 Test for table with space in name
Tests code in b51836f846
2017-11-12 12:08:32 -08:00
Simon Willison
b51836f846 Fixed bug with tables with spaces in their name
The new database index page was erroring.
2017-11-12 12:02:45 -08:00
Simon Willison
59580d02da Implemented custom SQL via textarea
Closes #65
2017-11-11 18:35:35 -08:00
Simon Willison
fd3a33989a Implemented new database view and template
Closes #53 - see comments there for screenshots.
2017-11-11 17:50:21 -08:00
Simon Willison
2366a016f2 Added links to .json and .jsono representations
Closes #62
2017-11-11 14:40:44 -08:00
Simon Willison
fa42a56c6a Bulked out table test a bit
I'm closing #50 - more tests will be added in the future, but the framework
is neatly in place for them now.
2017-11-11 14:22:47 -08:00
Simon Willison
e9e1def4c0 Revised JSON design a bit
Closes #63
2017-11-11 14:20:00 -08:00
Simon Willison
e4bf66d9b0 Added header with breadcrumbs and footer
Also cleaned up titles on various pages.

Closes #61
2017-11-11 12:36:20 -08:00
Simon Willison
40a563ebac Reworked metadata building options
Building metadata is now optional. If you want to do it, do this:

    datasette build *.db --metadata=metadata.json

Then when you run the server you can tell it to read from metadata:

    datasette serve *.db --metadata=metadata.json

The Dockerfile generated by datasette publish now uses this mechanism.

Closes #60
2017-11-11 12:11:51 -08:00
Simon Willison
ad8b5d3bd2 JSON version of our homepage
Now available at http://localhost:8006/.json

Tested by tests added in 407795b612
2017-11-11 09:49:47 -08:00
Simon Willison
407795b612 Initial unit tests against our Sanic app
Refs #50

I had to disable the build metadata function to get these tests to work
sensibly. I need to completely rethink how that mechanism works.
2017-11-11 09:47:59 -08:00
Simon Willison
3280972c89 Fixed tests I broke earlier
Broke these tests in 21c9c04310
2017-11-11 08:52:17 -08:00
Simon Willison
3863a30b5d publish command checks 'now' is installed
Closes #58
2017-11-11 08:00:00 -08:00
Simon Willison
65e350ca2a Implemented 'datasette publish one.db two.db' command
Closes #26
2017-11-10 23:25:22 -08:00
Simon Willison
7d81083d40 Implemented responsive tables, removed bootstrap
No need for all of bootstrap since we only need to style a few elements.

Implemented responsive table pattern from here:
https://css-tricks.com/responsive-data-tables/

Refs #16
2017-11-10 21:55:50 -08:00
Simon Willison
21c9c04310 Implemented cursor-based pagination for table view
Closes #5
2017-11-10 12:41:14 -08:00
Simon Willison
e9fce44195 Don't serve cache headers in debug or refresh modes 2017-11-10 12:26:37 -08:00
Simon Willison
a8a293cd71 Refactored util functions into new utils module 2017-11-10 11:25:54 -08:00
Simon Willison
1c57bd202f Replaced app_factory with new Datasette class
This should make it easier to add unit tests.
2017-11-10 11:05:57 -08:00
Simon Willison
03c58fb350 Show databases in alphabetical order on index page 2017-11-10 11:04:56 -08:00
Simon Willison
40d3b3eae6 Refactored tests into new tests/ folder
Guided by https://docs.pytest.org/en/latest/goodpractices.html
2017-11-10 10:48:16 -08:00
Simon Willison
e06b011771 Updated tests
Refs #23
2017-11-10 10:43:54 -08:00
Simon Willison
e7e50875d3 Renamed to 'datasette' 2017-11-10 10:38:35 -08:00
Simon Willison
292f140a4f Explicitly order by pk (or by rowid)
Refs #5
2017-11-09 08:11:14 -08:00
Simon Willison
bc9871c935 gt/lt/gte/lte now treat numeric arguments as numeric
This now works:

    https://immutabase-dlmggyoepw.now.sh/northwind-40d049b/Products?UnitsInStock__gt=100

Previously the input value of 100 would be treated as a string.

Also fixed a bug where filter arguments had stopped working entirely.

Refs #23
2017-11-09 08:09:55 -08:00
Simon Willison
d9fa2bf7ba Use rowid if no primary key available
Allows us to link to individual records even for tables that do not have a primary key.

Refs #5
2017-11-09 06:39:50 -08:00
Simon Willison
b2dee11fcd Databases now get distinct colours
A left border based on their content hash.

Closes #31
2017-11-09 06:14:40 -08:00
Simon Willison
abb591d832 Added --reload argument to 'immutabase serve' command
Uses hupper to restart the server when the code changes. Useful for development.

Depends on https://pypi.python.org/pypi/hupper
2017-11-09 06:14:26 -08:00
Simon Willison
8af7bc100c Added a MANIFEST.in
Now python setup.py bdist_wheel creates a .whl that includes the CSS.
2017-11-08 18:39:42 -08:00
Simon Willison
7e0cedae3d Now using bootstrap 4 beta
Refs #16
2017-11-05 18:49:07 -08:00
Simon Willison
9e9e961390 Fixed error in RowView 2017-11-05 18:38:06 -08:00
Simon Willison
25c241fa5a Renamed project to immutabase 2017-11-05 18:32:13 -08:00
Simon Willison
a0bb9da17f Now requires DB files to be passed as arguments
Refs #40
2017-11-05 18:24:43 -08:00
Simon Willison
186c513a61 Support parameterized SQL and block potentially harmful queries
You can now call arbitrary SQL like this:

    /flights?sql=select%20*%20from%20airports%20where%20country%20like%20:c&c=iceland

Unescaped, those querystring params look like this:

    sql = select * from airports where country like :c
    c = iceland

So SQL can be constructed with named parameters embedded in it, which will
then be read from the querystring and correctly escaped.

This means we can aggressively filter the SQL parameter for potentially
dangerous syntax. For the moment we enforce that it starts with a SELECT
statement and we ban the sequence "pragma" from it entirely.

If you need to use pragma in a query, you can use the new named parameter
mechanism.

Fixes #39
2017-11-04 19:49:18 -07:00
Simon Willison
31b21f5c5e Moved all SQLite queries to threads
SQLite operations are blocking, but we're running everything in Sanic, an
asyncio web framework, so blocking operations are bad - a long-running DB
operation could hold up the entire server.

Instead, I've moved all SQLite operations into threads. These are managed by a
concurrent.futures ThreadPoolExecutor. This means I can run up to X queries in
parallel, and I can continue to queue up additional incoming HTTP traffic
while the threadpool is busy.

Each thread is responsible for managing its own SQLite connections - one per
database. These are cached in a threadlocal.

Since we are working with immutable, read-only SQLite databases it should be
safe to share SQLite objects across threads. On this assumption I'm using the
check_same_thread=False option. Opening a database connection looks like this:

    conn = sqlite3.connect(
        'file:filename.db?immutable=1',
        uri=True,
        check_same_thread=False,
    )

The following articles were helpful in figuring this out:

* https://pymotw.com/3/asyncio/executors.html
* https://marlinux.wordpress.com/2017/05/19/python-3-6-asyncio-sqlalchemy/

Closes #45. Refs #38.
2017-11-04 19:21:44 -07:00
Simon Willison
1fc75809a6 Refactored everything into a factory function
I now call a factory function to construct the Sanic app:

    app = app_factory(files)

This allows me to pass additional arguments to it, e.g. the files to serve.

Also refactored my class-based views to accept jinja as an argument, e.g:

    app.add_route(
        TableView.as_view(jinja),
        '/<db_name:[^/]+>/<table:[^/]+?><as_json:(.jsono?)?$>'
    )
2017-11-04 19:13:44 -07:00