You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by GitBox <gi...@apache.org> on 2018/12/14 05:41:16 UTC
[GitHub] avantika-karwasara closed pull request #6533: UIC-787: Add heat map
generation algorithm
avantika-karwasara closed pull request #6533: UIC-787: Add heat map generation algorithm
URL: https://github.com/apache/incubator-superset/pull/6533
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..ca3c0aca30
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+**/venv
+**/venv2
+**/install
+**/scripts
+**/superset.egg-info
+**/build
+**/dist
+**/node_modules
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 11929a9b7e..7a62806624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ envpy3
build
*.db
tmp
-superset_config.py
local_config.py
env
dist
@@ -26,7 +25,6 @@ app.db
.idea
*.sqllite
.vscode
-.python-version
.tox
dump.rdb
@@ -43,8 +41,6 @@ venv
@eaDir/
# docker
-/Dockerfile
-/docker-build.sh
-/docker-compose.yml
-/docker-entrypoint.sh
-/docker-init.sh
+venv2
+superset/assets/cypress/videos
+cypress
diff --git a/.python-version b/.python-version
new file mode 100644
index 0000000000..b55f10804f
--- /dev/null
+++ b/.python-version
@@ -0,0 +1 @@
+3.6.5
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000..50d7827eb4
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,64 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Python: Current File (Integrated Terminal)",
+ "type": "python",
+ "request": "launch",
+ "program": "${file}",
+ "console": "integratedTerminal"
+ },
+ {
+ "name": "Python: Attach",
+ "type": "python",
+ "request": "attach",
+ "port": 5678,
+ "host": "localhost"
+ },
+ {
+ "name": "Python: Module",
+ "type": "python",
+ "request": "launch",
+ "module": "enter-your-module-name-here",
+ "console": "integratedTerminal"
+ },
+ {
+ "name": "Python: Django",
+ "type": "python",
+ "request": "launch",
+ "program": "${workspaceFolder}/manage.py",
+ "console": "integratedTerminal",
+ "args": [
+ "runserver",
+ "--noreload",
+ "--nothreading"
+ ],
+ "django": true
+ },
+ {
+ "name": "Python: Flask",
+ "type": "python",
+ "request": "launch",
+ "module": "flask",
+ "env": {
+ "FLASK_APP": "${workspaceFolder}/superset/__init__.py"
+ },
+ "args": [
+ "run",
+ "--no-debugger",
+ "--no-reload"
+ ],
+ "jinja": true
+ },
+ {
+ "name": "Python: Current File (External Terminal)",
+ "type": "python",
+ "request": "launch",
+ "program": "${file}",
+ "console": "externalTerminal"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..326cf58bd7
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,205 @@
+#!/usr/bin/env groovy
+
+/*
+This is a sample Jenkinsfile to demonstrate the list of stages
+that should be implemented for continuous integration and continuous
+deployment of a rpmized application.
+This pipeline expects following branch names in GitHub repository
+that has to be followed:
+master
+feature/JIRA-ID-Description
+fix/JIRA-ID-Description
+release/X.Y.Z
+This pipeline also implements stages for pull requests testing
+hence it is strongly recommended to follow pull request practices.
+Which is: Nothing can be merged into master or release branch without
+creating a pull request.
+Pipeline follows following Artifact versioning strategy which in
+this case is a rpm tag promotion:
+If Branch Name is feature/JIRA-ID-Description or fix/JIRA-ID-Description
+ then, rpmTag = JIRA-ID (From branch name, ephemeral Artifact)
+If Branch Name is PR-ID
+ then, rpmTag = PR-ID (From PR name, ephemeral Artifact)
+If Branch Name is master or release,
+ then, rpmTag = <module vesion>-<currentBuild number>-dev
+After dev test, dev tag prmotes to qa, such as:
+ rpmTag = <module vesion>-<currentBuild number>-qa
+After QA test, qa tag promotes to rc, such as:
+ rpmTag = <module vesion>-<currentBuild number>-rc
+After Acceptance test, rc tag prmotes to prod -
+ rpmTag = <module vesion>-<currentBuild number>-prod
+* Ephemeral artifacts created with feature or fix Branches
+ and with pull should get deleted after closure of the
+ branch/PR.
+* Note that rpm tags promotion on master or release branches
+does not create separate artifacts but a different tag to
+the same rpm image which should be kept until the image is
+in use.
+*/
+
+pipeline {
+ agent any
+
+ environment {
+ // Define global environment variables in this section
+ buildNum = currentBuild.getNumber()
+ buildType = BRANCH_NAME.split('/').first()
+ branchVersion = BRANCH_NAME.split('/').last()
+ buildVersion = '1.0.4'
+ }
+ stages {
+
+ stage("Build and test") {
+ parallel {
+
+ stage("Unit test") {
+ steps {
+ echo "Run Commmands to execute unit test"
+ }
+ }
+ stage("Code coverage") {
+ steps {
+ echo "Run Commmands to execute code coverage test"
+ }
+ }
+ stage("Static code analysis or Checkstyle") {
+ steps {
+ echo "Run Commmands to execute static code analysis test"
+ }
+ }
+ }
+ }
+ stage("Build or Compile") {
+ steps {
+ echo "Run Commmands to trigger build"
+ }
+ }
+ stage('Code Quality with SonarQube') {
+ steps {
+ script {
+ echo "Code Quality with SonarQube"
+ }
+ }
+ }
+ stage('Create RPMs') {
+ steps {
+ echo "Run Commmand to trigger rpm build"
+ sh "make build-rpms"
+ }
+ }
+
+ stage("Push rpm images in artifactory") {
+ steps {
+ echo "Run Commmand to push rpm image in artifactory"
+ sh "make publish-rpms"
+ }
+ }
+
+ stage("Deploy the particular plugin") {
+ when {
+ expression {
+ env.buildType ==~ /(feature|PR-.*|fix)/
+ }
+ }
+ steps {
+ // Stubs should be used to perform functional testing
+ echo "Deploy the Artifact on ephemeral environment"
+ }
+ }
+
+ stage("Test the particular plugin") {
+ when {
+ expression {
+ // Run only for buildTypes master or Release
+ env.buildType ==~ /(feature|PR-.*|fix)/
+ }
+ }
+ steps {
+ // supporting components have fixed versions
+ echo "Trigger test run to verify code changes"
+
+ }
+ }
+
+ stage("Promote Artifact to QA") {
+ steps {
+ echo "Promote Artifact name to module-A: in artifactory"
+ }
+ }
+
+ stage("Deploy on the QA environment") {
+ when {
+ expression {
+ env.buildType ==~ /(feature|PR-.*|fix)/
+ }
+ }
+ steps {
+ // Stubs should be used to perform functional testing
+ echo "Deploy the Artifact on ephemeral environment"
+ }
+ }
+
+ stage("Test on the QA environment") {
+ when {
+ expression {
+ // Run only for buildTypes master or Release
+ env.buildType ==~ /(feature|PR-.*|fix)/
+ }
+ }
+
+ steps {
+ // supporting components have fixed versions
+ echo "Trigger test run to verify code changes"
+ echo "Trigger integration test run with fixed versions"
+ }
+ }
+
+ stage("Promote Artifact to RC") {
+ when {
+ expression {
+ // Run only for buildTypes master or Release
+ env.buildType in ['master','release']
+ }
+ }
+ environment {
+ rpmTagStage = "rc"
+ rpmTag = "${env.rpmTagVersion}-${rpmTagStage}"
+ }
+ steps {
+ // supporting components have fixed versions
+ echo "Promote Artifact name to module-A:${rpmTag}"
+ }
+ }
+
+ stage("Deploy and test on the Pre-Prod environment") {
+ when {
+ expression {
+ // Run only for buildTypes master or Release
+ env.buildType in ['master','release']
+ }
+ }
+ steps {
+ // supporting components have fixed versions
+ echo "Deploy the Artifact on staging equivalent setup"
+ echo "Trigger integration test run with latest stable versions"
+ }
+ }
+
+ stage("Promote Artifact to PROD") {
+ when {
+ expression {
+ // Run only for buildTypes master or Release
+ env.buildType in ['master','release']
+ }
+ }
+ environment {
+ rpmTagStage = "prod"
+ rpmTag = "${env.rpmTagVersion}-${rpmTagStage}"
+ }
+ steps {
+ // supporting components have fixed versions
+ echo "Promote Artifact name to module-A:${rpmTag}"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..2ad278795d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,33 @@
+# Note for editing Makefile : Makefile requires Tab to identify commands
+
+
+SHELL := /bin/bash
+
+
+publish-all:
+ clean
+ build-rpms
+ publish-rpms
+
+
+publish-rpms:
+ @echo "= = = = = = = > START TARGET : [publish-rpms] < = = = = = = ="
+ cd rpm-mgmt; ./deploy_rpms.sh
+ @echo "= = = = = = = = > END TARGET : [publish-rpms] < = = = = = = ="
+
+
+build-rpms: dist
+ cd rpm-mgmt && rm -rf .package && ./build_rpm.sh
+
+
+clean:
+ @echo "= = = = = = = > START TARGET : [clean] < = = = = = = ="
+ rm -rf dist
+ @echo "= = = = = = = = > END TARGET : [clean] < = = = = = = ="
+
+
+dist:
+ mkdir -p dist/installer
+
+
+.PHONY: publish-all publish-rpms clean dist build-rpms
\ No newline at end of file
diff --git a/Pipfile b/Pipfile
new file mode 100644
index 0000000000..e732cac041
--- /dev/null
+++ b/Pipfile
@@ -0,0 +1,73 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+superset = {editable = true, path = "."}
+colorama = "==0.3.9"
+click = "==6.7"
+bleach = "==2.1.2"
+"boto3" = "==1.4.7"
+botocore = "==1.7.48"
+celery = "==4.2.0"
+cryptography = "==1.9"
+flower = "==0.9.2"
+future = "==0.16.0"
+geopy = "==1.11.0"
+gunicorn = "==19.8.0"
+humanize = "==0.5.1"
+idna = "==2.6"
+isodate = "==0.6.0"
+pandas = "==0.23.1"
+parsedatetime = "==2.0.0"
+"pathlib2" = "==2.3.0"
+polyline = "==1.3.2"
+pydruid = "==0.4.4"
+"psycopg2-binary" = "==2.7.5"
+python-dateutil = "==2.6.1"
+python-geohash = "==0.8.5"
+requests = "==2.18.4"
+simplejson = "==3.15.0"
+six = "==1.11.0"
+sqlparse = "==0.2.4"
+tableschema = "==1.1.0"
+thrift = "==0.11.0"
+unicodecsv = "==0.14.1"
+"contextlib2" = "==0.5.5"
+elasticsearch = "==5.5.3"
+Flask = "==0.12.2"
+Flask-WTF = "==0.14.2"
+PyYAML = "==3.12"
+Unidecode = "==1.0.22"
+Flask-AppBuilder = "==1.10.0"
+Flask-Caching = "==1.4.0"
+Flask-Compress = "==1.4.0"
+Flask-Migrate = "==2.1.1"
+Flask-SQLAlchemy = "==2.1"
+Markdown = "==2.6.11"
+PyHive = "==0.5.1"
+SQLAlchemy = "==1.2.2"
+SQLAlchemy-Utils = "==0.32.21"
+thrift_sasl = "==0.3.0"
+pipenv = "*"
+
+[dev-packages]
+"autopep8" = "==1.3.5"
+console-log = "==0.2.10"
+"flake8-coding" = "==1.3.0"
+"flake8-commas" = "==2.0.0"
+"flake8-future-import" = "==0.4.5"
+"flake8-import-order" = "==0.18"
+"flake8-quotes" = "==1.0.0"
+"flake8" = "==3.5.0"
+ipdb = "==0.11"
+mysqlclient = "==1.3.12"
+pylint = "==1.9.2"
+redis = "==2.10.6"
+statsd = "==3.2.2"
+tox = "==3.1.2"
+Flask-Cors = "==3.0.3"
+
+[requires]
+python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
new file mode 100644
index 0000000000..c4229043e1
--- /dev/null
+++ b/Pipfile.lock
@@ -0,0 +1,1398 @@
+{
+ "_meta": {
+ "hash": {
+ "sha256": "df8be88cafc6f7fd78e344df2567125d6e14b5ce6334457c99c14007ab727a59"
+ },
+ "pipfile-spec": 6,
+ "requires": {
+ "python_version": "3.6"
+ },
+ "sources": [
+ {
+ "name": "pypi",
+ "url": "https://pypi.org/simple",
+ "verify_ssl": true
+ }
+ ]
+ },
+ "default": {
+ "alembic": {
+ "hashes": [
+ "sha256:0fe570f23dc48fb1bbda6f6a396f1c0c28d7045c0ad14018c104a511e6c1fe8a"
+ ],
+ "version": "==1.0.1"
+ },
+ "amqp": {
+ "hashes": [
+ "sha256:073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb",
+ "sha256:eed41946890cd43e8dee44a316b85cf6fee5a1a34bb4a562b660a358eb529e1b"
+ ],
+ "version": "==2.3.2"
+ },
+ "asn1crypto": {
+ "hashes": [
+ "sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87",
+ "sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"
+ ],
+ "version": "==0.24.0"
+ },
+ "babel": {
+ "hashes": [
+ "sha256:6778d85147d5d85345c14a26aada5e478ab04e39b078b0745ee6870c2b5cf669",
+ "sha256:8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"
+ ],
+ "version": "==2.6.0"
+ },
+ "beautifulsoup4": {
+ "hashes": [
+ "sha256:11a9a27b7d3bddc6d86f59fb76afb70e921a25ac2d6cc55b40d072bd68435a76",
+ "sha256:7015e76bf32f1f574636c4288399a6de66ce08fb7b2457f628a8d70c0fbabb11",
+ "sha256:808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89"
+ ],
+ "version": "==4.6.0"
+ },
+ "billiard": {
+ "hashes": [
+ "sha256:ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84"
+ ],
+ "version": "==3.5.0.4"
+ },
+ "bleach": {
+ "hashes": [
+ "sha256:38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19",
+ "sha256:cf567e7ed30ea5e05b31231d88ae170af1c5544758b9d7bebbc20590b7c30b1e"
+ ],
+ "index": "pypi",
+ "version": "==2.1.2"
+ },
+ "boto3": {
+ "hashes": [
+ "sha256:38057b066990172ce6ebbf2a5e046a545503793581fcf14cab0e3821c6112eb0",
+ "sha256:f79f77dca2280f7780f39d72a5088f4cf2b626c0921e7185ed6ac17abfdd7e6c"
+ ],
+ "index": "pypi",
+ "version": "==1.4.7"
+ },
+ "botocore": {
+ "hashes": [
+ "sha256:19d519c8b37d7d35334267f25515e395c431a12a3c624214e2267d12950dbe95",
+ "sha256:5c1c023075269265f44a1c5b09a18d6865eca1c85a4be6886ddcc8af01b1c997"
+ ],
+ "index": "pypi",
+ "version": "==1.7.48"
+ },
+ "bottleneck": {
+ "hashes": [
+ "sha256:6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36"
+ ],
+ "version": "==1.2.1"
+ },
+ "cchardet": {
+ "hashes": [
+ "sha256:079aa02a14072874d943a671ba778a9def5b0e3cedc2ac9f59308526cfb31472",
+ "sha256:3e048a21688dcb4c797f40c8deb3600887bcaf435620256fd8becd4252012750",
+ "sha256:41fced7a6f05ef859fe3eac89fc2120aca3cbbfd2b6c803bed3ee4bf02956903",
+ "sha256:440903d5dca3d326f4b841e7fa760b6af1be4f950ead1a6ff77b76eaa46f0cd3",
+ "sha256:50170f346527c5df4d3cb94648ca187c666e61c0db6e510b984e867c44709d8b",
+ "sha256:6c55a6e7bc7337671c9f1ad90746c0efb2b2979ff4305c7ca1d7d381f05174c1",
+ "sha256:7f581ea172b252034f745dfd49733966b73b73907bdef0b47ad5f2008b797d54",
+ "sha256:80f7b087198827e60c81574c321b12f89188eae626ae1567d66808928be42f88",
+ "sha256:8ba753ff73ca2f3554999a0e027eab9450f6ffdb7e92e1b4e13b52be89995349",
+ "sha256:9ad8f61d6d1ca37bd4b954ad92d461ea4f58d0dc413b0790a5abed7c09e54996",
+ "sha256:a35bd23cedbaa87cc9300af1dd10bb03fda41894045fbca7bfdf1d350b813f25",
+ "sha256:a8feb9a7def2310e18c27e485a21a38669abe8c2e36b93c6ce1a1363495d4cdf",
+ "sha256:aa9dd4cee8a5210a6d0a7b263b98dc50637e00401fc4a5ad3ce2dbef54fdfa02",
+ "sha256:ab9858a0673262e467619df91f425cfef0590dcf5deef5c0c7945e9dc4dbd7d8",
+ "sha256:b09a488bbb35be95f82845e3c4312be9025e8377975b027eee67e0b39445e070",
+ "sha256:b2893d558761b3534cddf5a49ba8d77df3d8f964d7b14680b925f4a85fc13476",
+ "sha256:b5a8f9b229a30cd2432572d15e169483bc47c24418772ff58d0585050631c2fd",
+ "sha256:bded54eeccd5f810bc69e076b3d9a35819a92e5e0559ad274b9ae9061b1b881d",
+ "sha256:cbc206061e69561af6e4cba11f99abd928346c6b5bcdc83eb32ae40e9fc23a5f",
+ "sha256:cc9745e0400da4cfb49f075e7819f22473b66443f953427058fee2c7b9547cc0",
+ "sha256:db30bf3825702c07fc55a290d41663fd8151f870642a15667bbabf81fff21e0b",
+ "sha256:eeeb1b95bb5851dda93ee522860a0e6066d47921cb1d540cb778346e37e5a524",
+ "sha256:f1c3919fb71ac5da3aeee42c5b731c99dcd2beed71db7fdc28ca993c173f0402"
+ ],
+ "version": "==2.1.4"
+ },
+ "celery": {
+ "hashes": [
+ "sha256:2082cbd82effa8ac8a8a58977d70bb203a9f362817e3b66f4578117b9f93d8a9",
+ "sha256:ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"
+ ],
+ "index": "pypi",
+ "version": "==4.2.0"
+ },
+ "certifi": {
+ "hashes": [
+ "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c",
+ "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a"
+ ],
+ "version": "==2018.10.15"
+ },
+ "cffi": {
+ "hashes": [
+ "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743",
+ "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef",
+ "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50",
+ "sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f",
+ "sha256:3bb6bd7266598f318063e584378b8e27c67de998a43362e8fce664c54ee52d30",
+ "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93",
+ "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257",
+ "sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b",
+ "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3",
+ "sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e",
+ "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc",
+ "sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04",
+ "sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6",
+ "sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359",
+ "sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596",
+ "sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b",
+ "sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd",
+ "sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95",
+ "sha256:a6a5cb8809091ec9ac03edde9304b3ad82ad4466333432b16d78ef40e0cce0d5",
+ "sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e",
+ "sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6",
+ "sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca",
+ "sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31",
+ "sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1",
+ "sha256:ca1bd81f40adc59011f58159e4aa6445fc585a32bb8ac9badf7a2c1aa23822f2",
+ "sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085",
+ "sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801",
+ "sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4",
+ "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184",
+ "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917",
+ "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
+ "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
+ ],
+ "version": "==1.11.5"
+ },
+ "chardet": {
+ "hashes": [
+ "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+ "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+ ],
+ "version": "==3.0.4"
+ },
+ "click": {
+ "hashes": [
+ "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d",
+ "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"
+ ],
+ "index": "pypi",
+ "version": "==6.7"
+ },
+ "colorama": {
+ "hashes": [
+ "sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda",
+ "sha256:48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"
+ ],
+ "index": "pypi",
+ "version": "==0.3.9"
+ },
+ "contextlib2": {
+ "hashes": [
+ "sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48",
+ "sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"
+ ],
+ "index": "pypi",
+ "version": "==0.5.5"
+ },
+ "cryptography": {
+ "hashes": [
+ "sha256:025a96e48164106f2082b00f42bf430cf21f09e203e42585a712e420b75cbff0",
+ "sha256:2230c186182d773064d06242e0fa604cd718bfff28aa9c5ae73d7e426e98a151",
+ "sha256:2908f709f02711dbb10561a9f154d2f7d1792385e2341e9708539cc4ecfb8667",
+ "sha256:2a5e577f5d2093e51486b4ec02b51bb5adb165b98fee99929d5af0813e90b469",
+ "sha256:2eb8297b877cb6b56216750fa7017c9f5786bec8afd6a0f1aaace02cbfb6195f",
+ "sha256:365eb804362e581c9a02e7a610b30514f07dd77b2a38aed338eb5192446bbc58",
+ "sha256:3dc94ed5a26b8553a325767358f505c0a43e0c89df078647f77a4d022ddcdc57",
+ "sha256:469a9d3d851038f1eb7d7f77bb08bb4775b41483372be450e25b293fe57bd59e",
+ "sha256:533143321d15c8743f91eec5c5f495c1b5cad9a25de8f6dab01eddd6b416903e",
+ "sha256:5474fe5ce6b517d3086e0231b6ad88f8978c551c4379f91c3d619c308490f0d7",
+ "sha256:5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882",
+ "sha256:5ff169869624e23767d70db274f13a9ea4e97c029425a1224aa5e049e84ce2af",
+ "sha256:61eb3534f8ed2415dd708b28919205d523f220e4cd5b8165844edfdd4a649b8e",
+ "sha256:7db719432648f14ea33edffc5f75330c595804eac86ca916528b35ce50a8bfd6",
+ "sha256:9d9da8bac2e31003d092f5ef6981a725c77c4e9a30638436884d61ad39f9a1ee",
+ "sha256:c26e057a2de13e97e708328d295c5ac4cd3eab4a5c42ce727dd1a53316034b8a",
+ "sha256:ca72537a7064bb80e34b6908e576ffc8e2c2cad29a7168f48d0999df089695c3",
+ "sha256:fab8ec6866e384d9827d5dc02a1383e991a6c05c54f818316c4b829e56ca2ba3"
+ ],
+ "index": "pypi",
+ "version": "==1.9"
+ },
+ "defusedxml": {
+ "hashes": [
+ "sha256:24d7f2f94f7f3cb6061acb215685e5125fbcdc40a857eff9de22518820b0a4f4",
+ "sha256:702a91ade2968a82beb0db1e0766a6a273f33d4616a6ce8cde475d8e09853b20"
+ ],
+ "version": "==0.5.0"
+ },
+ "docutils": {
+ "hashes": [
+ "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
+ "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
+ "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
+ ],
+ "version": "==0.14"
+ },
+ "elasticsearch": {
+ "hashes": [
+ "sha256:658380fd60bdaf746fef12958f0abc49063218ce93ee1ae4ca1fe6291c896433",
+ "sha256:ae91b089f2f2b5b3daa04297949e5f805ab12d187218cb587273f472656fd250"
+ ],
+ "index": "pypi",
+ "version": "==5.5.3"
+ },
+ "et-xmlfile": {
+ "hashes": [
+ "sha256:614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b"
+ ],
+ "version": "==1.0.1"
+ },
+ "feather-format": {
+ "hashes": [
+ "sha256:a7a0fbc727e1877354d4b4ad83f8e382a249f116241d0ccfc624cac24bddb1a9"
+ ],
+ "version": "==0.4.0"
+ },
+ "flask": {
+ "hashes": [
+ "sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856",
+ "sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1"
+ ],
+ "index": "pypi",
+ "version": "==0.12.2"
+ },
+ "flask-appbuilder": {
+ "hashes": [
+ "sha256:e20dc60e35944a6be652b379902b5684377cd3366ff3de713077ba07b3573704"
+ ],
+ "index": "pypi",
+ "version": "==1.10.0"
+ },
+ "flask-babel": {
+ "hashes": [
+ "sha256:d29b36c399e42e98bc9401c8c1c159f2befcb8c12a2a2a87ec49ad7623036899"
+ ],
+ "version": "==0.11.1"
+ },
+ "flask-caching": {
+ "hashes": [
+ "sha256:44fe827c6cc519d48fb0945fa05ae3d128af9a98f2a6e71d4702fd512534f227",
+ "sha256:e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985"
+ ],
+ "index": "pypi",
+ "version": "==1.4.0"
+ },
+ "flask-compress": {
+ "hashes": [
+ "sha256:468693f4ddd11ac6a41bca4eb5f94b071b763256d54136f77957cfee635badb3"
+ ],
+ "index": "pypi",
+ "version": "==1.4.0"
+ },
+ "flask-login": {
+ "hashes": [
+ "sha256:83d5f10e5c4f214feed6cc41c212db63a58a15ac32e56df81591bfa0a5cee3e5"
+ ],
+ "version": "==0.2.11"
+ },
+ "flask-migrate": {
+ "hashes": [
+ "sha256:493f9b3795985b9b4915bf3b7d16946697f027b73545384e7d9e3a79f989d2fe",
+ "sha256:b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed"
+ ],
+ "index": "pypi",
+ "version": "==2.1.1"
+ },
+ "flask-openid": {
+ "hashes": [
+ "sha256:5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab"
+ ],
+ "version": "==1.2.5"
+ },
+ "flask-sqlalchemy": {
+ "hashes": [
+ "sha256:c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5"
+ ],
+ "index": "pypi",
+ "version": "==2.1"
+ },
+ "flask-wtf": {
+ "hashes": [
+ "sha256:5d14d55cfd35f613d99ee7cba0fc3fbbe63ba02f544d349158c14ca15561cc36",
+ "sha256:d9a9e366b32dcbb98ef17228e76be15702cd2600675668bca23f63a7947fd5ac"
+ ],
+ "index": "pypi",
+ "version": "==0.14.2"
+ },
+ "flower": {
+ "hashes": [
+ "sha256:a7a828c2dbea7e9cff1c86d63626f0eeb047b1b1e9a0ee5daad30771fb51e6d0"
+ ],
+ "index": "pypi",
+ "version": "==0.9.2"
+ },
+ "future": {
+ "hashes": [
+ "sha256:e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb"
+ ],
+ "index": "pypi",
+ "version": "==0.16.0"
+ },
+ "geopy": {
+ "hashes": [
+ "sha256:4250e5a9e9f7abb990eddf01d1491fc112755e14f76060011c607ba759a74112",
+ "sha256:5215b360f524118a468c13bf97ecbff6136a1876bf4b11d624916e9c9e0f7c17"
+ ],
+ "index": "pypi",
+ "version": "==1.11.0"
+ },
+ "gunicorn": {
+ "hashes": [
+ "sha256:eb8d8924b117a609fae9f8cd85df0cad3535dd613fdbcdbba3ee88d5459f1d4f",
+ "sha256:f5ca088d029fe3cea166c59bb43b7ccc9c850fe25af3da61350fe712c5cc5aa2"
+ ],
+ "index": "pypi",
+ "version": "==19.8.0"
+ },
+ "html5lib": {
+ "hashes": [
+ "sha256:b8934484cf22f1db684c0fae27569a0db404d0208d20163fbf51cc537245d008",
+ "sha256:ee747c0ffd3028d2722061936b5c65ee4fe13c8e4613519b4447123fc4546298"
+ ],
+ "version": "==0.999999999"
+ },
+ "humanize": {
+ "hashes": [
+ "sha256:a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19"
+ ],
+ "index": "pypi",
+ "version": "==0.5.1"
+ },
+ "idna": {
+ "hashes": [
+ "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f",
+ "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4"
+ ],
+ "index": "pypi",
+ "version": "==2.6"
+ },
+ "ijson": {
+ "hashes": [
+ "sha256:ef5f9f6bf9e44f2e1721e72bcc82c7ac6bb012b525e0f8642dedf7ddc44cf474",
+ "sha256:eff9ce137698dcb565420497050955cb811892eb073ea1c09d92ecaf671bd7f7"
+ ],
+ "version": "==2.3"
+ },
+ "isodate": {
+ "hashes": [
+ "sha256:2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8",
+ "sha256:aa4d33c06640f5352aca96e4b81afd8ab3b47337cc12089822d6f322ac772c81"
+ ],
+ "index": "pypi",
+ "version": "==0.6.0"
+ },
+ "itsdangerous": {
+ "hashes": [
+ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
+ "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
+ ],
+ "version": "==1.1.0"
+ },
+ "jdcal": {
+ "hashes": [
+ "sha256:948fb8d079e63b4be7a69dd5f0cd618a0a57e80753de8248fd786a8a20658a07",
+ "sha256:ea0a5067c5f0f50ad4c7bdc80abad3d976604f6fb026b0b3a17a9d84bb9046c9"
+ ],
+ "version": "==1.4"
+ },
+ "jinja2": {
+ "hashes": [
+ "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
+ "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
+ ],
+ "version": "==2.10"
+ },
+ "jmespath": {
+ "hashes": [
+ "sha256:6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64",
+ "sha256:f11b4461f425740a1d908e9a3f7365c3d2e569f6ca68a2ff8bc5bcd9676edd63"
+ ],
+ "version": "==0.9.3"
+ },
+ "jsonlines": {
+ "hashes": [
+ "sha256:0ebd5b0c3efe0d4b5018b320fb0ee1a7b680ab39f6eb853715859f818d386cc8",
+ "sha256:43b8d5588a9d4862c8a4a49580e38e20ec595aee7ad6fe469b10fb83fbefde88"
+ ],
+ "version": "==1.2.0"
+ },
+ "jsonschema": {
+ "hashes": [
+ "sha256:000e68abd33c972a5248544925a0cae7d1125f9bf6c58280d37546b946769a08",
+ "sha256:6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02"
+ ],
+ "version": "==2.6.0"
+ },
+ "kombu": {
+ "hashes": [
+ "sha256:86adec6c60f63124e2082ea8481bbe4ebe04fde8ebed32c177c7f0cd2c1c9082",
+ "sha256:b274db3a4eacc4789aeb24e1de3e460586db7c4fc8610f7adcc7a3a1709a60af"
+ ],
+ "version": "==4.2.1"
+ },
+ "linear-tsv": {
+ "hashes": [
+ "sha256:b504d78f4075615ae75de86a16e5680701a441fc84da2a2cf9f94351ab1ccbf5"
+ ],
+ "version": "==1.1.0"
+ },
+ "lxml": {
+ "hashes": [
+ "sha256:0da0a0711b8aa3161cf263ced74f736990952e44f1d0183c5248f16a1dc1f133",
+ "sha256:13e5a6373168ffad39facbba98d35a8bdbc6248dbaa61c9c9470c39906c1b8f1",
+ "sha256:13ec5a016e588b2e0ec2c46e0091b1b639b0eb6e428c108f0695f2bff1bafae8",
+ "sha256:163aefc42424c5ce3a3f9a021d8362445142ab51d4b34face30c9db6c6054687",
+ "sha256:1a55955329cc8a406458a7eb112c78290c9bc7e2311750ac1d70314a10246a15",
+ "sha256:202a22be99423d269ff11dec7cdf23b6262b3da17854336d4741699c53ca7ea9",
+ "sha256:2e779d9da6a3f4f8cd75bb31b5aef9bfdf5dcd415847c4eca8891847108861bc",
+ "sha256:372de0c373710c3114b10b20580d880b2e0b71f045092278a63aa15412336a7f",
+ "sha256:3ae6d795aaef0d724e533e0383fe8877e6a25f8b22b3d61dd06b53ce12186165",
+ "sha256:420e91c29fb6c3f920a4d7b74864721f57cfc5ebe4bef980a2de268de3805f10",
+ "sha256:50bd89e62f730614beb7ac85c78d948c470a1bfff4728ff67a178fda7e3c5192",
+ "sha256:52c4bf8871a1e91958a0cb9ec30dbc268298efd0e59660ceebc8277d61b36be2",
+ "sha256:54325c7eae22211c0a577b2ca4f10f47b4d352aaff468909209af543a57eb08e",
+ "sha256:548ed7232a56b2ab7df3330de8a283bf937d4878dd4ddb57068849f06cb15a2c",
+ "sha256:5c321ab3b310f0342f5369be7279fcfc0366eb8c8b47bd8fa31b1a3c063b6586",
+ "sha256:5c4ad32804abf0d872776f44bf4e4a5181ed37b3de77a87f6d7b2a1d42620cbd",
+ "sha256:5d5d46ff5465241e6100f0a023e8afcbd75119f598e94c444246bb7f4cbd23f6",
+ "sha256:736f72be15caad8116891eb6aa4a078b590d231fdc63818c40c21624ac71db96",
+ "sha256:79226dd2b9fbd63f1b8739b6823bd95b81d502043fd0b81ff8925d55b22f0154",
+ "sha256:872c9f47d523489e3fa4a933610bc9fa5fa434a75d9d26dc01df4b433f2f8b98",
+ "sha256:93081f9c87fa520447a191152c7d89cf687c5c8e6fef06493ba809e3196ca35e",
+ "sha256:9374c9399c1d8479b2b93295abf5997ebaa6d9c5e21a3dc03d1c18b61247cfae",
+ "sha256:9e32fb013ff5b7bd06b1899fe027d46d5b4b2e684ff9159146841bfaaa6b3866",
+ "sha256:a61a7a4286d8fc450a32a148fced8d3ac71fa55afd922a4043e13cb86eb6d797",
+ "sha256:b3d66246c9b41e495ca02a7c33f6ca415febd06e1e9e1cc5842592881c327987",
+ "sha256:bd9f07e9aef9ff12f3a07d0a084001e983f4c32ea5b1143e1804762a58d22271",
+ "sha256:d1cb088a961cf093b73c7b9460fa43a3afff385c1f1bc306fc3b8819819c2d24",
+ "sha256:dda7051dad02da2f36be48d68ca500d31fcd8c8fce3986183d48b02637f2f985",
+ "sha256:e54ca8cdd70079e7a3e2c061ef3703b2a43159462c1dbd17c11f3ea1fb3601e7",
+ "sha256:e66a62e84cdea052a17a5e2a896cd79a9a53ec570681f3bc32d012863e02acb0",
+ "sha256:ef4945f9c9e32e68669109e2b009becc71f3ca57b9de79b604b820ca8de2b85c"
+ ],
+ "version": "==3.8.0"
+ },
+ "mako": {
+ "hashes": [
+ "sha256:4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"
+ ],
+ "version": "==1.0.7"
+ },
+ "markdown": {
+ "hashes": [
+ "sha256:9ba587db9daee7ec761cfc656272be6aabe2ed300fece21208e4aab2e457bc8f",
+ "sha256:a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81"
+ ],
+ "index": "pypi",
+ "version": "==2.6.11"
+ },
+ "markupsafe": {
+ "hashes": [
+ "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+ ],
+ "version": "==1.0"
+ },
+ "numexpr": {
+ "hashes": [
+ "sha256:0cd95fef6cb8c0e716c6e2081ce4da0350d361195c0eac6c5b0f1f2d6e15d1e2",
+ "sha256:1c24ffb5837f5e4d8cbd30bcaa55ba10f39a9174fddeeff80b92567c1c44d037",
+ "sha256:21512b764bbfb80c6579f63cde8470e2986cf45741d7cbd84ddf0c43a6662289",
+ "sha256:2439b399f813b806129a5ee330aa4a354f4f93827f90ee34c75544dc637e750e",
+ "sha256:3085f83f24707ea86d5ed141b44fd3646e1ebc91b994dd97df18f904a774c3fe",
+ "sha256:35e99a2c07dea4cbe221ac230351d6dad6a401f4825056f136ea0cfda109faf1",
+ "sha256:3ad5369a90ab3bb6110a5af55857bb26bd62c99e0a7d2dd7a738f55a79de6c98",
+ "sha256:422354710d7c7f81f0d8cbac8f2d41c6e3fd4f74a6e5b3cbbb7c639b4cbfce53",
+ "sha256:4431dc92a9c674678ce151735d96454ab2506651696d3eaf9ce26560822e60e8",
+ "sha256:5c5c78eb8f034770cbb36823ea82a24e073eb2a3b644c82bf5396686a888d155",
+ "sha256:5cfa58eb834d541a9cce65f20f61df77294b9ef7339dd86f0765662d912765be",
+ "sha256:6e269478879181e9ad3e7769c6e122d9f5c7e835994713a1df4979fce0bf8260",
+ "sha256:7a6a92c25b2a16417134c17912c29339b5bcee0ac47b06454827489a6b744b8b",
+ "sha256:80e1bf9b0f979f0f2598811f35f2e33f0c9ea84da611c604c2b66a14622138ff",
+ "sha256:879f1fc624b00fd62642821d599973abc0d5eeaae428fc3719734216ad909030",
+ "sha256:88bae26db9c8ba4feee40605dd44ab0474413e5a4562cc95dfa068a7b25c61df",
+ "sha256:89d8192f2b838eec1f7e74fcd401610c98ecbb598d67f3f0d5ddda7c364d9fbf",
+ "sha256:a48c48e7f9c97eb4620472338612ef3139a04f97966b44bfde85fec78bfa7791",
+ "sha256:b2cd9c914caf55cb28bd11912ef7f3842506e37cf4ea1d995b7d00638d6de020",
+ "sha256:bb5ee81885b678a866c59204bab97e84ca8f9487c04289492e6ce428c7b573e5",
+ "sha256:c8c9b450a8004961a062e64a3beb8dec1e96246f67a1215465b3a38ae561e628",
+ "sha256:f0bef9a3a5407fb8d6344cf91b658bef7c13ec8a8eb13f423822d9d2ca5af6ce",
+ "sha256:f63c422f52ed8b322ee02b4a3b86e46f41ce5893c04c96e3a24d7c681f80f98c"
+ ],
+ "version": "==2.6.4"
+ },
+ "numpy": {
+ "hashes": [
+ "sha256:032df9b6571c5f1d41ea6f6a189223208cb488990373aa686aca55570fcccb42",
+ "sha256:094f8a83e5bd0a44a7557fa24a46db6ba7d5299c389ddbc9e0e18722f567fb63",
+ "sha256:1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6",
+ "sha256:2aa0910eaeb603b1a5598193cc3bc8eacf1baf6c95cbc3955eb8e15fa380c133",
+ "sha256:2f5ebc7a04885c7d69e5daa05208faef4db7f1ae6a99f4d36962df8cd54cdc76",
+ "sha256:32a07241cb624e104b88b08dea2851bf4ec5d65a1f599d7735041ced7171fd7a",
+ "sha256:3c7959f750b54b445f14962a3ddc41b9eadbab00b86da55fbb1967b2b79aad10",
+ "sha256:3d8f9273c763a139a99e65c2a3c10f1109df30bedae7f011b10d95c538364704",
+ "sha256:63bca71691339d2d6f8a7c970821f2b12098a53afccc0190d4e1555e75e5223a",
+ "sha256:7ae9c3baff3b989859c88e0168ad10902118595b996bf781eaf011bb72428798",
+ "sha256:866a7c8774ccc7d603667fad95456b4cf56d79a2bb5a7648ac9f0082e0b9416e",
+ "sha256:8bc4b92a273659e44ca3f3a2f8786cfa39d8302223bcfe7df794429c63d5f5a1",
+ "sha256:919f65e0732195474897b1cafefb4d4e7c2bb8174a725e506b62e9096e4df28d",
+ "sha256:9d1598573d310104acb90377f0a8c2319f737084689f5eb18012becaf345cda5",
+ "sha256:9fff90c88bfaad2901be50453d5cd7897a826c1d901f0654ee1d73ab3a48cd18",
+ "sha256:a245464ddf6d90e2d6287e9cef6bcfda2a99467fdcf1b677b99cd0b6c7b43de2",
+ "sha256:a988db28f54e104a01e8573ceb6f28202b4c15635b1450b2e3b2b822c6564f9b",
+ "sha256:b12fe6f31babb9477aa0f9692730654b3ee0e71f33b4568170dfafd439caf0a2",
+ "sha256:b7599ff4acd23f5de983e3aec772153b1043e131487a5c6ad0f94b41a828877a",
+ "sha256:c9f4dafd6065c4c782be84cd67ceeb9b1d4380af60a7af32be10ebecd723385e",
+ "sha256:ce3622b73ccd844ba301c1aea65d36cf9d8331e7c25c16b1725d0f14db99aaf4",
+ "sha256:d0f36a24cf8061a2c03e151be3418146717505b9b4ec17502fa3bbdb04ec1431",
+ "sha256:d263f8f14f2da0c079c0297e829e550d8f2c4e0ffef215506bd1d0ddd2bff3de",
+ "sha256:d8837ff272800668aabdfe70b966631914b0d6513aed4fc1b1428446f771834d",
+ "sha256:ef694fe72a3995aa778a5095bda946e0d31f7efabd5e8063ad8c6238ab7d3f78",
+ "sha256:f1fd1a6f40a501ba4035f5ed2c1f4faa68245d1407bf97d2ee401e4f23d1720b",
+ "sha256:fa337b6bd5fe2b8c4e705f4102186feb9985de9bb8536d32d5129a658f1789e0",
+ "sha256:febd31cd0d2fd2509ca2ec53cb339f8bf593c1bd245b9fc55c1917a68532a0af"
+ ],
+ "version": "==1.15.3"
+ },
+ "openpyxl": {
+ "hashes": [
+ "sha256:626d38647c063d55803ef4971c4d43226538d4e95cb6260c094e363ee33e10c7"
+ ],
+ "version": "==2.4.11"
+ },
+ "pandas": {
+ "hashes": [
+ "sha256:211cfdb9f72f26d2ede21c751d27e08fed4434d47fb9bb82ebc8ff753888b8b6",
+ "sha256:28fd087514616549a0e3259cd68ac88d7eaed6bd3062017a7f312e27941266bd",
+ "sha256:2fb7c63138bd5ead296b18b2cb6abd3a394f7581e5ae052b02b27df8244b03ca",
+ "sha256:372435456c349a8d39ff001967b161f6bd29d4c3de145a4cf9b366648defbb1f",
+ "sha256:3790a3348ab0f416e58061d21693cb662fbb2f638001b94bf2b2199fedc1b1c2",
+ "sha256:437a6e906a6717a9ed2627cf6e7895b63dfaa0172567cbd75a553f55cf78cc17",
+ "sha256:50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690",
+ "sha256:720daad75b5d35dd1b446842210c4f3fd447464c9c0884972f3f12b213a9edd1",
+ "sha256:b4fb71acbc2709b8f5993cb4b5445d8182864f11c39787e317aae39f21206270",
+ "sha256:b704fd73022342cce612996de495a16954311e0c0cf077c1b83d5cf0b9656a60",
+ "sha256:cbbecca0c7af6a2160b2d6ba30becc286824a98c61dcc6a41fada664f226424c",
+ "sha256:d2a071de755cc8ee7784e1b4c7b9b643d951d35c8adea7d64fe7c57cff9c47a7",
+ "sha256:d8154c5c68713a82461aba735832f0b4692be8a45a0a340a303bf90d6f80f36f",
+ "sha256:e1b86f7c55467ce1f6c12715f2fd1817f4a909b5c8c39bd4b5d2415ef2b04bd8",
+ "sha256:fcc63e8134516e93e16eb4ceac9afaa51f4adc5bf58efddae7cbc562f5b77dd0"
+ ],
+ "index": "pypi",
+ "version": "==0.23.1"
+ },
+ "parsedatetime": {
+ "hashes": [
+ "sha256:74aaed8e8639842ff48c05c1e3708a26ffa138eb00d557be6681b5df771f7c8c",
+ "sha256:9be60b878b50eb9cf65a0d32e7652f593ca76c0d8cf361ab0f2bff0771a33933"
+ ],
+ "index": "pypi",
+ "version": "==2.0.0"
+ },
+ "pathlib2": {
+ "hashes": [
+ "sha256:d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3",
+ "sha256:db3e43032d23787d3e9aec8c7ef1e0d2c3c589d5f303477661ebda2ca6d4bfba"
+ ],
+ "index": "pypi",
+ "version": "==2.3.0"
+ },
+ "pipenv": {
+ "hashes": [
+ "sha256:a785235bf2ddf65ea8a91531b3372471d9ad86036335dba8bd63f20c00a68e63",
+ "sha256:aca036e5fe988c8c2850167976b9361cfa8519afffe95bb1010105547622f9ee",
+ "sha256:d5ac9a7705c654ec6ed0059df4f0470d88119591d2724828cb5268207547afc1"
+ ],
+ "index": "pypi",
+ "version": "==2018.10.13"
+ },
+ "polyline": {
+ "hashes": [
+ "sha256:40c017e7b35bee5a773f8a4d27a98bcd1daa2564bad4d3b5494481054b2bbe28",
+ "sha256:60b95c002a039c3d0f23e210dc8b0856b91580f483724a969c441b81c9bfed3d"
+ ],
+ "index": "pypi",
+ "version": "==1.3.2"
+ },
+ "psycopg2-binary": {
+ "hashes": [
+ "sha256:04afb59bbbd2eab3148e6816beddc74348078b8c02a1113ea7f7822f5be4afe3",
+ "sha256:098b18f4d8857a8f9b206d1dc54db56c2255d5d26458917e7bcad61ebfe4338f",
+ "sha256:0bf855d4a7083e20ead961fda4923887094eaeace0ab2d76eb4aa300f4bbf5bd",
+ "sha256:197dda3ffd02057820be83fe4d84529ea70bf39a9a4daee1d20ffc74eb3d042e",
+ "sha256:278ef63afb4b3d842b4609f2c05ffbfb76795cf6a184deeb8707cd5ed3c981a5",
+ "sha256:3cbf8c4fc8f22f0817220891cf405831559f4d4c12c4f73913730a2ea6c47a47",
+ "sha256:4305aed922c4d9d6163ab3a41d80b5a1cfab54917467da8168552c42cad84d32",
+ "sha256:47ee296f704fb8b2a616dec691cdcfd5fa0f11943955e88faa98cbd1dc3b3e3d",
+ "sha256:4a0e38cb30457e70580903367161173d4a7d1381eb2f2cfe4e69b7806623f484",
+ "sha256:4d6c294c6638a71cafb82a37f182f24321f1163b08b5d5ca076e11fe838a3086",
+ "sha256:4f3233c366500730f839f92833194fd8f9a5c4529c8cd8040aa162c3740de8e5",
+ "sha256:5221f5a3f4ca2ddf0d58e8b8a32ca50948be9a43351fda797eb4e72d7a7aa34d",
+ "sha256:5c6ca0b507540a11eaf9e77dee4f07c131c2ec80ca0cffa146671bf690bc1c02",
+ "sha256:789bd89d71d704db2b3d5e67d6d518b158985d791d3b2dec5ab85457cfc9677b",
+ "sha256:7b94d29239efeaa6a967f3b5971bd0518d2a24edd1511edbf4a2c8b815220d07",
+ "sha256:89bc65ef3301c74cf32db25334421ea6adbe8f65601ea45dcaaf095abed910bb",
+ "sha256:89d6d3a549f405c20c9ae4dc94d7ed2de2fa77427a470674490a622070732e62",
+ "sha256:97521704ac7127d7d8ba22877da3c7bf4a40366587d238ec679ff38e33177498",
+ "sha256:a395b62d5f44ff6f633231abe568e2203b8fabf9797cd6386aa92497df912d9a",
+ "sha256:a6d32c37f714c3f34158f3fa659f3a8f2658d5f53c4297d45579b9677cc4d852",
+ "sha256:a89ee5c26f72f2d0d74b991ce49e42ddeb4ac0dc2d8c06a0f2770a1ab48f4fe0",
+ "sha256:b4c8b0ef3608e59317bfc501df84a61e48b5445d45f24d0391a24802de5f2d84",
+ "sha256:b5fcf07140219a1f71e18486b8dc28e2e1b76a441c19374805c617aa6d9a9d55",
+ "sha256:b86f527f00956ecebad6ab3bb30e3a75fedf1160a8716978dd8ce7adddedd86f",
+ "sha256:be4c4aa22ba22f70de36c98b06480e2f1697972d49eb20d525f400d204a6d272",
+ "sha256:c2ac7aa1a144d4e0e613ac7286dae85671e99fe7a1353954d4905629c36b811c",
+ "sha256:de26ef4787b5e778e8223913a3e50368b44e7480f83c76df1f51d23bd21cea16",
+ "sha256:e70ebcfc5372dc7b699c0110454fc4263967f30c55454397e5769eb72c0eb0ce",
+ "sha256:eadbd32b6bc48b67b0457fccc94c86f7ccc8178ab839f684eb285bb592dc143e",
+ "sha256:ecbc6dfff6db06b8b72ae8a2f25ff20fbdcb83cb543811a08f7cb555042aa729"
+ ],
+ "index": "pypi",
+ "version": "==2.7.5"
+ },
+ "pyarrow": {
+ "hashes": [
+ "sha256:08cf372e4b6147afc020c4b803e0141b1a64b149e3e0db606a87c9b727880ce8",
+ "sha256:23788dba72cb365435630142537b327577c20944060be6ab012bb81f8379e18b",
+ "sha256:2e315224f8a8da69e50310ed3543cac40527dfa9a6d67c2285677ee40cb6bb3f",
+ "sha256:36746973e7d82afe6e78e46968e9236351094d0fb943e817f7a6972bb5d6d574",
+ "sha256:55ec39ae2c302e1e2c98008f1e69dc0d1a7efacdd15a9b9e3d04d25006989cd5",
+ "sha256:5b7cb30bf43b5e485346c90fbb5c61ac5fd3f4476c16637196b36e8d1f2c89af",
+ "sha256:a5519aac76168ed0b1ec37150b3c66e9d74a0838e210c6437c04c1caa3fdb9c6",
+ "sha256:ab9e9bb53a11a55ae76c0384d0fd628c3013f5d222c9ab43e7e3bc90dbd36d9e",
+ "sha256:b82edbd225b6f1b4c6512947aeda38a7b439027166574d6c429b9dc4b35e0e6c",
+ "sha256:e74daadd14c6e8c5822b9dca09f6c388c4588a0c8f67ebd5dc741ea85662b43c",
+ "sha256:f1ddc694375c985b350e545e9f33b3a86da4ddc40289cfca463ebffbb1d24d2a",
+ "sha256:ff723618043421e05a302a1dd7169dfaa9a6a8ec87255be62407db9a205ed68e"
+ ],
+ "version": "==0.11.1"
+ },
+ "pycparser": {
+ "hashes": [
+ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"
+ ],
+ "version": "==2.19"
+ },
+ "pydruid": {
+ "hashes": [
+ "sha256:42cc1ca0b276c6129ba87b85349f36ce85e70c0f110a108bfcbf54e27270c1c4"
+ ],
+ "index": "pypi",
+ "version": "==0.4.4"
+ },
+ "pyhive": {
+ "hashes": [
+ "sha256:4b75e4dcca7c869daa3d461c567f236f3b7db4ece7731fa51ff297354282f15c"
+ ],
+ "index": "pypi",
+ "version": "==0.5.1"
+ },
+ "python-dateutil": {
+ "hashes": [
+ "sha256:891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca",
+ "sha256:95511bae634d69bc7329ba55e646499a842bc4ec342ad54a8cdb65645a0aad3c"
+ ],
+ "index": "pypi",
+ "version": "==2.6.1"
+ },
+ "python-editor": {
+ "hashes": [
+ "sha256:a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565"
+ ],
+ "version": "==1.0.3"
+ },
+ "python-geohash": {
+ "hashes": [
+ "sha256:05a21fcf4eda1a5eddbd291890ade23fc5ddaa6bb98f2ee23d2d384ed14f086d"
+ ],
+ "index": "pypi",
+ "version": "==0.8.5"
+ },
+ "python3-openid": {
+ "hashes": [
+ "sha256:0086da6b6ef3161cfe50fb1ee5cceaf2cda1700019fda03c2c5c440ca6abe4fa",
+ "sha256:628d365d687e12da12d02c6691170f4451db28d6d68d050007e4a40065868502"
+ ],
+ "version": "==3.1.0"
+ },
+ "pytz": {
+ "hashes": [
+ "sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca",
+ "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6"
+ ],
+ "version": "==2018.7"
+ },
+ "pyyaml": {
+ "hashes": [
+ "sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
+ "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
+ "sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
+ "sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7",
+ "sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
+ "sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
+ "sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
+ "sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269"
+ ],
+ "index": "pypi",
+ "version": "==3.12"
+ },
+ "requests": {
+ "hashes": [
+ "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b",
+ "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e"
+ ],
+ "index": "pypi",
+ "version": "==2.18.4"
+ },
+ "rfc3986": {
+ "hashes": [
+ "sha256:632b8fcd2ac37f24334316227f909be4f9d0738cbf409404cff6fa5f69a24093",
+ "sha256:8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b"
+ ],
+ "version": "==1.1.0"
+ },
+ "s3transfer": {
+ "hashes": [
+ "sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1",
+ "sha256:c7a9ec356982d5e9ab2d4b46391a7d6a950e2b04c472419f5fdec70cc0ada72f"
+ ],
+ "version": "==0.1.13"
+ },
+ "sasl": {
+ "hashes": [
+ "sha256:04f22e17bbebe0cd42471757a48c2c07126773c38741b1dad8d9fe724c16289d"
+ ],
+ "version": "==0.2.1"
+ },
+ "simplejson": {
+ "hashes": [
+ "sha256:1e651e49b91024e615267fe800ad094c1174800ff06a3b29652f4a656dc51228",
+ "sha256:2fa4eafab7cb4f900ce7739129cef0da1f25acfa89089540ce6241a15a61df78",
+ "sha256:346ef48e38d202634ef5f8402d3e043984ef9f504f00b2275807cc8a01ae7d31",
+ "sha256:523d3df8dd6a366f8911ffdd9778d2e52d174f1b2ae867c543f9f200ab06595d",
+ "sha256:839ce3128375c4b6a08b4d20e67befe8fc0d6cf7ed1a1ee6117f035225368de8",
+ "sha256:97502022f2fe5cf78580d5b0889030a62f46080508d32a0992ee7d7d107790b8",
+ "sha256:ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb",
+ "sha256:b5263de68cd0891ff4fe8ceb14e6382635ffb1be2ee0c8f7e664681679cd8163",
+ "sha256:bb68f637d12dccf7ddeece29b4a5f27f15b768dff7f02c198d3d7640f9b8d2dc",
+ "sha256:d6b38d952a3e90022287998928b12a77471b054455bcded9731dfb8371c47df8",
+ "sha256:d7e1191ddccabcdc5b300d4469e0fbe69abda6d5e1fba37dad66f8a9913a9994",
+ "sha256:f00fb192452506454ce7dba6de5a0d5386631e1d6cbc8dcb7e7d4b220bb13c06"
+ ],
+ "index": "pypi",
+ "version": "==3.15.0"
+ },
+ "six": {
+ "hashes": [
+ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
+ "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
+ ],
+ "index": "pypi",
+ "version": "==1.11.0"
+ },
+ "sqlalchemy": {
+ "hashes": [
+ "sha256:64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d"
+ ],
+ "index": "pypi",
+ "version": "==1.2.2"
+ },
+ "sqlalchemy-utils": {
+ "hashes": [
+ "sha256:e35431b0e57c4f7030ff598c23813c8b7b04b508ce10e8e9ebe448645b38d6d7"
+ ],
+ "index": "pypi",
+ "version": "==0.32.21"
+ },
+ "sqlparse": {
+ "hashes": [
+ "sha256:ce028444cfab83be538752a2ffdb56bc417b7784ff35bb9a3062413717807dec",
+ "sha256:d9cf190f51cbb26da0412247dfe4fb5f4098edb73db84e02f9fc21fdca31fed4"
+ ],
+ "index": "pypi",
+ "version": "==0.2.4"
+ },
+ "superset": {
+ "editable": true,
+ "path": "."
+ },
+ "tableschema": {
+ "hashes": [
+ "sha256:4b68da205780b76b2856470bf3603b7ace97bc7b0ed02337429d78c9bb448b13",
+ "sha256:67552d43f49cb02e7b16522b34ffe7effd071137ac81b4e8060eeb7cdc3c599d"
+ ],
+ "index": "pypi",
+ "version": "==1.1.0"
+ },
+ "tabulator": {
+ "hashes": [
+ "sha256:5fb17abf339d4a530c849aeeb562d24cbe9640297f1e5cd1d3d287184cda096c",
+ "sha256:9ce63e68a1f4360679ddee638f8a7489336967d965040bd414d05180d56847d0"
+ ],
+ "version": "==1.18.0"
+ },
+ "thrift": {
+ "hashes": [
+ "sha256:7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b"
+ ],
+ "index": "pypi",
+ "version": "==0.11.0"
+ },
+ "thrift-sasl": {
+ "hashes": [
+ "sha256:80e015290e7c9afc5b4864bfb964e841d4d98e1d70f74bc216cf269f243f3362"
+ ],
+ "index": "pypi",
+ "version": "==0.3.0"
+ },
+ "tornado": {
+ "hashes": [
+ "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d",
+ "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409",
+ "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f",
+ "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f",
+ "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5",
+ "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb",
+ "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"
+ ],
+ "version": "==5.1.1"
+ },
+ "unicodecsv": {
+ "hashes": [
+ "sha256:018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc"
+ ],
+ "index": "pypi",
+ "version": "==0.14.1"
+ },
+ "unidecode": {
+ "hashes": [
+ "sha256:72f49d3729f3d8f5799f710b97c1451c5163102e76d64d20e170aedbbd923582",
+ "sha256:8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5"
+ ],
+ "index": "pypi",
+ "version": "==1.0.22"
+ },
+ "urllib3": {
+ "hashes": [
+ "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
+ "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
+ ],
+ "version": "==1.22"
+ },
+ "vine": {
+ "hashes": [
+ "sha256:52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72",
+ "sha256:6849544be74ec3638e84d90bc1cf2e1e9224cc10d96cd4383ec3f69e9bce077b"
+ ],
+ "version": "==1.1.4"
+ },
+ "virtualenv": {
+ "hashes": [
+ "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669",
+ "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752"
+ ],
+ "version": "==16.0.0"
+ },
+ "virtualenv-clone": {
+ "hashes": [
+ "sha256:afce268508aa5596c90dda234abe345deebc401a57d287bcbd76baa140a1aa58"
+ ],
+ "version": "==0.4.0"
+ },
+ "webencodings": {
+ "hashes": [
+ "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
+ "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
+ ],
+ "version": "==0.5.1"
+ },
+ "werkzeug": {
+ "hashes": [
+ "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",
+ "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b"
+ ],
+ "version": "==0.14.1"
+ },
+ "wtforms": {
+ "hashes": [
+ "sha256:0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61",
+ "sha256:e3ee092c827582c50877cdbd49e9ce6d2c5c1f6561f849b3b068c1b8029626f1"
+ ],
+ "version": "==2.2.1"
+ },
+ "xlrd": {
+ "hashes": [
+ "sha256:83a1d2f1091078fb3f65876753b5302c5cfb6a41de64b9587b74cefa75157148",
+ "sha256:8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"
+ ],
+ "version": "==1.1.0"
+ }
+ },
+ "develop": {
+ "appnope": {
+ "hashes": [
+ "sha256:5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0",
+ "sha256:8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"
+ ],
+ "markers": "sys_platform == 'darwin'",
+ "version": "==0.1.0"
+ },
+ "astroid": {
+ "hashes": [
+ "sha256:0ef2bf9f07c3150929b25e8e61b5198c27b0dca195e156f0e4d5bdd89185ca1a",
+ "sha256:fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"
+ ],
+ "version": "==1.6.5"
+ },
+ "autopep8": {
+ "hashes": [
+ "sha256:2284d4ae2052fedb9f466c09728e30d2e231cfded5ffd7b1a20c34123fdc4ba4"
+ ],
+ "index": "pypi",
+ "version": "==1.3.5"
+ },
+ "backcall": {
+ "hashes": [
+ "sha256:38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4",
+ "sha256:bbbf4b1e5cd2bdb08f915895b51081c041bac22394fdfcfdfbe9f14b77c08bf2"
+ ],
+ "version": "==0.1.0"
+ },
+ "click": {
+ "hashes": [
+ "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d",
+ "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"
+ ],
+ "index": "pypi",
+ "version": "==6.7"
+ },
+ "console-log": {
+ "hashes": [
+ "sha256:a4018b1a7a1105978ddfb8660864fdb0f732665fa11b0ce4538945d4530c2088",
+ "sha256:d2d9a1e3de8d12276107b82f37e6aca38162d2d5bc6c55142750575c034185d6"
+ ],
+ "index": "pypi",
+ "version": "==0.2.10"
+ },
+ "decorator": {
+ "hashes": [
+ "sha256:2c51dff8ef3c447388fe5e4453d24a2bf128d3a4c32af3fabef1f01c6851ab82",
+ "sha256:c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"
+ ],
+ "version": "==4.3.0"
+ },
+ "flake8": {
+ "hashes": [
+ "sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0",
+ "sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37"
+ ],
+ "index": "pypi",
+ "version": "==3.5.0"
+ },
+ "flake8-coding": {
+ "hashes": [
+ "sha256:725d51e270aa990f568b6197204b17b87271a4e34da4e2412f7e38d298d0cdad",
+ "sha256:ba01e96f879377766a3d71f3499a832b19386ce4831270bfe671ab57d0fe50be"
+ ],
+ "index": "pypi",
+ "version": "==1.3.0"
+ },
+ "flake8-commas": {
+ "hashes": [
+ "sha256:d3005899466f51380387df7151fb59afec666a0f4f4a2c6a8995b975de0f44b7",
+ "sha256:ee2141a3495ef9789a3894ed8802d03eff1eaaf98ce6d8653a7c573ef101935e"
+ ],
+ "index": "pypi",
+ "version": "==2.0.0"
+ },
+ "flake8-future-import": {
+ "hashes": [
+ "sha256:0c89030fd59912b5f0ac32e55df2461455c1d459e4317df616ce8d3d25646cc0",
+ "sha256:3e51623208684133bff6c76b3ccc707659e96229e89f6bebd3fface445fa8154"
+ ],
+ "index": "pypi",
+ "version": "==0.4.5"
+ },
+ "flake8-import-order": {
+ "hashes": [
+ "sha256:9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf",
+ "sha256:feca2fd0a17611b33b7fa84449939196c2c82764e262486d5c3e143ed77d387b"
+ ],
+ "index": "pypi",
+ "version": "==0.18"
+ },
+ "flake8-quotes": {
+ "hashes": [
+ "sha256:fd9127ad8bbcf3b546fa7871a5266fd8623ce765ebe3d5aa5eabb80c01212b26"
+ ],
+ "index": "pypi",
+ "version": "==1.0.0"
+ },
+ "flask": {
+ "hashes": [
+ "sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856",
+ "sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1"
+ ],
+ "index": "pypi",
+ "version": "==0.12.2"
+ },
+ "flask-cors": {
+ "hashes": [
+ "sha256:62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b",
+ "sha256:ac4b81b3d90f5f18714c995c807f94501df8c9bbc22ef4261c1cd850748c3850"
+ ],
+ "index": "pypi",
+ "version": "==3.0.3"
+ },
+ "gevent": {
+ "hashes": [
+ "sha256:1f277c5cf060b30313c5f9b91588f4c645e11839e14a63c83fcf6f24b1bc9b95",
+ "sha256:298a04a334fb5e3dcd6f89d063866a09155da56041bc94756da59db412cb45b1",
+ "sha256:30e9b2878d5b57c68a40b3a08d496bcdaefc79893948989bb9b9fab087b3f3c0",
+ "sha256:33533bc5c6522883e4437e901059fe5afa3ea74287eeea27a130494ff130e731",
+ "sha256:3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c",
+ "sha256:419fd562e4b94b91b58cccb3bd3f17e1a11f6162fca6c591a7822bc8a68f023d",
+ "sha256:4ea938f44b882e02cca9583069d38eb5f257cc15a03e918980c307e7739b1038",
+ "sha256:51143a479965e3e634252a0f4a1ea07e5307cf8dc773ef6bf9dfe6741785fb4c",
+ "sha256:5bf9bd1dd4951552d9207af3168f420575e3049016b9c10fe0c96760ce3555b7",
+ "sha256:6004512833707a1877cc1a5aea90fd182f569e089bc9ab22a81d480dad018f1b",
+ "sha256:640b3b52121ab519e0980cb38b572df0d2bc76941103a697e828c13d76ac8836",
+ "sha256:6951655cc18b8371d823e81c700883debb0f633aae76f425dfeb240f76b95a67",
+ "sha256:71eeb8d9146e8131b65c3364bb760b097c21b7b9fdbec91bf120685a510f997a",
+ "sha256:7c899e5a6f94d6310352716740f05e41eb8c52d995f27fc01e90380913aa8f22",
+ "sha256:8465f84ba31aaf52a080837e9c5ddd592ab0a21dfda3212239ce1e1796f4d503",
+ "sha256:99de2e38dde8669dd30a8a1261bdb39caee6bd00a5f928d01dfdb85ab0502562",
+ "sha256:9fa4284b44bc42bef6e437488d000ae37499ccee0d239013465638504c4565b7",
+ "sha256:a1beea0443d3404c03e069d4c4d9fc13d8ec001771c77f9a23f01911a41f0e49",
+ "sha256:a66a26b78d90d7c4e9bf9efb2b2bd0af49234604ac52eaca03ea79ac411e3f6d",
+ "sha256:a94e197bd9667834f7bb6bd8dff1736fab68619d0f8cd78a9c1cebe3c4944677",
+ "sha256:ac0331d3a3289a3d16627742be9c8969f293740a31efdedcd9087dadd6b2da57",
+ "sha256:d26b57c50bf52fb38dadf3df5bbecd2236f49d7ac98f3cf32d6b8a2d25afc27f",
+ "sha256:fd23b27387d76410eb6a01ea13efc7d8b4b95974ba212c336e8b1d6ab45a9578"
+ ],
+ "version": "==1.3.7"
+ },
+ "gevent-websocket": {
+ "hashes": [
+ "sha256:17b67d91282f8f4c973eba0551183fc84f56f1c90c8f6b6b30256f31f66f5242",
+ "sha256:7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0"
+ ],
+ "version": "==0.10.1"
+ },
+ "greenlet": {
+ "hashes": [
+ "sha256:000546ad01e6389e98626c1367be58efa613fa82a1be98b0c6fc24b563acc6d0",
+ "sha256:0d48200bc50cbf498716712129eef819b1729339e34c3ae71656964dac907c28",
+ "sha256:23d12eacffa9d0f290c0fe0c4e81ba6d5f3a5b7ac3c30a5eaf0126bf4deda5c8",
+ "sha256:37c9ba82bd82eb6a23c2e5acc03055c0e45697253b2393c9a50cef76a3985304",
+ "sha256:51503524dd6f152ab4ad1fbd168fc6c30b5795e8c70be4410a64940b3abb55c0",
+ "sha256:8041e2de00e745c0e05a502d6e6db310db7faa7c979b3a5877123548a4c0b214",
+ "sha256:81fcd96a275209ef117e9ec91f75c731fa18dcfd9ffaa1c0adbdaa3616a86043",
+ "sha256:853da4f9563d982e4121fed8c92eea1a4594a2299037b3034c3c898cb8e933d6",
+ "sha256:8b4572c334593d449113f9dc8d19b93b7b271bdbe90ba7509eb178923327b625",
+ "sha256:9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc",
+ "sha256:9854f612e1b59ec66804931df5add3b2d5ef0067748ea29dc60f0efdcda9a638",
+ "sha256:99a26afdb82ea83a265137a398f570402aa1f2b5dfb4ac3300c026931817b163",
+ "sha256:a19bf883b3384957e4a4a13e6bd1ae3d85ae87f4beb5957e35b0be287f12f4e4",
+ "sha256:a9f145660588187ff835c55a7d2ddf6abfc570c2651c276d3d4be8a2766db490",
+ "sha256:ac57fcdcfb0b73bb3203b58a14501abb7e5ff9ea5e2edfa06bb03035f0cff248",
+ "sha256:bcb530089ff24f6458a81ac3fa699e8c00194208a724b644ecc68422e1111939",
+ "sha256:beeabe25c3b704f7d56b573f7d2ff88fc99f0138e43480cecdfcaa3b87fe4f87",
+ "sha256:d634a7ea1fc3380ff96f9e44d8d22f38418c1c381d5fac680b272d7d90883720",
+ "sha256:d97b0661e1aead761f0ded3b769044bb00ed5d33e1ec865e891a8b128bf7c656"
+ ],
+ "markers": "platform_python_implementation == 'CPython'",
+ "version": "==0.4.15"
+ },
+ "ipdb": {
+ "hashes": [
+ "sha256:7081c65ed7bfe7737f83fa4213ca8afd9617b42ff6b3f1daf9a3419839a2a00a"
+ ],
+ "index": "pypi",
+ "version": "==0.11"
+ },
+ "ipython": {
+ "hashes": [
+ "sha256:a5781d6934a3341a1f9acb4ea5acdc7ea0a0855e689dbe755d070ca51e995435",
+ "sha256:b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd"
+ ],
+ "version": "==7.1.1"
+ },
+ "ipython-genutils": {
+ "hashes": [
+ "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8",
+ "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"
+ ],
+ "version": "==0.2.0"
+ },
+ "isort": {
+ "hashes": [
+ "sha256:1153601da39a25b14ddc54955dbbacbb6b2d19135386699e2ad58517953b34af",
+ "sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8",
+ "sha256:ec9ef8f4a9bc6f71eec99e1806bfa2de401650d996c59330782b89a5555c1497"
+ ],
+ "version": "==4.3.4"
+ },
+ "itsdangerous": {
+ "hashes": [
+ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
+ "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
+ ],
+ "version": "==1.1.0"
+ },
+ "jedi": {
+ "hashes": [
+ "sha256:0191c447165f798e6a730285f2eee783fff81b0d3df261945ecb80983b5c3ca7",
+ "sha256:b7493f73a2febe0dc33d51c99b474547f7f6c0b2c8fb2b21f453eef204c12148"
+ ],
+ "version": "==0.13.1"
+ },
+ "jinja2": {
+ "hashes": [
+ "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
+ "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
+ ],
+ "version": "==2.10"
+ },
+ "lazy-object-proxy": {
+ "hashes": [
+ "sha256:0ce34342b419bd8f018e6666bfef729aec3edf62345a53b537a4dcc115746a33",
+ "sha256:1b668120716eb7ee21d8a38815e5eb3bb8211117d9a90b0f8e21722c0758cc39",
+ "sha256:209615b0fe4624d79e50220ce3310ca1a9445fd8e6d3572a896e7f9146bbf019",
+ "sha256:27bf62cb2b1a2068d443ff7097ee33393f8483b570b475db8ebf7e1cba64f088",
+ "sha256:27ea6fd1c02dcc78172a82fc37fcc0992a94e4cecf53cb6d73f11749825bd98b",
+ "sha256:2c1b21b44ac9beb0fc848d3993924147ba45c4ebc24be19825e57aabbe74a99e",
+ "sha256:2df72ab12046a3496a92476020a1a0abf78b2a7db9ff4dc2036b8dd980203ae6",
+ "sha256:320ffd3de9699d3892048baee45ebfbbf9388a7d65d832d7e580243ade426d2b",
+ "sha256:50e3b9a464d5d08cc5227413db0d1c4707b6172e4d4d915c1c70e4de0bbff1f5",
+ "sha256:5276db7ff62bb7b52f77f1f51ed58850e315154249aceb42e7f4c611f0f847ff",
+ "sha256:61a6cf00dcb1a7f0c773ed4acc509cb636af2d6337a08f362413c76b2b47a8dd",
+ "sha256:6ae6c4cb59f199d8827c5a07546b2ab7e85d262acaccaacd49b62f53f7c456f7",
+ "sha256:7661d401d60d8bf15bb5da39e4dd72f5d764c5aff5a86ef52a042506e3e970ff",
+ "sha256:7bd527f36a605c914efca5d3d014170b2cb184723e423d26b1fb2fd9108e264d",
+ "sha256:7cb54db3535c8686ea12e9535eb087d32421184eacc6939ef15ef50f83a5e7e2",
+ "sha256:7f3a2d740291f7f2c111d86a1c4851b70fb000a6c8883a59660d95ad57b9df35",
+ "sha256:81304b7d8e9c824d058087dcb89144842c8e0dea6d281c031f59f0acf66963d4",
+ "sha256:933947e8b4fbe617a51528b09851685138b49d511af0b6c0da2539115d6d4514",
+ "sha256:94223d7f060301b3a8c09c9b3bc3294b56b2188e7d8179c762a1cda72c979252",
+ "sha256:ab3ca49afcb47058393b0122428358d2fbe0408cf99f1b58b295cfeb4ed39109",
+ "sha256:bd6292f565ca46dee4e737ebcc20742e3b5be2b01556dafe169f6c65d088875f",
+ "sha256:cb924aa3e4a3fb644d0c463cad5bc2572649a6a3f68a7f8e4fbe44aaa6d77e4c",
+ "sha256:d0fc7a286feac9077ec52a927fc9fe8fe2fabab95426722be4c953c9a8bede92",
+ "sha256:ddc34786490a6e4ec0a855d401034cbd1242ef186c20d79d2166d6a4bd449577",
+ "sha256:e34b155e36fa9da7e1b7c738ed7767fc9491a62ec6af70fe9da4a057759edc2d",
+ "sha256:e5b9e8f6bda48460b7b143c3821b21b452cb3a835e6bbd5dd33aa0c8d3f5137d",
+ "sha256:e81ebf6c5ee9684be8f2c87563880f93eedd56dd2b6146d8a725b50b7e5adb0f",
+ "sha256:eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a",
+ "sha256:f460d1ceb0e4a5dcb2a652db0904224f367c9b3c1470d5a7683c0480e582468b"
+ ],
+ "version": "==1.3.1"
+ },
+ "markupsafe": {
+ "hashes": [
+ "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+ ],
+ "version": "==1.0"
+ },
+ "mccabe": {
+ "hashes": [
+ "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+ "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
+ ],
+ "version": "==0.6.1"
+ },
+ "mysqlclient": {
+ "hashes": [
+ "sha256:1e85e48b167e2af3bb08f273fdbd1ad6401cbe75057fa6513f97387dc7b282dc",
+ "sha256:2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5",
+ "sha256:371df79d000af56b4e540b7ce2120d1c9afb04b751bfce25a1eb609c50fd10ff",
+ "sha256:b3b1a7e4468180afb79289b54069d9499242946a4cedf3928cbf6b2a13800016",
+ "sha256:d56e379c03efad746e84705cbb97401f60d1f98b05e11a27f2d9c2d043936974"
+ ],
+ "index": "pypi",
+ "version": "==1.3.12"
+ },
+ "packaging": {
+ "hashes": [
+ "sha256:0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807",
+ "sha256:f95a1e147590f204328170981833854229bb2912ac3d5f89e2a8ccd2834800c9"
+ ],
+ "version": "==18.0"
+ },
+ "parso": {
+ "hashes": [
+ "sha256:35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2",
+ "sha256:895c63e93b94ac1e1690f5fdd40b65f07c8171e3e53cbd7793b5b96c0e0a7f24"
+ ],
+ "version": "==0.3.1"
+ },
+ "pexpect": {
+ "hashes": [
+ "sha256:2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba",
+ "sha256:3fbd41d4caf27fa4a377bfd16fef87271099463e6fa73e92a52f92dfee5d425b"
+ ],
+ "markers": "sys_platform != 'win32'",
+ "version": "==4.6.0"
+ },
+ "pickleshare": {
+ "hashes": [
+ "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca",
+ "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"
+ ],
+ "version": "==0.7.5"
+ },
+ "pluggy": {
+ "hashes": [
+ "sha256:447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095",
+ "sha256:bde19360a8ec4dfd8a20dcb811780a30998101f078fc7ded6162f0076f50508f"
+ ],
+ "version": "==0.8.0"
+ },
+ "prompt-toolkit": {
+ "hashes": [
+ "sha256:646b3401b3b0bb7752100bc9b7aeecb36cb09cdfc63652b5856708b5ba8db7da",
+ "sha256:82766ffd7397e6661465e20bd1390db0781ca4fbbab4cf6c2578cacdd8b09754",
+ "sha256:ccad8461b5d912782726af17122113e196085e7e11d57cf0c9b982bf1ab2c7be"
+ ],
+ "version": "==2.0.6"
+ },
+ "ptyprocess": {
+ "hashes": [
+ "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0",
+ "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"
+ ],
+ "version": "==0.6.0"
+ },
+ "py": {
+ "hashes": [
+ "sha256:bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694",
+ "sha256:e76826342cefe3c3d5f7e8ee4316b80d1dd8a300781612ddbc765c17ba25a6c6"
+ ],
+ "version": "==1.7.0"
+ },
+ "pycodestyle": {
+ "hashes": [
+ "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766",
+ "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9"
+ ],
+ "version": "==2.3.1"
+ },
+ "pyflakes": {
+ "hashes": [
+ "sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f",
+ "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"
+ ],
+ "version": "==1.6.0"
+ },
+ "pygments": {
+ "hashes": [
+ "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
+ "sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"
+ ],
+ "version": "==2.2.0"
+ },
+ "pylint": {
+ "hashes": [
+ "sha256:a48070545c12430cfc4e865bf62f5ad367784765681b3db442d8230f0960aa3c",
+ "sha256:fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3"
+ ],
+ "index": "pypi",
+ "version": "==1.9.2"
+ },
+ "pyparsing": {
+ "hashes": [
+ "sha256:bc6c7146b91af3f567cf6daeaec360bc07d45ffec4cf5353f4d7a208ce7ca30a",
+ "sha256:d29593d8ebe7b57d6967b62494f8c72b03ac0262b1eed63826c6f788b3606401"
+ ],
+ "version": "==2.2.2"
+ },
+ "redis": {
+ "hashes": [
+ "sha256:8a1900a9f2a0a44ecf6e8b5eb3e967a9909dfed219ad66df094f27f7d6f330fb",
+ "sha256:a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f"
+ ],
+ "index": "pypi",
+ "version": "==2.10.6"
+ },
+ "six": {
+ "hashes": [
+ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
+ "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
+ ],
+ "index": "pypi",
+ "version": "==1.11.0"
+ },
+ "statsd": {
+ "hashes": [
+ "sha256:50e0e7b34e5c01e78e270f17ccbd6bcc334f1a81ac5cb0b19050f7dd24d72c3e",
+ "sha256:84f2427ef7b8ffab28cdb717933f6889d248d710eee32b5eb79e3fdac0e374dd"
+ ],
+ "index": "pypi",
+ "version": "==3.2.2"
+ },
+ "tox": {
+ "hashes": [
+ "sha256:4df108a1fcc93a7ee4ac97e1a3a1fc3d41ddd22445d518976604e2ef05025280",
+ "sha256:9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059"
+ ],
+ "index": "pypi",
+ "version": "==3.1.2"
+ },
+ "traitlets": {
+ "hashes": [
+ "sha256:9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835",
+ "sha256:c6cb5e6f57c5a9bdaa40fa71ce7b4af30298fbab9ece9815b5d995ab6217c7d9"
+ ],
+ "version": "==4.3.2"
+ },
+ "virtualenv": {
+ "hashes": [
+ "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669",
+ "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752"
+ ],
+ "version": "==16.0.0"
+ },
+ "wcwidth": {
+ "hashes": [
+ "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
+ "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
+ ],
+ "version": "==0.1.7"
+ },
+ "werkzeug": {
+ "hashes": [
+ "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",
+ "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b"
+ ],
+ "version": "==0.14.1"
+ },
+ "wrapt": {
+ "hashes": [
+ "sha256:d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"
+ ],
+ "version": "==1.10.11"
+ },
+ "wsgigzip": {
+ "hashes": [
+ "sha256:4df09de683ee4e98d1083bd44713e99a00c306d1060443041df2492a96e85fe2",
+ "sha256:a4238d19dbbe7845ea3b510c96aea92a2ae86ec36e0779c7945460e20bb7fe0e",
+ "sha256:c24115660e9ac8cfb1c9703ffce35eb41edacf4edcfc7a5c457ac8f4780663e4",
+ "sha256:c8afbde561f54787878708ffa95f3556a8791c5972501c322f292972b0d355e8"
+ ],
+ "version": "==0.1.4"
+ }
+ }
+}
diff --git a/RUN_ansible b/RUN_ansible
new file mode 100644
index 0000000000..e2a2a7aa36
--- /dev/null
+++ b/RUN_ansible
@@ -0,0 +1,18 @@
+Copy files on platform -
+
+ Inventory Files -
+ cd ansible/inventory/templates/group_vars/global/all
+ scp -r superset.yml root@192.168.133.58:/etc/reflex-provisioner/inventory/generated/dev/um001/group_vars/all/
+
+
+ Playbook Files-
+ cd ansible/playbooks
+ scp -r superset root@192.168.133.58:/etc/reflex-provisioner/playbooks
+
+ Roles Files -
+ cd ansible/roles
+ scp -r superset root@192.168.133.58:/etc/reflex-provisioner/roles
+
+Run ansible playbook-
+ansible-playbook -i inventory/generated/dev/um001/hosts playbooks/superset/main.yml --user root -e ansible_ssh_pass=guavus@123
+
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..fd2a01863f
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.1.0
diff --git a/contrib/cache/dataframe.py b/contrib/cache/dataframe.py
new file mode 100644
index 0000000000..d24a99d074
--- /dev/null
+++ b/contrib/cache/dataframe.py
@@ -0,0 +1,170 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+from io import open
+import json
+import os
+import tempfile
+from time import time
+try:
+ import cPickle as pickle
+except ImportError: # pragma: no cover
+ import pickle
+import pandas as pd
+from six import u
+from werkzeug.contrib.cache import FileSystemCache
+class DataFrameCache(FileSystemCache):
+ """
+ A cache that stores Pandas DataFrames on the file system.
+ DataFrames are stored in Feather Format - a fast on-disk representation
+ of the Apache Arrow in-memory format to eliminate serialization
+ overhead.
+ This cache depends on being the only user of the `cache_dir`. Make
+ absolutely sure that nobody but this cache stores files there or
+ otherwise the cache will randomly delete files therein.
+ :param cache_dir: the directory where cache files are stored.
+ :param threshold: the maximum number of items the cache stores before
+ it starts deleting some.
+ :param default_timeout: the default timeout that is used if no timeout is
+ specified on :meth:`~BaseCache.set`. A timeout of
+ 0 indicates that the cache never expires.
+ :param mode: the file mode wanted for the cache files, default 0600
+ """
+ _fs_cache_suffix = '.cached'
+ _fs_metadata_suffix = '.metadata'
+ def _list_dir(self):
+ """return a list of (fully qualified) cache filenames
+ """
+ return [os.path.join(self._path, fn) for fn in os.listdir(self._path)
+ if fn.endswith(self._fs_cache_suffix)]
+ def _prune(self):
+ entries = self._list_dir()
+ if len(entries) > self._threshold:
+ now = time()
+ for idx, cname in enumerate(entries):
+ mname = os.path.splitext(cname)[0] + self._fs_metadata_suffix
+ try:
+ with open(mname, 'r', encoding='utf-8') as f:
+ metadata = json.load(f)
+ except (IOError, OSError):
+ metadata = {'expires': -1}
+ try:
+ remove = ((metadata['expires'] != 0 and metadata['expires'] <= now)
+ or idx % 3 == 0)
+ if remove:
+ os.remove(cname)
+ os.remove(mname)
+ except (IOError, OSError):
+ pass
+ def clear(self):
+ for cname in self._list_dir():
+ try:
+ mname = os.path.splitext(cname)[0] + self._fs_metadata_suffix
+ os.remove(cname)
+ os.remove(mname)
+ except (IOError, OSError):
+ return False
+ return True
+ def get(self, key):
+ filename = self._get_filename(key)
+ cname = filename + self._fs_cache_suffix
+ mname = filename + self._fs_metadata_suffix
+ try:
+ with open(mname, 'r', encoding='utf-8') as f:
+ metadata = json.load(f)
+ except (IOError, OSError):
+ metadata = {'expires': -1}
+ try:
+ with open(cname, 'rb') as f:
+ if metadata['expires'] == 0 or metadata['expires'] > time():
+ read_method = getattr(pd, 'read_{}'.format(metadata['format']))
+ read_args = metadata.get('read_args', {})
+ if metadata['format'] == 'hdf':
+ return read_method(f.name, **read_args)
+ else:
+ return read_method(f, **read_args)
+ else:
+ os.remove(cname)
+ os.remove(mname)
+ return None
+ except (IOError, OSError):
+ return None
+ def add(self, key, value, timeout=None):
+ filename = self._get_filename(key) + self._fs_cache_suffix
+ if not os.path.exists(filename):
+ return self.set(key, value, timeout)
+ return False
+ def set(self, key, value, timeout=None):
+ metadata = {'expires': self._normalize_timeout(timeout)}
+ filename = self._get_filename(key)
+ cname = filename + self._fs_cache_suffix
+ mname = filename + self._fs_metadata_suffix
+ suffix = self._fs_transaction_suffix
+ self._prune()
+ def to_feather(filename, dataframe, metadata):
+ with tempfile.NamedTemporaryFile(dir=self._path, suffix=suffix) as f:
+ dataframe.to_feather(f)
+ metadata['format'] = 'feather'
+ os.link(f.name, cname)
+ def to_hdf(filename, dataframe, metadata):
+ with tempfile.NamedTemporaryFile(dir=self._path, suffix=suffix) as f:
+ dataframe.to_hdf(f.name, 'df')
+ metadata['format'] = 'hdf'
+ metadata['read_args'] = {'key': 'df'}
+ os.link(f.name, cname)
+ def to_pickle(filename, dataframe, metadata):
+ with tempfile.NamedTemporaryFile(dir=self._path, suffix=suffix) as f:
+ pickle.dump(dataframe, f, pickle.HIGHEST_PROTOCOL)
+ metadata['format'] = 'pickle'
+ os.link(f.name, cname)
+ for serializer in [to_feather, to_hdf, to_pickle]:
+ try:
+ serializer(cname, value, metadata)
+ with open(mname, 'w', encoding='utf-8') as f:
+ f.write(u(json.dumps(metadata)))
+ return True
+ except Exception:
+ # Try the next serializer
+ pass
+ # We didn't successfully save the data
+ return False
+ def delete(self, key):
+ filename = self._get_filename(key)
+ cname = filename + self._fs_cache_suffix
+ mname = filename + self._fs_metadata_suffix
+ try:
+ os.remove(cname)
+ os.remove(mname)
+ except (IOError, OSError):
+ return False
+ else:
+ return True
+ def has(self, key):
+ filename = self._get_filename(key)
+ cname = filename + self._fs_cache_suffix
+ mname = filename + self._fs_metadata_suffix
+ try:
+ with open(mname, 'r', encoding='utf-8') as f:
+ metadata = json.load(f)
+ except (IOError, OSError):
+ metadata = {'expires': -1}
+ try:
+ with open(cname, 'rb') as f:
+ if metadata['expires'] == 0 or metadata['expires'] > time():
+ return True
+ else:
+ os.remove(cname)
+ os.remove(mname)
+ return False
+ except (IOError, OSError):
+ return False
+ def inc(self, key, delta=1):
+ raise NotImplementedError()
+ def dec(self, key, delta=1):
+ raise NotImplementedError()
+def dataframe(app, config, args, kwargs):
+ """Return a DataFrameCache for use by Flask-Cache."""
+ args.insert(0, config['CACHE_DIR'])
+ kwargs.update(dict(threshold=config['CACHE_THRESHOLD']))
+ return DataFrameCache(*args, **kwargs)
\ No newline at end of file
diff --git a/contrib/connectors/pandas/__init__.py b/contrib/connectors/pandas/__init__.py
new file mode 100644
index 0000000000..f8caddf26a
--- /dev/null
+++ b/contrib/connectors/pandas/__init__.py
@@ -0,0 +1,2 @@
+from . import models # noqa
+from . import views # noqa
\ No newline at end of file
diff --git a/contrib/connectors/pandas/models.py b/contrib/connectors/pandas/models.py
new file mode 100644
index 0000000000..c9f7e9d713
--- /dev/null
+++ b/contrib/connectors/pandas/models.py
@@ -0,0 +1,939 @@
+from collections import OrderedDict
+from datetime import datetime
+import logging
+from past.builtins import basestring
+try:
+ from urllib.parse import urlparse
+except ImportError:
+ from urlparse import urlparse
+
+import pandas as pd
+import requests
+import humanize
+from io import BytesIO
+from pandas.api.types import (
+ is_string_dtype, is_numeric_dtype, is_datetime64_any_dtype)
+
+from sqlalchemy import (
+ Column, Integer, String, ForeignKey, Text
+)
+import sqlalchemy as sa
+from sqlalchemy.orm import backref, relationship
+from sqlalchemy_utils import ChoiceType, JSONType
+
+from flask import escape, Markup
+from flask_appbuilder import Model
+from flask_babel import lazy_gettext as _
+
+from superset import dataframe_cache, db, security_manager, utils
+from superset.connectors.base.models import (
+ BaseDatasource, BaseColumn, BaseMetric)
+from superset.models.helpers import QueryResult, set_perm
+from superset.utils import QueryStatus
+
+FORMATS = [
+ ('csv', 'csv'),
+ ('html', 'html'),
+ ('json', 'json'),
+ ('excel', 'Microsoft Excel'),
+ ('stata', 'Stata'),
+]
+
+try:
+ import tables # NOQA
+ FORMATS.append(('hdf', 'HDF5'))
+except ImportError:
+ pass
+
+try:
+ import feather # NOQA
+ FORMATS.append(('feather', 'Feather'))
+except ImportError:
+ pass
+
+
+class PandasDatabase(object):
+ """Non-ORM object for a Pandas Source"""
+
+ def __init__(self, database_name, cache_timeout=None):
+ self.database_name = database_name
+ self.cache_timeout = cache_timeout
+ self.data = {};
+
+ def __str__(self):
+ return self.database_name
+
+
+class PandasColumn(Model, BaseColumn):
+ """
+ ORM object for Pandas columns.
+
+ Each Pandas Datasource can have multiple columns"""
+
+ __tablename__ = 'pandas_columns'
+
+ id = Column(Integer, primary_key=True)
+ pandas_datasource_id = Column(Integer, ForeignKey('pandas_datasources.id'))
+ datasource = relationship(
+ 'PandasDatasource',
+ backref=backref('columns', cascade='all, delete-orphan'),
+ foreign_keys=[pandas_datasource_id])
+ expression = Column(Text)
+
+ @property
+ def is_num(self):
+ return self.type and is_numeric_dtype(self.type)
+
+ @property
+ def is_time(self):
+ return self.type and is_datetime64_any_dtype(self.type)
+
+ @property
+ def is_dttm(self):
+ return self.is_time
+
+ @property
+ def is_string(self):
+ return self.type and is_string_dtype(self.type)
+
+ @property
+ def data(self):
+ attrs = (
+ 'column_name', 'verbose_name', 'description', 'expression',
+ 'filterable', 'groupby', 'is_dttm')
+ return {s: getattr(self, s) for s in attrs}
+
+ def get_perm(self):
+ if self.datasource:
+ return ('{parent_name}.[{obj.expression}]'
+ '(id:{obj.id})').format(
+ obj=self,
+ parent_name=self.datasource.full_name)
+ return None
+
+
+class PandasMetric(Model, BaseMetric):
+ """
+ ORM object for Pandas metrics.
+
+ Each Pandas Datasource can have multiple metrics
+ """
+
+ __tablename__ = 'pandas_metrics'
+
+ id = Column(Integer, primary_key=True)
+ pandas_datasource_id = Column(Integer, ForeignKey('pandas_datasources.id'))
+ datasource = relationship(
+ 'PandasDatasource',
+ backref=backref('metrics', cascade='all, delete-orphan'),
+ foreign_keys=[pandas_datasource_id])
+ source = Column(Text)
+ expression = Column(Text)
+
+ def get_perm(self):
+ if self.datasource:
+ return ('{parent_name}.[{obj.metric_name}]'
+ '(id:{obj.id})').format(
+ obj=self,
+ parent_name=self.datasource.full_name)
+ return None
+
+
+class PandasDatasource(Model, BaseDatasource):
+ """A datasource based on a Pandas DataFrame"""
+
+ # See http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases # NOQA
+ GRAINS = OrderedDict([
+ ('5 seconds', '5S'),
+ ('30 seconds', '30S'),
+ ('1 minute', 'T'),
+ ('5 minutes', '5T'),
+ ('1 hour', 'H'),
+ ('6 hour', '6H'),
+ ('day', 'D'),
+ ('one_day', 'D'),
+ ('1 day', 'D'),
+ ('7 days', '7D'),
+ ('week', 'W-MON'),
+ ('week_starting_sunday', 'W-SUN'),
+ ('week_ending_saturday', 'W-SUN'),
+ ('month', 'M'),
+ ('quarter', 'Q'),
+ ('year', 'A'),
+ ])
+
+ __tablename__ = 'pandas_datasources'
+ type = 'pandas'
+ baselink = 'pandasdatasourcemodelview' # url portion pointing to ModelView
+ column_class = PandasColumn
+ metric_class = PandasMetric
+
+ name = Column(String(100), nullable=False)
+ source_url = Column(String(1000), nullable=False)
+ source_auth = Column(JSONType)
+ source_parameters = Column(JSONType)
+ format = Column(ChoiceType(FORMATS), nullable=False)
+ additional_parameters = Column(JSONType)
+
+ user_id = Column(Integer, ForeignKey('ab_user.id'))
+ owner = relationship(
+ security_manager.user_model,
+ backref='pandas_datasources',
+ foreign_keys=[user_id])
+
+ fetch_values_predicate = Column(String(1000))
+ main_dttm_col = Column(String(250))
+
+ # Used to do code highlighting when displaying the query in the UI
+ query_language = None
+
+ # A Pandas Dataframe containing the data retrieved from the source url
+ df = None
+
+ def __repr__(self):
+ return self.name
+
+ @property
+ def datasource_name(self):
+ return self.name
+
+ @property
+ def full_name(self):
+ return self.name
+
+ @property
+ def database(self):
+ try:
+ database_name = urlparse(self.source_url).netloc
+ except AttributeError:
+ database_name = 'memory'
+ return PandasDatabase(database_name=database_name,
+ cache_timeout=None)
+
+ @property
+ def connection(self):
+ return self.source_url
+
+ @property
+ def schema(self):
+ uri = urlparse(self.source_url)
+ return uri.path
+
+ @property
+ def schema_perm(self):
+ """Returns endpoint permission if present, host one otherwise."""
+ return security_manager.get_schema_perm(self.database, self.schema)
+
+ @property
+ def description_markeddown(self):
+ return utils.markdown(self.description)
+
+ @property
+ def link(self):
+ name = escape(self.name)
+ return Markup(
+ '<a href="{self.explore_url}">{name}</a>'.format(**locals()))
+
+ def get_perm(self):
+ return (
+ 'pandas.{obj.name}'
+ '(id:{obj.id})').format(obj=self)
+
+ @property
+ def dttm_cols(self):
+ l = [c.column_name for c in self.columns if c.is_dttm] # noqa: E741
+ if self.main_dttm_col and self.main_dttm_col not in l:
+ l.append(self.main_dttm_col)
+ return l
+
+ @property
+ def num_cols(self):
+ return [c.column_name for c in self.columns if c.is_num]
+
+ @property
+ def any_dttm_col(self):
+ cols = self.dttm_cols
+ if cols:
+ return cols[0]
+
+ @property
+ def html(self):
+ t = ((c.column_name, c.type) for c in self.columns)
+ df = pd.DataFrame(t)
+ df.columns = ['field', 'type']
+ return df.to_html(
+ index=False,
+ classes=(
+ 'dataframe table table-striped table-bordered '
+ 'table-condensed'))
+
+ @property
+ def data(self):
+ d = super(PandasDatasource, self).data
+ # Note that the front end uses `granularity_sqla` and
+ # `time_grain_sqla` as the parameters for selecting the
+ # column and time grain separately.
+ d['granularity_sqla'] = utils.choicify(self.dttm_cols)
+ d['time_grain_sqla'] = [(g, g) for g in self.GRAINS.keys()]
+ logging.info(d)
+ return d
+
+ @property
+ def pandas_read_method(self):
+ try:
+ # The format is a Choice object
+ format = self.format.code
+ except AttributeError:
+ format = self.format
+ return getattr(pd, 'read_{format}'.format(format=format))
+
+ @property
+ def pandas_read_parameters(self):
+ return self.additional_parameters or {}
+
+ def get_empty_dataframe(self):
+ """Create an empty dataframe with the correct columns and dtypes"""
+ columns = []
+ for col in self.columns:
+ type = ('datetime64[ns]'
+ if is_datetime64_any_dtype(col.type)
+ else col.type)
+ columns.append((col.column_name, type))
+ return pd.DataFrame({k: pd.Series(dtype=t) for k, t in columns})
+
+ @property
+ def cache_key(self):
+ source = {'source_url': self.source_url,
+ 'source_auth': self.source_auth}
+ source.update(self.source_parameters or {})
+ source.update(self.pandas_read_parameters)
+ s = str([(k, source[k]) for k in sorted(source.keys())])
+ return hashlib.md5(s.encode('utf-8')).hexdigest()
+
+ def get_dataframe(self):
+ """
+ Read the source_url and return a Pandas DataFrame.
+
+ Use the PandasColumns to coerce columns into the correct dtype,
+ and add any calculated columns to the DataFrame.
+ """
+ if self.df is None:
+ if dataframe_cache:
+ cache_key = self.cache_key
+ self.df = dataframe_cache.get(cache_key)
+ if not isinstance(self.df, pd.DataFrame):
+ if (isinstance(self.source_url, basestring) and
+ self.source_url[:4] == 'http'):
+ # Use requests to retrieve remote data so we can handle authentication
+ auth = self.source_auth
+ url = self.source_url
+ if isinstance(auth, (tuple, list)):
+ response = requests.get(url, params=self.source_parameters,
+ auth=tuple(auth))
+ elif auth:
+ response = requests.get(url, params=self.source_parameters,
+ headers={'Authorization': auth})
+ else:
+ response = requests.get(url, params=self.source_parameters)
+ response.raise_for_status()
+ data = BytesIO(response.content)
+ else:
+ # Local file, so just use Pandas directly
+ data = self.source_url
+ # Read the dataframe from the response
+ self.df = self.pandas_read_method(data, **self.pandas_read_parameters)
+
+ # read_html returns a list of DataFrames
+ if (isinstance(self.df, list) and
+ isinstance(self.df[0], pd.DataFrame)):
+ self.df = self.df[0]
+
+ # Our column names are always strings
+ self.df.columns = [str(col) for col in self.df.columns]
+
+ if dataframe_cache:
+ timeout = self.cache_timeout or self.database.cache_timeout
+ dataframe_cache.set(cache_key, self.df, timeout)
+
+ calculated_columns = []
+ for col in self.columns:
+ name = col.column_name
+ type = col.type
+ # Prepare calculated columns
+ if col.expression:
+ calculated_columns.append('{name} = {expr}'.format(
+ name=name, expr=col.expression))
+ elif type != self.df[name].dtype.name:
+ # Convert column to correct dtype
+ try:
+ self.df[name] = self.df[name].values.astype(type)
+ except ValueError as e:
+ message = ('Failed to convert column {name} '
+ 'from {old_type} to {new_type}').format(
+ name=name,
+ old_type=self.df[name].dtype.name,
+ new_type=type)
+ e.args = (message,) + e.args
+ raise
+ # Add the calcuated columns, using a multi-line string to add them all at once
+ # See https://pandas.pydata.org/pandas-docs/stable/enhancingperf.html#enhancingperf-eval # NOQA: E501
+ if calculated_columns:
+ self.df.eval('\n'.join(calculated_columns),
+ truediv=True,
+ inplace=True)
+ return self.df
+
+ def get_filter_query(self, filter):
+ """
+ Build a query string to filter a dataframe.
+
+ Filter is a list of dicts of op, col and value.
+
+ Returns a string that can be passed to DataFrame.query() to
+ restrict the DataFrame to only the matching rows.
+ """
+ cols = {col.column_name: col for col in self.columns}
+ print("cols {}".format(cols))
+ query = ''
+ for flt in filter:
+ if not all([flt.get(s) for s in ['col', 'op', 'val']]):
+ continue
+ col = flt['col']
+ print("col {}".format(col))
+ col = col.replace(' ', '_')
+ print("after col {}".format(col))
+ col_obj = cols.get(col)
+ print("col_obj {}".format(col_obj))
+ op = flt['op']
+ eq = flt['val']
+ if query:
+ query += ' and '
+ if op == 'LIKE':
+ query += "{col}.str.match('{eq}')".format(col=col, eq=eq)
+ else:
+ # Rely on Pandas partial string indexing for datetime fields,
+ # see https://pandas.pydata.org/pandas-docs/stable/timeseries.html#partial-string-indexing # NOQA
+ try:
+ if ((col_obj.is_string or col_obj.is_dttm) and
+ not isinstance(eq, list)):
+ eq = "'{}'".format(eq)
+ except AttributeError:
+ # col_obj is None, probably because the col is a metric,
+ # in which case it is numeric anyway
+ pass
+ query += '({col} {op} \"{eq}\")'.format(col=col, op=op, eq=eq)
+ return query
+
+ def get_agg_function(self, expr):
+ """
+ Return a function that can be passed to DataFrame.apply().
+
+ Complex expressions that work on multiple columns must be a function
+ that accepts a Group as the parameter.
+
+ The function can be defined on the Connector, or on the DataFrame,
+ in the local scope
+ """
+ if expr in ['sum', 'mean', 'std', 'sem', 'count', 'min', 'max']:
+ return expr
+ if hasattr(self, expr):
+ return getattr(self, expr)
+ if hasattr(self.get_dataframe(), expr):
+ return getattr(self.get_dataframe(), expr)
+ return locals()[expr]
+
+ def process_dataframe(
+ self,
+ df,
+ groupby,
+ metrics,
+ granularity,
+ from_dttm,
+ to_dttm,
+ filter=None, # noqa
+ is_timeseries=True,
+ timeseries_limit=15,
+ timeseries_limit_metric=None,
+ row_limit=None,
+ inner_from_dttm=None,
+ inner_to_dttm=None,
+ orderby=None,
+ extras=None,
+ columns=None,
+ form_data=None,
+ is_prequery=False,
+ prequeries=None,
+ order_desc=True):
+ """Querying any dataframe table from this common interface"""
+ if orderby:
+ orderby, ascending = map(list, zip(*orderby))
+ else:
+ orderby = []
+ ascending = []
+ metric_order_asc = not order_desc
+ filter = filter or []
+ query_str = 'df'
+
+ # Build a dict of the metrics to include, including those that
+ # are required for post-aggregation filtering
+ # Note that the front end uses `having_druid` as the parameter
+ # for post-aggregation filters, and we are reusing that
+ # interface component.
+ filtered_metrics = [flt['col']
+ for flt in extras.get('having_druid', [])
+ if flt['col'] not in metrics]
+ metrics_dict = {m.metric_name: m for m in self.metrics}
+ metrics_exprs = OrderedDict()
+ for m in metrics + filtered_metrics:
+ try:
+ metric = metrics_dict[m]
+ except KeyError:
+ raise Exception(_("Metric '{}' is not valid".format(m)))
+ metrics_exprs[m] = metric
+
+ # Standard tests (copied from SqlaTable)
+ if not granularity and is_timeseries:
+ raise Exception(_(
+ 'Datetime column not provided as part table configuration '
+ 'and is required by this type of chart'))
+
+ # Filter the DataFrame by the time column, and resample if necessary
+ timestamp_cols = []
+ timestamp_exprs = []
+ if granularity and granularity != 'all':
+
+ if from_dttm:
+ filter.append({'col': granularity,
+ 'op': '>=',
+ 'val': from_dttm})
+ if to_dttm:
+ filter.append({'col': granularity,
+ 'op': '<=',
+ 'val': to_dttm})
+
+ if is_timeseries:
+ # Note that the front end uses `time_grain_sqla` as
+ # the parameter for setting the time grain when the
+ # granularity is being used to select the timetamp column
+ time_grain = self.GRAINS[extras.get('time_grain_sqla')]
+ timestamp_cols = ['__timestamp']
+ timestamp_exprs = [pd.Grouper(key=granularity,
+ freq=time_grain)]
+
+ if timeseries_limit_metric and timeseries_limit:
+ metric = metrics_dict[timeseries_limit_metric]
+ assert isinstance(metric.source, basestring)
+ aggregates = {metric.source: metric.expression}
+ df = (df[df.set_index(groupby)
+ .index.isin(
+ df.groupby(groupby, sort=False)
+ .aggregate(aggregates)
+ .sort_values(metric.source,
+ ascending=metric_order_asc)
+ .iloc[:timeseries_limit].index)])
+
+ query_str += ('[df.set_index({groupby}).index.isin('
+ 'df.groupby({groupby}, sort=False)'
+ '.aggregate({aggregates})'
+ ".sort_values('{metric.source}', "
+ 'ascending={metric_order_asc})'
+ '.iloc[:{timeseries_limit}].index)]').format(
+ groupby=groupby,
+ timeseries_limit_metric=timeseries_limit_metric,
+ timeseries_limit=timeseries_limit,
+ aggregates=aggregates,
+ metric=metric,
+ metric_order_asc=metric_order_asc)
+
+ # Additional filtering of rows prior to aggregation
+ if filter:
+ filter_str = self.get_filter_query(filter)
+ print("Query {}".format(filter_str))
+ df = df.query(filter_str)
+ query_str += '.query("{filter_str}")'.format(filter_str=filter_str)
+
+ # We have one of:
+ # - columns only: return a simple table of results with no aggregation
+ # - metrics only: return a single row with one column per metric
+ # aggregated for the whole dataframe
+ # - groupby and metrics: return a table of distinct groupby columns
+ # and aggregations
+ # - groupby only: return a table of distinct rows
+ if columns:
+ # A simple table of results with no aggregation or grouping
+ if orderby:
+ df = df.sort_values(orderby, ascending=ascending)
+ query_str += ('.sort_values({orderby}, '
+ 'ascending={ascending})').format(
+ orderby=orderby,
+ ascending=ascending)
+ df = df[columns]
+ query_str += '[{columns}]'.format(columns=columns)
+
+ elif metrics_exprs:
+ # Aggregate the dataframe
+
+ # Single-column aggregates can be calculated using aggregate,
+ # multi-column ones need to use apply.
+ # aggregates is a dict keyed by a column name, where the value is
+ # a list of expressions that can be used by DataFrame.aggregate()
+ # apply_functions is a dict keyed by the metric name, where the
+ # value is a function that can be passed to DataFrame.apply()
+ aggregates = OrderedDict()
+ agg_names = []
+ apply_functions = []
+ apply_names = []
+ for metric_name, metric in metrics_exprs.items():
+ sources = []
+ if metric.source:
+ sources = [s.strip() for s in metric.source.split(',') if s]
+ if len(sources) == 1:
+ # Single column source, so use aggregate
+ func = self.get_agg_function(metric.expression)
+ if metric.source in aggregates:
+ aggregates[metric.source].append(func)
+ else:
+ aggregates[metric.source] = [func]
+ agg_names.append(metric_name)
+ else:
+ # Multiple columns so the expression must be a function
+ # that accepts a Group as the parameter
+ apply_functions.append((sources,
+ metric.expression,
+ self.get_agg_function(metric.expression)))
+ apply_names.append(metric_name)
+
+ # Build a list of like-indexed DataFrames containing the results
+ # of DataFrame.aggregate() and individual DataFrame.apply() calls
+ dfs = []
+ query_strs = []
+
+ if groupby or timestamp_exprs:
+ df = df.groupby(groupby + timestamp_exprs, sort=False)
+ query_str += '.groupby({}, sort=False)'.format(groupby + timestamp_exprs)
+
+ for sources, expr, func in apply_functions:
+ apply_df = df
+ apply_str = query_str
+
+ if sources:
+ apply_df = df[sources]
+ apply_str = query_str + '[{}]'.format(sources)
+
+ if groupby or timestamp_exprs:
+ apply_df = df.apply(func)
+ apply_str += '.apply({})'.format(expr)
+ else:
+ # If we call DataFrame.apply() without a groupby then the func is
+ # called on each column individually. Therefore, if we have a
+ # summary with multi-column aggregates we need to pass the whole
+ # DataFrame to the function.
+ apply_df = pd.Series(func(apply_df)).to_frame()
+ apply_str = 'pd.Series({expr}({df})).to_frame()'.format(
+ expr=expr,
+ df=apply_str)
+
+ # Superset expects a DataFrame with single Row and
+ # the metrics as columns, rather than with the metrics as the
+ # index, so if we have a summary then we need to pivot it.
+ apply_df = apply_df.unstack().to_frame().T
+ apply_str += '.unstack().to_frame().T'
+
+ dfs.append(apply_df)
+ query_strs.append(apply_str)
+
+ if aggregates:
+ if groupby or timestamp_exprs:
+ dfs.append(df.aggregate(aggregates))
+ query_strs.append(query_str +
+ '.aggregate({})'.format(aggregates))
+ else:
+ # For a summary table we need to preserve the metric order
+ # so we can set the correct column names, so process aggregates
+ # for each dataframe column in turn
+ for col, col_agg in aggregates.items():
+ agg_df = df.aggregate({col: col_agg})
+ agg_str = query_str + '.aggregate({}: {})'.format(col, col_agg)
+
+ # Superset expects a DataFrame with single Row and
+ # the metrics as columns, rather than with the metrics as the
+ # index, so if we have a summary then we need to pivot it.
+ agg_df = agg_df.unstack().to_frame().T
+ agg_str += '.unstack().to_frame().T'
+
+ dfs.append(agg_df)
+ query_strs.append(agg_str)
+
+ # If there is more than one DataFrame in the list then
+ # concatenate them along the index
+ if len(dfs) > 1:
+ df = pd.concat(dfs, axis=1)
+ query_str = 'pd.concat([{}], axis=1)'.format(', '.join(query_strs))
+ else:
+ df = dfs[0]
+ query_str = query_strs[0]
+
+ if groupby or timestamp_exprs:
+ df = df.reset_index()
+ query_str += '.reset_index()'
+
+ # Set the correct columns names and then reorder the columns
+ # to match the requested order
+ df.columns = groupby + timestamp_cols + apply_names + agg_names
+ df = df[groupby + timestamp_cols + metrics + filtered_metrics]
+
+ # Filtering of rows post-aggregation based on metrics
+ # Note that the front end uses `having_druid` as the parameter
+ # for post-aggregation filters, and we are reusing that
+ # interface component.
+ if extras.get('having_druid'):
+ filter_str = self.get_filter_query(extras.get('having_druid'))
+ df = df.query(filter_str)
+ query_str += '.query("{filter_str}")'.format(
+ filter_str=filter_str)
+
+ # Order by the first metric descending by default,
+ # or within the existing orderby
+ orderby.append((metrics + filtered_metrics)[0])
+ ascending.append(metric_order_asc)
+
+ # Use the groupby and __timestamp by as a tie breaker
+ orderby = orderby + groupby + timestamp_cols
+ ascending = ascending + ([True] * len(groupby + timestamp_cols))
+
+ # Sort the values
+ if orderby:
+ df = df.sort_values(orderby, ascending=ascending)
+ query_str += ('.sort_values({orderby}, '
+ 'ascending={ascending})').format(
+ orderby=orderby,
+ ascending=ascending)
+
+ # Remove metrics only added for post-aggregation filtering
+ if filtered_metrics:
+ df = df.drop(filtered_metrics, axis=1)
+ query_str += '.drop({filtered_metrics}, axis=1)'.format(
+ filtered_metrics=filtered_metrics)
+
+ elif groupby:
+ # Group by without any metrics is equivalent to SELECT DISTINCT,
+ # order by the size descending by default, or within the
+ # existing orderby
+ orderby.append(0)
+ ascending.append(not order_desc)
+ # Use the group by as a tie breaker
+ orderby = orderby + groupby
+ ascending = ascending + ([True] * len(groupby))
+ df = (df.groupby(groupby, sort=False)
+ .size()
+ .reset_index()
+ .sort_values(orderby, ascending=ascending)
+ .drop(0, axis=1))
+ query_str += ('.groupby({groupby}, sort=False).size()'
+ '.reset_index()'
+ '.sort_values({orderby}, ascending={ascending})'
+ '.drop(0, axis=1)').format(
+ groupby=groupby,
+ orderby=orderby,
+ ascending=ascending)
+
+ if row_limit:
+ df = df.iloc[:row_limit]
+ query_str += '.iloc[:{row_limit}]'.format(row_limit=row_limit)
+
+ # Coerce datetimes to str so that Pandas can set the correct precision
+ for col in df.columns:
+ if is_datetime64_any_dtype(df[col].dtype):
+ df[col] = df[col].astype(str)
+
+ return df, query_str
+
+ def get_query_str(self, query_obj):
+ """Returns a query as a string
+
+ This is used to be displayed to the user so that she/he can
+ understand what is taking place behind the scene"""
+ logging.debug('query_obj: %s', query_obj)
+ df = self.get_empty_dataframe()
+ df, query_str = self.process_dataframe(df, **query_obj)
+ logging.debug('query_str: %s', query_str)
+ return query_str
+
+ def query(self, query_obj):
+ """Executes the query and returns a dataframe
+
+ query_obj is a dictionary representing Superset's query interface.
+ Should return a ``superset.models.helpers.QueryResult``
+ """
+ logging.debug('query_obj: %s', query_obj)
+ qry_start_dttm = datetime.now()
+ status = QueryStatus.SUCCESS
+ error_message = None
+ df = None
+ query_str = ''
+ try:
+ df = self.get_dataframe()
+ df, query_str = self.process_dataframe(df, **query_obj)
+ logging.debug('query_str: %s', query_str)
+ except Exception as e:
+ status = QueryStatus.FAILED
+ logging.exception(e)
+ error_message = str(e)
+
+ return QueryResult(
+ status=status,
+ df=df,
+ duration=datetime.now() - qry_start_dttm,
+ query=query_str,
+ error_message=error_message)
+
+ def values_for_column(self, column_name, limit=10000):
+ """Given a column, returns an iterable of distinct values
+
+ This is used to populate the dropdown showing a list of
+ values in filters in the explore view"""
+ values = self.get_dataframe()[column_name].unique()
+ if limit:
+ values = values[:limit]
+ return values.tolist()
+
+ def get_metadata(self):
+ """Build the metadata for the table and merge it in"""
+ df = self.get_dataframe()
+
+ any_date_col = None
+ dbcols = (
+ db.session.query(PandasColumn)
+ .filter(PandasColumn.datasource == self)
+ .filter(or_(PandasColumn.column_name == col
+ for col in df.columns)))
+ dbcols = {dbcol.column_name: dbcol for dbcol in dbcols}
+ for col in df.columns:
+ dbcol = dbcols.get(col, None)
+
+ if not dbcol:
+ dtype = df.dtypes[col].name
+ # Pandas defaults columns where all values are None to a dtype of
+ # float with all values as NaN, but if we can't correctly infer
+ # the dtype we are better to assume object so we don't
+ # create large numbers of unwanted Metrics
+ if self.df[col].isnull().all():
+ dtype = 'object'
+ dbcol = PandasColumn(column_name=str(col), type=dtype)
+ # Only treat `object` as string if we have some data
+ if self.df[col].notnull().any():
+ dbcol.groupby = dbcol.is_string
+ dbcol.filterable = dbcol.is_string
+ dbcol.sum = dbcol.is_num
+ dbcol.avg = dbcol.is_num
+ dbcol.min = dbcol.is_num or dbcol.is_dttm
+ dbcol.max = dbcol.is_num or dbcol.is_dttm
+ self.columns.append(dbcol)
+
+ if not any_date_col and dbcol.is_time:
+ any_date_col = col
+
+ # Datasource-level metrics
+ # Note that column-specific metrics are created by reconcile_column_metrics
+ # when the column is created.
+ metrics = [
+ PandasMetric(
+ metric_name='count',
+ verbose_name='count',
+ metric_type='count',
+ source=None,
+ expression='count')]
+ dbmetrics = (
+ db.session.query(PandasMetric)
+ .filter(PandasMetric.datasource == self)
+ .filter(or_(PandasMetric.metric_name == metric.metric_name
+ for metric in metrics)))
+ dbmetrics = {metric.metric_name: metric for metric in dbmetrics}
+ for metric in metrics:
+ if not dbmetrics.get(metric.metric_name, None):
+ metric.pandas_datasource_id = self.id
+ db.session.add(metric)
+
+ if not self.main_dttm_col:
+ self.main_dttm_col = any_date_col
+
+ db.session.merge(self)
+ db.session.commit()
+
+
+def reconcile_column_metrics(mapper, connection, target):
+ """
+ Create or delete PandasMetrics to match the metric attributes
+ specified on a PandasColumn
+ """
+ mtable = PandasMetric.__table__
+ for metric_type in ('sum', 'avg', 'max', 'min', 'count_distinct'):
+ # Set up the metric attributes
+ metric_name = metric_type + '__' + target.column_name
+ verbose_name = metric_name
+ source = target.column_name
+ if metric_type == 'avg':
+ expression = 'mean',
+ elif metric_type == 'count_distinct':
+ expression = 'nunique'
+ else:
+ expression = metric_type
+
+ if getattr(target, metric_type):
+ # Create the metric if it doesn't already exist
+ result = connection.execute(
+ mtable
+ .select()
+ .where(
+ and_(
+ mtable.c.pandas_datasource_id == target.pandas_datasource_id,
+ mtable.c.metric_name == metric_name)))
+ if not result.rowcount:
+ connection.execute(
+ mtable.insert(),
+ pandas_datasource_id=target.pandas_datasource_id,
+ metric_name=metric_name,
+ verbose_name=verbose_name,
+ source=source,
+ expression=expression)
+ else:
+ # Delete the metric if it exists and hasn't been customized
+ connection.execute(
+ mtable
+ .delete()
+ .where(
+ and_(
+ mtable.c.pandas_datasource_id == target.pandas_datasource_id,
+ mtable.c.metric_name == metric_name,
+ mtable.c.verbose_name == verbose_name,
+ mtable.c.source == source,
+ mtable.c.expression == expression)))
+
+
+def reconcile_metric_column(mapper, connection, target):
+ """
+ Clear the metric attribute on a PandasColumn if the
+ corresponding PandasMetric is deleted
+ """
+ ctable = PandasColumn.__table__
+ try:
+ metric_type, column_name = target.metric_name.split('__', 1)
+ if metric_type in ctable.c:
+ connection.execute(
+ ctable
+ .update()
+ .values(**{metric_type: False})
+ .where(
+ and_(
+ ctable.c.pandas_datasource_id == target.pandas_datasource_id,
+ ctable.c.column_name == column_name)))
+ except ValueError:
+ # Metric name doesn't contain __
+ pass
+
+
+sa.event.listen(PandasColumn, 'after_insert', reconcile_column_metrics)
+sa.event.listen(PandasColumn, 'after_update', reconcile_column_metrics)
+sa.event.listen(PandasMetric, 'before_delete', reconcile_metric_column)
+sa.event.listen(PandasDatasource, 'after_insert', set_perm)
+sa.event.listen(PandasDatasource, 'after_update', set_perm)
diff --git a/contrib/connectors/pandas/views.py b/contrib/connectors/pandas/views.py
new file mode 100644
index 0000000000..91a328257f
--- /dev/null
+++ b/contrib/connectors/pandas/views.py
@@ -0,0 +1,336 @@
+"""Views used by the SqlAlchemy connector"""
+import json
+import logging
+from flask import flash, Markup, redirect
+from flask_appbuilder import CompactCRUDMixin, expose
+from flask_appbuilder.fieldwidgets import BS3TextAreaFieldWidget, BS3TextFieldWidget
+from flask_appbuilder.models.sqla.interface import SQLAInterface
+from flask_babel import gettext as __
+from flask_babel import lazy_gettext as _
+from past.builtins import basestring
+import sqlalchemy as sa
+from wtforms import SelectField, StringField, validators
+from superset import appbuilder, db, security, security_manager, utils
+from superset.connectors.base.views import DatasourceModelView
+from flask_appbuilder.security.decorators import has_access
+from superset.views.base import (
+ DatasourceFilter, DeleteMixin, get_datasource_exist_error_msg,
+ ListWidgetWithCheckboxes, SupersetModelView,
+)
+
+from .models import FORMATS, PandasColumn, PandasDatasource, PandasMetric
+
+
+class ChoiceTypeSelectField(SelectField):
+ """A SelectField based on a ChoiceType model field."""
+
+ def process_data(self, value):
+ """Use the code rather than the str() representation as data"""
+ try:
+ self.data = value.code
+ except AttributeError:
+ super(ChoiceTypeSelectField, self).process_data(value)
+
+
+class JSONField(StringField):
+ """
+ JSON field for WTForms that converts between the form string data
+ and a dictionary representation, with validation
+
+ See https://gist.github.com/dukebody/dcc371bf286534d546e9
+ """
+
+ def _value(self):
+ return json.dumps(self.data) if self.data else ''
+
+ def process_formdata(self, valuelist):
+ if valuelist:
+ try:
+ self.data = json.loads(valuelist[0])
+ except ValueError:
+ raise ValueError('This field contains invalid JSON')
+ else:
+ self.data = None
+
+ def pre_validate(self, form):
+ super(StringField, self).pre_validate(form)
+ if self.data:
+ try:
+ json.dumps(self.data)
+ except TypeError:
+ raise ValueError('This field contains invalid JSON')
+
+
+class PandasColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa
+ datamodel = SQLAInterface(PandasColumn)
+
+ list_title = _('List Columns')
+ show_title = _('Show Column')
+ add_title = _('Add Column')
+ edit_title = _('Edit Column')
+
+ list_widget = ListWidgetWithCheckboxes
+ edit_columns = [
+ 'column_name', 'verbose_name', 'description',
+ 'type', 'groupby', 'filterable',
+ 'datasource', 'count_distinct', 'sum', 'avg', 'min', 'max']
+ add_columns = edit_columns
+ list_columns = [
+ 'column_name', 'verbose_name', 'type', 'groupby', 'filterable',
+ 'count_distinct', 'sum', 'avg', 'min', 'max']
+ page_size = 500
+ description_columns = {
+ 'is_dttm': _(
+ 'Whether to make this column available as a '
+ '[Time Granularity] option, column has to be DATETIME or '
+ 'DATETIME-like'),
+ 'filterable': _(
+ 'Whether this column is exposed in the `Filters` section '
+ 'of the explore view.'),
+ 'type': _(
+ 'The data type that was inferred by Pandas. '
+ 'It may be necessary to input a type manually for '
+ 'expression-defined columns in some cases. In most case '
+ 'users should not need to alter this.'),
+ }
+ label_columns = {
+ 'column_name': _('Column'),
+ 'verbose_name': _('Verbose Name'),
+ 'description': _('Description'),
+ 'groupby': _('Groupable'),
+ 'filterable': _('Filterable'),
+ 'datasource': _('Datasource'),
+ 'count_distinct': _('Count Distinct'),
+ 'sum': _('Sum'),
+ 'avg': _('Average'),
+ 'min': _('Min'),
+ 'max': _('Max'),
+ 'type': _('Type'),
+ }
+
+
+appbuilder.add_view_no_menu(PandasColumnInlineView)
+
+
+class PandasMetricInlineView(CompactCRUDMixin, SupersetModelView, DeleteMixin): # noqa
+ datamodel = SQLAInterface(PandasMetric)
+
+ list_title = _('List Metrics')
+ show_title = _('Show Metric')
+ add_title = _('Add Metric')
+ edit_title = _('Edit Metric')
+
+ list_columns = ['metric_name', 'verbose_name', 'metric_type']
+ edit_columns = [
+ 'metric_name', 'description', 'verbose_name', 'metric_type',
+ 'source', 'expression', 'datasource', 'd3format', 'is_restricted',
+ 'warning_text']
+ description_columns = {
+ 'source': utils.markdown(
+ 'a comma-separated list of column(s) used to calculate '
+ ' the metric. Example: `claim_amount`', True),
+ 'expression': utils.markdown(
+ 'a valid Pandas expression as supported by the underlying '
+ 'backend. Example: `count()`', True),
+ 'is_restricted': _('Whether the access to this metric is restricted '
+ 'to certain roles. Only roles with the permission '
+ "'metric access on XXX (the name of this metric)' "
+ 'are allowed to access this metric'),
+ 'd3format': utils.markdown(
+ 'd3 formatting string as defined [here]'
+ '(https://github.com/d3/d3-format/blob/master/README.md#format). '
+ 'For instance, this default formatting applies in the Table '
+ 'visualization and allow for different metric to use different '
+ 'formats', True,
+ ),
+ }
+ add_columns = edit_columns
+ page_size = 500
+ label_columns = {
+ 'metric_name': _('Metric'),
+ 'description': _('Description'),
+ 'verbose_name': _('Verbose Name'),
+ 'metric_type': _('Type'),
+ 'source': _('Pandas Source Columns'),
+ 'expression': _('Pandas Expression'),
+ 'datasource': _('Datasource'),
+ 'd3format': _('D3 Format'),
+ 'is_restricted': _('Is Restricted'),
+ 'warning_text': _('Warning Message'),
+ }
+
+ def post_add(self, metric):
+ if metric.is_restricted:
+ security.merge_perm(security_manager, 'metric_access', metric.get_perm())
+
+ def post_update(self, metric):
+ if metric.is_restricted:
+ security.merge_perm(security_manager, 'metric_access', metric.get_perm())
+
+
+appbuilder.add_view_no_menu(PandasMetricInlineView)
+
+
+class PandasDatasourceModelView(DatasourceModelView, DeleteMixin): # noqa
+ datamodel = SQLAInterface(PandasDatasource)
+
+ list_title = _('List File Datasources')
+ show_title = _('Show File Datasource')
+ add_title = _('Add File Datasource')
+ edit_title = _('Edit File Datasource')
+
+ list_columns = [
+ 'link', 'changed_by_', 'modified']
+ order_columns = [
+ 'link', 'changed_on_']
+ add_columns = ['name', 'source_url', 'source_auth', 'source_parameters',
+ 'format', 'additional_parameters']
+ add_form_extra_fields = {
+ 'source_auth': JSONField(
+ _('Source Credentials'),
+ [validators.optional(), validators.length(max=100)],
+ widget=BS3TextFieldWidget(),
+ description=(
+ 'Credentials required to access the raw data, if required. '
+ 'Can be either a username and password in the form '
+ "'[\"username\", \"password\"]' which will be authenticated "
+ 'using HTTP Basic Auth, or a string which will be used as '
+ 'an Authorization header')),
+ 'source_parameters': JSONField(
+ _('Additional Query Parameters'),
+ [validators.optional(), validators.length(max=500)],
+ widget=BS3TextAreaFieldWidget(),
+ description=(
+ 'A JSON-formatted dictionary of additional parameters '
+ 'used to request the remote file')),
+ 'format': ChoiceTypeSelectField(_('Format'), choices=FORMATS),
+ 'additional_parameters': JSONField(
+ _('Additional Read Parameters'),
+ [validators.optional(), validators.length(max=500)],
+ widget=BS3TextAreaFieldWidget(),
+ description=(
+ 'A JSON-formatted dictionary of additional parameters '
+ 'passed to the Pandas read function')),
+ }
+ edit_columns = [
+ 'name', 'source_url', 'source_auth', 'source_parameters',
+ 'format', 'additional_parameters',
+ 'filter_select_enabled', 'slices',
+ 'fetch_values_predicate',
+ 'description', 'owner',
+ 'main_dttm_col', 'default_endpoint', 'offset', 'cache_timeout']
+ edit_form_extra_fields = add_form_extra_fields
+ show_columns = edit_columns + ['perm']
+ related_views = [PandasColumnInlineView, PandasMetricInlineView]
+ base_order = ('changed_on', 'desc')
+ search_columns = (
+ 'owner', 'name', 'source_url',
+ )
+ description_columns = {
+ 'slices': _(
+ 'The list of slices associated with this datasource. By '
+ 'altering this datasource, you may change how these associated '
+ 'slices behave. '
+ 'Also note that slices need to point to a datasource, so '
+ 'this form will fail at saving if removing slices from a '
+ 'datasource. If you want to change the datasource for a slice, '
+ "overwrite the slice from the 'explore view'"),
+ 'offset': _('Timezone offset (in hours) for this datasource'),
+ 'name': _(
+ 'The name of this datasource'),
+ 'source_url': _(
+ 'The URL used to access the raw data'),
+ 'format': _(
+ 'The format of the raw data, e.g. csv'),
+ 'description': Markup(
+ "Supports <a href='https://daringfireball.net/projects/markdown/'>"
+ 'markdown</a>'),
+ 'fetch_values_predicate': _(
+ 'Predicate applied when fetching distinct value to '
+ 'populate the filter control component. Supports '
+ 'jinja template syntax. Applies only when '
+ '`Enable Filter Select` is on.'),
+ 'default_endpoint': _(
+ 'Redirects to this endpoint when clicking on the datasource '
+ 'from the datasource list'),
+ 'filter_select_enabled': _(
+ "Whether to populate the filter's dropdown in the explore "
+ "view's filter section with a list of distinct values fetched "
+ 'from the backend on the fly'),
+ }
+ base_filters = [['id', DatasourceFilter, lambda: []]]
+ label_columns = {
+ 'slices': _('Associated Slices'),
+ 'link': _('Datasource'),
+ 'changed_by_': _('Changed By'),
+ 'changed_on_': _('Last Changed'),
+ 'filter_select_enabled': _('Enable Filter Select'),
+ 'default_endpoint': _('Default Endpoint'),
+ 'offset': _('Offset'),
+ 'cache_timeout': _('Cache Timeout'),
+ 'name': _('Name'),
+ 'source_url': _('Source URL'),
+ 'format': _('Format'),
+ 'fetch_values_predicate': _('Fetch Values Predicate'),
+ 'owner': _('Owner'),
+ 'main_dttm_col': _('Main Datetime Column'),
+ 'description': _('Description'),
+ }
+
+ def pre_add(self, datasource):
+ number_of_existing_datasources = (
+ db.session
+ .query(sa.func.count('*'))
+ .filter(PandasDatasource.source_url == datasource.source_url)
+ .scalar())
+ # datasource object is already added to the session
+ if number_of_existing_datasources > 1:
+ raise Exception(
+ get_datasource_exist_error_msg(datasource.full_name))
+
+ # Fail before adding if the datasource can't be found
+ try:
+ datasource.get_dataframe()
+ except Exception as e:
+ logging.exception(e)
+ raise Exception(_(
+ 'File [{}] could not be read, '
+ 'please double check the '
+ 'Source URL and Read Method').format(datasource.name))
+
+ def post_add(self, datasource, flash_message=True):
+ datasource.get_metadata()
+ security.merge_perm(security_manager, 'datasource_access', datasource.get_perm())
+
+ if flash_message:
+ flash(_(
+ 'The datasource was created. '
+ 'As part of this two phase configuration '
+ 'process, you should now click the edit button by '
+ 'the new datasource to configure it.'), 'info')
+
+ def post_update(self, datasource):
+ self.post_add(datasource, flash_message=False)
+
+ def _delete(self, pk):
+ DeleteMixin._delete(self, pk)
+
+ @expose('/edit/<pk>', methods=['GET', 'POST'])
+ @has_access
+ def edit(self, pk):
+ """Simple hack to redirect to explore view after saving"""
+ resp = super(PandasDatasourceModelView, self).edit(pk)
+ if isinstance(resp, basestring):
+ return resp
+ return redirect('/superset/explore/pandas/{}/'.format(pk))
+
+
+appbuilder.add_view(
+ PandasDatasourceModelView,
+ 'File Datasources',
+ label=__('File Datasources'),
+ category='Sources',
+ category_label=__('Sources'),
+ icon='fa-file',)
+
+appbuilder.add_separator('Sources')
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
deleted file mode 100644
index 3d474864f7..0000000000
--- a/contrib/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM python:3.6
-
-MAINTAINER Xiao Hanyu <ha...@shopeemobile.com>
-
-# Add a normal user
-RUN useradd --user-group --create-home --shell /bin/bash work
-
-# Configure environment
-ENV LANG=C.UTF-8 \
- LC_ALL=C.UTF-8 \
- HOME=/home/work
-
-RUN apt-get update -y
-
-# Install some dependencies
-# http://airbnb.io/superset/installation.html#os-dependencies
-RUN apt-get update -y && apt-get install -y build-essential libssl-dev \
- libffi-dev python3-dev libsasl2-dev libldap2-dev
-
-RUN apt-get install -y vim less postgresql-client redis-tools
-
-# Install nodejs for custom build
-# https://github.com/apache/incubator-superset/blob/master/docs/installation.rst#making-your-own-build
-# https://nodejs.org/en/download/package-manager/
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN apt-get install -y nodejs
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -; \
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list; \
- apt-get update; \
- apt-get install -y yarn
-
-RUN mkdir $HOME/incubator-superset
-
-WORKDIR $HOME/incubator-superset
-
-COPY ./ ./
-
-RUN pip install --upgrade setuptools pip
-RUN pip install -e . && pip install -r requirements-dev.txt
-
-ENV PATH=/home/work/incubator-superset/superset/bin:$PATH \
- PYTHONPATH=./superset/:$PYTHONPATH
-
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
-
-COPY ./superset ./superset
-RUN chown -R work:work $HOME
-
-USER work
-
-RUN cd superset/assets && yarn
-RUN cd superset/assets && npm run build
-
-HEALTHCHECK CMD ["curl", "-f", "http://localhost:8088/health"]
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-EXPOSE 8088
diff --git a/contrib/docker/docker-build.sh b/contrib/docker/docker-build.sh
deleted file mode 100644
index 55f73274d6..0000000000
--- a/contrib/docker/docker-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-docker build -t apache/incubator-superset -f Dockerfile .
diff --git a/contrib/docker/docker-init.sh b/contrib/docker/docker-init.sh
deleted file mode 100644
index 940ad4fa34..0000000000
--- a/contrib/docker/docker-init.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# Create an admin user (you will be prompted to set username, first and last name before setting a password)
-fabmanager create-admin --app superset
-
-# Initialize the database
-superset db upgrade
-
-# Load some data to play with
-superset load_examples
-
-# Create default roles and permissions
-superset init
-
-# Need to run `npm run build` when enter contains for first time
-cd superset/assets && npm run build && cd ../../
-
-# Start superset worker for SQL Lab
-superset worker &
-
-# To start a development web server, use the -d switch
-superset runserver -d
diff --git a/contrib/tests/cache_tests.py b/contrib/tests/cache_tests.py
new file mode 100644
index 0000000000..581d6563f8
--- /dev/null
+++ b/contrib/tests/cache_tests.py
@@ -0,0 +1,116 @@
+"""Unit tests for DataFrameCache"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+import datetime
+import os
+import shutil
+import tempfile
+import time
+import pandas as pd
+from pandas.testing import assert_frame_equal
+from tests.base_tests import SupersetTestCase
+from ..cache.dataframe import DataFrameCache
+class DataFrameCacheTestCase(SupersetTestCase):
+ def setUp(self):
+ self.cache = DataFrameCache(cache_dir=tempfile.mkdtemp())
+ def tearDown(self):
+ shutil.rmtree(self.cache._path)
+ def get_df(self, key):
+ return pd.DataFrame({'one': pd.Series([1, 2, 3]),
+ key: pd.Series([1, 2, 3, 4])})
+ def test_get_dict(self):
+ a = self.get_df('a')
+ b = self.get_df('b')
+ assert self.cache.set('a', a)
+ assert self.cache.set('b', b)
+ d = self.cache.get_dict('a', 'b')
+ assert 'a' in d
+ assert_frame_equal(a, d['a'])
+ assert_frame_equal(b, d['b'])
+ def test_set_get(self):
+ for i in range(3):
+ assert self.cache.set(str(i), self.get_df(str(i)))
+ for i in range(3):
+ assert_frame_equal(self.cache.get(str(i)), self.get_df(str(i)))
+ def test_get_set(self):
+ assert self.cache.set('foo', self.get_df('bar'))
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ def test_get_many(self):
+ assert self.cache.set('foo', self.get_df('bar'))
+ assert self.cache.set('spam', self.get_df('eggs'))
+ result = list(self.cache.get_many('foo', 'spam'))
+ assert_frame_equal(result[0], self.get_df('bar'))
+ assert_frame_equal(result[1], self.get_df('eggs'))
+ def test_set_many(self):
+ assert self.cache.set_many({'foo': self.get_df('bar'),
+ 'spam': self.get_df('eggs')})
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ assert_frame_equal(self.cache.get('spam'), self.get_df('eggs'))
+ def test_add(self):
+ # sanity check that add() works like set()
+ assert self.cache.add('foo', self.get_df('bar'))
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ assert not self.cache.add('foo', self.get_df('qux'))
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ def test_delete(self):
+ assert self.cache.add('foo', self.get_df('bar'))
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ assert self.cache.delete('foo')
+ assert self.cache.get('foo') is None
+ def test_delete_many(self):
+ assert self.cache.add('foo', self.get_df('bar'))
+ assert self.cache.add('spam', self.get_df('eggs'))
+ assert self.cache.delete_many('foo', 'spam')
+ assert self.cache.get('foo') is None
+ assert self.cache.get('spam') is None
+ def test_timeout(self):
+ self.cache.set('foo', self.get_df('bar'), 0)
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ self.cache.set('baz', self.get_df('qux'), 1)
+ assert_frame_equal(self.cache.get('baz'), self.get_df('qux'))
+ time.sleep(3)
+ # timeout of zero means no timeout
+ assert_frame_equal(self.cache.get('foo'), self.get_df('bar'))
+ assert self.cache.get('baz') is None
+ def test_has(self):
+ assert self.cache.has('foo') in (False, 0)
+ assert self.cache.has('spam') in (False, 0)
+ assert self.cache.set('foo', self.get_df('bar'))
+ assert self.cache.has('foo') in (True, 1)
+ assert self.cache.has('spam') in (False, 0)
+ self.cache.delete('foo')
+ assert self.cache.has('foo') in (False, 0)
+ assert self.cache.has('spam') in (False, 0)
+ def test_prune(self):
+ THRESHOLD = 13
+ c = DataFrameCache(cache_dir=tempfile.mkdtemp(),
+ threshold=THRESHOLD)
+ for i in range(2 * THRESHOLD):
+ assert c.set(str(i), self.get_df(str(i)))
+ cache_files = os.listdir(c._path)
+ shutil.rmtree(c._path)
+ # There will be a small .expires file for every cached file
+ assert len(cache_files) <= THRESHOLD * 2
+ def test_clear(self):
+ cache_files = os.listdir(self.cache._path)
+ assert self.cache.set('foo', self.get_df('bar'))
+ cache_files = os.listdir(self.cache._path)
+ # There will be a small .expires file for every cached file
+ assert len(cache_files) == 2
+ assert self.cache.clear()
+ cache_files = os.listdir(self.cache._path)
+ assert len(cache_files) == 0
+ def test_non_feather_format(self):
+ # The Feather on-disk format isn't indexed and doesn't handle
+ # Object-type columns with non-homogeneous data
+ # See:
+ # - https://github.com/wesm/feather/tree/master/python#limitations
+ # - https://github.com/wesm/feather/issues/200
+ now = datetime.datetime.now
+ df = pd.DataFrame({'one': pd.Series([1, 2, 3], index=['a', 'b', 'c']),
+ 'two': pd.Series([1, 'string', now(), 4],
+ index=['a', 'b', 'c', 'd'])})
+ assert self.cache.set('foo', df)
+ assert_frame_equal(self.cache.get('foo'), df)
\ No newline at end of file
diff --git a/contrib/tests/connector_tests.py b/contrib/tests/connector_tests.py
new file mode 100644
index 0000000000..e0e8779750
--- /dev/null
+++ b/contrib/tests/connector_tests.py
@@ -0,0 +1,988 @@
+"""Unit tests for Superset"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+from collections import OrderedDict
+import datetime
+import io
+import re
+import unittest
+import markdown
+import pandas as pd
+from pandas.testing import assert_frame_equal
+from sqlalchemy import Date
+from tests.base_tests import SupersetTestCase
+from superset.connectors.sqla.models import SqlaTable, SqlMetric, TableColumn
+from superset.models.core import Database
+from superset.models.helpers import QueryResult
+from superset.utils import QueryStatus
+from ..connectors.pandas.models import (
+ PandasColumn, PandasDatasource, PandasMetric)
+class BaseConnectorTestCase(SupersetTestCase):
+ """
+ Standard tests for Connectors, especially for .query()
+ Connector-specific subclasses should override, `setUp()`
+ to create a Datasource with the appropriate Columns and
+ Metrics, and store a copy of the raw
+ data in the `self.df` attribute
+ """
+ def __init__(self, methodName='runTest'):
+ """Setup assertEqual for DataFrames"""
+ super(BaseConnectorTestCase, self).__init__(methodName)
+ self.addTypeEqualityFunc(pd.DataFrame, 'assertFrameEqual')
+ @classmethod
+ def setUpClass(cls):
+ if cls is BaseConnectorTestCase:
+ raise unittest.SkipTest('Skip tests from BaseConnectorTestCase')
+ super(BaseConnectorTestCase, cls).setUpClass()
+ data = """
+ | region | district | project | received | value | value2 | category |
+ |----------|------------|-----------|---------------------|--------|--------|-----------|
+ | Region 1 | District A | Project A | 2001-01-31 10:00:00 | 33 | 12.30 | CategoryA |
+ | Region 1 | District A | Project A | 2001-01-31 12:00:00 | 32 | 13.60 | CategoryB |
+ | Region 1 | District B | Project B | 2001-01-31 13:00:00 | 35 | 15.50 | CategoryA |
+ | Region 2 | District C | Project C | 2001-01-31 09:00:00 | 12 | 17.80 | CategoryB |
+ | Region 1 | District A | Project A | 2001-02-28 09:00:00 | 66 | 11.30 | CategoryB |
+ | Region 1 | District B | Project B | 2001-02-28 08:00:00 | 15 | 19.90 | CategoryB |
+ | Region 1 | District B | Project B | 2001-02-28 10:00:00 | 25 | 15.30 | CategoryA |
+ | Region 2 | District C | Project C | 2001-02-28 08:00:00 | 18 | 13.80 | CategoryA |
+ | Region 1 | District A | Project A | 2001-03-31 11:00:00 | 85 | 45.10 | CategoryB |
+ | Region 1 | District B | Project B | 2001-03-31 12:00:00 | 5 | 28.10 | CategoryA |
+ | Region 2 | District C | Project C | 2001-03-31 14:00:00 | 35 | 22.60 | CategoryB |
+ | Region 1 | District A | Project A | 2001-04-30 10:00:00 | 15 | 11.00 | CategoryA |
+ | Region 1 | District A | Project A | 2001-04-30 12:00:00 | 15 | 16.10 | CategoryB |
+ | Region 2 | District C | Project C | 2001-04-30 13:00:00 | 15 | 18.50 | CategoryA |
+ """ # NOQA: E501
+ def assertFrameEqual(self, frame1, frame2, msg=None):
+ # We don't care about the index, because it is
+ # not part of the data returned to the client
+ return assert_frame_equal(frame1.reset_index(drop=True),
+ frame2.reset_index(drop=True),
+ msg)
+ def setUp(self):
+ # Create a copy of the raw data as a dataframe to be
+ # used for calculated expected results
+ self.df = self.md_to_df(self.data)
+ self.df['received'] = self.df['received'].values.astype('datetime64[D]')
+ def md_to_html(self, md_raw):
+ """
+ Convert a possibly-indented Markdown-table to a file-like object
+ that can be parsed by pd.read_html().
+ See https://github.com/XLSForm/pyxform/blob/master/pyxform/tests_v1/pyxform_test_case.py # NOQA
+ for the inspiration
+ """
+ _md = []
+ for line in md_raw.split('\n'):
+ if re.match(r'^\s+\#', line):
+ # ignore lines which start with pound sign
+ continue
+ elif re.match(r'^(.*)(\#[^\|]+)$', line):
+ # keep everything before the # outside of the last occurrence
+ # of |
+ _md.append(
+ re.match(r'^(.*)(\#[^\|]+)$', line).groups()[0].strip())
+ else:
+ _md.append(line.strip())
+ md = '\n'.join(_md)
+ return io.StringIO(
+ markdown.markdown(md, extensions=['markdown.extensions.tables']))
+ def md_to_df(self, md_raw):
+ """
+ Convert a possibly-indented Markdown-table to a Pandas DataFrame
+ """
+ return pd.read_html(self.md_to_html(md_raw))[0]
+ def test_values_for_column(self):
+ result = self.datasource.values_for_column('project')
+ self.assertEqual(result, self.df['project'].unique().tolist())
+ def test_values_for_column_with_limit(self):
+ result = self.datasource.values_for_column('project', 1)
+ self.assertEqual(result, self.df['project'].unique()[:1].tolist())
+ def test_get_query_str(self):
+ p = {
+ 'groupby': ['project'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.get_query_str(p)
+ self.assertIn('project', result)
+ def test_summary_single_metric(self):
+ p = {
+ 'groupby': [],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = pd.DataFrame({'sum__value': [self.df['value'].sum()]})
+ self.assertEqual(result.df, expected_df)
+ def test_summary_multiple_metrics(self):
+ p = {
+ 'groupby': [],
+ 'metrics': ['sum__value', 'avg__value', 'value_percentage', 'ratio'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ self.df['ratio'] = self.df['value'] / self.df['value2']
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = pd.DataFrame(OrderedDict([
+ ('sum__value', [self.df['value'].sum()]),
+ ('avg__value', [self.df['value'].mean()]),
+ ('value_percentage', [sum(self.df['value']) /
+ sum(self.df['value'] + self.df['value2'])]),
+ ('ratio', [self.df['ratio'].mean()]),
+ ]))
+ self.assertEqual(result.df, expected_df)
+ def test_from_to_dttm(self):
+ p = {
+ 'groupby': [],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 3, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ df = self.df.loc[self.df['received'] > datetime.datetime(2001, 3, 1)]
+ expected_df = pd.DataFrame({'sum__value': [df['value'].sum()]})
+ self.assertEqual(result.df, expected_df)
+ def test_filter_eq_string(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'district', 'val': 'District A', 'op': '=='},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[self.df['district'] == 'District A']
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=False)
+ self.assertEqual(result.df, expected_df)
+ def test_filter_eq_num(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'value', 'val': '85', 'op': '=='},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[self.df['value'] == 85]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=False)
+ self.assertEqual(result.df, expected_df)
+ def test_filter_eq_date(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'received', 'val': '2001-02-28', 'op': '=='},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[self.df['received'] == datetime.datetime(2001, 2, 28)]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=False)
+ self.assertEqual(result.df, expected_df)
+ def test_filter_gte(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'value', 'val': '70', 'op': '>='},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[self.df['value'] >= 70]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=False)
+ self.assertEqual(result.df, expected_df)
+ def test_filter_in_num(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'value', 'val': ['32', '35'], 'op': 'in'},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[~((self.df['value'] != 32) &
+ (self.df['value'] != 35))]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = (expected_df.sort_values(['sum__value'], ascending=False)
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_filter_in_str(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'project', 'val': ['Project A', 'Project C'], 'op': 'in'},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[~((self.df['project'] != 'Project A') &
+ (self.df['project'] != 'Project C'))]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = (expected_df.sort_values(['sum__value'], ascending=False)
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_filter_not_in_num(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'value', 'val': ['32', '35'], 'op': 'not in'},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[((self.df['value'] != 32) &
+ (self.df['value'] != 35))]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = (expected_df.sort_values(['sum__value'], ascending=False)
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_filter_not_in_str(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [
+ {'col': 'project', 'val': ['Project A', 'Project C'], 'op': 'not in'},
+ ],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .loc[((self.df['project'] != 'Project A') &
+ (self.df['project'] != 'Project C'))]
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=False)
+ self.assertEqual(result.df, expected_df)
+ def test_columns_only(self):
+ p = {
+ 'groupby': [],
+ 'metrics': [],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ 'columns': ['project', 'region', 'received', 'value'],
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = self.df[p['columns']].copy()
+ expected_df['received'] = expected_df['received'].astype(str)
+ self.assertEqual(result.df, expected_df)
+ def test_orderby_with_columns(self):
+ p = {
+ 'groupby': [],
+ 'metrics': [],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ 'columns': ['project', 'region', 'received', 'value'],
+ 'orderby': [
+ ['project', False],
+ ['region', True],
+ ],
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .sort_values(['project', 'region'],
+ ascending=[False, True])
+ .reset_index(drop=True)
+ [p['columns']])
+ expected_df['received'] = expected_df['received'].astype(str)
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_only(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': [],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])
+ .size()
+ .reset_index()
+ .sort_values([0], ascending=False)
+ .drop(0, axis=1))
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_single_metric(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])['value']
+ .sum()
+ .reset_index()
+ .sort_values(['value'], ascending=False))
+ expected_df.columns = p['groupby'] + p['metrics']
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_multiple_metrics(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value', 'avg__value', 'value_percentage', 'ratio'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ self.df['ratio'] = self.df['value'] / self.df['value2']
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])
+ .aggregate(OrderedDict([('value', ['sum', 'mean']),
+ ('ratio', ['mean'])])))
+ expected_df['value_percentage'] = (self.df.groupby(p['groupby'])
+ .apply(lambda x: sum(x['value']) /
+ sum(x['value'] + x['value2'])))
+ expected_df = expected_df.reset_index()
+ expected_df.columns = (p['groupby'] +
+ ['sum__value', 'avg__value', 'ratio', 'value_percentage'])
+ expected_df = (expected_df[p['groupby'] + p['metrics']]
+ .sort_values(['sum__value'], ascending=False))
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_ratio_metric(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['ratio'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ self.df['ratio'] = self.df['value'] / self.df['value2']
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])['ratio']
+ .mean()
+ .reset_index()
+ .sort_values(['ratio'], ascending=False))
+ expected_df.columns = p['groupby'] + p['metrics']
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_value_percentage_metric(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['value_percentage'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])
+ .apply(lambda x: sum(x['value']) /
+ sum(x['value'] + x['value2']))
+ .reset_index()
+ .sort_values([0], ascending=False))
+ expected_df.columns = p['groupby'] + p['metrics']
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_category_percentage_metric(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['category_percentage'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])['category']
+ .value_counts(normalize=True)
+ .reset_index(p['groupby'])
+ .loc['CategoryA']
+ .reset_index(drop=True)
+ .sort_values(['category'], ascending=False))
+ expected_df.columns = p['groupby'] + p['metrics']
+ self.assertEqual(result.df, expected_df)
+ def test_groupby_ascending_order(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value', 'avg__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ },
+ 'order_desc': False,
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df.groupby(p['groupby'])
+ .aggregate({'value': ['sum', 'mean']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = expected_df.sort_values(['sum__value'], ascending=True)
+ self.assertEqual(result.df, expected_df)
+ def test_timeseries_single_metric(self):
+ p = {
+ 'groupby': [],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': True,
+ 'timeseries_limit': 50,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ # Note that week and month don't work on SQLite
+ # See https://github.com/apache/incubator-superset/issues/617
+ 'time_grain_sqla': 'day',
+ },
+ 'order_desc': True,
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ time_grain = PandasDatasource.GRAINS[p['extras']['time_grain_sqla']]
+ expected_df = (self.df.groupby(p['groupby'] +
+ [pd.Grouper(key=p['granularity'],
+ freq=time_grain)])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = (p['groupby'] +
+ ['__timestamp'] +
+ p['metrics'])
+ expected_df['__timestamp'] = expected_df['__timestamp'].astype(str)
+ expected_df = (expected_df.sort_values(p['metrics'][0],
+ ascending=(not p['order_desc']))
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_timeseries_multiple_metrics(self):
+ p = {
+ 'groupby': [],
+ 'metrics': ['sum__value', 'avg__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': True,
+ 'timeseries_limit': 50,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ # Note that week and month don't work on SQLite
+ # See https://github.com/apache/incubator-superset/issues/617
+ 'time_grain_sqla': 'day',
+ },
+ 'order_desc': True,
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ time_grain = PandasDatasource.GRAINS[p['extras']['time_grain_sqla']]
+ expected_df = (self.df.groupby(p['groupby'] +
+ [pd.Grouper(key=p['granularity'],
+ freq=time_grain)])
+ .aggregate({'value': ['sum', 'mean']})
+ .reset_index())
+ expected_df.columns = (p['groupby'] +
+ ['__timestamp'] +
+ p['metrics'])
+ expected_df['__timestamp'] = expected_df['__timestamp'].astype(str)
+ expected_df = (expected_df.sort_values(p['metrics'][0],
+ ascending=(not p['order_desc'])))
+ self.assertEqual(result.df, expected_df)
+ def test_timeseries_groupby(self):
+ p = {
+ 'groupby': ['project'],
+ 'metrics': ['sum__value', 'avg__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': True,
+ 'timeseries_limit': 50,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ # Note that week and month don't work on SQLite
+ # See https://github.com/apache/incubator-superset/issues/617
+ 'time_grain_sqla': 'day',
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ time_grain = PandasDatasource.GRAINS[p['extras']['time_grain_sqla']]
+ expected_df = (self.df.groupby(p['groupby'] +
+ [pd.Grouper(key=p['granularity'],
+ freq=time_grain)])
+ .aggregate({'value': ['sum', 'mean']})
+ .reset_index())
+ expected_df.columns = (p['groupby'] +
+ ['__timestamp'] +
+ p['metrics'])
+ expected_df['__timestamp'] = expected_df['__timestamp'].astype(str)
+ expected_df = (expected_df.sort_values(['sum__value'], ascending=False)
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_timeseries_limit(self):
+ p = {
+ 'groupby': ['project', 'district'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': True,
+ 'timeseries_limit': 2,
+ 'timeseries_limit_metric': 'avg__value',
+ 'row_limit': 5000,
+ 'extras': {
+ # Note that week and month don't work on SQLite
+ # See https://github.com/apache/incubator-superset/issues/617
+ 'time_grain_sqla': 'day',
+ },
+ 'order_desc': True,
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ time_grain = PandasDatasource.GRAINS[p['extras']['time_grain_sqla']]
+ limit_df = (self.df.groupby(p['groupby'])
+ .aggregate({'value': 'mean'})
+ .sort_values('value', ascending=(not p['order_desc']))
+ .iloc[:p['timeseries_limit']])
+ source_df = self.df.set_index(p['groupby'])
+ expected_df = (source_df[source_df.index.isin(limit_df.index)]
+ .groupby(p['groupby'] + [pd.Grouper(key=p['granularity'],
+ freq=time_grain)])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = (p['groupby'] +
+ ['__timestamp'] +
+ p['metrics'])
+ expected_df['__timestamp'] = expected_df['__timestamp'].astype(str)
+ expected_df = (expected_df.sort_values(['sum__value'],
+ ascending=(not p['order_desc']))
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+ def test_timeseries_limit_ascending_order(self):
+ p = {
+ 'groupby': ['project', 'district'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'filter': [],
+ 'is_timeseries': True,
+ 'timeseries_limit': 2,
+ 'timeseries_limit_metric': 'avg__value',
+ 'row_limit': 5000,
+ 'extras': {
+ # Note that week and month don't work on SQLite
+ # See https://github.com/apache/incubator-superset/issues/617
+ 'time_grain_sqla': 'day',
+ },
+ 'order_desc': False,
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ time_grain = PandasDatasource.GRAINS[p['extras']['time_grain_sqla']]
+ limit_df = (self.df.groupby(p['groupby'])
+ .aggregate({'value': 'mean'})
+ .sort_values('value', ascending=(not p['order_desc']))
+ .iloc[:p['timeseries_limit']])
+ source_df = self.df.set_index(p['groupby'])
+ expected_df = (source_df[source_df.index.isin(limit_df.index)]
+ .groupby(p['groupby'] + [pd.Grouper(key=p['granularity'],
+ freq=time_grain)])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = (p['groupby'] +
+ ['__timestamp'] +
+ p['metrics'])
+ expected_df['__timestamp'] = expected_df['__timestamp'].astype(str)
+ expected_df = (expected_df.sort_values(['sum__value'],
+ ascending=(not p['order_desc']))
+ .reset_index(drop=True))
+ self.assertEqual(result.df, expected_df)
+class SqlaConnectorTestCase(BaseConnectorTestCase):
+ columns = [
+ TableColumn(column_name='region', type='VARCHAR(20)'),
+ TableColumn(column_name='district', type='VARCHAR(20)'),
+ TableColumn(column_name='project', type='VARCHAR(20)'),
+ TableColumn(column_name='received', type='DATE', is_dttm=True),
+ TableColumn(column_name='value', type='BIGINT'),
+ ]
+ metrics = [
+ SqlMetric(metric_name='sum__value', metric_type='sum',
+ expression='SUM(value)'),
+ SqlMetric(metric_name='avg__value', metric_type='avg',
+ expression='AVG(value)'),
+ SqlMetric(metric_name='ratio', metric_type='avg',
+ expression='AVG(value/value2)'),
+ SqlMetric(metric_name='value_percentage', metric_type='custom',
+ expression='SUM(value)/SUM(value + value2)'),
+ SqlMetric(metric_name='category_percentage', metric_type='custom',
+ expression="SUM(CASE WHEN category='CategoryA' THEN 1 ELSE 0 END)/"
+ 'CAST(COUNT(*) AS REAL)'),
+ ]
+ def setUp(self):
+ super(SqlaConnectorTestCase, self).setUp()
+ sqlalchemy_uri = 'sqlite:////tmp/test.db'
+ database = Database(
+ database_name='test_database',
+ sqlalchemy_uri=sqlalchemy_uri)
+ self.connection = database.get_sqla_engine().connect()
+ self.datasource = SqlaTable(table_name='test_datasource',
+ database=database,
+ columns=self.columns,
+ metrics=self.metrics)
+ with database.get_sqla_engine().begin() as connection:
+ self.df.to_sql(self.datasource.table_name,
+ connection,
+ if_exists='replace',
+ index=False,
+ dtype={'received': Date})
+class PandasConnectorTestCase(BaseConnectorTestCase):
+ columns = [
+ PandasColumn(column_name='region', type='object'),
+ PandasColumn(column_name='district', type='object'),
+ PandasColumn(column_name='project', type='object'),
+ PandasColumn(column_name='received', type='datetime64[D]'),
+ PandasColumn(column_name='value', type='int64'),
+ PandasColumn(column_name='ratio', type='float64',
+ expression='value / value2'),
+ PandasColumn(column_name='inverse_ratio', type='float64',
+ expression='value2 / value'),
+ ]
+ metrics = [
+ PandasMetric(metric_name='sum__value', metric_type='sum',
+ source='value', expression='sum'),
+ PandasMetric(metric_name='avg__value', metric_type='avg',
+ source='value', expression='mean'),
+ PandasMetric(metric_name='ratio', metric_type='avg',
+ source='ratio', expression='mean'),
+ PandasMetric(metric_name='value_percentage', metric_type='custom',
+ source=None, expression='calc_value_percentage'),
+ PandasMetric(metric_name='category_percentage', metric_type='custom',
+ source='category', expression='calc_category_percentage'),
+ ]
+ def setUp(self):
+ super(PandasConnectorTestCase, self).setUp()
+ self.datasource = PandasDatasource(name='test datasource',
+ source_url=self.md_to_html(self.data),
+ format='html',
+ columns=self.columns,
+ metrics=self.metrics)
+ def calc_value_percentage(group):
+ return sum(group['value']) / sum(group['value'] + group['value2'])
+ self.datasource.calc_value_percentage = calc_value_percentage
+ def calc_category_percentage(group):
+ return group.value_counts(normalize=True).loc['CategoryA']
+ self.datasource.calc_category_percentage = calc_category_percentage
+ def test_post_aggregation_filter(self):
+ p = {
+ 'groupby': ['project', 'region'],
+ 'metrics': ['sum__value'],
+ 'granularity': 'received',
+ 'from_dttm': datetime.datetime(2001, 1, 1),
+ 'to_dttm': datetime.datetime(2001, 12, 31),
+ 'is_timeseries': False,
+ 'timeseries_limit': 0,
+ 'timeseries_limit_metric': None,
+ 'row_limit': 5000,
+ 'extras': {
+ 'time_grain_sqla': None,
+ 'having_druid': [
+ {'col': 'sum__value', 'val': '150', 'op': '>='},
+ ],
+ },
+ }
+ result = self.datasource.query(p)
+ self.assertIsInstance(result, QueryResult)
+ self.assertEqual(result.error_message, None)
+ self.assertEqual(result.status, QueryStatus.SUCCESS)
+ expected_df = (self.df
+ .groupby(p['groupby'])
+ .aggregate({'value': ['sum']})
+ .reset_index())
+ expected_df.columns = p['groupby'] + p['metrics']
+ expected_df = (expected_df.loc[expected_df['sum__value'] >= 150]
+ .sort_values(['sum__value'], ascending=False))
+ self.assertEqual(result.df, expected_df)
+if __name__ == '__main__':
+ unittest.main()
\ No newline at end of file
diff --git a/deployments/postgres-deployment.yaml b/deployments/postgres-deployment.yaml
new file mode 100644
index 0000000000..3729f37d7a
--- /dev/null
+++ b/deployments/postgres-deployment.yaml
@@ -0,0 +1,39 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ creationTimestamp: null
+ labels:
+ service: postgres
+ name: postgres
+spec:
+ replicas: 1
+ strategy:
+ type: Recreate
+ template:
+ metadata:
+ creationTimestamp: null
+ labels:
+ service: postgres
+ spec:
+ containers:
+ - env:
+ - name: POSTGRES_DB
+ value: superset
+ - name: POSTGRES_PASSWORD
+ value: superset
+ - name: POSTGRES_USER
+ value: superset
+ image: postgres:10
+ name: postgres
+ ports:
+ - containerPort: 5432
+ resources: {}
+ volumeMounts:
+ - mountPath: /var/lib/postgresql/data
+ name: postgres-storage
+ restartPolicy: Always
+ volumes:
+ - name: postgres-storage
+ persistentVolumeClaim:
+ claimName: postgres-volume-claim
+status: {}
diff --git a/deployments/postgres-persistent-volume.yaml b/deployments/postgres-persistent-volume.yaml
new file mode 100644
index 0000000000..0bfa733220
--- /dev/null
+++ b/deployments/postgres-persistent-volume.yaml
@@ -0,0 +1,13 @@
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+ name: postgres-volume
+ labels:
+ type: local
+spec:
+ capacity:
+ storage: 100Mi
+ accessModes:
+ - ReadWriteOnce
+ hostPath:
+ path: "/mnt/postgres/data"
\ No newline at end of file
diff --git a/deployments/postgres-service.yaml b/deployments/postgres-service.yaml
new file mode 100644
index 0000000000..d608d52c50
--- /dev/null
+++ b/deployments/postgres-service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+ creationTimestamp: null
+ labels:
+ service: postgres
+ name: postgres
+spec:
+ ports:
+ - name: "5432"
+ port: 5432
+ targetPort: 5432
+ selector:
+ service: postgres
+status:
+ loadBalancer: {}
diff --git a/deployments/postgres-volume-claim.yaml b/deployments/postgres-volume-claim.yaml
new file mode 100644
index 0000000000..d937f4836e
--- /dev/null
+++ b/deployments/postgres-volume-claim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ creationTimestamp: null
+ labels:
+ service: postgres
+ name: postgres-volume-claim
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 100Mi
+status: {}
diff --git a/deployments/redis-deployment.yaml b/deployments/redis-deployment.yaml
new file mode 100644
index 0000000000..f30c733601
--- /dev/null
+++ b/deployments/redis-deployment.yaml
@@ -0,0 +1,32 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ creationTimestamp: null
+ labels:
+ service: redis
+ name: redis
+spec:
+ replicas: 1
+ strategy:
+ type: Recreate
+ template:
+ metadata:
+ creationTimestamp: null
+ labels:
+ service: redis
+ spec:
+ containers:
+ - image: redis:3.2
+ name: redis
+ ports:
+ - containerPort: 6379
+ resources: {}
+ volumeMounts:
+ - mountPath: /data
+ name: redis-storage
+ restartPolicy: Always
+ volumes:
+ - name: redis-storage
+ persistentVolumeClaim:
+ claimName: redis-volume-claim
+status: {}
diff --git a/deployments/redis-persistent-volume.yaml b/deployments/redis-persistent-volume.yaml
new file mode 100644
index 0000000000..0413132c54
--- /dev/null
+++ b/deployments/redis-persistent-volume.yaml
@@ -0,0 +1,13 @@
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+ name: redis-volume
+ labels:
+ type: local
+spec:
+ capacity:
+ storage: 100Mi
+ accessModes:
+ - ReadWriteOnce
+ hostPath:
+ path: "/mnt/redis/data"
\ No newline at end of file
diff --git a/deployments/redis-service.yaml b/deployments/redis-service.yaml
new file mode 100644
index 0000000000..c68b66fbcf
--- /dev/null
+++ b/deployments/redis-service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+ creationTimestamp: null
+ labels:
+ service: redis
+ name: redis
+spec:
+ ports:
+ - name: "6379"
+ port: 6379
+ targetPort: 6379
+ selector:
+ service: redis
+status:
+ loadBalancer: {}
diff --git a/deployments/redis-volume-claim.yaml b/deployments/redis-volume-claim.yaml
new file mode 100644
index 0000000000..5a94d64c09
--- /dev/null
+++ b/deployments/redis-volume-claim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ creationTimestamp: null
+ labels:
+ service: redis
+ name: redis-volume-claim
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 100Mi
+status: {}
diff --git a/deployments/superset-deployment.yaml b/deployments/superset-deployment.yaml
new file mode 100644
index 0000000000..efa2576a30
--- /dev/null
+++ b/deployments/superset-deployment.yaml
@@ -0,0 +1,54 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ name: superset
+spec:
+ replicas: 1
+ strategy:
+ type: Recreate
+ template:
+ metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ spec:
+ containers:
+ - args:
+ - tail
+ - -f
+ - /dev/null
+ env:
+ - name: POSTGRES_DB
+ value: superset
+ - name: POSTGRES_HOST
+ value: postgres
+ - name: POSTGRES_PASSWORD
+ value: superset
+ - name: POSTGRES_PORT
+ value: "5432"
+ - name: POSTGRES_USER
+ value: superset
+ - name: REDIS_HOST
+ value: redis
+ - name: REDIS_PORT
+ value: "6379"
+ - name: SUPERSET_ENV
+ value: local
+ image: artifacts.ggn.in.guavus.com:4245/guavus-superset:1.0.4
+ name: superset
+ ports:
+ - containerPort: 8088
+ hostPort: 8088
+ resources: {}
+ volumeMounts:
+ - mountPath: /home/work/incubator-superset/superset/assets/node_modules
+ name: superset-node-modules-storage
+ restartPolicy: Always
+ volumes:
+ - name: superset-node-modules-storage
+ persistentVolumeClaim:
+ claimName: superset-node-modules-volume-claim
+status: {}
diff --git a/deployments/superset-node-modules-volume-claim.yaml b/deployments/superset-node-modules-volume-claim.yaml
new file mode 100644
index 0000000000..654f4b73ed
--- /dev/null
+++ b/deployments/superset-node-modules-volume-claim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ creationTimestamp: null
+ labels:
+ service: superset-node-modules
+ name: superset-node-modules-volume-claim
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 100Mi
+status: {}
diff --git a/deployments/superset-persistent-volume.yaml b/deployments/superset-persistent-volume.yaml
new file mode 100644
index 0000000000..e4ece4741a
--- /dev/null
+++ b/deployments/superset-persistent-volume.yaml
@@ -0,0 +1,13 @@
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+ name: superset-node-modules-volume
+ labels:
+ type: local
+spec:
+ capacity:
+ storage: 100Mi
+ accessModes:
+ - ReadWriteOnce
+ hostPath:
+ path: "/mnt/superset-node_modules/data"
\ No newline at end of file
diff --git a/deployments/superset-service.yaml b/deployments/superset-service.yaml
new file mode 100644
index 0000000000..a70ed776eb
--- /dev/null
+++ b/deployments/superset-service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ name: superset
+spec:
+ ports:
+ - name: "8088"
+ protocol: TCP
+ port: 8088
+ targetPort: 8088
+ selector:
+ service: superset
+status:
+ loadBalancer: {}
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000..3ec454dc4b
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,43 @@
+FROM python:3.6.5
+
+MAINTAINER Arpit Agarwal <ar...@guavus.com>
+
+# Configure environment
+ENV LANG=C.UTF-8 \
+ LC_ALL=C.UTF-8 \
+ HOME=/home/work
+
+RUN apt-get update -y && apt-get install -y build-essential libssl-dev \
+ libffi-dev python3-dev libsasl2-dev libldap2-dev \
+ libsasl2-modules
+
+RUN mkdir -p $HOME/incubator-superset
+
+WORKDIR $HOME/incubator-superset
+
+COPY ./ ./
+
+RUN pip install --upgrade setuptools pip && pip install wheel && python ./setup.py bdist_wheel && pip install ./dist/*.whl
+
+# Install nodejs for custom build
+# https://github.com/apache/incubator-superset/blob/master/docs/installation.rst#making-your-own-build
+# https://nodejs.org/en/download/package-manager/
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt-get install -y nodejs
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -; \
+ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list; \
+ apt-get update; \
+ apt-get install -y yarn
+
+RUN cd superset/assets && yarn && yarn run build && cd ../../
+
+ENV PATH=/home/work/incubator-superset/superset/bin:$PATH \
+ PYTHONPATH=./superset/:$PYTHONPATH
+
+COPY docker-init.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-init.sh
+
+EXPOSE 8088
+
+ENTRYPOINT ["docker-init.sh"]
+
diff --git a/docker/cleanup-docker.sh b/docker/cleanup-docker.sh
new file mode 100644
index 0000000000..241c4a85e6
--- /dev/null
+++ b/docker/cleanup-docker.sh
@@ -0,0 +1,6 @@
+# remove all exited containers
+docker rm -v $(docker ps -a -q -f status=exited)
+# remove unused images
+docker rmi $(docker images -f "dangling=true" -q)
+# docker container that removes unwanted/unused volumes
+docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes
\ No newline at end of file
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
new file mode 100644
index 0000000000..42d7ce420d
--- /dev/null
+++ b/docker/docker-build.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -ex
+START=$(date +%s)
+docker build -t guavus-superset -f Dockerfile .
+END=$(date +%s)
+DIFF=$(( $END - $START ))
+echo "Build completed in $DIFF seconds"
diff --git a/contrib/docker/docker-compose.yml b/docker/docker-compose.yml
similarity index 92%
rename from contrib/docker/docker-compose.yml
rename to docker/docker-compose.yml
index 9085793c10..4d95c59b5c 100644
--- a/contrib/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
volumes:
- postgres:/var/lib/postgresql/data
superset:
- image: apache/incubator-superset
+ image: guavus-superset
restart: always
environment:
POSTGRES_DB: superset
@@ -37,7 +37,6 @@ services:
- postgres
- redis
volumes:
- - .:/home/work/incubator-superset
- superset-node-modules:/home/work/incubator-superset/superset/assets/node_modules
volumes:
postgres:
diff --git a/contrib/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
similarity index 100%
rename from contrib/docker/docker-entrypoint.sh
rename to docker/docker-entrypoint.sh
diff --git a/docker/docker-init.sh b/docker/docker-init.sh
new file mode 100755
index 0000000000..8f38db5ca6
--- /dev/null
+++ b/docker/docker-init.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -ex
+
+ echo "Initializing database"
+ superset db upgrade
+
+ echo "Creating default roles and permissions"
+ superset init
+
+# To start a development web server, use the -d switch
+ superset runserver
diff --git a/contrib/docker/superset_config.py b/docker/superset_config.py
similarity index 94%
rename from contrib/docker/superset_config.py
rename to docker/superset_config.py
index 52536d6b6c..94f338adde 100644
--- a/contrib/docker/superset_config.py
+++ b/docker/superset_config.py
@@ -26,6 +26,9 @@ def get_env_variable(var_name, default=None):
POSTGRES_PORT = get_env_variable('POSTGRES_PORT')
POSTGRES_DB = get_env_variable('POSTGRES_DB')
+# Timeout duration for SQL Lab synchronous queries
+SQLLAB_TIMEOUT = 3600
+
# The SQLAlchemy connection string.
SQLALCHEMY_DATABASE_URI = 'postgresql://%s:%s@%s:%s/%s' % (POSTGRES_USER,
POSTGRES_PASSWORD,
@@ -45,4 +48,4 @@ class CeleryConfig(object):
CELERY_TASK_PROTOCOL = 1
-CELERY_CONFIG = CeleryConfig
+CELERY_CONFIG = CeleryConfig
\ No newline at end of file
diff --git a/docs/files.rst b/docs/files.rst
new file mode 100644
index 0000000000..51bc55d5a5
--- /dev/null
+++ b/docs/files.rst
@@ -0,0 +1,87 @@
+Files
+=====
+Superset can visualize data contained in flat files or outputted by REST APIs
+using Pandas. This page clarifies the features and limitations of using File
+Datasources with Superset.
+File Datasources do not use files uploaded directly to the Superset server. The
+files are stored elsewhere and downloaded (and cached) by Superset when required.
+This approach offers two important advantages over uploaded files:
+1. If the remote file is updated, then Superset will automatically download
+and use the new data when the datasource timeout expires. If the file had
+been uploaded manually then each change in the source data would require a
+new manual upload.
+2. Data can be provided by a REST API rather than an actual file. This provides
+a method to use Superset to visualize current data stored in other systems
+without needing to manually extract it first.
+.. note ::
+ A File Datasource downloads the full content of the source url
+ and then performs all filtering, grouping and aggregation locally
+ on the Superset server. File Datasources that access large
+ volumes of data may impact server performance and affect other users.
+ Server administrators should ensure that adequate memory and CPU
+ resources are available before enabling the File Datasource.
+Installation
+''''''''''''
+File Datasources are not enabled by default. To enable them the systems
+administrator should update the `superset_config.py` or other configuration
+file to include: :: python
+ # Include additional data sources
+ ADDITIONAL_MODULE_DS_MAP = {
+ 'contrib.connectors.pandas.models': ['PandasDatasource'],
+ }
+Supported Formats
+'''''''''''''''''
+File Datasources use the `Pandas library <http://pandas.pydata.org/>`_
+directly. Using a default installation in Superset, Pandas can read the
+following formats:
+* csv
+* html
+* json
+* Microsoft Excel
+* Stata
+If the appropriate dependencies have also been installed then the following
+additional formats are supported:
+* HDF5 (if PyTables is installed: `pip install tables`)
+* Feather (if Feather is installed: `pip install feather-format`)
+See the `Pandas Dependencies <http://pandas.pydata.org/pandas-docs/stable/install.html#dependencies>`_
+documentation for more information.
+Adding a File Datasource
+''''''''''''''''''''''''
+When you add a new File Datasource you need to provide the following information:
+* Source URL: the URL that the file to be visualized can be downloaded from.
+This can be a file hosted on another server or on a file sharing platform
+such as Dropbox, Google Drive or Amazon S3. It can also be the URL of a REST API
+end point.
+* Source Credentials: if the Source URL requires authentication then specify
+the credentials to be used. Credentials entered as ``["username", "password"]`` -
+i.e. as a valid username and password enclosed in quotation marks, separated
+by a comma and surrounded by parentheses - will be treated as a separate username
+and password and the File Datasource will use HTTP Basic Auth to authenticate to
+the remote server. Text in any other format will be passed to the remote server
+as an `Authentication` header. Typically this is used with API tokens issued by
+the remote server. Remote servers that require authentication should also use
+an HTTPS Source URL.
+* Source Parameters: a JSON-formatted dictionary of additional query parameters
+that are passed to the remote server. This field will not be required for file
+downloads, but is useful for specifying requests against REST APIs.
+* Format: The format of the data returned by the remote server
+* Read Parameters: a JSON-formatted dictionary of additional parameters that are
+passed to Pandas when the file retrieved from the remote Server is read into a
+DataFrame.
+Aggregations
+''''''''''''
+Common aggregations can be defined and used in Superset.
+The first and simpler use case is to use the checkbox matrix exposed in your
+datasource's edit view (``Sources -> File Datasources ->
+[your datasource] -> Edit -> [tab] List Datasource Column``).
+Clicking the ``GroupBy`` and ``Filterable`` checkboxes will make the column
+appear in the related dropdowns while in explore view. Checking
+``Count Distinct``, ``Min``, ``Max`` ``Average`` or ``Sum`` will result in creating
+new metrics that will appear in the ``List Metrics`` tab.
+You can create your own aggregations manually from the ``List Metrics`` tab for
+more complex cases.
+Post-Aggregations
+'''''''''''''''''
+File Datasources allow post aggregation in Superset. Any Metric that has been
+defined for the Datasource can be used as part of a Result Filter to limit
+the returned data.
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 370f51647a..43b14db987 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -77,6 +77,7 @@ Contents
sqllab
gallery
druid
+ files
misc
faq
diff --git a/learnings/Permissions.md b/learnings/Permissions.md
new file mode 100644
index 0000000000..b7f0ff852d
--- /dev/null
+++ b/learnings/Permissions.md
@@ -0,0 +1,39 @@
+# permissions
+
+list -> read
+
+## Initial page with no error
+
+1. can fave slices on Superset
+1. can fave dashboards on Superset
+1. can recent activity on Superset
+
+## List of dashboards
+
+1. can list on DashboardModelViewAsync
+
+## See a dashboard
+
+1. can dashboard on Superset => for view a dashbaord
+1. can explore JSON on Superset => for viewing slice inside a chart
+1. can list on CssTemplateAsyncModelView => for template
+
+## Perm Gyaan
+
+1. Async is used for list view of model
+1. cam list for showing in a list
+1. can show for show buton in lits
+1. can edit for edit button in list
+
+## SEE Permissons
+
+ ```sql
+ select ab_permission.name, ab_view_menu.name, ab_role.name from ab_permission_view JOIN ab_permission ON ab_permission_view.permission_id = ab_permission.id JOIN ab_permission_view_role on ab_permission_view.id = ab_permission_view_role.permission_view_id JOIN ab_role ON ab_role.id = ab_permission_view_role.role_id JOIN ab_view_menu ON ab_view_menu.id = ab_permission_view.view_menu_id where ab_role.name = 'Dashboard_Viewer';
+ ```
+
+ ```sql
+ select ab_permission.name, ab_view_menu.name, ab_role.name from ab_permission_view JOIN ab_permission ON ab_permission_view.permission_id = ab_permission.id JOIN ab_permission_view_role ON ab_permission_view.id = ab_permission_view_role.permission_view_id JOIN ab_role ON ab_role.id = ab_permission_view_role.role_id JOIN ab_view_menu ON ab_view_menu.id = ab_permission_view.view_menu_id where ab_role.id = 1;
+
+ ```
+
+
\ No newline at end of file
diff --git a/learnings/debug.md b/learnings/debug.md
new file mode 100644
index 0000000000..75a8ba6046
--- /dev/null
+++ b/learnings/debug.md
@@ -0,0 +1,26 @@
+# Debug
+
+## Python
+
+1. Install vscode python extention https://marketplace.visualstudio.com/items?itemName=ms-python.python
+
+1. To initialize debug , first select the Debug View in the sidebar
+
+1. Choose `Python:Flask` option in dropdown
+
+1. Click `play` icon
+
+1. Check logs in Teminal
+
+1. Run `http://127.0.0.1:5000` url in browser
+
+1. Add degug point in any `*.py` file and follow debug conventions
+
+1. more in details check `https://code.visualstudio.com/docs/python/debugging`
+
+**note** Default python venv path is `venv/bin/python` . To change default update in file `.vscode/WorkspaceSettings` .
+
+## Html/Javascript
+
+1. Follow browser supported debugger tools
+
diff --git a/learnings/theme.md b/learnings/theme.md
new file mode 100644
index 0000000000..0ff4460b7d
--- /dev/null
+++ b/learnings/theme.md
@@ -0,0 +1,46 @@
+# Theme Support
+
+## Header
+
+### Steps
+
+* Add Company logo at `./superset/assets/images/guavus_logo.svg`
+* Update new logo path for `APP_ICON` in `./config.py`
+* Update Navbar Template at `./superset/templates/appbuilder/navbar.html`
+* Define custom less at `./superset/assets/stylesheets/guavus.less`
+* Include `guavus.less` in `./superset/assets/stylesheets/superset.less`
+
+## Footer
+
+### Steps-
+
+* Define `TIMEZONE` and `COPYRIGHT` vars in `./config.py` to display in Footer
+* Define Footer Template `./superset/templates/appbuilder/footer.html`
+* Include `Footer Template` in `./superset/templates/appbuilder/baselayout.html` and `./superset/templates/superset/basic.html` at `footer` tag
+
+## Note
+
+* Logo, divider line and footer changes are incode these cannot be modify via configuration on runtime. It will be re-code on demand.
+
+## CSS Template support in Superset
+
+### Creating a CSS template
+
+1. Login to Superset with an account that has admin privileges
+1. Go to Manage. Then CSS Templates. This will take you to a page showing all the available templates.
+1. Create a new CSS template by clicking the + icon in the top right.
+1. Specify the Template Name and Css. Click Save.
+
+### Applying a CSS template
+
+How it works in Superset is you manually apply the templates to dashboards. So with that in mind ...
+
+1. Go to the dashboard whose CSS you'd like to change
+
+1. Click Edit Dashboard. It should be available in the top right. If you can't see the Edit Dashboard button then that means you don't have the required privileges to make any changes to the dashboard.
+
+1. Click the Actions dropdown button and go all the way down to Edit CSS. This will allow you to access all the templates that you'd created previously in step 1. Select the template you want. During the selection process, the CSS will be applied automatically and you can get a preview of how it's going to look.
+
+1. Once you have selected a template. Go back to the Actions dropdown button but this time click Save to save your changes.
+
+That's all there is to it!
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index fdb627d962..0000000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-console_log==0.2.10
-flake8-coding==1.3.0
-flake8-commas==2.0.0
-flake8-future-import==0.4.5
-flake8-import-order==0.18
-flake8-quotes==1.0.0
-flake8==3.5.0
-flask-cors==3.0.3
-ipdb==0.11
-mysqlclient==1.3.12
-psycopg2-binary==2.7.5
-pycodestyle==2.3.1
-pylint==1.9.2
-redis==2.10.6
-statsd==3.2.2
-tox==3.1.2
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b076fc0c5a..0000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-bleach==2.1.2
-boto3==1.4.7
-botocore==1.7.48
-celery==4.2.0
-colorama==0.3.9
-cryptography==1.9
-flask==0.12.2
-flask-appbuilder==1.10.0
-flask-caching==1.4.0
-flask-compress==1.4.0
-flask-migrate==2.1.1
-flask-wtf==0.14.2
-flower==0.9.2
-future==0.16.0
-geopy==1.11.0
-gunicorn==19.8.0
-humanize==0.5.1
-idna==2.6
-isodate==0.6.0
-markdown==2.6.11
-pandas==0.23.1
-parsedatetime==2.0.0
-pathlib2==2.3.0
-polyline==1.3.2
-pydruid==0.4.4
-pyhive==0.5.1
-python-dateutil==2.6.1
-python-geohash==0.8.5
-pyyaml==3.12
-requests==2.18.4
-simplejson==3.15.0
-six==1.11.0
-sqlalchemy==1.2.2
-sqlalchemy-utils==0.32.21
-sqlparse==0.2.4
-tableschema==1.1.0
-thrift==0.11.0
-thrift-sasl==0.3.0
-unicodecsv==0.14.1
-unidecode==1.0.22
-contextlib2==0.5.5
-
diff --git a/rpm-mgmt/artifactory.sh b/rpm-mgmt/artifactory.sh
new file mode 100644
index 0000000000..b45f68612f
--- /dev/null
+++ b/rpm-mgmt/artifactory.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+export ARTIFACTORY_USERNAME=dev-deployer
+export ARTIFACTORY_PASSWORD=dev@guavus
+
+export version=`cat ../VERSION`
+
+MAJOR_VERSION=$(echo $version | awk -F. '{print $1}')
+MINOR_VERSION=$(echo $version | awk -F. '{print $2}')
+PATCH_VERSION=$(echo $version | awk -F. '{print $3}')
+
+export RPM_ARTIFACTORY=artifacts.ggn.in.guavus.com:4245/ggn-dev-rpms/superset/release/$version/
diff --git a/rpm-mgmt/build_rpm.sh b/rpm-mgmt/build_rpm.sh
new file mode 100755
index 0000000000..ddf8a6161a
--- /dev/null
+++ b/rpm-mgmt/build_rpm.sh
@@ -0,0 +1,17 @@
+set -e
+
+pushd "$(dirname "$0")"
+
+source artifactory.sh
+
+PACKAGE_PATH="../dist/installer"
+PACKAGE_NAME="superset-installer"
+
+VERSION=$version
+DATE=`date +'%Y%m%d'`
+
+echo -e "# # # # # # # START : Creating RPM package Solution Installer # # # # # # #"
+fpm -f -s dir -t rpm --rpm-os linux -v ${VERSION} --iteration ${DATE}_${BUILD_NUMBER} --chdir ../superset-installer -p $PACKAGE_PATH -n $PACKAGE_NAME .
+echo -e "# # # # # # # # END : Creating RPM package for Solution Installer # # # # # # #"
+
+popd > /dev/null
\ No newline at end of file
diff --git a/rpm-mgmt/deploy_rpms.sh b/rpm-mgmt/deploy_rpms.sh
new file mode 100755
index 0000000000..8ad6c2c616
--- /dev/null
+++ b/rpm-mgmt/deploy_rpms.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Pushes the generated rpms to artifactory
+#
+# Usage:
+# sh deploy_rpms.sh
+#
+# rpm must have been generated first. Run make publish-rpms
+
+set -e
+
+pushd "$(dirname "$0")"
+
+source artifactory.sh
+
+INSTALLER_RPM=`ls ../dist/installer`
+
+
+print_lines(){
+ for i in `seq 1 4`;
+ do
+ echo " # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #"
+ done
+}
+
+echo "Pushing rpm for superset solution installer to artifactory"
+curl --user $ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD -X PUT "$RPM_ARTIFACTORY/" -T ../dist/installer/$INSTALLER_RPM
+echo "Published RPM for superset solution installer successfully"
+
+
+popd
\ No newline at end of file
diff --git a/scripts/create_docker.sh b/scripts/create_docker.sh
new file mode 100644
index 0000000000..8c3dcf9f8a
--- /dev/null
+++ b/scripts/create_docker.sh
@@ -0,0 +1,9 @@
+# moving docker files to root
+cp ./docker/{docker-build.sh,docker-compose.yml,docker-entrypoint.sh,docker-init.sh,Dockerfile} .
+cp ./docker/superset_config.py superset/
+
+bash -x docker-build.sh
+
+# deleting moved files
+rm -rf ./{docker-build.sh,docker-compose.yml,docker-entrypoint.sh,docker-init.sh,Dockerfile}
+rm -rf ./superset/superset_config.py
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 84c0c48405..897b3a92ef 100644
--- a/setup.py
+++ b/setup.py
@@ -59,14 +59,17 @@ def get_git_sha():
'boto3==1.4.7',
'botocore>=1.7.0, <1.8.0',
'celery>=4.2.0',
+ 'click==6.7',
'colorama',
'contextlib2',
'cryptography',
+ 'elasticsearch',
'flask<1.0.0',
'flask-appbuilder==1.10.0', # known db migration with 1.11+
'flask-caching',
'flask-compress',
'flask-migrate',
+ 'flask-sqlalchemy==2.1',
'flask-wtf',
'flower', # deprecated
'future>=0.16.0, <0.17',
@@ -75,11 +78,12 @@ def get_git_sha():
'humanize',
'idna',
'isodate',
- 'markdown',
+ 'markdown<3.0.0',
'pandas>=0.18.0',
'parsedatetime',
'pathlib2',
'polyline',
+ 'psycopg2-binary',
'pydruid>=0.4.3',
'pyhive>=0.4.0',
'python-dateutil',
@@ -96,6 +100,13 @@ def get_git_sha():
'thrift-sasl>=0.2.1',
'unicodecsv',
'unidecode>=0.04.21',
+ 'beautifulsoup4==4.6.0',
+ 'bottleneck==1.2.1',
+ 'feather-format==0.4.0',
+ 'html5lib==0.999999999',
+ 'lxml==3.8.0',
+ 'numexpr==2.6.4',
+ 'xlrd==1.1.0',
],
extras_require={
'cors': ['flask-cors>=2.0.0'],
diff --git a/superset-installer/etc/reflex-provisioner/inventory/templates/group_vars/global/all/raf/superset.yml b/superset-installer/etc/reflex-provisioner/inventory/templates/group_vars/global/all/raf/superset.yml
new file mode 100644
index 0000000000..1df97b1cd9
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/inventory/templates/group_vars/global/all/raf/superset.yml
@@ -0,0 +1,70 @@
+---
+
+#------------------------------------------------------------------#
+# Disclaimer #
+#------------------------------------------------------------------#
+# Defining superset_docker_registry. This will be updated in #
+# /etc/reflex-provisioner/playbooks/superset/main.yml if the #
+# site_connectivity is offline. #
+#------------------------------------------------------------------#
+docker_default_registry: "{{ site_default_dck_repo_host }}"
+
+superset_docker_registry: "{{ docker_default_registry }}"
+
+#------------------------------------------------------------------#
+# Components Version #
+#------------------------------------------------------------------#
+superset_image_tag: "1.0.4"
+
+#------------------------------------------------------------------#
+# Docker Path #
+#------------------------------------------------------------------#
+
+security_docker_images_root_path: "/opt/repos/security/docker"
+
+#------------------------------------------------------------------#
+# Docker Images #
+#------------------------------------------------------------------#
+
+superset_docker_image_name: "{{ superset_docker_registry }}/guavus-superset"
+
+superset_docker_images:
+ - name: guavus-superset
+ tag: "{{ superset_image_tag }}"
+
+superset_kube_namespace: default
+
+#------------------------------------------------------------------#
+# Configurations #
+#------------------------------------------------------------------#
+
+superset_owner_user: 'superset'
+superset_owner_password: 'superset'
+
+superset_postgres_access_ip: "{{ platform_loadbalancer_vip_01 }}"
+superset_postgres_access_port: "{{ platform_postgresql_port }}"
+
+superset_sql_conn_creds:
+ admin:
+ postgres:
+ user: "{{ platform_postgres_admin_login }}"
+ password: "{{ platform_postgres_admin_password }}"
+
+superset_sql_conn_targets:
+ postgres:
+ host: "{{ superset_postgres_access_ip }}"
+ ssl_mode: disable
+ engine: postgres
+
+superset_postgres_db: "superset"
+superset_postgres_db_user: "{{ superset_sql_conn_creds['admin']['postgres']['user'] }}"
+superset_postgres_db_password: "{{ superset_sql_conn_creds['admin']['postgres']['password'] }}"
+
+
+superset_host_port: "8888"
+superset_docker_restart_policy: "Always"
+
+#Path on hosts
+superset_host_base_dir: "/opt/guavus/superset"
+superset_host_k8s_dir: "{{ superset_host_base_dir }}/deployment/k8s"
+superset_host_sql_dir: "{{ superset_host_base_dir }}/deployment/sql"
diff --git a/superset-installer/etc/reflex-provisioner/inventory/templates/vars/common/default.yml b/superset-installer/etc/reflex-provisioner/inventory/templates/vars/common/default.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/superset-installer/etc/reflex-provisioner/inventory/templates/vars/customers/default.yml b/superset-installer/etc/reflex-provisioner/inventory/templates/vars/customers/default.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/superset-installer/etc/reflex-provisioner/playbooks/raf/superset/main.yml b/superset-installer/etc/reflex-provisioner/playbooks/raf/superset/main.yml
new file mode 100644
index 0000000000..080ee5686c
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/playbooks/raf/superset/main.yml
@@ -0,0 +1,57 @@
+---
+
+- name: Retrieve facts all host
+ hosts:
+ - all
+ gather_facts: true
+ any_errors_fatal: true
+ tags:
+ - 'always'
+ tasks: []
+
+
+- name: "Set superset psql host IP"
+ hosts:
+ - management-nodes
+ tags:
+ - always
+ tasks:
+ - set_fact:
+ site_floating_ip:
+ ip: "{{ hostvars[groups['management-nodes'][0]]['ansible_default_ipv4']['address'] }}"
+ when: site_deployment_type == 'NONHA'
+
+# This play permits to use a hierarchy of variables. The
+# variables are loaded form the vars inventory dir. It
+# respects the following order:
+# - common
+# - customers/common
+# - customers/stage
+# - extra_vars
+- name: Load hierarchical variables
+ hosts:
+ - all
+ any_errors_fatal: True
+ tags:
+ - 'always'
+ roles:
+ - reflex-provisionner/load_vars
+
+
+- name: Superset db creation
+ hosts:
+ - management-nodes
+ roles:
+ - role: raf/superset/data_model
+
+- name: Superset haproxy backend
+ hosts:
+ - loadbalancer-nodes
+ roles:
+ - raf/superset/haproxy_backend
+
+- name: Superset role deployment
+ hosts:
+ - management-nodes
+ roles:
+ - raf/superset/superset
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/data_model/tasks/main.yml b/superset-installer/etc/reflex-provisioner/roles/raf/superset/data_model/tasks/main.yml
new file mode 100644
index 0000000000..ff751cb46f
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/data_model/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+- name: create {{ superset_owner_user }} owner in postgres for {{ superset_postgres_db }} database
+ postgresql_user:
+ name: "{{ superset_owner_user }}"
+ login_host: "{{ superset_postgres_access_ip }}"
+ login_password: "{{ superset_postgres_db_password }}"
+ password: "{{ superset_owner_password }}"
+ role_attr_flags: CREATEDB
+ port: "{{ superset_postgres_access_port }}"
+ become: yes
+ become_user: postgres
+
+- name: create {{ superset_postgres_db }} database in postgres for {{ superset_owner_user }} owner
+ postgresql_db:
+ name: "{{ superset_postgres_db }}"
+ login_host: "{{ superset_postgres_access_ip }}"
+ login_user: "{{ superset_owner_user }}"
+ login_password: "{{ superset_owner_password }}"
+ encoding: "UTF-8"
+ owner: "{{ superset_owner_user }}"
+ port: "{{ superset_postgres_access_port }}"
+
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/handlers/main.yml b/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/handlers/main.yml
new file mode 100644
index 0000000000..a87286c4fe
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/handlers/main.yml
@@ -0,0 +1,24 @@
+---
+
+- name: Reload Haproxy
+ command: /bin/true
+ notify:
+ - Kill haproxy
+ - Restart pacemaker.service
+ - Restart haproxy.service
+
+- name: 'Kill haproxy'
+ shell: '/usr/bin/pkill haproxy'
+ when: inventory_hostname in groups['loadbalancer-nodes']
+
+- name: 'Restart pacemaker.service'
+ systemd:
+ name: pacemaker.service
+ state: restarted
+ when: inventory_hostname in groups['loadbalancer-nodes']
+
+- name: 'Restart haproxy.service'
+ systemd:
+ name: haproxy.service
+ state: restarted
+ when: inventory_hostname in groups['loadbalancer-nodes']
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/tasks/main.yml b/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/tasks/main.yml
new file mode 100644
index 0000000000..d70addd051
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/haproxy_backend/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+- name: Add superset servers in haproxy
+ blockinfile:
+ dest: /etc/haproxy/haproxy.cfg
+ backup: yes
+ marker: "# {mark} SUPERSET SERVICE BLOCK"
+ block: |
+ listen SUPERSET_{{ superset_host_port }}
+ bind {{ site_floating_ip.ip }}:{{ superset_host_port }}
+ mode http
+ balance roundrobin
+ appsession JSESSIONID len 1024 timeout 1h request-learn
+ option forwardfor
+ {% for host in groups['master-nodes'] %}server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_default_ipv4']['address'] }}:{{ superset_host_port }}
+ {%- if loop.first %} check
+ {% else %} check
+ {% endif -%}
+ {% endfor %}
+ notify:
+ - Reload Haproxy
+ when:
+ - inventory_hostname in groups['loadbalancer-nodes']
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/defaults/main.yml b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/defaults/main.yml
new file mode 100644
index 0000000000..93557a6bd6
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+
+superset_deploy: true
+# Set to TRUE to always re-deploy kubernetes pods. Used in development
+superset_reload_pods: false
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/tasks/main.yml b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/tasks/main.yml
new file mode 100644
index 0000000000..aec6a81663
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/tasks/main.yml
@@ -0,0 +1,82 @@
+---
+
+- name: Set superset docker registry
+ set_fact:
+ superset_docker_registry: '{{ docker_default_registry }}'
+ when:
+ - site_connectivity == "offline"
+
+
+- name: Populate offline docker registry with superset images
+ docker_image:
+ name: '{{ item.name }}'
+ tag: '{{ item.tag }}'
+ push: yes
+ force: yes
+ timeout: 6000
+ repository: "{{ superset_docker_registry }}/{{ item.name }}"
+ load_path: "{{ security_docker_images_root_path }}/{{ item.name }}.tar"
+ with_items:
+ - '{{ superset_docker_images }}'
+ when:
+ - site_connectivity == "offline"
+ - inventory_hostname == groups['management-nodes'][0]
+
+
+- name: Create base directories
+ file:
+ path: "{{ item }}"
+ state: directory
+ recurse: yes
+ owner: root
+ group: root
+ mode: 0755
+ with_items:
+ - "{{ superset_host_k8s_dir }}"
+ when:
+ - superset_deploy
+
+
+- name: Create kubernetes templates and copy superset deployment files
+ template:
+ src: "{{ item.file }}.j2"
+ dest: "{{ superset_host_k8s_dir }}/{{ item.file }}"
+ with_items:
+ - name: superset-deployment
+ file: superset-deployment.yaml
+ type: Deployment
+ - name: superset-service
+ file: superset-service.yaml
+ type: Service
+ register: superset_deploy_files
+ when:
+ - superset_deploy
+
+
+- name: Undeploy superset
+ kube:
+ name: "{{ item.item.name }}"
+ namespace: "{{ superset_kube_namespace }}"
+ kubectl: "{{ bin_dir }}/kubectl"
+ resource: "{{ item.item.type }}"
+ filename: "{{ superset_host_k8s_dir }}/{{ item.item.file }}"
+ state: "absent"
+ force: "true"
+ with_items: "{{ superset_deploy_files.results }}"
+ when:
+ - superset_deploy
+ - superset_reload_pods
+
+
+- name: Deploy superset
+ kube:
+ name: "{{ item.item.name }}"
+ namespace: "{{ superset_kube_namespace }}"
+ kubectl: "{{ bin_dir }}/kubectl"
+ resource: "{{ item.item.type }}"
+ filename: "{{ superset_host_k8s_dir }}/{{ item.item.file }}"
+ state: "{{ item.changed | ternary('latest','present') }}"
+ force: "true"
+ with_items: "{{ superset_deploy_files.results }}"
+ when:
+ - superset_deploy
\ No newline at end of file
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-deployment.yaml.j2 b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-deployment.yaml.j2
new file mode 100644
index 0000000000..6cbf74585f
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-deployment.yaml.j2
@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ name: superset
+ namespace: {{ superset_kube_namespace }}
+spec:
+ replicas: 1
+ strategy:
+ type: Recreate
+ template:
+ metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ spec:
+ containers:
+ - args:
+ - tail
+ - -f
+ - /dev/null
+ env:
+ - name: POSTGRES_DB
+ value: {{ superset_postgres_db }}
+ - name: POSTGRES_HOST
+ value: "{{ superset_postgres_access_ip }}"
+ - name: POSTGRES_PASSWORD
+ value: {{ superset_postgres_db_password }}
+ - name: POSTGRES_PORT
+ value: "{{ superset_postgres_access_port }}"
+ - name: POSTGRES_USER
+ value: {{ superset_postgres_db_user }}
+ - name: REDIS_HOST
+ value: redis
+ - name: REDIS_PORT
+ value: "6379"
+ - name: SUPERSET_ENV
+ value: local
+ image: {{ superset_docker_image_name }}:{{ superset_image_tag }}
+ name: superset
+ ports:
+ - containerPort: 8088
+ hostPort: {{ superset_host_port }}
+ resources: {}
+ restartPolicy: {{ superset_docker_restart_policy }}
+ nodeSelector:
+ master-nodes: "true"
+status: {}
diff --git a/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-service.yaml.j2 b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-service.yaml.j2
new file mode 100644
index 0000000000..66d67fa7f7
--- /dev/null
+++ b/superset-installer/etc/reflex-provisioner/roles/raf/superset/superset/templates/superset-service.yaml.j2
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+ creationTimestamp: null
+ labels:
+ service: superset
+ name: superset
+ namespace: {{ superset_kube_namespace }}
+spec:
+ ports:
+ - name: "8088"
+ protocol: TCP
+ port: 8088
+ targetPort: 8088
+ selector:
+ service: superset
+status:
+ loadBalancer: {}
diff --git a/superset/__init__.py b/superset/__init__.py
index 5ec3c94a33..5570ea642f 100644
--- a/superset/__init__.py
+++ b/superset/__init__.py
@@ -113,6 +113,13 @@ def get_manifest():
cache = utils.setup_cache(app, conf.get('CACHE_CONFIG'))
tables_cache = utils.setup_cache(app, conf.get('TABLE_NAMES_CACHE_CONFIG'))
+# For example:
+# DATAFRAME_CACHE_CONFIG = {
+# 'CACHE_TYPE': 'contrib.connectors.pandas.cache.dataframe',
+# 'CACHE_DEFAULT_TIMEOUT': 60 * 60 * 24,
+# 'CACHE_DIR': '/tmp/pandasdatasource_cache',
+# 'CACHE_THRESHOLD': 200}
+dataframe_cache = utils.setup_cache(app, conf.get('DATAFRAME_CACHE_CONFIG'))
migrate = Migrate(app, db, directory=APP_DIR + '/migrations')
diff --git a/superset/assets/backendSync.json b/superset/assets/backendSync.json
index 9b825529e9..9f562550e0 100644
--- a/superset/assets/backendSync.json
+++ b/superset/assets/backendSync.json
@@ -903,6 +903,13 @@
"description": "One or many controls to group by",
"valueKey": "column_name"
},
+ "publish_columns": {
+ "type": "SelectControl",
+ "multi": true,
+ "label": "Publish Columns",
+ "default": [],
+ "description": "Columns to publish data on click"
+ },
"dimension": {
"type": "SelectControl",
"multi": false,
@@ -1055,7 +1062,7 @@
"type": "SelectControl",
"freeForm": true,
"label": "Time Granularity",
- "default": "one day",
+ "default": "one_day",
"choices": [
[
"all",
@@ -2258,6 +2265,13 @@
"default": true,
"description": "The rich tooltip shows a list of all series for that point in time"
},
+ "chart_interactivity": {
+ "type": "CheckboxControl",
+ "label": "Interactivity",
+ "renderTrigger": true,
+ "default": false,
+ "description": "This is used for enable/disable chart click event"
+ },
"y_log_scale": {
"type": "CheckboxControl",
"label": "Y Log Scale",
@@ -2629,6 +2643,15 @@
"hidden": true,
"description": "The id of the active slice"
},
+ "linked_slice": {
+ "type": "SelectControl",
+ "multi": true,
+ "label": "Subscribe slices",
+ "validators": [
+ ],
+ "description": "Select slices to subscribe",
+ "renderTrigger": false
+ },
"cache_timeout": {
"type": "HiddenControl",
"label": "Cache Timeout (seconds)",
diff --git a/superset/assets/images/guavus_logo.svg b/superset/assets/images/guavus_logo.svg
new file mode 100644
index 0000000000..5622f2a581
--- /dev/null
+++ b/superset/assets/images/guavus_logo.svg
@@ -0,0 +1,2055 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+ <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+ <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+ <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+ <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+ <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+ <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+ <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="79px" height="20px"
+ viewBox="0 0 79 20" enable-background="new 0 0 79 20" xml:space="preserve">
+<switch>
+ <foreignObject requiredExtensions="&ns_ai;" x="0" y="0" width="1" height="1">
+ <i:pgfRef xlink:href="#adobe_illustrator_pgf">
+ </i:pgfRef>
+ </foreignObject>
+ <g i:extraneous="self">
+ <g>
+ <path fill="#F48020" d="M35.199,11.553c0,0.673-0.548,1.221-1.219,1.221c-0.674,0-1.22-0.547-1.22-1.221
+ c0-0.672,0.546-1.218,1.22-1.218C34.651,10.335,35.199,10.881,35.199,11.553"/>
+ <path fill="#FFFFFF" d="M15.042,0.568c0.176-0.031,0.375-0.056,0.6-0.071c0.225-0.017,0.415-0.024,0.575-0.024
+ c0.176,0,0.376,0.007,0.6,0.024c0.224,0.016,0.424,0.041,0.6,0.071v6.739c0,0.767,0.071,1.402,0.216,1.906
+ c0.143,0.504,0.359,0.898,0.646,1.186c0.288,0.289,0.639,0.489,1.057,0.6c0.415,0.113,0.894,0.169,1.438,0.169
+ c0.816,0,1.511-0.089,2.086-0.265V0.568c0.177-0.031,0.374-0.056,0.588-0.071c0.216-0.017,0.412-0.024,0.588-0.024
+ c0.175,0,0.372,0.007,0.587,0.024c0.216,0.016,0.412,0.041,0.587,0.071v11.918c-0.56,0.16-1.227,0.311-2.002,0.456
+ c-0.776,0.144-1.58,0.216-2.411,0.216c-0.784,0-1.522-0.068-2.219-0.203c-0.694-0.137-1.307-0.413-1.833-0.828
+ c-0.528-0.416-0.943-1-1.248-1.751c-0.303-0.751-0.456-1.742-0.456-2.974V0.568z"/>
+ <path fill="#FFFFFF" d="M39.265,0.568c0.224-0.031,0.455-0.056,0.695-0.071c0.24-0.017,0.456-0.024,0.648-0.024
+ c0.207,0,0.435,0.007,0.681,0.024c0.25,0.016,0.46,0.041,0.637,0.071l4.356,10.143l4.381-10.143
+ c0.175-0.031,0.375-0.056,0.6-0.071c0.223-0.017,0.437-0.024,0.646-0.024c0.176,0,0.375,0.007,0.6,0.024
+ c0.224,0.016,0.447,0.041,0.673,0.071l-5.795,12.304c-0.209,0.031-0.418,0.055-0.625,0.07c-0.208,0.016-0.4,0.024-0.575,0.024
+ c-0.178,0-0.364-0.008-0.567-0.024c-0.198-0.016-0.395-0.04-0.585-0.07L39.265,0.568z"/>
+ <path fill="#FFFFFF" d="M54.698,0.568c0.176-0.031,0.377-0.056,0.599-0.071c0.224-0.017,0.417-0.024,0.576-0.024
+ c0.176,0,0.377,0.007,0.6,0.024c0.225,0.016,0.424,0.041,0.601,0.071v6.739c0,0.767,0.071,1.402,0.216,1.906
+ c0.144,0.504,0.36,0.898,0.646,1.186c0.289,0.289,0.642,0.489,1.057,0.6c0.415,0.113,0.895,0.169,1.438,0.169
+ c0.816,0,1.511-0.089,2.087-0.265V0.568c0.176-0.031,0.372-0.056,0.588-0.071c0.216-0.017,0.411-0.024,0.587-0.024
+ c0.177,0,0.372,0.007,0.588,0.024c0.216,0.016,0.41,0.041,0.586,0.071v11.918c-0.559,0.16-1.226,0.311-2,0.456
+ c-0.777,0.144-1.58,0.216-2.413,0.216c-0.783,0-1.521-0.068-2.219-0.203c-0.694-0.137-1.306-0.413-1.833-0.828
+ c-0.528-0.416-0.943-1-1.246-1.751c-0.303-0.751-0.457-1.742-0.457-2.974V0.568z"/>
+ <path fill="#FFFFFF" d="M68.059,10.64c0.432,0.176,0.908,0.315,1.429,0.419c0.517,0.104,1.033,0.155,1.544,0.155
+ c0.368,0,0.72-0.04,1.056-0.119c0.334-0.08,0.627-0.2,0.874-0.361c0.249-0.159,0.449-0.354,0.602-0.587
+ c0.15-0.23,0.227-0.491,0.227-0.78c0-0.319-0.059-0.582-0.179-0.791c-0.12-0.207-0.282-0.384-0.48-0.527
+ c-0.201-0.144-0.432-0.268-0.695-0.372c-0.264-0.104-0.548-0.204-0.852-0.299l-0.839-0.312c-1.023-0.384-1.767-0.815-2.231-1.294
+ c-0.463-0.479-0.695-1.127-0.695-1.942c0-1.088,0.389-1.951,1.164-2.59c0.773-0.639,1.914-0.959,3.416-0.959
+ c0.625,0,1.238,0.06,1.836,0.18c0.6,0.12,1.123,0.261,1.57,0.419c-0.032,0.321-0.091,0.641-0.18,0.96
+ c-0.088,0.32-0.195,0.616-0.323,0.887c-0.353-0.127-0.773-0.251-1.26-0.371c-0.487-0.121-1.011-0.179-1.57-0.179
+ c-0.592,0-1.115,0.103-1.571,0.312c-0.454,0.208-0.683,0.575-0.683,1.102c0,0.272,0.056,0.504,0.168,0.696
+ c0.11,0.192,0.264,0.356,0.456,0.492s0.412,0.252,0.659,0.347c0.249,0.096,0.516,0.192,0.804,0.288l1.056,0.36
+ c0.383,0.128,0.747,0.28,1.091,0.456c0.343,0.175,0.639,0.396,0.887,0.659c0.249,0.264,0.447,0.583,0.599,0.959
+ c0.152,0.375,0.229,0.828,0.229,1.355c0,0.592-0.12,1.131-0.361,1.618c-0.241,0.489-0.581,0.904-1.02,1.247
+ c-0.44,0.344-0.971,0.612-1.593,0.806c-0.625,0.191-1.313,0.286-2.064,0.286c-0.767,0-1.438-0.052-2.015-0.156
+ c-0.575-0.104-1.111-0.243-1.605-0.42c0.03-0.319,0.1-0.642,0.203-0.971C67.814,11.285,67.93,10.96,68.059,10.64"/>
+ <path fill="#FFFFFF" d="M40.938,12.678c-0.224,0.032-0.457,0.057-0.695,0.072c-0.241,0.015-0.457,0.024-0.647,0.024
+ c-0.208,0-0.437-0.009-0.684-0.024c-0.249-0.015-0.461-0.04-0.637-0.072L33.918,2.535l-4.379,10.143
+ c-0.177,0.032-0.377,0.057-0.6,0.072c-0.224,0.015-0.439,0.024-0.648,0.024c-0.176,0-0.375-0.009-0.599-0.024
+ c-0.224-0.015-0.447-0.04-0.671-0.072l5.796-12.302c0.207-0.032,0.415-0.056,0.622-0.072c0.208-0.016,0.401-0.023,0.576-0.023
+ c0.177,0,0.363,0.007,0.565,0.023c0.199,0.016,0.395,0.041,0.586,0.072L40.938,12.678z"/>
+ <path fill="#FFFFFF" d="M8.344,11.071c-0.376,0.063-0.771,0.097-1.187,0.097c-0.559,0-1.072-0.072-1.535-0.215
+ c-0.464-0.145-0.867-0.381-1.21-0.708C4.067,9.917,3.8,9.497,3.608,8.984C3.416,8.474,3.32,7.859,3.32,7.139
+ c0-0.72,0.087-1.375,0.264-1.965c0.175-0.592,0.434-1.104,0.779-1.536C4.707,3.207,5.143,2.87,5.67,2.63
+ c0.527-0.239,1.143-0.36,1.847-0.36c0.176,0,0.332,0.004,0.468,0.013c0.137,0.008,0.272,0.016,0.408,0.024
+ S8.671,2.33,8.824,2.355C8.97,2.377,9.15,2.412,9.364,2.458v8.403C9.05,10.939,8.71,11.009,8.344,11.071 M9.819,0.425
+ C9.18,0.329,8.413,0.281,7.517,0.281c-1.023,0-1.947,0.164-2.77,0.491C3.924,1.101,3.224,1.563,2.648,2.163
+ c-0.576,0.6-1.02,1.315-1.331,2.146C1.005,5.141,0.85,6.052,0.85,7.043c0,1.15,0.168,2.114,0.503,2.89
+ c0.336,0.775,0.788,1.403,1.355,1.881c0.567,0.481,1.228,0.82,1.979,1.02c0.751,0.199,1.542,0.3,2.374,0.3
+ c0.463,0,0.883-0.024,1.259-0.072c0.367-0.047,0.714-0.11,1.044-0.187v0.507c0,0.768-0.072,1.402-0.217,1.907
+ c-0.144,0.504-0.359,0.9-0.646,1.187c-0.288,0.289-0.641,0.487-1.055,0.6c-0.416,0.112-0.896,0.167-1.439,0.167
+ c-2.268-0.011-3.733-0.923-3.733-0.923c-0.083,0.158-0.164,0.338-0.245,0.539c-0.079,0.202-0.146,0.387-0.199,0.554
+ c-0.052,0.168-0.103,0.357-0.153,0.567c-0.048,0.21-0.085,0.403-0.107,0.582c0.561,0.159,1.228,0.312,2.002,0.456
+ c0.777,0.144,1.58,0.216,2.411,0.216c0.783,0,1.522-0.068,2.218-0.203c0.695-0.137,1.307-0.413,1.834-0.828
+ c0.527-0.417,0.943-1,1.248-1.75c0.303-0.751,0.455-1.744,0.455-2.974v-1.547V1.07V0.832C11.098,0.656,10.459,0.521,9.819,0.425"
+ />
+ </g>
+ </g>
+</switch>
+<i:pgf id="adobe_illustrator_pgf">
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+80//a775Wi/5jfzn9/Amb14L8eJGN78aqf48vxquv0bbXf1G/v388O796eXz9y/fvnn27s83v6DR
+4ufHt29fydv/0nriq/uvX75/++6r47Pn/yq99dXvXr568dVvXjx//9Ob/ywX/N/yz171P33HBk58
+m7/jfFhk1KuZpEUQypajzw5rLX6031rLHOvNPz5jA7sOiyHczjHJeJfbKLK6doi80pJTvdnqbRK5
+8kbW+q00td1sWd41yLsWqV6WeLNttyKDlZvnuKxst7Jsy8223KYNl5V4i7P5btYqM7bgnNp0i4NX
+b9Z4K6tsscvq7Sz84CYm2mulVta7LeV2W2DOL/PtVqtMzXwryz7oZXm9FaVCaiUE3crdktxlXtNN
+XPSZQIhbqTdRXkOEZ71MiCGUfCPDW4KMecqI/9zgD68wS4l6I8O4ZRAWnJ6oV8230Cdu1nS7YQku
+0jVB+NXNGm6jqCc3rUbcble/KNyKAJvaYy9pQ2ozzXCGbGIp3a6hrjdhu11kPtlVSdZ5TDe4QSiV
+DyQtSlsFUbQiQcsY0JAm7MUvkrdhl/0s3CLyD1nUyu28lXCzSh8K4xOCPAXmQ0Bk7rzpddLnCQMS
+sr3GKqyk4pllxNG58n1FuCvGu9qARcx46U95VY4mWuFykHsirFcUAx2vdbuVJ7XxiuFWPsscStKv
+Qd5LLi+imdykVcZtk1uui9xE2k1yMxlavUymXJCOu8lyD9lZ2InCl1dclgA1WGQxxi1IO0lmWcht
+UgmvTGhrC7M82iwvVGXcyyrjLMMkE58zWKakcHodMXms2zRLn8sMXNELccHN5M2KXL3JnIoy2zil
+86KzjpfJACekkkNUdZYOiOg9uZc8+7zF5eZileGqf+FCPnHIy21ZkQY06zp5PRJlYiECj7OlisKG
+iGi8wcIOmNt3nTzyWLJJ9zqyckRjHBoxgt/KZ7cSZe7WhFrWjMw1vli7lxPaTMUD9Vr+Hq2dsxfz
+944BHSHDkqOseZlXr3fEVedVlFkpO3EFQTZW4RDCYjcZxUbQQZNZFmRl9Fqr3rW34wS7m17mxOV2
+EVHhprcTblcZ/eFuRtDL/JlaLX/q1s7Zu/lL/6e/l19//+SN4Zffyj7wzYtn7198/ZVcoPvB9Xp/
+80z23Lu33/z5q7f/wg3lr9+9/e6b3Q5Sb37y05t//Icre8ltmGUboYU+hFw0/D0WBsTLa6yB6KEA
+/M64qWQ9Clw3lbXc5rrJvoh1s+oE7kSkH4C/VOZJLLKjCkNLRVitdLbWQBpbxNujp2Qjk31NiDJn
+9DJZlEj7fZM3bbwRqtXgZU6Ut7HrFmzSsjGHkIwiLDAtdaDwytU28F5P5q/Wm4s+WKPUons8L3Si
+8BpO9/bGBXyv3lx0y37ZhxX9IbykLNKtwlxe74gifoBxBeGKq0i9zrgCdhyZtvZV34D+ll4FXRhl
+c2ptNILdqXU0iUEGs+BO3sysq7Xdau6rtz9Oq+QP3Jo5e63d/N/NPNlS5kCXkEj+kQCasi7J8hPD
+RYvEhnS2y4e6ysatE26RLZQ9uskbzsK5yDGxgIGt24JIF8J2l1n+um3ClytFJSHIliPbAp51DsYy
+Z2HSSRY0dwwwrSBcHHteXWWHLbIHyoIWyVt2ZNkMRKDQy7ARyMtV4RHC/2+4vckmVEX2EfVCvgs7
+CCLNyFZS62K7khDzVnQ7EeZzs0DEEZUJvbnmDQSpXmQRCvOQtWeXCVG6RRaOPL6oYbxZKiJByF5a
+VghG5/1xtsFgcWCLlftuSHX6ekfE+2JDlvfc1shphFmzCKsL6HL7/tz7OJel15GtXg==
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ ysFZ8W5kRfjgQW9FKQmmzxveCs4EfifYrW3ujrQc81EEQ7DuhW6FDZ9OkFubp5cAt+I8igFxkaqF
+ChyRNnNbkU8cR9wHIECRdnZTWnCly6UC4JZibcNqeiNbp9vI38TW5cVNEFuXu/QEsBWSXhLeLl4r
+9KKsYTSulRU0a21aK+TJiL9dsFapmDeqdTmKHaRW/B2/EqBWxuXhaQeoNSLowWlFWQ8wCDemFSV6
+XHqa0rpM8QtI63I492a0IiWgNyPiyS7YDq2qYE55vBitNJIqbPVUIkUz181oZTQbrurNaGV7a0T+
+gtGKid1sQCJaUzQnuBCt50hGtMJAAk0gWineR0ziRrTCi4kXQlkq+N/snG1EqzOz64VopefFxg9G
+tDIBiVknEK1fHLaIVX0/ROtyw5YXoRVBV+r8A9CKoGvULnA5gyk9Gdi61SyLkDIzWzFcwKA6UMNZ
+sRvzJzeblTWJcqpJZl2BVw3gqqJlF6lVry18P1Ycxmbo2TS9NGFd/EnrXFxWeuFM1weXlWsdZpaD
+y8oInkv4Nl2VUTyWRhrLyvNCqfTGstLBJXjr8469SmavJscsiJnj26ay0sI+rDeVlTuwFMZUVl40
+JhNTWfffN5WV0VwW65vKqsLcWTeVlekrFhdcVFbGvtkeboRq7ZGwM7Cs9Hyz+KqnpBCeU06byorQ
+O2uODGXlvxcRYDeUlWeEOxdQ1hRtBALKSu0+BtEbykojP2pDWWngkGIoKwczlA7cUFZ6ezjvgLLC
+wOLYgLLCQLH5DWXlmpJjv6CsFDYsRYz06xgdpvJBG8rKNSbuWlBZ8V5Dsx9QVqUWS31BWYmTANEg
+oKzKb6e+oawIzXNMuaGs5Hk0MVc1FgKxNw+TVQF9jVcbykoRA+JEAWWloQjCivgV96qK25yCdkii
+eK8NZSWWLimWN0R4S7pBN5QVegdE+oLJylTbPEhWyGAYs7iRrMBpMTu9t4LnQN6CmazIevD9uJms
+MLI1q5isYAHRHQgmK7IzDBDdTFaix7DkDCYrDPTYgslKA5TSN5OVfB6W85vJKmDPx90MJit3Y6nL
+xWRNzW5aMFlR1splRTBZ1bobCOHDZGXWiuUmZrLypKt8ATJZQW8jJ+BCssKm3zKSNRFUU+tGstKA
+sMmNZIWR1LFAsnIrXr+RrDxwEiZ+I1mR/hOmwkhWPFnSqwLJug03kvUYjWTFwRmQCNhqorw4zxeS
+FQlTOl17q6wFTBBZ998XkDVswWNNZHRBiWAe634Zbx4rE58oyw4eKyuFkZsOHiuzWAbgn97uMC65
+Z/qCkcPCqiR4rMxF6e9d5sAXvermN1UgP8JBkNCAf8X68caxkm7V5EMqeVwC9RY8VoZw5o1jJRHw
+yVLUDH0aKooPHCs/JueOrwYTVa6Bcaz4uyN/FzhWGOjp3DhWGBmnDxwrDW5FShwrDY+OU8+3kpUl
+NZCVyVVqnALICrkaK+JeQFY85m7MOnmYLOAf6gZKHivVW+SFXDxWygSyGOj6orF+VjLXPFa8dez7
+9AKywko88Aay0oJHsomstFDPdhNZeTw2Og8iKwVzLEoNIissjFtdRFY6mEx+mshKgNWg+CjAIcmg
+yAvJum0bycrJiLLMQLLyXs3yickKq14pM1lh4GJ/M1m5CSUzN5OVVj6hYLKK/jVMaRWtM2vEezFZ
+qaF7jFrqmjm7horNZCWiQNn8i8nKeC3Lk4PJyhJIStVMW+Vbz+u+mKxctKRjW9EJLQiA23ADWY/R
+nB10sBA0xDjWLz72d3XjP+5EFWXi0FhVVJ42jBXeOldYwWJFJLfXN4oVQSJW15rE2iWu3iDWqQr2
+F4f1wzbISzVRFaoJBAuDw4pVM/rz3BhWrOP6vcuAOHEzWC33fCFYUQqIGgETWNFdQxgSAVgRr2yp
+vvirUFyjwN74VYS+UDIbcFNQZaH+uOmrsE0SWQVfRZDumRu9ClE9amVu8irE2aivCPIq/l6I8Bu8
+ir9R3XuDV8mu/fgQArwK6TkEDPvUoLHlauSQxJgLgVss6irE1QVfuyu7AKVbuEEXcxXCG9KlNaCW
+pfE9iKulsyH2hVuFB5GxXDBtla3XnrJhq4Da1We+WaulSA6wUauQgjcSWV0RAQPqh16gVRihGA3O
+aiHgPh/MakFErZQ3ZbUsCUkJWUUilEhNvyjINLNDwoVYrUbLBWGVMbA1NmAVC3auay++KqITxLlE
+rOoxtMB01W6N1Q1XhY0yI7NVsc9SYlKR0sf4gYus2qxwCrBqc/e54Kq2mGoOVxWiEwbSzVWFIgLv
+qamqcA5HejFVEQhlfstI1WHCTBBVB+v8XjxV5L+zYKnEqQ6TfYKmil1AILhhqhC6MP1llipmc+CX
+jVKFCotlChdJFZeHSTpAqrh8JlAdnkT4EKHWG6OKwBtki0FRZbJa4EQm67rq9G+EajfOPwiqUSEc
+ANXu8v+bn8p+B2VtfOqu+TQ9tbAyOb3gqdXIq2CngvGJ9JjRqa1seuQmp5IjkesGpzZ3FQpuarNI
+8camwlbEP6WollCJnjc0tRVx5m9oarW+Ppip8KLYNM3JMxQ/saXfRUyl5mCUDUwFqAMfjnmpuAMQ
+Ut64VNie1TctFfTFKe0NYamFqY/0YqUGSSVQqYXV1zlIqfgz46ouUCruxiPdEDmpBa+eQCbM7xcW
+5pcXJRVFPyz7Ul1FyZo+gpGKkiJiXS9EKksActuEVIGv1gakIk/ZxwuPmrtqLIOOir/BDAk4Kv5+
+6nqxUTPyIE87aFSAhdRferAlbOWHfoNRyUe3DVxU6DeQ4wsuKl7WLL7pxqI2kI2eQ0XF3AinMKCo
+iA89QqluJupiyXg6SNTKgstDRMW4pdfoAFGbaDcbiJo8ZZqHilehphcNFW8Q3I2AoUI2ifRFwFAx
+K/JyLxYqIAmQPwQKFQFEpSgx0SDJnscnECrEM+1wULFm148Q/MLOmyW/KagfLxZYExuCar3oZqBC
+1lvLG4GK8EOph4CKqaMc/ikynKm/8aeIPq956Kd4Vdk1wPDTj4m/qiDysE+LnJdAn2bPzEE+ZVUv
+3qILfAptRR8be4oFBEF4QT1FJdCTPkFPwX+vm3mKRNkjlwpDJ5cuFMteyNMH1CC2KzfyFDFEN1qW
+cORhpascys08RTRdsGhDT2EQGd5sni9+7vd0ojFsDq9Pg3kKVQAEV4E8DXJSEE+Ru5qClG7gKVbi
+UEEG7xQVz9CJBO6UwIG6XrRTjELwFQw7bQY1BusUf4/5Ip02Z7gDdIrsIOLuwTklPAQq3gtz2ppg
+IxEoBiEJ3kbwS8H7cH5qQ05n2hlQ2rBY5h1Q0SLINFiN34RT2HAjA3C6TNk33xRgSP3rppsiko1Z
+L+CmKIJhYMvbIHGGzNKNNp1TXT2DbBpcz0CWjql0xc01RXgN/kXY+pQONKim8fcNNQ1bME2HZ9eg
+lY6uReSNNIXAski9RdtMCq0G0HT/ffFMwxY4UyJYV90002GCwg0zhcKUIBOzTMEzQ6A3WKbkm+Xx
+QpkOt6INkumw1iW4pXi1Sx4vjilYoKafUuc1DfMOiimEbgHtDIgp4mtF8ULGIvh3ORBTxhHTC2E6
+zZgJgul0p50AmLqv7Y0vZcyy1aCXMscpcBLnOuVA680uDWhPoEvndC+YIJdOf3wvcOlkNlLyLdck
+scIluKX4OytcvLGltKW5qaVAvUK0ENBSlKfAB7uZpes0DGNhF0mwIwWylEUe+QUsBR0IUaDgleKd
+k2zeuNLo/Puilc7gLwasdMVqJVilrLpq840qNYh2g0pxPqsfTClqTliId1NKERYkqTrzPqkqIRil
++wgXoXRGDtGA0ukUS+BI49O+8aRQPQp+KjrpTLpxmzo6qgFkN5y0Byk0jMi0kL5pNCnFw7O+yaTD
+Pak3mJRYjF4Ol3Q8p/w0lL3jOQWoIqs9buwRUNIPg8oybyZpd7R3I0n7E3WTrrrdhgtIemzikXbz
+WTYPc2RV97xwpJSs1G8bRoqqkqC40amoLn56oUjrisJgk0gpT+/RcEnC8ujwtHOGyO6kogigjj0D
+vGeoRnXi+8UgbdYLbAQpklqtbQDpCAjuzR9F/hAq8sCPcjXkjVAaSgCioWihokA1UDHnjtW1NUvF
+tNGjNaulxYs8WrG4Do4pbjQMKok2eLRazndzR9HvTmftZFvkeoI6+tk5+fE7Oj5/Bx39K6GjbL9E
+kQFG0o8xVpLZ0tycllC7ntyVaWk7vqJYSTBeTkMogqHNmtPN3cnQfeL4U6srUHVF6F1dS0KtRZKr
+w+A2NHUekdSdcxgGb6z3Mv6JNaXPgQWIywwYHZZDsFDjJZT1I1qAOlUt+prt7PkgYUtKOFYmXFEa
+XJ7GlEU05+UgX1xlS1NnMoHSIWQYq4/EdxqjCnRQxHWhFBc+oZaP7iqQWdeKu0A28FDXZ9VutiRH
+B41sT4/7Y80K5KTmCkpYWP7OTCuZWbCUdPYkQ47W1gUadtsKrElxwbBQxokI9Awuf3NLafZ4xbKX
+XdsXzxbreQbaH42a7Ccb+fdelU9lZzgWzrOOKamB7sdc3NgtnEhGtJOL2iW2GO9cQGIeYVVDFb4Z
+TYmJGmX7HQrfQfKJhZK69FRbh9vrMOkCC0KX/Lvq7xqMRRqn+mk3dsrp7q0FS2/R7weRZVp6Ob3h
+xWeDhJZaKjxydWF6hAFN3Xl17Rk5MS4vkrZ72AgDitjMBtnou85mVF25drwEdZophZYDZKHyMSF0
+jaYDIqlh+iG9YLpiDLeQj1sJBotBeWPVoWo4Uop4LL/V6U+JlhRnC6/P+yHzgb9Zk8Ljs/gfFgzw
+sKSgBuC7ZTE1nriP31VXhrei4AkAqj4lZR6XVISrH6in2YAYn5fKdDMtdbGhsttC4bMZ05M1rBRs
+0AqgHy2Dv9BJrKIBTnVmQcXuOfioEhpWMpiyavh1KIb98uMWl7JEofdyfSes0sYRaGq4virEcUHQ
+bWXJchyveEIGjeOpfSRiJew4gFE5qyk1e6MD6b5vLa1AjsLK14XvDXN0WDIvdux2+SK3eRyFYBds
+NnMcCkNxO5H98QuJb1yT9DGNeUYRNnBG7TPbPjBgSN8B8Qo8ncrBb5itAlgARgddZyHVjc0XULuB
+HbXZNAOOj5XfwVL9iZ7JkoYrccGT3JCauBhoHvS3hG74O8Xdeay1TWTsej9RTmI/F9XvI//s50HR
+A78pPN/dCQInSr9nWRqc5hJlSReY/INY3hLhBDbEIpeRpSt+i4CCADuf33z8JL9K9I9b+fH7x2kP
+OrEn6QXXsQYGHBfFsrsmSUKwIu+H31T3ycFMdqFFPiY1Zyv2zKZnQInFFmOrmNMPZC1bc80SXMmk
+ZKXGLTfhwEumZB1r7YYGuoKAHMZ59QZt/RrxYKXisRHbjb91DphPiEfplv7SUmKKRuki1zW0Isne
+3deNR2KIkPNI/GIJakPPSpYl+sz8MtxZji1ZsDJBpAixKrytJBRz8BldanU2L2G7AA==
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 8H99Ouoxvh7PMV+Pch/1fuhf7oFvzvXc7tn6esZntj5vwzVbX8Z7tr7MZ7Y+R71m63MGr9n6PON7
+2/023Ec9xvsMLvM52+t9PNf19R58eXNeN+d6xpcrs9+G25U5xpcrc8znMs5Rrws+Z/C6OecZ39vu
+t+E+6jG+Hs8xX4/yvI/XQ/9yD37+7IOwicHHOXzyQcL88isGk+yfHBMU0UmR8TZbkvc+KouX1tsD
+COMnH+TedvsV91GP8XUGx3yd7TnqdV1f7sHffJ48c+/rvh5P4fr941NcZ3oZ76u6zOcOXEc99+o6
+g/u+Hk/h3nb7FPdRj/F1Bsd8ne056nVdX+7B95knz/z7urfHW7jO4fgV19lexvvKLvO5C9dRz/26
+zuC+t8dbuLfdfsV91GN8ncExX2d7jnpd15d78Dd/Z893MFGxUr6MBWF+fd/oMZnsEhxjFw7k01gA
+7EN9xnssYBYk1feXGMZPY8G97f6+76Me4+sMjvk623PU67q+3IPvvR553dvz5V7ncL7x62wv431l
+l/ncheuo535dZ3Df2/Pl3tvub/w+6jG+zuCYr7M9R72u68s9+J7rkdd9PV/t9fvn+77O9DLeV3WZ
+zx24jnru1XUG9309X+297f6+76Me4+sMjvk623PU67q+3ANP7ujvhyTOJ8+niaD/yX2yyv3taB3j
+yyk75uOjnKNe3sw5g5fn8/XEHBJpXxx8HrZ8Wv3wBLR0uNYTx/haexzzccXPUS+nvX3x7V+ng1P8
+lwq3/uM//Mkr2PpfEoMtf7MYrO/Yp0DsibfiDfsNY+z705ejXeHYv2nAEANn1wKe6pdyJo/MeF+Y
+PSEAWumldmqfjFiW13YmD5uxhB/12/uoTRKA9xnYuCePNcanbYfU3u+jHuPrDI75Ottz1Ou6vtyD
+7zd54N8/3VsM8yBhvM6hsE1je5/tZbyv7DKfu3Ad9dyv6wzue1sstn1vO6VWex/1GF9ncMzX2Z6j
+Xtf15R58l8mDpRuf7iuG+ZE/vbOYEFL59M5exvuqLvO5A9dRz726zuC+rxjma++ftp3Kmb6Peoyv
+Mzjm62zPUa/r+nIPvl8wC/VRHj/LOiEJqAyP+XcKM+RRYzgv45PRyOAdkrD5UdnI66gcvtP89jqD
+MO6QBKSL722LNLHvox7jfQaX+ZztOep1XV/vwRWSaHJ+75uD4EFqnw6CMAP0KK+fu4z3qV3mcxnn
+qNcFnzN43RwED+Zcn7YtKgx7H/UYX4/nmK9HuY96P/Qv9+A7rLr3yxE5y8viKf/9Eto5eD8sGz+9
+Lve2+xW4j3qM6fO7uk6aaj+iOMXLcg52vQrnZ69bdp/idXuvbfeDuI96jOnzG+NT/J5f/vDPffry
+w/y6Q/A6oQp6G33Bn+7m8M15HfVTMFJn8CUYqUf5KRipp3Yf9RjvM7jM52yv8eRc19d78OXLf92c
+6xs9BznP5vq5y3if2mU+l3GO+ikYqTP4EozUS/QpGFk/35zL+Ho8x3w9yjOeXA/9yz34DlN5knzx
+033N7uH5vq/uYfe+r8f4uq/HfO7AOeqnfLXO4Eu++n1iV7569L3AiDkAx075Nvss+myf5oBjfM0B
+x3xG63PUa1w/Z/CaA76e2HcaF7Z3POz1fVohhPnl9Q87g2+jncFPKwQG2MoONfuodnLfZ2DjpxXC
+ve32+u+jHuPrDI75Ottz1Ou6vtyD7xNqlmf8uq/Hj79+/3j815lexvuqLvO5A9dRz726zuC+r8eP
+v7fdHv991GN8ncExX2d7jnpd15d78N1CzfaOX/f2+PLXORyv/zrby3hf2WU+d+E66rlf1xnc9/b4
+8ve22+u/j3qMrzM45utsz1Gv6/pyD75PqLlHKG6O1D+PBWF+fd8MhOX5yYigWZufxwIE2NBQ6H1U
+hOLe36FMn8aBs93+su/jHePrt4/5Os9zzOuKvlz9944TvO7q+Wavczhf93W2l/G+sst87sJ11Lhb
+1++fu3q+17Pd/q7v4x3j67eP+TrPc8zrir5c/feMELzu6PlSr98/3/R1ppfxvqrLfO7AddS4U9fv
+nzt6vtKz3f6a7+Md4+u3j/k6z3PM64q+XP3Pf/0Y6L/8wx/++Jff/8m38Yp//jUioKUDLMXa/wWc
+A/A0H0+htAnG67jNP30yt4+VTx803wf5DfM+yB94et9Dpfo6G9QLrXXOHXkmmjOQ6DaO7m0fAKtl
+bM9qMiZUeP/oA/SnetuKiqXPF++f+wnu5sc/DFEC4BH+/VH69Hmg2iVlmSf2lLGXjxdRP4kaAxk/
+FhQ+jzpLnMdAKah/EP0qbUP9ki4OVTUypvH4BFZaZ/8HZBedwHzimhdaDupGMOgvo4+Z6nUbFl5h
+37JcvCXeaP9+tunDj/f9RiVx7E1Gom5Ka3Giz9hGlOL5kny7gfgb5+LRI9knX8vetA3vf67+0+3/
+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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ bj89FSiOVWN5UDh/igbH8M0mFYLYNDroLogTQOBYBAnHUhCSJniZdnl3Mi25hZFlQoVUEzoD3uQ5
+sGyBO35VCGoL5amoylTDq0FlrIIeQCpR3QO9oIoKHj8n+h2DEvUu1gpKWsQbAPzuRLkj+8iVqW6n
+NFtdATH8Lcqw4NDLGRAVO4Ykel2sxZQL3gigd+8vcodYxupJwjIGCWms+QjxQTtKWMY6VMIyVrSk
+FqtigpcBCcsEFFmWgDxpjFiI55cnLAstTFjGREgtoZzxJgBm2Tx3GrpbwjIGCWms7AjxrBElPGPF
+KeEZa1dSLahfgjc8JxxjSGRYhHi6GKlQzi9O+MXNSxjGJEg1oZsRJwBm2DxvGspaOi0DKE6fsM7G
+CRbUn4RhrCUlDGNVSqqxsiWIGZCwTECRZwnI08aIhXp+eTovQxPTiRnIiBOTaZeJGQEyMef4k2pn
+kWdaOOQpY22GSWeFJzJM1KLIMNGdGCTaFaMVQGRYBAnDUhDRJYiZcnl5ZBi3MPKLaWCIjuwjrMlz
+YNY8X1J1LPKKIUwUqzFMNWs6kVesDkVWscbEENaoGCc/Rz4JRNiUQIgexsn08lsjj7hlkUfcdoYI
+tQFn8hx4NM+PVP+KPGII01OJ2Pf0snITeRQUoMgiVpEYwioUo+TnyCKBCIsSCJHDOJnc8NLIIW5X
+5FAVBTdBhNaAMnkOHJrnRqpwRQ4xhMlhRUVmXNBlIodY4YksYp1I6gSdSXCG58gigQiLEoj3ygac
+TC+/NZlpoWWRR9x2qcPUMs74HHg0z4+Lj/a+q63K3Du8v9GOJbArBLbjF9yTtF4LK6vceg34J8AA
+HFIq7mG2qkUO6VCT/7bZ14TeUW9nY7P7dJ/uc+2fH//0d37+138kD7/7i7919tA//Ob53/q7P//Z
+j5eX+8Xf+0V8+u2f/85PW5RLXvq//NGf/Mk/+6c/8Q+//NWf/fpf/W/n/qfX//u/+vWf/uqXny0t
+9+t/9+s/kKc//tM/aVEu+fzsV7iL+y9/Rg9/kx7+z7/lf/o7/xqf/vCnq8o1n/7wty8rl3z+7p8j
+/N/9Hj38Hj38+d/3P/2Dv8CnP/3FqnLNp8vLJZ9/9B8Q/h//UfLw//iH7/zj/4hPf/EPV5VrPl1e
+Lvn84/+E8P/3HycP/+H3/U//Iz39+99fVa75dHm5i98a6rfGdoW3/sN/TzxI2RN41XxaUm5prQvK
+JR/f+//279LD7/3bZFw0n5aUW1rrgnLJ52/8AQ37v04PYQ6Egd54WlJuaa0LyiWfH/3yX/zZn/3B
+//xX6OHzfwrz/Y9++fl3Fp/myv3q13/x6z9cVuuCcunnr/7057/z3zP4s5/+TpRtzadGuR//DCTd
+/7C01gXluk/36T7dp/t0n+7TfbpP9+k+3af7dJ/u0326T/fpPt2n+3Sf7tN9uk/36T7dp/t0n+7T
+fbpP9+k+3af7rPj8+Kc///nPQszYd/7KT3/39/72m4f89Ns//92f/tXl5X7x93/xNz9fs1zy0l/+
+8Z/+6R//Ux//9fkvf/Vnf/6v/9cQ3fo5/vTP/8lnS8v9+i9+/St5alcu+fz0n2MU3a98gN1PKabu
+/wrRrf7pj357STl6aNa6vFzy8fGDf57GD/753/M/LYla/fOl8YgtyyUfHx75H3z86e83olt/fzFq
+tVGu+XR5ueTz+xQK+p8ujTNdUm5prQvK3fhbGxwJcar/4DuLT0vKLa11Qbnk8wvf+34o+N7/v3/3
+O4tPS8otrXVBueTzMxrcfxziuP8FfP///tnf+M7i02I5mRFtyyWfv/LLP/g3/+YPfunn8U/+yR/8
+m3/1f/xPQZY0nubK/dGf/PpP/nBZrQvKpZ/P/sbf+Ts//Tw+/O2//vl3lj01y/32z3/vd3+2tNYF
+5bpP9+k+2/T5tqcnpNSEyxKszUFbp1gLSQXnkqx56BXSrPmK84nW5qBrpFrDmgvJ1jytV0m3tox3
+iG9M5185dV4VmB1SQGIiNqi4JBXbHLR9MjaouCQdG0CvmJCNai6kZJuDtk/KRnTNp2Uj4FUSsy3j
+3WqmL0vYNgddI2Ub1FyStI2gV0jbRvXmE7c1ge1TtxFRC8nbCHqV9G3LOHcBl5ekdZuDrpHYDWou
+Se1G0Csld6OaC+nd5qDtE7wRYQsp3gh6lSRvy7i3mtNLkr81ga3TvwH2JQngEHq1FHBYczEJ3By0
+fRo4EJSLieCQ1PVTwS3h2moGL0kR1wS2ThKHFyEspInDi+CukCgOqy2kimsC2yaLQ2oW0sUhcP2E
+cUu4tZqxSxLJNYGtU8lhNt75ZHIIu0I6OcwKvJBQrglsmVIOaVlIKofA9dPKLeHVBVrFYrq5JrB1
+wjmotphyjoDrJ52javNp55rAtonniJr51HMEXDv53BJuXbSmLSSlS4BrpKVLdOKYXiZRiddJTZeo
+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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ /4MY8t4cJdkNaiAfWwZlHFJrEQbWPUsw4SPKkEezpAMxyUFbviwKp6uIjv5RBk+CeZv5hf2O8/MF
+9RnifxxXUF2/m93V6xfQ5hdTeMxuhsh5vXUhlvf1G2P+JJGFR2K5AKNjhe+KIyifF3ZXibWfXIuz
+dL4yWWTCWdXn3/Upb0t3cG4eFU7emPJM4VE+cae7z5lYZtUTXVY9r2Wz6mEdVY9vFeuWn4+nRgJq
+QzYRMERUjz3tXsvIh1EI7DCeRDlB/lFoR4/saddM+h3VtpNU4nyc7dSau+tPzWjF8OTYo7vG2SpS
+V09Dym6C7UBKccusjFbMMKv+ZSqkrP6SGi0DlrvxWhOy0zDAOxDOPRhoq4mhkc/foiEY3EPJYZkS
+E7q9F67hMZA8/x8JQzlb6c9x/FDlHAMn46SOPTDaKzA7UJjuhl2e2LLctSte5c5d6sBWtncfFq5r
+GaATt3QC/fMUN2xSLLEFaMZI+dRuOYFixgVF/8CC6onoZd6A+WlacJk3Lq60IRnGhecyr9qOLFvt
+zJwmmaP689v0khe2vCR6xHcWX16SXnWVF+ZV9QykmS/oaJg8+Ix6Z/BmnuaOZskXXGd9q4gmtfW9
+JzvZ71XNetqGWGdj3fC6DGl+dOJoKy+ulfF4celgSM4Onbp0vqC3FYQo39WxWOXzm1ZwFHR1LNZY
+v+rljw6KcPIGwG5GHsaFPozgBZjZoKw7LnWHVwHWdA9i1pmk0avbmGKt6RYpZtZoa45rYs7DvInT
+pcB1np390Ts27b/AeGp2waCTQ2troJnCw6d/hR4zONj2Ujk/2t2aVBYefvfWC5TJfuzSStbQlkld
+pw2KxNenTnM35DX40HxLK3WyM80sr0wj2DuGNYtSsJWX1cuUnbmHeJaBKJy8PJQVWsDTQCy+5d9o
+skLsDQMhMXLcwUR91FDq+mmNmJxsSpoPGWlne5iXWSdlSGjDr2PE8+U1EDgkNcAT9Lv4MLbqw0FA
+jt3dDl9wnUEF/qgAzNoSidzLPOhulr0qgGNdAXiN953nF/ZAcp83opt8hdX5DKsnr+f6vo/Rpt79
+NpiqNKfLL7OqrhlMZ+FsAx+HmBx4/5P1yp/KjpUbsbyLuGPYg6MkINaaIm4ilibi+A12Tx6kzQJ+
+guZiFnHbqHt1dgm4dtdbhsQtl3BiTclaR+OWkrVkSH5OzB68Q1C8OiULUzMIkrL6a6dJTtC5hDOv
+6Q0tSrIO5WRhNst/SG8AH/wyeEL4pMrSanlfK4tNdcj7+IJuWbqfE7S529wo74PIsjrXZ1EFDvka
+RB3BEycb9KYp0zAxudK5hdWVBj5wTiYqOtmDM42ofGp1pdehHfHH8HiC7uPxml9gj27FsIUjDLHY
+Wobw1OIJ/01eMldR96mt5vNT3fhp9uUP2ejJqdXuOU3IF3ThdOAds9H7iwI4ug3yvhVr7o0wrRVJ
+ep/F1Dn5skAdi6FbZYeMviyZi8HUoc2qsPH8BpoVtHlhBkepM3ByEcaTWi/nvTznhxs7a2feFfW8
+BQnAnPKtdtlWElk45VsRsDWEzz5eAqHxBTfepMCr5m7yfJ7hmAPJ9Uaj7IkTOJtKIIGiRZM6FFUn
+rwNnfbunxfs2wEw7hOsZUfP+YBh7F4mI2eMs4mOqW9lhKOLDp77gajH0YG4QMCa19h6fgxOBznLG
+PJHS4H5mfk1WzKrRZoPokkabDawbeB40mm2GpAiEyf1uqtFudY2mRq/rePBWYKs1ms/jDhIC9neN
+pkll9W68BY0Gq2an0daWfYCzvkZbyl0QOJtrNARl871XDMdlNyhRiGi7OGlf0M4bMBmhu7FbBG3c
+OrT3UbjEtfm8JcQ8S7lx1LbpBqxqX97Dv85qyKNnVgQ5v5jbCTPJwK+nZgHYnX8tJesLOqrZP55+
+MAvzHY6lTZH4XxwUWDXLoSYnDbMajjfX3hEKzsMAnM2PQGAoDgG1Zed9NRzzprvH9LLNbgIGto1c
+NbGFML848i7M1hBak5v49wYmbe9ezzaO+B7uvWazDLkLR2t4v5Z/756DRcA29++ff+1s4bpWDK3a
++imtZSuG4Gzi3xugaLbw71YMw7Hx7+2gaNGrAxyv1tDdFmIN8/y7sTU02cKWdZ8YY4HWrRxHQvrH
+9hyWYitNh6f0YxiOvkBr6rIkRlImPOy+PTxskqu25PkB2KbSbRiXjWy7n7V2oZgnd1ddSYTFKSKC
+tUx5knOX3dMi0PMu7ZK58nCczjIkR47AZ3tWipfVMBVTySWzVEylPcWVHgwTU3joOR7Pcz655hDv
+w8gYb6T0IFyd2fZO2wIwx70bLdvj9UA9AGP39k/r28iQAMXE9VwMhzOIaCVbKU85WALMQdibrodv
+CUf41Py9p0F55Igl4VIsMhFd3Z5l+bORbWShrAGulpt9+JOjq5Y/cfda9ifz7CuqmyvbVdCRL7ds
+XkNntGLLFXSWiqE/19C5V9BhnbyFGjpHpLiCzrFacM0aOvcKOmO14CY1dO4VdCavb4MaOvcKOlO1
+4AY1dO4VdC7VgmvV0LlX0OFqwS3U0Ln3U2qrN66hWxJcUwWdFllsWEPnXkGH/bHVNXSmA8kuFWaX
+4Yqdt+18Bt65Eshy2MXDkGwzvaXVB7dj3uqlKpYY+c+HYUtW79cmOeA10/tUMlv79ZbOsMdXsh7Y
++DOd9mMmdjXXimo2PuKlGKz/3b9blUQx7/G5AXM/h+VtfjjXt6pyzvP8LJmrZXnxTvT0+kNyqHxc
+kblyG5JdyRyay1pFc550TdlyFEQ/27NeAdV8raMg5PyY7WGQ9dPGTklj/GWwjfNVzWTAfWo+j8Vu
+5pOQ6yYGMSfDmm+aMSbFbk7bNuYoaVWxm3N86r7hYNCWZdfDIKbQdFUYUrZUM5gqhb0BMx/Bopd3
+bDrM76rKR286q11ZK+jFUukU9nZY5yOUa5WY4tq3M49Vh6tjeyCW3V625o8tp85WJQ4H0sSSJoF3
+b20Pzf5hx6rq6HY5VoEZPCVrHdhKt8tzHd9i1Rn4Ner4OqvqXwKmpJVzaZpzEYy7K718Bj58+Blw
+GlTOrkTTef1WnoH3fIqgVzVnMG3Xz2sdnzRdVRPjxgzm0+kI2NYqRKf6zodTZco6wFZzvHeKmROs
+G1JsZZmo90nqGu1PFDMnfpnCQzNpPuhUsxyst6nk8ubLLuV8l8MsTdSv7fOW7vVyFhAOAAa7Zots
+A+KNeaXRP2+u0l3zEOxpEd+KYO+j5jnYcwJgPaP4BxCrPo0C66x9VcNbqdyfVqhFrbYvqktjLxao
+xG11ksHnmpJGVWkOQdwS27vVyPlWlDl72PLEE3L/5IlvKbxy8SMzs6Wj/JHS3APJDTsjTpz8fbxe
+escmVCKe0ooCuSWt41wRNbe15n/wx469Srwu747+2Pfxeukd5zI76wmiP9Ppc0WmwWcJJZxZYM2M
+jGlIpnpkGBSzTvrDZUhmYV5txVzoxHkdkvvp9NVFcW5Dsn67I2XJ/5KSpG1kZE5wRmbDU2rgCe95
+yMgoe3wrynP2MqnQJhkZQ7x/snlGBgBEXE53rFGG9peMzFK14OYZGVSGZsnIOFWkrqrP49bKyNjm
++U88lOd4K85BJXogcKs52dvxPXRVB2V2lk91Z9n53LgXZ5k9uo0HPDCDe03i5HQ7JxnQumSuwttJ
+6sDUMpEVZ3q9lKH98QC70b6gAjLn7NIa5WNLRxdsqwVX1dWtfWh2+YQqrqvzeF7Pta7OUDrqUim8
+Ogl66vqRKoP0GnxL16N6l8vfIkVtHg2dWvPudDBpO/VwCMs2ztS518Ot//2xv9TD2Z2CvvzZdj3c
+BnUWa9TDuZ1Q3V49HMpabyiBHurhbL4I6ljE9fd6ONNpKPWd8Lbr4azfHSUVcduuh1v5lYCt1MOZ
+dqw8HLX8Wz2cNRZz2tZBlWybV9YjA7e1M5EAynwm0sm39HIm8m7s6UzkKtmfDdhN3YAiPiCxeTU6
+hpNYtfoe4XipI3GEQvwxDGcLlVxLJxlczsCv1miouM45IbZ83tlwl43Diefwb2zpxHP4d8VCWITQ
+MdvzcLeJGOrFR4aswqZiCMBcPytjp8ccxbA58SqGLt44ovd68aIto23na8AYznri41CPDHC2UghZ
+SnuzYivhOH8S2OFrWk7HrJc/Cbzya2jmrLTla43RxHIOCxWfuX/YaWVArVWk0rt/PSBimLPTh4X/
+VJHa3m15KCL1WJHa3u14SRmsKPXbSkXq8+92KlIRnG1UpKJ6sc0rUhGUbVSkIjjePgNtCYntzvVh
+AXH+aOrah4yiSWX1zWL4sLEYWkrh7PXYtkvh8Hl+1xM92yiFs12XrZfC/T1vaaaYe+y+Rly5QSmc
+8RtEuBjuXymFs8kq/AulcPb5MY/xWdPNMTSqAuP3k90Knz4dz6p6+SK82R8rplaERV4PeiFQvKeM
+oocEMgLm/GW7NX2YpY8Mr7u5YKhGb3rcwnH7Oi+ocjuTp2NZXdxsrat7dvwcjtU4qNlRG/Ogyy+6
+NS5hh09ZA3zFZfbiszq8a7dKgd6iXJH3cq+VRvaynEvPw6D5K40jsYmvDS89lqe5fE1onBQLqW6x
+WEifoksIbiaqOQoOzUNWMk7mWiy7qjMUJSk1Sk/OdWfSVebSyF7mYrf97sWZMflsQMp/xoIH/rFT
+hR3XfHArduulHZFSlUbBrcIuePF11nZC+uaCtJqUDUittViZ+MyQhbMWu3EPn3XtZkJLCdhuxK3Y
+jU5ZkJrv49v/caqwEwKBX2Hx7FTs9uRWdfbjXmE3bjQckYbq/c+eE9K++318Vw/OSMvnT1VH8u6N
+2P2WE9Irc4UdXlUQWGXW+JfC5xmP/fbt+pGsgqkn91z3BJGLXpJ+iumsCzaO6LkaJWUri6HVoLrl
+jj0cuTV7sPERmYtpj+gyNN5Oac/qE6rWrInzPVa/HoZk2BdzGdSqw6mrznmQ6HWbN8nZXTti800V
+D9klt5vk1srCPZU8H5FcUQ2Jvwm5xrm+VZfIuZ7r885PKy6Rc5yf3b1vqy4b8Tq/1XcNeCb6qntG
+LN9S2+D+OO/yUu07X0TkeNzV6wV07pnev1TT/S0Ps241nV0coN7Fub1qOo/fh9mwms4uJ2iVl82r
+6exq6f5a+ehcTWeXi7c/ab9JNZ2JLIrM2n5/bKNqOjtQK74Q8odquj9a5DWr6ez2aTRbubVqOrta
+OmO8v51qOrtaOo9ne9aoprPLtas3sG+vms5udXGmd6vVdHbOjfHs6Haq6exq6Ry+Nr9BNd3ykD4D
+zp7SX6vp7JxTX3Db1XR262dzGmrDajorqJV3Cv+pms7Jt9xuNZ13im1STWcBZd0T31I13Z8otnY1
+nWuN1daq6exrq7ddTWcHALBsuZrObrfEcgZ+C9V0durBHL1uo5puxc7IlqrpVtuXbVTT2RFD98a3
+VU23qpJrO9V0drV0jvfxbR4AJvUA0HS/2FqfbnK+xWv5kkrr3RweC59+Vwi7ifjc2A==
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ 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
+ ]]>
+ <![CDATA[
+ BNrYC/MYZ7TqIpJAVUGrVl1vNOgQaBRgXkaaQ5NExE1bGRHEUtUq6gJCG8tQBhUCDTwtmFQINAky
+bdGn0CgJkmjqB8Zf4AygwO6LssWLgEZO5k0uIDQJkiybRg8CIAgWjtEbDVYdGjHzGKw6Gi9H0Uar
+jqghaOKtyLKItKAkG606WheJF4zWGi0fjxnLYNVhlQWRMll/xB8so/kIyKojxmI5zmzVgQV5zmjT
+QWBkRmIMNh2JGqUGNIpN14RWM+nQwvGS0aJDC81zqsdKLDpSJUQhaBZdVzmaRTc06RZ9WTVhjSVK
+ECXICltiQv/gRk6m1KiGFhDNgSCCoIwGZg+xlSirBgsxOS/jEUoobuQ4VRaA1KiJjBlaGBrxkgQm
+kWUYQxN6k0Z04iz9QEuqwEQeJFLCy6xKFuh2/Cp4dIzaj6LR4KAJXCvVkZdJiywwigIRgQr4TXAQ
+aTWiA0MBSw9NEFypnpSEdBQ08WqYQHOi+qZIszJZClAlPO4mylgm0eoAjS1NrCAx6qtaI8VJEunH
+YoWB9KIk0LhJoGkl/AGmFJRXOSWyAQssUgLuxzKyEjlhfw810SyZFShenmIVIslEcyGjjDx21CTI
+stIkSkh8ESlZXvEGBVEZMIiFiHUGstMiJ+KlAYUkKjwmcjRuIgEEMgGihKUc1h5MH00aKRRrISkH
++jNE+YJVlhiasJeI/Q5kgHmax008TXwuDkVSWMglMh3cxsgM6gZ+NU3QIk1hbgFFwVJYUA2NwFQc
+1lQSCg5QCzhtoqwwOYkgkGOKAtkuGS2v+poChUlOGawi/CVhuoEF4gxNZLVA+jhTPxgkq+pClsNN
+nKpYkGZFPjJ6FcVLqg0AZx+68SlYTqUJ6MfgJolSAzQ8BfQmj6jFK5OgKNJPpFllXjxpwNqDzJ3V
+XuRZQSAkAu+a9OMYwiAgnVjq0TAoEiEDIcEjVUYrcyQNAkwgSwKeFQ+zVV4VeRo3qZEGnUJMRkjE
+85yCAZMBU42lFAwgWIS6nEgzhiaiMCSRxMlaPwRXUFYZx/tkrWSlF84nEC3FEXULjYLMkX4MTRQc
+qBgBsZapiZcUKhkbQVCVV0mkDyxIEQmkQHUQ5c0iI8SoWGUiDCDGokh0o8Dp3EuTJiWEgCZRVAas
+aUxolGlWwHNliHIEWaAYmcVNHJkqB0aEU14UyTiAyxiKSDioSJo0sVi5I+aliKMGBp0GgSzilWGV
+NASRvyHRXCQZBW0y0tZoUcEPUSSX4rEOASA80TTEmyYcIsqs0o1D7g/iJGxZiRpgUDoNMRcrKk2g
+XxiVLyVe0T4wco4wtMRp2ocScZPMCorikjiBvCqoTgEoQgbpHNREC7waAYsca2pCKoFWX9UbRZl0
+ozg1EcSyJvnDdlKS1OEKrJIbAj4mogvmSTGBIoPcK0QPMgMUHwq8rBAJJEBp5Gi8WuCZ0WqaA6lj
+rNyJA2eIR2AFlUyWoHGvJh6aVyNhB8SS00CsKmBx070k5DmTOIshq4uawBixCgJK1cY8KykxlSSL
+RGlTlOL9gERKWBvzlKhEVDyxJ6gNeTQkUSsgUkKTQImKCZc5xFnQJBLbjCJtmqhUrMc5hboMoiBq
+Ug0byjHs2Pg0KAOLkgayGk9iUv7gNsWKowHTCC1KQWgkx34CTlNwjJpr5pUMhD5RFAninIfibWoJ
+adDdMs8YmkjoyEoiY+kHvopogiapkb6GEpqUlJ02MGgCSRONw+ckLR+lTLOIk+WyqrN5UFwofcHK
+htXDHYe4kRVoyQgQmiCEEIxoWeQdy8axsShM41njDFjkRJqy9qiJkWkzOaCNpk00YlhYUJrnTcBE
+NWrRUUKMKKiMpYwLhFxLnymjBweIoXgLORji1RIjDBjQ1DmjscZiiJoY4pWhJoYiGwUcqyZIWIpj
+lL0IHKwodh6JPDSBXZWMpp8DNU1zgtlFgEaQZs7SjxVFzgQNjKmopto1rEgtS5JpdKCVRTVXo8wB
+wghBMEy1ayMJKBSILXwMLaG3tGw0eJ8gIzQshyCp2UYWGUsaeaSMGq4IpAV0hzkuptE2gmSMi2mk
+j3mj987QWmIGBxYMVmc0in0kNWKnQFVAQIDcMEX78mhoqAkbK9wEc8euCI3iVsHkl9OwFhSlbBvg
+LClqAp2n+Nvgt2FbSbP6FgRxaWmWEJYYFWQNzU00SLLyptqIdmuUfhwlqu4rSnihJsVBhkUXWVZ5
+U92LQk+RA4BmQEuKm0AJMpkpK2DtC06HwBK7iChCEYvHgNlCwTKiG8coLpwkIrcR0VdQ/R+BJd4l
+rANNMj3IE5MxVrTFw6qeE8WTRaZVfxA3dTEzCDIjW/qBq6P1Q4JIK0QlTRLZdgPmgtWilUYZ+fjQ
+xPCCilVG9gKxoMwovXAygLzKM6KiwFgIi3E/QaQVFCyLpyqlJIZVvFDFv6RR3CqrbUisGBppW0p5
+EzMQamIFTnVWwTEEJWFok5GjhxMU0KgGIDLWgQgB1jSEpSm8WktShOwPvVPC72M/gfj6KPf4gxtp
+Uc2WswzyngEEjMyoKwzLYVAfsGqcrCbjlH7I/9ASNRxH2AeCNkUtKKEUMJ7MkM0BEE4c1kCT4qag
+MAEFiDSjuac0iebRm+AAEOFHEYCAvBka7Z8QPwt56hKPm1haVJxiCEaJXIOvQ/GqCGB3lwZ3l8f5
+Hc1/NDQJJKmPXtUb1TAXQVMERSLaB2PlWcVrk1llwLSakkKRP6YRQ7ATH41FPjA0wSPFscAuBiES
+I/KK2WFkzHcs8jMV3ckq1MV5RuIGscqbvGonkL+EtrnQWjGM5lWRV8E6CbShhUgYz6gbSlo3meNY
+1R+TCdspGkd1+AizqyNRnHzMsCynpcLNzI4dSJATE7fDq6wEyzs0NbJEZlATCQihRURxDeZegoBD
+mVyyzjLyjmTSiP1+LCcSMQY8yeJjqaaIbQZqiSSliFQCTV7lkfEXiILhZaVJFliiYCCAwyMDFhEF
+UaEcIJVII0gZj2nOk0w4SoBzyjJQZL9SbVLUMCspr+INVMQQjIj9AcCKaf0P5n1apjh1yBgFXhKl
+SUBuHJYQhkDj0dA5hQtlDks5GjLK8NAoh8JoI0HnFVATSeagtCGK88ibOA7Ejcgs4haG5EkFeEYR
+eRNEQZkBsroK4zMkWSYSNwM18cQVFNAWDuYuGikMljQhsScyDosgkzaIWBgiIMqGqEjYBhs0kQCT
+kCgKilliiTmARlpgiA3CcRtuIkE+NKmbtUoT0WYi2VXR+6HwgZNVaEQ1MorrDUhZmlW4BliKVwYn
+ozQQ8CC4xsq0wKdFe7WUJgzgKVKEugzSdYxCSgkfWaBQMkpZFgr5AQyyYiRhyZMEMnoRxTPEmUGW
+GAWXDPJEySKwaHuDNzUh1UjOP+htyBMDEtWNjSi2QBrc1IgyPGD58FEJ0HvEr0IZKayoGZTXVpPu
+DEWmb7E0yAjFbn23PnknEt15uPfVC+SQU3nUw+eEkklfMHjZ/ug3pu2vYX/q+5i1/9PfaY9G43l7
+3p/Ak52PaX82H0/7O7PP8X9RC7yidg8GyxcV3/8F6V7mwQ==
+ ]]>
+</i:pgf>
+</svg>
diff --git a/superset/assets/images/viz_thumbnails/leaflet_map.png b/superset/assets/images/viz_thumbnails/leaflet_map.png
new file mode 100644
index 0000000000..9c1a732cd5
Binary files /dev/null and b/superset/assets/images/viz_thumbnails/leaflet_map.png differ
diff --git a/superset/assets/images/viz_thumbnails_large/leaflet_map.png b/superset/assets/images/viz_thumbnails_large/leaflet_map.png
new file mode 100644
index 0000000000..acc452cf03
Binary files /dev/null and b/superset/assets/images/viz_thumbnails_large/leaflet_map.png differ
diff --git a/superset/assets/package.json b/superset/assets/package.json
index d66316a219..9b8c6670a2 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -70,6 +70,8 @@
"immutable": "^3.8.2",
"jed": "^1.1.1",
"jquery": "3.1.1",
+ "leaflet": "^1.3.4",
+ "@turf/turf":"^5.1.6",
"lodash.throttle": "^4.1.1",
"luma.gl": "^5.1.4",
"mapbox-gl": "^0.45.0",
diff --git a/superset/assets/src/chart/Chart.jsx b/superset/assets/src/chart/Chart.jsx
index 032f1d672e..8737283c85 100644
--- a/superset/assets/src/chart/Chart.jsx
+++ b/superset/assets/src/chart/Chart.jsx
@@ -12,6 +12,7 @@ import StackTraceMessage from '../components/StackTraceMessage';
import RefreshChartOverlay from '../components/RefreshChartOverlay';
import visPromiseLookup from '../visualizations';
import sandboxedEval from '../modules/sandbox';
+
import './chart.css';
const propTypes = {
@@ -44,11 +45,14 @@ const propTypes = {
getFilters: PropTypes.func,
onQuery: PropTypes.func,
onDismissRefreshOverlay: PropTypes.func,
+ // chart events
+ itemClick:PropTypes.func,
};
const defaultProps = {
addFilter: () => ({}),
getFilters: () => ({}),
+ itemClick: () => ({}),
};
class Chart extends React.PureComponent {
@@ -71,6 +75,7 @@ class Chart extends React.PureComponent {
this.height = this.height.bind(this);
this.width = this.width.bind(this);
this.visPromise = null;
+ this.itemClick = this.itemClick.bind(this);
}
componentDidMount() {
@@ -148,6 +153,10 @@ class Chart extends React.PureComponent {
this.props.addFilter(col, vals, merge, refresh);
}
+ itemClick(data){
+ this.props.itemClick(data);
+ }
+
clearError() {
this.setState({ errorMsg: null });
}
diff --git a/superset/assets/src/dashboard/components/Dashboard.jsx b/superset/assets/src/dashboard/components/Dashboard.jsx
index 2bb9b9ca20..cc1919d305 100644
--- a/superset/assets/src/dashboard/components/Dashboard.jsx
+++ b/superset/assets/src/dashboard/components/Dashboard.jsx
@@ -197,11 +197,11 @@ class Dashboard extends React.PureComponent {
this.getAllCharts().forEach(chart => {
// filterKey is a string, immune array contains numbers
- if (String(chart.id) !== filterKey && immune.indexOf(chart.id) === -1) {
+ if (String(chart.id) !== filterKey && immune.indexOf(chart.id) === -1 && this.isFilterkeyExistInLinkedSlices(chart, filterKey)) {
const updatedFormData = getFormDataWithExtraFilters({
chart,
dashboardMetadata: this.props.dashboardInfo.metadata,
- filters: this.props.dashboardState.filters,
+ filters: this.getExtraFilters(chart),
sliceId: chart.id,
});
@@ -215,6 +215,49 @@ class Dashboard extends React.PureComponent {
});
}
+ isFilterkeyExistInLinkedSlices(chart, filterKey) {
+ const propExist = chart.formData.hasOwnProperty("linked_slice");
+ let keyExists = false;
+ if (propExist) {
+ const linked_slices = chart.formData.linked_slice;
+ const key = parseInt(filterKey);
+ if (linked_slices instanceof Array) {
+ keyExists = linked_slices.indexOf(key) != -1
+ } else {
+ keyExists = linked_slices === key
+ }
+ }
+ return keyExists
+ }
+
+ getExtraFilters(chart) {
+ const slicesInState = this.getLinkedSliceWithFilters(chart.formData)
+ const filters = this.getFiltersFromSlices(slicesInState)
+ return filters;
+ }
+
+ getFiltersFromSlices(slices) {
+ const filters = {};
+ slices.forEach( slice => {
+ filters[slice] = this.props.dashboardState.filters[slice];
+ })
+ return filters;
+ }
+
+ getLinkedSliceWithFilters(formData) {
+ let slicesInState = [];
+ const propExist = formData.hasOwnProperty("linked_slice");
+ if(propExist) {
+ const linked_slices = formData.linked_slice;
+ if (linked_slices instanceof Array) {
+ slicesInState = linked_slices.filter(element => this.props.dashboardState.filters.hasOwnProperty(element));
+ } else {
+ slicesInState = [linked_slices];
+ }
+ }
+ return slicesInState;
+ }
+
render() {
return <DashboardBuilder />;
}
diff --git a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
index 7e2e6a65d5..d405f7f62b 100644
--- a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
@@ -9,6 +9,7 @@ import MissingChart from '../MissingChart';
import { chartPropType } from '../../../chart/chartReducer';
import { slicePropShape } from '../../util/propShapes';
import { VIZ_TYPES } from '../../../visualizations';
+import { supersetURL } from '../../../utils/common';
const propTypes = {
id: PropTypes.number.isRequired,
@@ -57,6 +58,7 @@ class Chart extends React.Component {
this.resize = this.resize.bind(this);
this.setDescriptionRef = this.setDescriptionRef.bind(this);
this.setHeaderRef = this.setHeaderRef.bind(this);
+ this.itemClick = this.itemClick.bind(this);
}
shouldComponentUpdate(nextProps, nextState) {
@@ -96,6 +98,43 @@ class Chart extends React.Component {
return this.props.filters;
}
+ itemClick(data) {
+ if (this.props.slice.form_data.hasOwnProperty('linked_slice') && this.props.slice.form_data.linked_slice) {
+ this.cloneSliceAndAddToDashboard(this.props.slice.form_data.linked_slice, data)
+ }
+ }
+
+ cloneSliceAndAddToDashboard(linked_slice_id, filters) {
+ // todo:: define a way to name cloned slice
+ const slice_name = "clone_of_slice_id_" + linked_slice_id
+ var requestParams = this.getRequestParamsForCloneSlice(linked_slice_id, slice_name);
+ this.props.getSliceById(linked_slice_id)
+ .then((data) => {
+ // todo:: append filters in formdata
+ this.props.saveSlice(data.form_data, requestParams)
+ .then((data) => {
+ window.location = supersetURL(data.dashboard);
+ });
+ })
+ }
+
+
+ getRequestParamsForCloneSlice(slice_id, slice_name) {
+ const dashId = this.getCurrentDashboardId();
+ return {
+ action: "saveas",
+ add_to_dash: "existing",
+ goto_dash: true,
+ save_to_dashboard_id: dashId,
+ slice_id: slice_id,
+ slice_name: slice_name,
+ }
+ }
+
+ getCurrentDashboardId() {
+ return this.props.dashboardInfo.id;
+ }
+
getChartHeight() {
const headerHeight = this.getHeaderHeight();
const descriptionHeight =
@@ -235,6 +274,7 @@ class Chart extends React.Component {
queryResponse={chart.queryResponse}
queryRequest={chart.queryRequest}
triggerQuery={chart.triggerQuery}
+ itemClick={this.itemClick}
/>
</div>
</div>
diff --git a/superset/assets/src/dashboard/containers/Chart.jsx b/superset/assets/src/dashboard/containers/Chart.jsx
index 97b2bb8e18..f0541571e6 100644
--- a/superset/assets/src/dashboard/containers/Chart.jsx
+++ b/superset/assets/src/dashboard/containers/Chart.jsx
@@ -6,6 +6,7 @@ import {
toggleExpandSlice,
} from '../actions/dashboardState';
import { refreshChart } from '../../chart/chartAction';
+import * as saveModalActions from '../../explore/actions/saveModalActions';
import getFormDataWithExtraFilters from '../util/charts/getFormDataWithExtraFilters';
import { updateComponents } from '../actions/dashboardLayout';
import Chart from '../components/gridComponents/Chart';
@@ -45,17 +46,20 @@ function mapStateToProps(
isExpanded: !!dashboardState.expandedSlices[id],
supersetCanExplore: !!dashboardInfo.superset_can_explore,
sliceCanEdit: !!dashboardInfo.slice_can_edit,
+ dashboardInfo:dashboardInfo,
};
}
function mapDispatchToProps(dispatch) {
+ const action = Object.assign({}, {
+ updateComponents,
+ toggleExpandSlice,
+ addFilter,
+ refreshChart,
+ }, saveModalActions );
+
return bindActionCreators(
- {
- updateComponents,
- toggleExpandSlice,
- addFilter,
- refreshChart,
- },
+ action,
dispatch,
);
}
diff --git a/superset/assets/src/dashboard/reducers/dashboardState.js b/superset/assets/src/dashboard/reducers/dashboardState.js
index 1479f88311..1683d4511f 100644
--- a/superset/assets/src/dashboard/reducers/dashboardState.js
+++ b/superset/assets/src/dashboard/reducers/dashboardState.js
@@ -102,9 +102,10 @@ export default function dashboardStateReducer(state = {}, action) {
'__time_origin',
'__granularity',
];
- if (
+ // TODO: we want to revisit the condition for more generic filter implementation
+ if (
filterKeys.indexOf(col) >= 0 ||
- action.chart.formData.groupby.indexOf(col) !== -1
+ action.chart.formData.publish_columns.indexOf(col) !== -1
) {
let newFilter = {};
if (!(sliceId in filters)) {
diff --git a/superset/assets/src/explore/AdhocFilter.js b/superset/assets/src/explore/AdhocFilter.js
index dc3599c201..9d27a328fb 100644
--- a/superset/assets/src/explore/AdhocFilter.js
+++ b/superset/assets/src/explore/AdhocFilter.js
@@ -3,6 +3,7 @@ import { MULTI_OPERATORS } from './constants';
export const EXPRESSION_TYPES = {
SIMPLE: 'SIMPLE',
SQL: 'SQL',
+ OPTIONS: 'OPTIONS'
};
export const CLAUSES = {
@@ -55,7 +56,14 @@ export default class AdhocFilter {
this.subject = null;
this.operator = null;
this.comparator = null;
+ } else if (this.expressionType === EXPRESSION_TYPES.OPTIONS) {
+ this.subject = adhocFilter.subject;
+ this.operator = adhocFilter.operator;
+ this.comparator = adhocFilter.comparator;
+ this.clause = adhocFilter.clause;
+ this.sqlExpression = adhocFilter.sqlExpression;
}
+
this.fromFormData = !!adhocFilter.filterOptionName;
this.filterOptionName = adhocFilter.filterOptionName ||
@@ -102,6 +110,12 @@ export default class AdhocFilter {
);
} else if (this.expressionType === EXPRESSION_TYPES.SQL) {
return !!(this.sqlExpression && this.clause);
+ } else if (this.expressionType === EXPRESSION_TYPES.OPTIONS){
+ return (
+ this.operator &&
+ this.comparator &&
+ this.sqlExpression&&
+ this.clause)
}
return false;
}
diff --git a/superset/assets/src/explore/actions/exploreActions.js b/superset/assets/src/explore/actions/exploreActions.js
index b8a883ee71..4e94a2852d 100644
--- a/superset/assets/src/explore/actions/exploreActions.js
+++ b/superset/assets/src/explore/actions/exploreActions.js
@@ -39,6 +39,26 @@ export function postDatasourcesFailed(error) {
return { type: POST_DATASOURCES_FAILED, error };
}
+export const SET_SLICES = 'SET_SLICES';
+export function setSlices(slices) {
+ return { type: SET_SLICES, slices };
+}
+
+export const FETCH_SLICES_STARTED = 'FETCH_SLICES_STARTED';
+export function fetchSlicesStarted() {
+ return { type: FETCH_SLICES_STARTED };
+}
+
+export const FETCH_SLICES_SUCCEEDED = 'FETCH_SLICES_SUCCEEDED';
+export function fetchSlicesSucceeded() {
+ return { type: FETCH_SLICES_SUCCEEDED };
+}
+
+export const POST_SLICES_FAILED = 'POST_SLICES_FAILED';
+export function postSlicesFailed(error) {
+ return { type: POST_SLICES_FAILED, error };
+}
+
export const RESET_FIELDS = 'RESET_FIELDS';
export function resetControls() {
return { type: RESET_FIELDS };
@@ -62,6 +82,24 @@ export function fetchDatasources() {
};
}
+export function fetchSlices() {
+ return function (dispatch) {
+ dispatch(fetchSlicesStarted());
+ const url = '/superset/user_slices';
+ $.ajax({
+ type: 'GET',
+ url,
+ success: (data) => {
+ dispatch(setSlices(data));
+ dispatch(fetchSlicesSucceeded());
+ },
+ error(error) {
+ dispatch(fetchSlicesFailed(error.responseJSON.error));
+ },
+ });
+ };
+}
+
export const TOGGLE_FAVE_STAR = 'TOGGLE_FAVE_STAR';
export function toggleFaveStar(isStarred) {
return { type: TOGGLE_FAVE_STAR, isStarred };
diff --git a/superset/assets/src/explore/actions/saveModalActions.js b/superset/assets/src/explore/actions/saveModalActions.js
index fab5f492c5..c759e23375 100644
--- a/superset/assets/src/explore/actions/saveModalActions.js
+++ b/superset/assets/src/explore/actions/saveModalActions.js
@@ -70,3 +70,29 @@ export function saveSlice(formData, requestParams) {
});
};
}
+
+export const GET_SLICE_BY_ID = 'GET_SLICE_BY_ID';
+export function sliceById(data) {
+ return { type: GET_SLICE_BY_ID, data };
+}
+export const GET_SLICE_BY_ID_FAILED = 'GET_SLICE_BY_ID_FAILED';
+export function sliceByIdFailed() {
+ return { type: GET_SLICE_BY_ID_FAILED };
+}
+export function getSliceById(sliceId)
+{
+ return (dispatch) => {
+ const url = '/superset/slice_json/'+ sliceId;
+ return $.ajax({
+ type: 'GET',
+ url,
+ data: undefined,
+ success: ((data) => {
+ dispatch(sliceById(data));
+ }),
+ error: (() => {
+ dispatch(sliceByIdFailed());
+ }),
+ });
+ };
+}
diff --git a/superset/assets/src/explore/components/AdhocColumnEditPopover.jsx b/superset/assets/src/explore/components/AdhocColumnEditPopover.jsx
new file mode 100644
index 0000000000..5e6da2a964
--- /dev/null
+++ b/superset/assets/src/explore/components/AdhocColumnEditPopover.jsx
@@ -0,0 +1,144 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button, Popover, Tab, Tabs } from 'react-bootstrap';
+
+import columnType from '../propTypes/columnType';
+import adhocMetricType from '../propTypes/adhocMetricType';
+import AdhocFilter, { EXPRESSION_TYPES } from '../AdhocFilter';
+import AdhocColumnEditPopoverContent from './AdhocColumnEditPopoverContent';
+import AdhocFilterEditPopoverSqlTabContent from './AdhocFilterEditPopoverSqlTabContent';
+
+const propTypes = {
+ adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
+ onChange: PropTypes.func.isRequired,
+ onClose: PropTypes.func.isRequired,
+ onResize: PropTypes.func.isRequired,
+ options: PropTypes.arrayOf(PropTypes.oneOfType([
+ columnType,
+ PropTypes.shape({ saved_metric_name: PropTypes.string.isRequired }),
+ adhocMetricType,
+ ])).isRequired,
+ datasource: PropTypes.object,
+};
+
+const startingWidth = 400;
+const startingHeight = 190;
+
+// todo: refactor remaining use AdhocColumn instead AdhocFilter
+//it's copy of AdhocFilterEditPopover,so most of code is same and may be unwanted
+export default class AdhocColumnEditPopover extends React.Component {
+ constructor(props) {
+ super(props);
+ this.onSave = this.onSave.bind(this);
+ this.onDragDown = this.onDragDown.bind(this);
+ this.onMouseMove = this.onMouseMove.bind(this);
+ this.onMouseUp = this.onMouseUp.bind(this);
+ this.onAdhocFilterChange = this.onAdhocFilterChange.bind(this);
+ this.adjustHeight = this.adjustHeight.bind(this);
+
+ this.state = {
+ adhocFilter: this.props.adhocFilter,
+ width: startingWidth,
+ height: startingHeight,
+ };
+ }
+
+ componentDidMount() {
+ document.addEventListener('mouseup', this.onMouseUp);
+ }
+
+ componentWillUnmount() {
+ document.removeEventListener('mouseup', this.onMouseUp);
+ document.removeEventListener('mousemove', this.onMouseMove);
+ }
+
+ onAdhocFilterChange(adhocFilter) {
+ this.setState({ adhocFilter });
+ }
+
+ onSave() {
+ this.props.onChange(this.state.adhocFilter);
+ this.props.onClose();
+ }
+
+ onDragDown(e) {
+ this.dragStartX = e.clientX;
+ this.dragStartY = e.clientY;
+ this.dragStartWidth = this.state.width;
+ this.dragStartHeight = this.state.height;
+ document.addEventListener('mousemove', this.onMouseMove);
+ }
+
+ onMouseMove(e) {
+ this.props.onResize();
+ this.setState({
+ width: Math.max(this.dragStartWidth + (e.clientX - this.dragStartX), startingWidth),
+ height: Math.max(this.dragStartHeight + (e.clientY - this.dragStartY) * 2, startingHeight),
+ });
+ }
+
+ onMouseUp() {
+ document.removeEventListener('mousemove', this.onMouseMove);
+ }
+
+ adjustHeight(heightDifference) {
+ this.setState(state => ({ height: state.height + heightDifference }));
+ }
+
+ render() {
+ const {
+ adhocFilter: propsAdhocFilter,
+ options,
+ onChange,
+ onClose,
+ onResize,
+ datasource,
+ ...popoverProps
+ } = this.props;
+
+ const { adhocFilter } = this.state;
+
+ const stateIsValid = adhocFilter.isValid();
+ const hasUnsavedChanges = !adhocFilter.equals(propsAdhocFilter);
+
+ return (
+ <Popover
+ id="filter-edit-popover"
+ {...popoverProps}
+ >
+ <Tabs
+ id="adhoc-filter-edit-tabs"
+ className="adhoc-filter-edit-tabs"
+ style={{ height: this.state.height, width: this.state.width }}
+ >
+ <Tab
+ className="adhoc-filter-edit-tab"
+ title="Options"
+ >
+ <AdhocColumnEditPopoverContent
+ adhocFilter={this.state.adhocFilter}
+ onChange={this.onAdhocFilterChange}
+ options={this.props.options}
+ datasource={this.props.datasource}
+ onHeightChange={this.adjustHeight}
+ />
+ </Tab>
+ </Tabs>
+ <div>
+ <Button
+ disabled={!stateIsValid}
+ bsStyle={(hasUnsavedChanges && stateIsValid) ? 'primary' : 'default'}
+ bsSize="small"
+ className="m-r-5"
+ onClick={this.onSave}
+ >
+ Save
+ </Button>
+ <Button bsSize="small" onClick={this.props.onClose}>Close</Button>
+ <i onMouseDown={this.onDragDown} className="glyphicon glyphicon-resize-full edit-popover-resize" />
+ </div>
+ </Popover>
+ );
+ }
+}
+AdhocColumnEditPopover.propTypes = propTypes;
diff --git a/superset/assets/src/explore/components/AdhocColumnEditPopoverContent.jsx b/superset/assets/src/explore/components/AdhocColumnEditPopoverContent.jsx
new file mode 100644
index 0000000000..51a0b677a5
--- /dev/null
+++ b/superset/assets/src/explore/components/AdhocColumnEditPopoverContent.jsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import AceEditor from 'react-ace';
+import { CompactPicker } from 'react-color';
+import TextControl from './controls/TextControl';
+import { ALL_COLOR_SCHEMES } from '../../modules/colors'
+import 'brace/mode/sql';
+import 'brace/theme/github';
+import 'brace/ext/language_tools';
+import { FormGroup } from 'react-bootstrap';
+import VirtualizedSelect from 'react-virtualized-select';
+
+import { sqlWords } from '../../SqlLab/components/AceEditorWrapper';
+import AdhocFilter, { EXPRESSION_TYPES, CLAUSES } from '../AdhocFilter';
+import adhocMetricType from '../propTypes/adhocMetricType';
+import columnType from '../propTypes/columnType';
+
+
+const propTypes = {
+ adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
+ onChange: PropTypes.func.isRequired,
+ options: PropTypes.arrayOf(PropTypes.oneOfType([
+ columnType,
+ PropTypes.shape({ saved_metric_name: PropTypes.string.isRequired }),
+ adhocMetricType,
+ ])).isRequired,
+ height: PropTypes.number,
+};
+
+const langTools = ace.acequire('ace/ext/language_tools');
+
+// todo: refactor remaining use AdhocColumn instead AdhocFilter
+//it's copy of AdhocFilterEditPopoverContent,so most of code is same and may be unwanted
+export default class AdhocColumnEditPopoverContent extends React.Component {
+ constructor(props) {
+ super(props);
+ console.log(this.props);
+ if(this.props.adhocFilter.expressionType == EXPRESSION_TYPES.SIMPLE){
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ comparator: '',
+ clause:'',
+ operator:'',
+ sqlExpression:'',
+ expressionType: EXPRESSION_TYPES.OPTIONS,
+ }));
+ }
+ this.onSqlExpressionChange = this.onSqlExpressionChange.bind(this);
+ this.onSqlExpressionClauseChange = this.onSqlExpressionClauseChange.bind(this);
+
+ this.handleAceEditorRef = this.handleAceEditorRef.bind(this);
+ this.onOperatorChange = this.onOperatorChange.bind(this);
+ this.onComparatorChange = this.onComparatorChange.bind(this);
+
+ }
+
+ onSqlExpressionClauseChange(clause) {
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ clause: clause.rgb,
+ expressionType: EXPRESSION_TYPES.OPTIONS,
+ }));
+ }
+
+ onSqlExpressionChange(sqlExpression) {
+
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ sqlExpression:sqlExpression,
+ expressionType: EXPRESSION_TYPES.OPTIONS,
+ }));
+ }
+
+ onOperatorChange(operator) {
+
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ operator: operator ,
+ expressionType: EXPRESSION_TYPES.OPTIONS,
+ }));
+ }
+
+ onComparatorChange(comparator) {
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ comparator: comparator.rgb,
+ expressionType: EXPRESSION_TYPES.OPTIONS,
+ }));
+ }
+
+ handleAceEditorRef(ref) {
+ if (ref) {
+ this.aceEditorRef = ref;
+ }
+ }
+
+ render() {
+ const { adhocFilter, height } = this.props;
+
+
+ return (
+ <span>
+ <table>
+ <tbody>
+ <tr>
+ <td>
+ <TextControl
+ name="map-color-low-value"
+ label="Min Value & Color"
+ placeholder=""
+ value= {adhocFilter.operator}
+ onChange={this.onOperatorChange}
+ />
+ </td>
+ <td>
+ <CompactPicker
+ color={adhocFilter.comparator}
+ colors={ALL_COLOR_SCHEMES['d3Category10']}
+ onChangeComplete={this.onComparatorChange}
+ />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <TextControl
+ name="map-color-high-value"
+ label="Max Value & Color"
+ placeholder=""
+ value= {adhocFilter.sqlExpression}
+ onChange={this.onSqlExpressionChange}
+ />
+ </td>
+ <td>
+ <CompactPicker
+ color={adhocFilter.clause}
+ colors={ALL_COLOR_SCHEMES['d3Category10']}
+ onChangeComplete={this.onSqlExpressionClauseChange}
+ />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <span>Min value color is filled for value in range (min - max) </span>
+ </span>
+ );
+ }
+}
+AdhocColumnEditPopoverContent.propTypes = propTypes;
diff --git a/superset/assets/src/explore/components/AdhocColumnOption.jsx b/superset/assets/src/explore/components/AdhocColumnOption.jsx
new file mode 100644
index 0000000000..5e37a2ce2e
--- /dev/null
+++ b/superset/assets/src/explore/components/AdhocColumnOption.jsx
@@ -0,0 +1,95 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Label, OverlayTrigger } from 'react-bootstrap';
+
+import AdhocColumnEditPopover from './AdhocColumnEditPopover';
+import AdhocFilter from '../AdhocFilter';
+import columnType from '../propTypes/columnType';
+import adhocMetricType from '../propTypes/adhocMetricType';
+
+const propTypes = {
+ adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
+ onFilterEdit: PropTypes.func.isRequired,
+ options: PropTypes.arrayOf(PropTypes.oneOfType([
+ columnType,
+ PropTypes.shape({ saved_metric_name: PropTypes.string.isRequired }),
+ adhocMetricType,
+ ])).isRequired,
+ datasource: PropTypes.object,
+};
+
+// todo: refactor remaining use AdhocColumn instead AdhocFilter
+//it's copy of AdhocFilterOption,so most of code is same and may be unwanted
+export default class AdhocColumnOption extends React.PureComponent {
+ constructor(props) {
+ super(props);
+ this.closeFilterEditOverlay = this.closeFilterEditOverlay.bind(this);
+ this.onPopoverResize = this.onPopoverResize.bind(this);
+ this.onOverlayEntered = this.onOverlayEntered.bind(this);
+ this.onOverlayExited = this.onOverlayExited.bind(this);
+ this.state = { overlayShown: !this.props.adhocFilter.fromFormData };
+ }
+
+ onPopoverResize() {
+ this.forceUpdate();
+ }
+
+ onOverlayEntered() {
+ this.setState({ overlayShown: true });
+ }
+
+ onOverlayExited() {
+ this.setState({ overlayShown: false });
+ }
+
+ onMouseDown(e) {
+ e.stopPropagation();
+ }
+
+ closeFilterEditOverlay() {
+ this.refs.overlay.hide();
+ }
+
+ render() {
+ const { adhocFilter } = this.props;
+ const overlay = (
+ <AdhocColumnEditPopover
+ onResize={this.onPopoverResize}
+ adhocFilter={adhocFilter}
+ onChange={this.props.onFilterEdit}
+ onClose={this.closeFilterEditOverlay}
+ options={this.props.options}
+ datasource={this.props.datasource}
+ />
+ );
+
+ return (
+ <OverlayTrigger
+ ref="overlay"
+ placement="right"
+ trigger="click"
+ disabled
+ overlay={overlay}
+ rootClose
+ shouldUpdatePosition
+ defaultOverlayShown={!adhocFilter.fromFormData}
+ onEntered={this.onOverlayEntered}
+ onExited={this.onOverlayExited}
+ >
+ <Label className="adhoc-filter-option">
+ <div onMouseDownCapture={this.onMouseDown}>
+ <span className="m-r-5 option-label">
+ {adhocFilter.subject}
+ <i
+ className={
+ `glyphicon glyphicon-triangle-${this.state.overlayShown ? 'left' : 'right'} adhoc-label-arrow`
+ }
+ />
+ </span>
+ </div>
+ </Label>
+ </OverlayTrigger>
+ );
+ }
+}
+AdhocColumnOption.propTypes = propTypes;
diff --git a/superset/assets/src/explore/components/Control.jsx b/superset/assets/src/explore/components/Control.jsx
index 52682dee00..ff16cd2bbe 100644
--- a/superset/assets/src/explore/components/Control.jsx
+++ b/superset/assets/src/explore/components/Control.jsx
@@ -44,6 +44,8 @@ export default class Control extends React.PureComponent {
this.onChange = this.onChange.bind(this);
}
componentDidMount() {
+ if(this.props.name == "linked_slice")
+ this.props.actions.fetchSlices();
this.validateAndSetValue(this.props.value, []);
}
onChange(value, errors) {
diff --git a/superset/assets/src/explore/components/controls/AdhocColumnControl.jsx b/superset/assets/src/explore/components/controls/AdhocColumnControl.jsx
new file mode 100644
index 0000000000..a540193f7a
--- /dev/null
+++ b/superset/assets/src/explore/components/controls/AdhocColumnControl.jsx
@@ -0,0 +1,200 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import VirtualizedSelect from 'react-virtualized-select';
+
+import { t } from '../../../locales';
+import ControlHeader from '../ControlHeader';
+import adhocFilterType from '../../propTypes/adhocFilterType';
+import adhocMetricType from '../../propTypes/adhocMetricType';
+import savedMetricType from '../../propTypes/savedMetricType';
+import columnType from '../../propTypes/columnType';
+import AdhocFilter, { CLAUSES, EXPRESSION_TYPES } from '../../AdhocFilter';
+import AdhocMetric from '../../AdhocMetric';
+import { OPERATORS } from '../../constants';
+import VirtualizedRendererWrap from '../../../components/VirtualizedRendererWrap';
+import OnPasteSelect from '../../../components/OnPasteSelect';
+import AdhocColumnOption from '../AdhocColumnOption';
+import FilterDefinitionOption from '../FilterDefinitionOption';
+
+const propTypes = {
+ name: PropTypes.string,
+ onChange: PropTypes.func,
+ value: PropTypes.arrayOf(PropTypes.object),
+ datasource: PropTypes.object,
+ columns: PropTypes.arrayOf(columnType),
+ savedMetrics: PropTypes.arrayOf(savedMetricType),
+ formData: PropTypes.shape({
+ metric: PropTypes.oneOfType([PropTypes.string, adhocMetricType]),
+ metrics: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, adhocMetricType])),
+ }),
+};
+
+const defaultProps = {
+ name: '',
+ onChange: () => {},
+ columns: [],
+ savedMetrics: [],
+ formData: {},
+};
+
+function isDictionaryForAdhocFilter(value) {
+ return value && !(value instanceof AdhocFilter) && value.expressionType;
+}
+
+// todo: refactor remaining use AdhocColumn instead AdhocFilter
+//it's copy of AdhocFilterControl,so most of code is same and may be unwanted
+export default class AdhocColumnControl extends React.Component {
+
+ constructor(props) {
+ super(props);
+ this.optionsForSelect = this.optionsForSelect.bind(this);
+ this.onFilterEdit = this.onFilterEdit.bind(this);
+ this.onChange = this.onChange.bind(this);
+ this.getMetricExpression = this.getMetricExpression.bind(this);
+ const filters = (this.props.value || []).map(filter => (
+ isDictionaryForAdhocFilter(filter) ? new AdhocFilter(filter) : filter
+ ));
+
+ this.optionRenderer = VirtualizedRendererWrap(option => (
+ <FilterDefinitionOption option={option} />
+ ));
+ this.valueRenderer = adhocFilter => (
+ <AdhocColumnOption
+ adhocFilter={adhocFilter}
+ onFilterEdit={this.onFilterEdit}
+ options={this.state.options}
+ datasource={this.props.datasource}
+ />
+ );
+ this.state = {
+ values: filters,
+ options: this.optionsForSelect(this.props),
+ };
+ }
+
+ componentWillReceiveProps(nextProps) {
+ if (
+ this.props.columns !== nextProps.columns ||
+ this.props.formData !== nextProps.formData
+ ) {
+ this.setState({ options: this.optionsForSelect(nextProps) });
+ }
+ if (this.props.value !== nextProps.value) {
+ this.setState({
+ values: (nextProps.value || []).map(
+ filter => (isDictionaryForAdhocFilter(filter) ? new AdhocFilter(filter) : filter
+ )),
+ });
+ }
+ }
+
+ onFilterEdit(changedFilter) {
+ this.props.onChange(this.state.values.map((value) => {
+ if (value.filterOptionName === changedFilter.filterOptionName) {
+ return changedFilter;
+ }
+ return value;
+ }));
+ }
+
+ onChange(opts) {
+ this.props.onChange(opts.map((option) => {
+ if (option.saved_metric_name) {
+ return new AdhocFilter({
+ expressionType: this.props.datasource.type === 'druid' ?
+ EXPRESSION_TYPES.SIMPLE :
+ EXPRESSION_TYPES.SQL,
+ subject: this.props.datasource.type === 'druid' ?
+ option.saved_metric_name :
+ this.getMetricExpression(option.saved_metric_name),
+ operator: OPERATORS['>'],
+ comparator: 0,
+ clause: CLAUSES.HAVING,
+ });
+ } else if (option.label) {
+ return new AdhocFilter({
+ expressionType: this.props.datasource.type === 'druid' ?
+ EXPRESSION_TYPES.SIMPLE :
+ EXPRESSION_TYPES.SQL,
+ subject: this.props.datasource.type === 'druid' ?
+ option.label :
+ new AdhocMetric(option).translateToSql(),
+ operator: OPERATORS['>'],
+ comparator: 0,
+ clause: CLAUSES.HAVING,
+ });
+ } else if (option.column_name) {
+ return new AdhocFilter({
+ expressionType: EXPRESSION_TYPES.SIMPLE,
+ subject: option.column_name,
+ operator: OPERATORS['=='],
+ comparator: '',
+ clause: CLAUSES.WHERE,
+ });
+ } else if (option instanceof AdhocFilter) {
+ return option;
+ }
+ return null;
+ }).filter(option => option));
+ }
+
+ getMetricExpression(savedMetricName) {
+ return this.props.savedMetrics.find((
+ savedMetric => savedMetric.metric_name === savedMetricName
+ )).expression;
+ }
+
+ optionsForSelect(props) {
+ const options = [
+ ...props.columns,
+ ...[...(props.formData.metrics || []), props.formData.metric].map(metric => (
+ metric && (
+ typeof metric === 'string' ?
+ { saved_metric_name: metric } :
+ new AdhocMetric(metric)
+ )
+ )),
+ ].filter(option => option);
+
+ return options.reduce((results, option) => {
+ if (option.saved_metric_name) {
+ results.push({ ...option, filterOptionName: option.saved_metric_name });
+ } else if (option.column_name) {
+ results.push({ ...option, filterOptionName: '_col_' + option.column_name });
+ } else if (option instanceof AdhocMetric) {
+ results.push({ ...option, filterOptionName: '_adhocmetric_' + option.label });
+ }
+ return results;
+ }, []).sort((a, b) => (
+ (a.saved_metric_name || a.column_name || a.label).localeCompare((
+ b.saved_metric_name || b.column_name || b.label
+ ))
+ ));
+ }
+
+ render() {
+ return (
+ <div className="metrics-select">
+ <ControlHeader {...this.props} />
+ <OnPasteSelect
+ multi
+ name={`select-${this.props.name}`}
+ placeholder={t('choose a column or metric')}
+ options={this.state.options}
+ value={this.state.values}
+ labelKey="label"
+ valueKey="filterOptionName"
+ clearable
+ closeOnSelect
+ onChange={this.onChange}
+ optionRenderer={this.optionRenderer}
+ valueRenderer={this.valueRenderer}
+ selectWrap={VirtualizedSelect}
+ />
+ </div>
+ );
+ }
+}
+
+AdhocColumnControl.propTypes = propTypes;
+AdhocColumnControl.defaultProps = defaultProps;
diff --git a/superset/assets/src/explore/components/controls/AnnotationLayer.jsx b/superset/assets/src/explore/components/controls/AnnotationLayer.jsx
index 9e31e6c856..989a6cca23 100644
--- a/superset/assets/src/explore/components/controls/AnnotationLayer.jsx
+++ b/superset/assets/src/explore/components/controls/AnnotationLayer.jsx
@@ -38,6 +38,7 @@ const propTypes = {
opacity: PropTypes.string,
style: PropTypes.string,
width: PropTypes.number,
+ markerWidth: PropTypes.number,
showMarkers: PropTypes.bool,
hideLine: PropTypes.bool,
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -48,10 +49,8 @@ const propTypes = {
timeColumn: PropTypes.string,
intervalEndColumn: PropTypes.string,
vizType: PropTypes.string,
-
error: PropTypes.string,
colorScheme: PropTypes.string,
-
addAnnotationLayer: PropTypes.func,
removeAnnotationLayer: PropTypes.func,
close: PropTypes.func,
@@ -65,6 +64,7 @@ const defaultProps = {
opacity: '',
style: 'solid',
width: 1,
+ markerWidth: 1,
showMarkers: false,
hideLine: false,
overrides: {},
@@ -84,7 +84,7 @@ export default class AnnotationLayer extends React.PureComponent {
constructor(props) {
super(props);
const { name, annotationType, sourceType,
- color, opacity, style, width, showMarkers, hideLine, value,
+ color, opacity, style, width, markerWidth, showMarkers, hideLine, value,
overrides, show, titleColumn, descriptionColumns,
timeColumn, intervalEndColumn } = props;
this.state = {
@@ -106,6 +106,7 @@ export default class AnnotationLayer extends React.PureComponent {
opacity,
style,
width,
+ markerWidth,
showMarkers,
hideLine,
// refData
@@ -477,7 +478,7 @@ export default class AnnotationLayer extends React.PureComponent {
}
renderDisplayConfiguration() {
- const { color, opacity, style, width, showMarkers, hideLine, annotationType } = this.state;
+ const { color, opacity, style, width, markerWidth, showMarkers, hideLine, annotationType } = this.state;
const colorScheme = [...ALL_COLOR_SCHEMES[this.props.colorScheme]];
if (color && color !== AUTOMATIC_COLOR &&
!colorScheme.find(x => x.toLowerCase() === color.toLowerCase())) {
@@ -551,6 +552,17 @@ export default class AnnotationLayer extends React.PureComponent {
onChange={v => this.setState({ showMarkers: v })}
/>
}
+ {annotationType === AnnotationTypes.TIME_SERIES && showMarkers &&
+ <TextControl
+ hovered
+ name="annotation-layer-marker-width"
+ label={t('Marker Size')}
+ description={'Set the size of marker'}
+ isInt
+ value={markerWidth}
+ onChange={v => this.setState({ markerWidth: v })}
+ />
+ }
{annotationType === AnnotationTypes.TIME_SERIES &&
<CheckboxControl
hovered
diff --git a/superset/assets/src/explore/components/controls/index.js b/superset/assets/src/explore/components/controls/index.js
index 4a2df4237b..3bdff188c0 100644
--- a/superset/assets/src/explore/components/controls/index.js
+++ b/superset/assets/src/explore/components/controls/index.js
@@ -18,6 +18,7 @@ import ViewportControl from './ViewportControl';
import VizTypeControl from './VizTypeControl';
import MetricsControl from './MetricsControl';
import AdhocFilterControl from './AdhocFilterControl';
+import AdhocColumnControl from './AdhocColumnControl';
const controlMap = {
AnnotationLayerControl,
@@ -40,5 +41,6 @@ const controlMap = {
VizTypeControl,
MetricsControl,
AdhocFilterControl,
+ AdhocColumnControl,
};
export default controlMap;
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index ddf0775974..dfd9fd2795 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -594,6 +594,19 @@ export const controls = {
options: (state.datasource) ? state.datasource.columns : [],
}),
},
+ publish_columns: {
+ type: 'SelectControl',
+ multi: true,
+ label: t('Publish Columns'),
+ default: [],
+ description: t('Columns to publish data on click'),
+ optionRenderer: c => <ColumnOption column={c} showType />,
+ valueRenderer: c => <ColumnOption column={c} />,
+ valueKey: 'column_name',
+ mapStateToProps: state => ({
+ options: (state.datasource) ? state.datasource.columns : [],
+ }),
+ },
spatial: {
type: 'SpatialControl',
@@ -754,7 +767,7 @@ export const controls = {
type: 'SelectControl',
freeForm: true,
label: t('Time Granularity'),
- default: 'one day',
+ default: 'one_day',
choices: [
[null, 'all'],
['PT5S', '5 seconds'],
@@ -1514,6 +1527,14 @@ export const controls = {
'point in time'),
},
+ chart_interactivity:{
+ type: 'CheckboxControl',
+ label: t('Interactivity'),
+ renderTrigger: true,
+ default: false,
+ description: t('This is used for enable/disable chart click event'),
+ },
+
y_log_scale: {
type: 'CheckboxControl',
label: t('Y Log Scale'),
@@ -1840,13 +1861,42 @@ export const controls = {
provideFormDataToProps: true,
},
+ adhoc_columns: {
+ type: 'AdhocColumnControl',
+ label: t('Color Columns'),
+ default: null,
+ description: '',
+ validators: [v.nonEmpty],
+ mapStateToProps: state => ({
+ columns: state.datasource ? state.datasource.columns : [],
+ savedMetrics: state.datasource ? state.datasource.metrics : [],
+ datasource: state.datasource,
+ }),
+ provideFormDataToProps: true,
+ },
+
slice_id: {
type: 'HiddenControl',
label: t('Chart ID'),
hidden: true,
description: t('The id of the active chart'),
},
-
+ linked_slice: {
+ "type": "SelectControl",
+ "label": "Subscribe Slices",
+ "multi": true,
+ "validators": [
+ ],
+ "description": "Select slices to subscribe",
+ "renderTrigger": false,
+ mapStateToProps: (state, control) => {
+ const newState = {};
+ if (state.slices) {
+ newState.options = state.slices.filter( slice => state.slice ? slice.id != state.slice.slice_id : true).map( slice => ({label: slice.title, value: slice.id}))
+ }
+ return newState;
+ }
+ },
cache_timeout: {
type: 'HiddenControl',
label: t('Cache Timeout (seconds)'),
diff --git a/superset/assets/src/explore/reducers/exploreReducer.js b/superset/assets/src/explore/reducers/exploreReducer.js
index 7d4c5d5e48..a26530b10e 100644
--- a/superset/assets/src/explore/reducers/exploreReducer.js
+++ b/superset/assets/src/explore/reducers/exploreReducer.js
@@ -63,6 +63,36 @@ export default function exploreReducer(state = {}, action) {
datasources: action.datasources,
};
},
+
+ [actions.FETCH_SLICES_STARTED]() {
+
+ return {
+ ...state,
+ isSlicesLoading: true,
+ };
+ },
+ [actions.FETCH_SLICES_SUCCEEDED]() {
+
+ return {
+ ...state,
+ isSlicesLoading: false,
+ };
+ },
+ [actions.FETCH_SLICES_FAILED]() {
+
+ return {
+ ...state,
+ isSlicesLoading: false,
+ controlPanelAlert: action.error,
+ };
+ },
+ [actions.SET_SLICES]() {
+ return {
+ ...state,
+ slices: action.slices,
+ };
+ },
+
[actions.REMOVE_CONTROL_PANEL_ALERT]() {
return {
...state,
diff --git a/superset/assets/src/explore/visTypes.jsx b/superset/assets/src/explore/visTypes.jsx
index acddf3e4ec..2e94bf8303 100644
--- a/superset/assets/src/explore/visTypes.jsx
+++ b/superset/assets/src/explore/visTypes.jsx
@@ -26,6 +26,13 @@ export const sections = {
['slice_id', 'cache_timeout'],
],
},
+ linkedSlices: {
+ label: t('Publish & Subscribe'),
+ expanded: true,
+ controlSetRows: [
+ ['publish_columns', 'linked_slice']
+ ],
+ },
colorScheme: {
label: t('Color Scheme'),
controlSetRows: [
@@ -89,6 +96,120 @@ const timeGrainSqlaAnimationOverrides = {
};
export const visTypes = {
+ leaflet_map: {
+ label: t('Leaflet Map'),
+ showOnExplore: true,
+ controlPanelSections: [
+ {
+ label: t('Query'),
+ expanded: true,
+ controlSetRows: [
+ ['geojson'],
+ ['polygon'],
+ ['adhoc_columns'],
+ ['adhoc_filters'],
+ ['row_limit', 'include_time'],
+ ],
+ },
+ {
+ label: t('Polygon/Marker'),
+ expanded: true,
+ controlSetRows: [
+ ['color_picker'],
+ ['stroke_color_picker'],
+ ['cell_size']
+
+ ],
+ },
+ {
+ label: t('Map Options'),
+ expanded: true,
+ controlSetRows: [
+ ['viewport_longitude', 'viewport_latitude'],
+ ['viewport_zoom', 'mapbox_style'],
+ ['min_radius','max_radius'],
+ ['ranges'],
+ ],
+ },
+ ],
+ controlOverrides: {
+ cell_size:{
+ default: .75,
+ validators: [],
+ isInt: false,
+ renderTrigger: false,
+ label: t('Fill Opacity'),
+ description: t('The Polygon fill color Opacity 0-1'),
+ },
+ stroke_color_picker:{
+ label: t('Border Color'),
+ description: t('Set the opacity to 0 if you do not want to override the color specified in the GeoJSON'),
+ renderTrigger: false,
+ },
+ color_picker:{
+ label: t('Default Fill Color'),
+ description: t('Use this to define a default fill color for outside range values'),
+ renderTrigger: false,
+ },
+ geojson:{
+ label: t('Id Column'),
+ description: t('Id column for GeoJson Column'),
+ },
+ polygon:{
+ label: t('GeoJson Column '),
+ },
+ mapbox_style:{
+ renderTrigger: false,
+ label: t('Map Layer'),
+ choices: [
+ ['Point', 'Marker'],
+ ['Polygon','Polygon'],
+ ['Polygon-Convex', 'Polygon Convex'],
+ ['Polygon-Concave', 'Polygon Concave'],
+ ],
+ default: 'Polygon',
+ description: t('Map Layer style'),
+ },
+ viewport_longitude:{
+ default: 72.83333,
+ isFloat: false,
+ },
+ viewport_latitude:{
+ default: 18.96667,
+ isFloat: false,
+ },
+ viewport_zoom:{
+ label: t('Default Zoom Level'),
+ description: t('Default Zoom Level'),
+ default: 12,
+ isInt: true,
+ },
+ min_radius:{
+ label: t('Minimum Zoom Level'),
+ description: t('Minimum Zoom Level'),
+ renderTrigger: false,
+ isInt: true,
+ default: 8,
+ },
+ max_radius:{
+ label: t('Maximum Zoom Level'),
+ description: t('Maximum Zoom Level'),
+ renderTrigger: false,
+ default: 18,
+ isInt: true,
+ },
+ ranges:{
+ label: t('Map Server URL'),
+ description: t('Map Server URL'),
+ renderTrigger: false,
+ default: 'http://{s}.tile.osm.org/{z}/{x}/{y}.png',
+ },
+ row_limit:{
+ default: 50,
+ }
+
+ },
+ },
dist_bar: {
label: t('Distribution - Bar Chart'),
showOnExplore: true,
@@ -180,6 +301,7 @@ export const visTypes = {
controlSetRows: [
['color_scheme'],
['show_brush', 'show_legend'],
+ ['chart_interactivity'],
['rich_tooltip', 'show_markers'],
['line_interpolation'],
],
@@ -1881,7 +2003,8 @@ export function sectionsToRender(vizType, datasourceType) {
return [].concat(
sectionsCopy.datasourceAndVizType,
- datasourceType === 'table' ? sectionsCopy.sqlaTimeSeries : sectionsCopy.druidTimeSeries,
+ sectionsCopy.linkedSlices,
+ (datasourceType === 'table' || datasourceType === 'pandas') ? sectionsCopy.sqlaTimeSeries : sectionsCopy.druidTimeSeries,
viz.controlPanelSections,
).filter(section => section);
}
diff --git a/superset/assets/src/visualizations/index.js b/superset/assets/src/visualizations/index.js
index 098079ea50..164198609b 100644
--- a/superset/assets/src/visualizations/index.js
+++ b/superset/assets/src/visualizations/index.js
@@ -50,6 +50,7 @@ export const VIZ_TYPES = {
deck_arc: 'deck_arc',
deck_polygon: 'deck_polygon',
rose: 'rose',
+ leaflet_map:'leaflet_map'
};
const loadVis = promise =>
@@ -137,6 +138,7 @@ const vizMap = {
[VIZ_TYPES.deck_multi]: () =>
loadVis(import(/* webpackChunkName: "deckgl/multi" */ './deckgl/multi.jsx')),
[VIZ_TYPES.rose]: () => loadVis(import(/* webpackChunkName: "rose" */ './rose.js')),
+ [VIZ_TYPES.leaflet_map]:() => loadVis(import('./leaflet_map.js')),
};
export default vizMap;
diff --git a/superset/assets/src/visualizations/leaflet_map.css b/superset/assets/src/visualizations/leaflet_map.css
new file mode 100644
index 0000000000..bd2758148b
--- /dev/null
+++ b/superset/assets/src/visualizations/leaflet_map.css
@@ -0,0 +1,3 @@
+.color_column_div{
+
+}
\ No newline at end of file
diff --git a/superset/assets/src/visualizations/leaflet_map.js b/superset/assets/src/visualizations/leaflet_map.js
new file mode 100644
index 0000000000..c58882b381
--- /dev/null
+++ b/superset/assets/src/visualizations/leaflet_map.js
@@ -0,0 +1,302 @@
+import './leaflet_map.css';
+// todo: use types to avoid full path of libs
+import '../../node_modules/leaflet/dist/leaflet.css';
+import * as L from '../../node_modules/leaflet/dist/leaflet.js';
+import * as turf from '@turf/turf';
+
+/**
+ * Leaflet Map Visualization
+ * @param {*} slice
+ * @param {*} payload
+ */
+function leafletmap(slice, payload) {
+
+ console.log(slice, payload);
+ const POLYGON = 'Polygon';
+ const CONVEX = 'Convex';
+ const CONCAVE = 'Concave';
+ const POINT = 'Point';
+
+ const formData = slice.formData;
+
+ const MARKER_FILL_COLOR = getRgbColor(formData.color_picker);
+ const MARKER_RADIUS = 10;
+ const MARKER_WEIGHT = 1;
+ const MARKER_OPACITY = 1;
+
+
+
+ var colorCols;
+ var geoJson;
+ var mapInstance;
+ var mapLayerType;
+ var selectedColorColumn;
+ var geoJsonLayer;
+
+ function getDefaultPolygonStyles() {
+ return {
+ color: getRgbColor(formData.stroke_color_picker),
+ fillColor: MARKER_FILL_COLOR,
+ weight: MARKER_WEIGHT,
+ opacity: MARKER_OPACITY,
+ fillOpacity: formData.cell_size
+ }
+ }
+
+ function getRgbColor(rgbObj){
+ return "rgb("+rgbObj.r+","+rgbObj.g+","+rgbObj.b+","+rgbObj.a+")";
+ }
+
+ function setMapLayerType() {
+ var map_style = formData.mapbox_style;
+ var types = map_style.split('-');
+ mapLayerType = (types.length == 2) ? types[1] : types[0];
+ console.log(map_style, mapLayerType);
+ }
+
+ function setLayout() {
+ const container = slice.container;
+ // fix of leaflet js :: error
+ //An error occurred while rendering the visualization: Error: Map container is already initialized.
+ var el = container.el;
+ if(el && el._leaflet_id){
+ el._leaflet_id = null;
+ }
+ container.css('height', slice.height());
+ container.css('overflow', 'auto');
+ }
+
+ function createColorColumns() {
+ // todo: current object is AdhocFilter,so propertynames are not match as we need
+ // create AdhocColumn with correct names
+ colorCols = {}
+ if (formData.adhoc_columns && formData.adhoc_columns.length > 0) {
+ formData.adhoc_columns.forEach(element => {
+ colorCols[element['subject']] = element;
+ });
+ }
+
+ selectedColorColumn = Object.keys(colorCols)[0];
+
+ }
+
+ function getTurfBasedGeoCordinates(points, type) {
+ var turfPoints = [];
+ points.forEach(element => {
+ turfPoints.push(turf.point(element))
+ });
+ var turfFeatureCollection = turf.featureCollection(turfPoints);
+ var hullFeature;
+ if (type == CONVEX)
+ hullFeature = turf.convex(turfFeatureCollection);
+ else if (type == CONCAVE)
+ hullFeature = turf.concave(turfFeatureCollection);
+
+ return hullFeature ? hullFeature.geometry.coordinates : points;
+ }
+
+ function getMapCordinates(data) {
+ const geoJsonField = formData.polygon;
+ var points = JSON.parse(data[geoJsonField]);
+ if (mapLayerType == POINT) {
+ return (points.length > 0 && points[0] instanceof Array) ? points[0] : points;
+ }
+ else if (mapLayerType == CONVEX || mapLayerType == CONCAVE) {
+ return getTurfBasedGeoCordinates(points, mapLayerType)
+ } else {
+ return [points];
+ }
+ }
+
+ function changeInRange0to1(val, max, min) {
+ if(max - min === 0) return 1;
+ return (val - min) / (max - min);
+ }
+
+ function colourGradientor(rgb_beginning,rgb_end,p,max,min){
+ var q = changeInRange0to1(p,max,min);
+ var w1 = q;
+ var w2 = 1 - q;
+ var rgb = [parseInt(rgb_beginning.r * w1 + rgb_end.r* w2),
+ parseInt(rgb_beginning.g * w1 + rgb_end.g* w2),
+ parseInt(rgb_beginning.b * w1 + rgb_end.b * w2),
+ parseInt(rgb_beginning.a * w1 + rgb_end.a * w2)];
+ return 'rgb('+rgb[0] +',' + rgb[1] +',' +rgb[2] +','+rgb_beginning.a + ')';
+ }
+
+ function getColorForColumnVaule(colname, colvalue) {
+ // todo: current object is AdhocFilter,so propertynames are not match as we need
+ // create AdhocColumn with correct names
+ var col = colorCols[colname];
+ var minValue = col['operator'];
+ var maxvalue = col['sqlExpression'];
+ var minValueClr = col['comparator'];
+ var maxValueClr = col['clause'];
+ var colclr = colourGradientor(minValueClr,maxValueClr, colvalue,maxvalue,minValue);
+
+ return colclr;
+ }
+
+ function getColumn(colname, colvalue) {
+ return {
+ 'name': colname,
+ 'value': colvalue,
+ 'color': getColorForColumnVaule(colname, colvalue)
+ }
+ }
+
+ function getMapProperties(data) {
+ const idfield = formData.geojson;
+ var obj = { 'id': data[idfield] };
+ for (const key in data) {
+ if (data.hasOwnProperty(key) && colorCols.hasOwnProperty(key)) {
+ obj[key] = getColumn(key, data[key])
+ }
+ }
+
+ return obj;
+ }
+
+ function getMapGeometry(data) {
+
+ return {
+ 'type': (mapLayerType == POINT) ? POINT : POLYGON,
+ 'coordinates': getMapCordinates(data)
+ };
+ }
+
+ function getFeatureObject(data) {
+ return {
+ 'type': 'Feature',
+ 'properties': getMapProperties(data),
+ 'geometry': getMapGeometry(data)
+ }
+ }
+
+ function getFeatures() {
+ var _data = payload.data.data;
+ var feats = [];
+ _data.forEach(element => {
+ feats.push(getFeatureObject(element));
+ });
+
+ return feats;
+ }
+
+
+ function createMapDP() {
+ geoJson = {
+ 'type': 'FeatureCollection',
+ 'features': getFeatures(),
+ }
+ console.log(geoJson);
+ }
+
+ function renderBasicMap() {
+
+ const def_lat = formData.viewport_latitude;
+ const def_long = formData.viewport_longitude;
+ const def_zoom = formData.viewport_zoom;
+ const def_mapserver = formData.ranges;
+ const min_zoom = formData.min_radius;
+ const max_zoom = formData.max_radius;
+
+ mapInstance = L.map(slice.containerId, {
+ minZoom: min_zoom,
+ maxZoom: max_zoom
+ }).setView([def_lat, def_long], def_zoom, {});
+
+ L.tileLayer(def_mapserver, {}).addTo(mapInstance);
+ }
+
+ function mapItemClick(event) {
+ slice.addFilter(formData.geojson, [event.target.feature.properties.id], false);
+ }
+
+ function getSelectedColorColumn() {
+ return selectedColorColumn;
+ }
+
+ function getLayerStyles(feature) {
+ var clr = feature.properties[getSelectedColorColumn()].color;
+ var styles = Object.assign({}, getDefaultPolygonStyles());
+ styles.fillColor = clr;
+ return styles;
+ }
+
+ function getPopupContent(feature) {
+ return "<div style='display:grid'><span><b>Details</b></span><span>" + formData.geojson + ' : ' + feature.properties.id + "</span><span>" + getSelectedColorColumn() + " : " + feature.properties[getSelectedColorColumn()].value + "</span></div>";
+ }
+
+ function renderPolygonLayer() {
+ geoJsonLayer = L.geoJson(geoJson, {
+ style: function (feature) {
+ return getLayerStyles(feature);
+ },
+
+ onEachFeature: function onEachFeature(feature, layer) {
+ layer.on({
+ click: mapItemClick
+ });
+ // todo: move this to tooltip functionality
+ layer.bindPopup(getPopupContent(feature));
+
+ },
+ pointToLayer: function (feature, latlng) {
+ var styles = getLayerStyles(feature)
+ styles.radius = MARKER_RADIUS;
+ return L.circleMarker(latlng, styles).on('click', mapItemClick);
+ },
+ }).addTo(mapInstance);
+ }
+
+ function changeColumn(event) {
+ selectedColorColumn = event.target.value;
+ mapInstance.removeLayer(geoJsonLayer);
+ console.log(selectedColorColumn);
+ renderPolygonLayer();
+ }
+ function getColumnOptions() {
+ var str = "<select>";
+ for (const key in colorCols) {
+ if (colorCols.hasOwnProperty(key)) {
+ str += "<option>" + key + "</option>";
+ }
+ }
+ str += "</select>";
+ return str;
+ }
+
+ function addColumnsDropdownToMap() {
+
+ if (Object.keys(colorCols).length > 1) {
+ var legend = L.control({ position: 'topright' });
+ legend.onAdd = function (map) {
+ var div = L.DomUtil.create('div', 'color_column_div');
+ div.innerHTML = getColumnOptions();
+ div.firstChild.onchange = changeColumn;
+ return div;
+ };
+ legend.addTo(mapInstance);
+ }
+ }
+
+ function drawMap() {
+ renderBasicMap();
+ renderPolygonLayer();
+ addColumnsDropdownToMap();
+ }
+
+ function init() {
+
+ setLayout();
+ setMapLayerType();
+ createColorColumns();
+ createMapDP();
+ drawMap();
+ }
+
+ init();
+}
+
+module.exports = leafletmap;
diff --git a/superset/assets/src/visualizations/nvd3_vis.js b/superset/assets/src/visualizations/nvd3_vis.js
index 4dcdb4087e..373d175675 100644
--- a/superset/assets/src/visualizations/nvd3_vis.js
+++ b/superset/assets/src/visualizations/nvd3_vis.js
@@ -131,9 +131,9 @@ export default function nvd3Vis(slice, payload) {
let data;
if (payload.data) {
if (Array.isArray(payload.data)) {
- data = payload.data.map(x => ({
- ...x, key: formatLabel(x.key, slice.datasource.verbose_map),
- }));
+ data = payload.data.map(x => ({
+ ...x, key: formatLabel(x.key, slice.datasource.verbose_map),
+ }));
} else {
data = payload.data;
}
@@ -172,6 +172,7 @@ export default function nvd3Vis(slice, payload) {
svg = d3.select(slice.selector).append('svg');
}
let height = slice.height();
+ let annotatedLayerMarkerWidth = 1;
const isTimeSeries = TIMESERIES_VIZ_TYPES.indexOf(vizType) >= 0;
// Handling xAxis ticks settings
@@ -231,15 +232,15 @@ export default function nvd3Vis(slice, payload) {
case 'bar':
chart = nv.models.multiBarChart()
- .showControls(fd.show_controls)
- .groupSpacing(0.1);
+ .showControls(fd.show_controls)
+ .groupSpacing(0.1);
if (!reduceXTicks) {
width = barchartWidth();
}
chart.width(width);
chart.xAxis
- .showMaxMin(false);
+ .showMaxMin(false);
stacked = fd.bar_stacked;
chart.stacked(stacked);
@@ -253,9 +254,9 @@ export default function nvd3Vis(slice, payload) {
case 'dist_bar':
chart = nv.models.multiBarChart()
- .showControls(fd.show_controls)
- .reduceXTicks(reduceXTicks)
- .groupSpacing(0.1); // Distance between each group of bars.
+ .showControls(fd.show_controls)
+ .reduceXTicks(reduceXTicks)
+ .groupSpacing(0.1); // Distance between each group of bars.
chart.xAxis.showMaxMin(false);
@@ -307,7 +308,7 @@ export default function nvd3Vis(slice, payload) {
case 'column':
chart = nv.models.multiBarChart()
- .reduceXTicks(false);
+ .reduceXTicks(false);
break;
case 'compare':
@@ -327,7 +328,7 @@ export default function nvd3Vis(slice, payload) {
let s = '<table>';
s += (
`<tr><td style="color: ${p.color};">` +
- `<strong>${p[fd.entity]}</strong> (${p.group})` +
+ `<strong>${p[fd.entity]}</strong> (${p.group})` +
'</td></tr>');
s += row(fd.x, formatter(p.x));
s += row(fd.y, formatter(p.y));
@@ -387,8 +388,8 @@ export default function nvd3Vis(slice, payload) {
}
if (chart.forceY &&
- fd.y_axis_bounds &&
- (fd.y_axis_bounds[0] !== null || fd.y_axis_bounds[1] !== null)) {
+ fd.y_axis_bounds &&
+ (fd.y_axis_bounds[0] !== null || fd.y_axis_bounds[1] !== null)) {
chart.forceY(fd.y_axis_bounds);
}
if (fd.y_log_scale) {
@@ -473,13 +474,13 @@ export default function nvd3Vis(slice, payload) {
d.series.forEach((series) => {
tooltip += (
`<tr class="${series.highlight ? 'emph' : ''}">` +
- `<td class='legend-color-guide' style="opacity: ${series.highlight ? '1' : '0.75'};"">` +
- '<div ' +
- `style="border: 2px solid ${series.highlight ? 'black' : 'transparent'}; background-color: ${series.color};"` +
- '></div>' +
- '</td>' +
- `<td>${dompurify.sanitize(series.key)}</td>` +
- `<td>${yAxisFormatter(series.value)}</td>` +
+ `<td class='legend-color-guide' style="opacity: ${series.highlight ? '1' : '0.75'};"">` +
+ '<div ' +
+ `style="border: 2px solid ${series.highlight ? 'black' : 'transparent'}; background-color: ${series.color};"` +
+ '></div>' +
+ '</td>' +
+ `<td>${dompurify.sanitize(series.key)}</td>` +
+ `<td>${yAxisFormatter(series.value)}</td>` +
'</tr>'
);
});
@@ -487,6 +488,13 @@ export default function nvd3Vis(slice, payload) {
return tooltip;
});
}
+
+ }
+
+ // add click event for line chart based on chart_interactivity flag
+ if (vizType === 'line' && fd.chart_interactivity)
+ {
+ chart.lines.dispatch.on('elementClick',slice.itemClick.bind(this));
}
if (['dual_line', 'line_multi'].indexOf(vizType) >= 0) {
@@ -509,11 +517,11 @@ export default function nvd3Vis(slice, payload) {
slice.container.css('height', height + 'px');
svg
- .datum(data)
- .transition().duration(500)
- .attr('height', height)
- .attr('width', width)
- .call(chart);
+ .datum(data)
+ .transition().duration(500)
+ .attr('height', height)
+ .attr('width', width)
+ .call(chart);
// align yAxis1 and yAxis2 ticks
if (['dual_line', 'line_multi'].indexOf(vizType) >= 0) {
@@ -542,8 +550,8 @@ export default function nvd3Vis(slice, payload) {
if (fd.show_markers) {
svg.selectAll('.nv-point')
- .style('stroke-opacity', 1)
- .style('fill-opacity', 1);
+ .style('stroke-opacity', 1)
+ .style('fill-opacity', 1);
}
if (chart.yAxis !== undefined || chart.yAxis2 !== undefined) {
@@ -553,7 +561,7 @@ export default function nvd3Vis(slice, payload) {
Math.min(isExplore ? containerWidth * 0.01 : containerWidth * 0.03, maxMarginPad),
);
const maxYAxisLabelWidth = chart.yAxis2 ? getMaxLabelSize(slice.container, 'nv-y1')
- : getMaxLabelSize(slice.container, 'nv-y');
+ : getMaxLabelSize(slice.container, 'nv-y');
const maxXAxisLabelHeight = getMaxLabelSize(slice.container, 'nv-x');
chart.margin({ left: maxYAxisLabelWidth + marginPad });
if (fd.y_axis_label && fd.y_axis_label !== '') {
@@ -612,30 +620,30 @@ export default function nvd3Vis(slice, payload) {
// Time series annotations add additional data
const timeSeriesAnnotations = annotationLayers
.filter(a => a.annotationType === AnnotationTypes.TIME_SERIES).reduce((bushel, a) =>
- bushel.concat((slice.annotationData[a.name] || []).map((series) => {
- if (!series) {
- return {};
- }
- const key = Array.isArray(series.key) ?
- `${a.name}, ${series.key.join(', ')}` : `${a.name}, ${series.key}`;
- return {
- ...series,
- key,
- color: a.color,
- strokeWidth: a.width,
- classed: `${a.opacity} ${a.style} nv-timeseries-annotation-layer showMarkers${a.showMarkers} hideLine${a.hideLine}`,
- };
- })), []);
+ bushel.concat((slice.annotationData[a.name] || []).map((series) => {
+ if (!series) {
+ return {};
+ }
+ const key = Array.isArray(series.key) ?
+ `${a.name}, ${series.key.join(', ')}` : `${a.name}, ${series.key}`;
+ return {
+ ...series,
+ key,
+ color: a.color,
+ strokeWidth: a.width,
+ classed: `${a.opacity} ${a.style} nv-timeseries-annotation-layer showMarkers${a.showMarkers} hideLine${a.hideLine}`,
+ };
+ })), []);
data.push(...timeSeriesAnnotations);
}
// render chart
svg
- .datum(data)
- .transition().duration(500)
- .attr('height', height)
- .attr('width', width)
- .call(chart);
+ .datum(data)
+ .transition().duration(500)
+ .attr('height', height)
+ .attr('width', width)
+ .call(chart);
// on scroll, hide tooltips. throttle to only 4x/second.
$(window).scroll(throttle(hideTooltips, 250));
@@ -855,10 +863,19 @@ export default function nvd3Vis(slice, payload) {
.attr('width', width)
.call(chart);
+ if (vizType === 'line' && fd.annotation_layers && fd.annotation_layers.length > 0) {
+ fd.annotation_layers.forEach(annotatedLayer => {
+ if (annotatedLayer.annotationType === AnnotationTypes.TIME_SERIES) {
+ annotatedLayerMarkerWidth = annotatedLayer.markerWidth;
+ }
+ });
+ }
+
// Display styles for Time Series Annotations
d3.selectAll('.slice_container .nv-timeseries-annotation-layer.showMarkerstrue .nv-point')
.style('stroke-opacity', 1)
- .style('fill-opacity', 1);
+ .style('fill-opacity', 1)
+ .style('stroke-width', annotatedLayerMarkerWidth);
d3.selectAll('.slice_container .nv-timeseries-annotation-layer.hideLinetrue')
.style('stroke-width', 0);
}
diff --git a/superset/assets/src/visualizations/pivot_table.js b/superset/assets/src/visualizations/pivot_table.js
index fded4616b3..1fcbb29181 100644
--- a/superset/assets/src/visualizations/pivot_table.js
+++ b/superset/assets/src/visualizations/pivot_table.js
@@ -35,6 +35,7 @@ module.exports = function (slice, payload) {
const tdText = $(this)[0].textContent;
if (!isNaN(tdText) && tdText !== '') {
$(this)[0].textContent = d3format(format, tdText);
+ $(this).attr('data-sort', tdText);
}
});
});
diff --git a/superset/assets/src/visualizations/table.js b/superset/assets/src/visualizations/table.js
index a715d19acb..8a100137cb 100644
--- a/superset/assets/src/visualizations/table.js
+++ b/superset/assets/src/visualizations/table.js
@@ -51,6 +51,10 @@ function tableVis(slice, payload) {
'table-condensed table-hover dataTable no-footer', true)
.attr('width', '100%');
+ const expressionMap = {};
+ slice.datasource.columns.forEach(column => {
+ expressionMap[column.column_name] = column.expression
+ });
const verboseMap = slice.datasource.verbose_map;
const cols = data.columns.map((c) => {
if (verboseMap[c]) {
@@ -64,6 +68,13 @@ function tableVis(slice, payload) {
return c;
});
+ function buttoRenderer(column) {
+ // console.log(slice.datasource)
+ const label = slice.datasource.verbose_map[column] || column
+ // console.log(slice.datasource.verbose_map[column]);
+ return `<button type="button" class="btn btn-sm btn-default">${label}</button>`
+ }
+
table.append('thead').append('tr')
.selectAll('th')
.data(cols)
@@ -96,6 +107,10 @@ function tableVis(slice, payload) {
if (c[0] === '%') {
html = d3.format('.3p')(val);
}
+ if(c === '__buttonrenderer') {
+ html = buttoRenderer(c);
+ c = expressionMap[c];
+ }
return {
col: c,
val,
@@ -150,14 +165,16 @@ function tableVis(slice, payload) {
)
.on('click', function (d) {
if (!d.isMetric && fd.table_filter) {
- const td = d3.select(this);
- if (td.classed('filtered')) {
- slice.removeFilter(d.col, [d.val]);
- d3.select(this).classed('filtered', false);
- } else {
- d3.select(this).classed('filtered', true);
- slice.addFilter(d.col, [d.val]);
- }
+ //addFilter args (col, vals, merge = true)
+ slice.addFilter(d.col, [d.val],false);
+ // const td = d3.select(this);
+ // if (td.classed('filtered')) {
+ // slice.removeFilter(d.col, [d.val]);
+ // d3.select(this).classed('filtered', false);
+ // } else {
+ // d3.select(this).classed('filtered', true);
+ // slice.addFilter(d.col, [d.val]);
+ // }
}
})
.style('cursor', function (d) {
diff --git a/superset/assets/stylesheets/guavus.less b/superset/assets/stylesheets/guavus.less
new file mode 100644
index 0000000000..cea6230dce
--- /dev/null
+++ b/superset/assets/stylesheets/guavus.less
@@ -0,0 +1,66 @@
+//=== Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-bg: #383846;
+@navbar-inverse-link-color: #fff;
+@navbar-inverse-link-hover-color: #fff;
+@navbar-height: 45px;
+@navbar-inverse-brand-hover-color: @navbar-inverse-link-color;
+
+.header-img-div {
+ display: inline-flex;
+ padding-top: 5px;
+}
+.header-divider-line {
+ width: 1px;
+ height: 23px;
+ margin-left: 20px;
+ margin-right: 20px;
+ background-color: @navbar-inverse-link-color;
+}
+
+// --- changing nav bar caret colors
+.caret {
+border: none;
+color: #fff;
+}
+.caret:hover {
+color: #fff;
+}
+
+// --- footer styles ---
+@footer-label-color: #fff;
+@footer-bar-background-color: @navbar-inverse-bg;
+@text-footer-font-size: 12px;
+@text-font-weight: 'normal';
+@default-text-font-style:'normal';
+
+.footer-right {
+ float: right;
+ margin: 5px 15px 5px 0px;
+ .footer-right-label {
+ font-size: @text-footer-font-size;
+ color: @footer-label-color;
+ font-style: @default-text-font-style;
+ font-weight: @text-font-weight;
+ }
+}
+
+.footer-left {
+ float: left;
+ margin: 5px 0px 5px 15px;
+ .footer-left-label {
+ font-size: @text-footer-font-size;
+ color: @footer-label-color;
+ font-style: @default-text-font-style;
+ font-weight: @text-font-weight;
+ }
+}
+
+.navbar-fixed-bottom-template {
+ min-height: 30px;
+ height: 30px;
+}
+
+.navbar-default-template {
+ background-color: @footer-bar-background-color;
+}
diff --git a/superset/assets/stylesheets/superset.less b/superset/assets/stylesheets/superset.less
index 566a4811d9..eb2c15b261 100644
--- a/superset/assets/stylesheets/superset.less
+++ b/superset/assets/stylesheets/superset.less
@@ -1,5 +1,6 @@
@import './less/index.less';
@import "./less/cosmo/variables.less";
+@import "./guavus.less";
body {
margin: 0px !important;
diff --git a/superset/assets/yarn.lock b/superset/assets/yarn.lock
index 669ab3a6c4..b61b495507 100644
--- a/superset/assets/yarn.lock
+++ b/superset/assets/yarn.lock
@@ -327,6 +327,1061 @@
dependencies:
samsam "1.3.0"
+"@turf/along@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/along/-/along-5.1.5.tgz#61d6e6a6584acddab56ac5584e07bf8cbe5f8beb"
+ dependencies:
+ "@turf/bearing" "^5.1.5"
+ "@turf/destination" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/area@5.1.x", "@turf/area@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/area/-/area-5.1.5.tgz#efd899bfd260cdbd1541b2a3c155f8a5d2eefa1d"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/bbox-clip@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/bbox-clip/-/bbox-clip-5.1.5.tgz#3364b5328dff9f3cf41d9e02edaff374d150cc84"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ lineclip "^1.1.5"
+
+"@turf/bbox-polygon@5.1.x", "@turf/bbox-polygon@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/bbox-polygon/-/bbox-polygon-5.1.5.tgz#6aeba4ed51d85d296e0f7c38b88c339f01eee024"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/bbox@5.1.x", "@turf/bbox@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-5.1.5.tgz#3051df514ad4c50f4a4f9b8a2d15fd8b6840eda3"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/bearing@5.1.x", "@turf/bearing@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-5.1.5.tgz#7a0b790136c4ef4797f0246305d45cbe2d27b3f7"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/bearing@6.x":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-6.0.1.tgz#8da5d17092e571f170cde7bfb2e5b0d74923c92d"
+ dependencies:
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+
+"@turf/bezier-spline@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/bezier-spline/-/bezier-spline-5.1.5.tgz#59a27bba5d7b97ef15ab3fd5a40fbd2387049bca"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-clockwise@5.1.x", "@turf/boolean-clockwise@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-clockwise/-/boolean-clockwise-5.1.5.tgz#3302b7dac62c5e291a0789e29af7283387fa9deb"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-contains@5.1.x", "@turf/boolean-contains@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-contains/-/boolean-contains-5.1.5.tgz#596d63aee636f7ad53ee99f9ff24c96994a0ef14"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/boolean-point-on-line" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-crosses@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-crosses/-/boolean-crosses-5.1.5.tgz#01bfaea2596f164de4a4d325094dc7c255c715d6"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/polygon-to-line" "^5.1.5"
+
+"@turf/boolean-disjoint@5.1.x":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-disjoint/-/boolean-disjoint-5.1.6.tgz#3fbd87084b269133f5fd15725deb3c6675fb8a9d"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/polygon-to-line" "^5.1.5"
+
+"@turf/boolean-equal@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-equal/-/boolean-equal-5.1.5.tgz#29f8f6d60bb84507dfd765b32254db8e72c938a4"
+ dependencies:
+ "@turf/clean-coords" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ geojson-equality "0.1.6"
+
+"@turf/boolean-overlap@5.1.x", "@turf/boolean-overlap@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-overlap/-/boolean-overlap-5.1.5.tgz#0d4e64c52c770a28e93d9efcdf8a8b8373acce75"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/line-overlap" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ geojson-equality "0.1.6"
+
+"@turf/boolean-parallel@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-parallel/-/boolean-parallel-5.1.5.tgz#739358475ea5b65c7e1827a3c3e0e8a687d3a85d"
+ dependencies:
+ "@turf/clean-coords" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/line-segment" "^5.1.5"
+ "@turf/rhumb-bearing" "^5.1.5"
+
+"@turf/boolean-point-in-polygon@5.1.x", "@turf/boolean-point-in-polygon@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-5.1.5.tgz#f01cc194d1e030a548bfda981cba43cfd62941b7"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-point-on-line@5.1.x", "@turf/boolean-point-on-line@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-point-on-line/-/boolean-point-on-line-5.1.5.tgz#f633c5ff802ad24bb8f158dadbaf6ff4a023dd7b"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-within@5.1.x", "@turf/boolean-within@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/boolean-within/-/boolean-within-5.1.5.tgz#47105d56d0752a9d0fbfcd43c36a5f9149dc8697"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/boolean-point-on-line" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/buffer@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/buffer/-/buffer-5.1.5.tgz#841c9627cfb974b122ac4e1a956f0466bc0231c4"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/center" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/projection" "^5.1.5"
+ d3-geo "1.7.1"
+ turf-jsts "*"
+
+"@turf/center-mean@5.1.x", "@turf/center-mean@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/center-mean/-/center-mean-5.1.5.tgz#8c8e9875391e5f09f0e6e78f5d661b88b2108a0a"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/center-median@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/center-median/-/center-median-5.1.5.tgz#bb461bfe7a2a48601d8a4727685718723a14a872"
+ dependencies:
+ "@turf/center-mean" "^5.1.5"
+ "@turf/centroid" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/center-of-mass@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/center-of-mass/-/center-of-mass-5.1.5.tgz#4d3bd79d88498dbab8324d4f69f0322f6520b9ca"
+ dependencies:
+ "@turf/centroid" "^5.1.5"
+ "@turf/convex" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/center@5.1.x", "@turf/center@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/center/-/center-5.1.5.tgz#44ab2cd954f63c0d37757f7158a99c3ef5114b80"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/centroid@5.1.x", "@turf/centroid@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-5.1.5.tgz#778ada74216335021ad8fd0e7a65a8349d53c769"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/circle@5.1.x", "@turf/circle@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/circle/-/circle-5.1.5.tgz#9b1577835508ab52fb1c10b2a5065cba2b87b6a5"
+ dependencies:
+ "@turf/destination" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/clean-coords@5.1.x", "@turf/clean-coords@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/clean-coords/-/clean-coords-5.1.5.tgz#12800a98a78c9a452a72ec428493c43acf2ada1f"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/clone@5.1.x", "@turf/clone@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-5.1.5.tgz#253e8d35477181976e33adfab50a0f02a7f0e367"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/clone@6.x":
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-6.0.2.tgz#7563cebbb3e2e19f361599bb244467e0dcc205c9"
+ dependencies:
+ "@turf/helpers" "6.x"
+
+"@turf/clusters-dbscan@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/clusters-dbscan/-/clusters-dbscan-5.1.5.tgz#5781fb4e656c747a0b8e9937df73181c0309e26f"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ density-clustering "1.3.0"
+
+"@turf/clusters-kmeans@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/clusters-kmeans/-/clusters-kmeans-5.1.5.tgz#fd6dfea8b133ba8bdc2370ac3cacee1587a302f1"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ skmeans "0.9.7"
+
+"@turf/clusters@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/clusters/-/clusters-5.1.5.tgz#673a5e5f1b19c9cababc57c908eeadd682224dd4"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/collect@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/collect/-/collect-5.1.5.tgz#fe98c9a8c218ecf24ffc33d7029517b7c19b2a3e"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ rbush "^2.0.1"
+
+"@turf/combine@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/combine/-/combine-5.1.5.tgz#bb14bdefa55504357195fc1a124cd7d53a8c8905"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/concave@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/concave/-/concave-5.1.5.tgz#23bbaac387d034b96574a1bd70d059237a9d2110"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/tin" "^5.1.5"
+ topojson-client "3.x"
+ topojson-server "3.x"
+
+"@turf/convex@5.1.x", "@turf/convex@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/convex/-/convex-5.1.5.tgz#0df9377dd002216ce9821b07f705e037dae3e01d"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ concaveman "*"
+
+"@turf/destination@5.1.x", "@turf/destination@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-5.1.5.tgz#ed35381bdce83bbddcbd07a2e2bce2bddffbcc26"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/difference@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/difference/-/difference-5.1.5.tgz#a24d690a7bca803f1090a9ee3b9d906fc4371f42"
+ dependencies:
+ "@turf/area" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ turf-jsts "*"
+
+"@turf/dissolve@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/dissolve/-/dissolve-5.1.5.tgz#2cf133a9021d2163831c3d7a958d6507f9d81938"
+ dependencies:
+ "@turf/boolean-overlap" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/union" "^5.1.5"
+ geojson-rbush "2.1.0"
+ get-closest "*"
+
+"@turf/distance@5.1.x", "@turf/distance@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-5.1.5.tgz#39cf18204bbf87587d707e609a60118909156409"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/distance@6.x":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-6.0.1.tgz#0761f28784286e7865a427c4e7e3593569c2dea8"
+ dependencies:
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+
+"@turf/ellipse@5.1.x", "@turf/ellipse@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/ellipse/-/ellipse-5.1.5.tgz#d57cab853985920cde60228a78d80458025c54be"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/rhumb-destination" "^5.1.5"
+ "@turf/transform-rotate" "^5.1.5"
+
+"@turf/envelope@5.1.x", "@turf/envelope@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/envelope/-/envelope-5.1.5.tgz#5013309c53fdd43dfaf4b588a65c3fed7dbc108a"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/bbox-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/explode@5.1.x", "@turf/explode@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-5.1.5.tgz#b12b2f774004a1b48f62ba95b20a1c655a3de118"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/flatten@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/flatten/-/flatten-5.1.5.tgz#da2927067133ed6169b0b9d607b9215688aa1358"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/flip@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/flip/-/flip-5.1.5.tgz#436f643a722f0ca53b9fce638e4693db3608a68a"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/great-circle@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/great-circle/-/great-circle-5.1.5.tgz#debfb671ce475509cb637301c15fcfccfa359a93"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/helpers@*", "@turf/helpers@6.x":
+ version "6.1.4"
+ resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.1.4.tgz#d6fd7ebe6782dd9c87dca5559bda5c48ae4c3836"
+
+"@turf/helpers@5.1.x", "@turf/helpers@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-5.1.5.tgz#153405227ab933d004a5bb9641a9ed999fcbe0cf"
+
+"@turf/hex-grid@5.1.x", "@turf/hex-grid@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/hex-grid/-/hex-grid-5.1.5.tgz#9b7ba5fecf5051f1e85892f713fce5c550502a6a"
+ dependencies:
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/intersect" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/interpolate@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/interpolate/-/interpolate-5.1.5.tgz#0f12f0ab756d6dd10afb290ca6e877bdef013eaa"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/centroid" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/hex-grid" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/point-grid" "^5.1.5"
+ "@turf/square-grid" "^5.1.5"
+ "@turf/triangle-grid" "^5.1.5"
+
+"@turf/intersect@5.1.x", "@turf/intersect@^5.1.5":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/intersect/-/intersect-5.1.6.tgz#13ffcceb7a529c2a7e5d6681ab3ba671f868e95f"
+ dependencies:
+ "@turf/clean-coords" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/truncate" "^5.1.5"
+ turf-jsts "*"
+
+"@turf/invariant@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-5.1.5.tgz#f59f4fefa09224b15dce1651f903c868d57a24e1"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/invariant@6.x":
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.1.2.tgz#6013ed6219f9ac2edada9b31e1dfa5918eb0a2f7"
+ dependencies:
+ "@turf/helpers" "6.x"
+
+"@turf/invariant@^5.1.5":
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-5.2.0.tgz#f0150ff7290b38577b73d088b7932c1ee0aa90a7"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/isobands@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/isobands/-/isobands-5.1.5.tgz#6b44cef584d551a31304187af23b4a1582e3f08d"
+ dependencies:
+ "@turf/area" "^5.1.5"
+ "@turf/bbox" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/explode" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/isolines@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/isolines/-/isolines-5.1.5.tgz#8ab4e7f42bb3dfc54614e5bf155967f7e55d2de1"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/kinks@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/kinks/-/kinks-5.1.5.tgz#8abb6961d9bb0107213baddf2c2c2640d0256980"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/length@5.1.x", "@turf/length@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/length/-/length-5.1.5.tgz#f3a5f864c2b996a8bb471794535a1faf12eebefb"
+ dependencies:
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/line-arc@5.1.x", "@turf/line-arc@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-arc/-/line-arc-5.1.5.tgz#0078a7447835a12ae414a211f9a64d1186150e15"
+ dependencies:
+ "@turf/circle" "^5.1.5"
+ "@turf/destination" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/line-chunk@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-chunk/-/line-chunk-5.1.5.tgz#910a85c05c06d9d0f9c38977a05e0818d5085c42"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/length" "^5.1.5"
+ "@turf/line-slice-along" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/line-intersect@5.1.x", "@turf/line-intersect@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-intersect/-/line-intersect-5.1.5.tgz#0e29071ae403295e491723bc49f5cfac8d11ddf3"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-segment" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ geojson-rbush "2.1.0"
+
+"@turf/line-offset@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-offset/-/line-offset-5.1.5.tgz#2ab5b2f089f8c913e231d994378e79dca90b5a1e"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/line-overlap@5.1.x", "@turf/line-overlap@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-overlap/-/line-overlap-5.1.5.tgz#943c6f87a0386dc43dfac11d2b3ff9c112cd3f60"
+ dependencies:
+ "@turf/boolean-point-on-line" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-segment" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/nearest-point-on-line" "^5.1.5"
+ geojson-rbush "2.1.0"
+
+"@turf/line-segment@5.1.x", "@turf/line-segment@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-segment/-/line-segment-5.1.5.tgz#3207aaee546ab24c3d8dc3cc63f91c770b8013e5"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/line-slice-along@5.1.x", "@turf/line-slice-along@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-slice-along/-/line-slice-along-5.1.5.tgz#eddad0a21ef479f2968a11bd2dd7289a2132e9a5"
+ dependencies:
+ "@turf/bearing" "^5.1.5"
+ "@turf/destination" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/line-slice@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-slice/-/line-slice-5.1.5.tgz#1ecfce1462a378579754cedf4464cde26829f2b5"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/nearest-point-on-line" "^5.1.5"
+
+"@turf/line-split@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-split/-/line-split-5.1.5.tgz#5b2df4c37619b72ef725b5163cf9926d5540acb7"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/line-segment" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/nearest-point-on-line" "^5.1.5"
+ "@turf/square" "^5.1.5"
+ "@turf/truncate" "^5.1.5"
+ geojson-rbush "2.1.0"
+
+"@turf/line-to-polygon@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/line-to-polygon/-/line-to-polygon-5.1.5.tgz#213cf41a68f8224778ba39d3187dec3e8b81865a"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/mask@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/mask/-/mask-5.1.5.tgz#9ab0fef1a272c98fe3ef492f9ffb618206b242d5"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/union" "^5.1.5"
+ rbush "^2.0.1"
+
+"@turf/meta@*", "@turf/meta@6.x":
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-6.0.2.tgz#eb92951126d24a613ac1b7b99d733fcc20fd30cf"
+ dependencies:
+ "@turf/helpers" "6.x"
+
+"@turf/meta@5.1.x":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.1.6.tgz#c20a863eded0869fb28548dee889341bccb46a46"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/meta@^5.1.5":
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.2.0.tgz#3b1ad485ee0c3b0b1775132a32c384d53e4ba53d"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/midpoint@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/midpoint/-/midpoint-5.1.5.tgz#e261f6b2b0ea8124cceff552a262dd465c9d05f0"
+ dependencies:
+ "@turf/bearing" "^5.1.5"
+ "@turf/destination" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/nearest-point-on-line@5.1.x", "@turf/nearest-point-on-line@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/nearest-point-on-line/-/nearest-point-on-line-5.1.5.tgz#5606ae297f15947524bea51a2a9ef51ec1bf9c36"
+ dependencies:
+ "@turf/bearing" "^5.1.5"
+ "@turf/destination" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-intersect" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/nearest-point-to-line@5.1.x":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/nearest-point-to-line/-/nearest-point-to-line-5.1.6.tgz#d30b7606e56a3dce97f4db6d45d352470e0b3f88"
+ dependencies:
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+ "@turf/meta" "6.x"
+ "@turf/point-to-line-distance" "^5.1.5"
+ object-assign "*"
+
+"@turf/nearest-point@5.1.x", "@turf/nearest-point@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/nearest-point/-/nearest-point-5.1.5.tgz#12050de41c398443224c7978de0f6213900d34fb"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/planepoint@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/planepoint/-/planepoint-5.1.5.tgz#18bbdf006f759def5e42c6a006c9f9de81b2b7ff"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/point-grid@5.1.x", "@turf/point-grid@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/point-grid/-/point-grid-5.1.5.tgz#305141248f50bafe36ce7e66ba4b97e7ab236887"
+ dependencies:
+ "@turf/boolean-within" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/point-on-feature@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/point-on-feature/-/point-on-feature-5.1.5.tgz#30c7f032430277c6418d96d289e45b6bfb213fe7"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/center" "^5.1.5"
+ "@turf/explode" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/nearest-point" "^5.1.5"
+
+"@turf/point-to-line-distance@5.1.x", "@turf/point-to-line-distance@^5.1.5":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/point-to-line-distance/-/point-to-line-distance-5.1.6.tgz#954f6cb68546420a030d8480392503264970d2d8"
+ dependencies:
+ "@turf/bearing" "6.x"
+ "@turf/distance" "6.x"
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+ "@turf/meta" "6.x"
+ "@turf/projection" "6.x"
+ "@turf/rhumb-bearing" "6.x"
+ "@turf/rhumb-distance" "6.x"
+
+"@turf/points-within-polygon@5.1.x", "@turf/points-within-polygon@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/points-within-polygon/-/points-within-polygon-5.1.5.tgz#2b855a5df3aada57c2ee820a0754ab94928a2337"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/polygon-tangents@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/polygon-tangents/-/polygon-tangents-5.1.5.tgz#2bf00991473025b178e250dc7cb9ae5409bbd652"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/polygon-to-line@5.1.x", "@turf/polygon-to-line@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/polygon-to-line/-/polygon-to-line-5.1.5.tgz#23bb448d84dc4c651999ac611a36d91c5925036a"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/polygonize@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/polygonize/-/polygonize-5.1.5.tgz#0493fa11879f39d10b9ad02ce6a23e942d08aa32"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/envelope" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/projection@5.1.x", "@turf/projection@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/projection/-/projection-5.1.5.tgz#24517eeeb2f36816ba9f712e7ae6d6a368edf757"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/projection@6.x":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@turf/projection/-/projection-6.0.1.tgz#bde70ae8441b9cefddf26d71c7db74bc3d9792b1"
+ dependencies:
+ "@turf/clone" "6.x"
+ "@turf/helpers" "6.x"
+ "@turf/meta" "6.x"
+
+"@turf/random@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/random/-/random-5.1.5.tgz#b32efc934560ae8ba57e8ebb51f241c39fba2e7b"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/rewind@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/rewind/-/rewind-5.1.5.tgz#9ea3db4a68b73c1fd1dd11f57631b143cfefa1c9"
+ dependencies:
+ "@turf/boolean-clockwise" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/rhumb-bearing@5.1.x", "@turf/rhumb-bearing@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/rhumb-bearing/-/rhumb-bearing-5.1.5.tgz#acf6a502427eb8c49e18cda6ae0effab0c5ddcd2"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/rhumb-bearing@6.x":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@turf/rhumb-bearing/-/rhumb-bearing-6.0.1.tgz#182c4c21fe951e097fb468ae128dc22ef6078f3f"
+ dependencies:
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+
+"@turf/rhumb-destination@5.1.x", "@turf/rhumb-destination@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/rhumb-destination/-/rhumb-destination-5.1.5.tgz#b1b2aeb921547f2ac0c1a994b6a130f92463c742"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/rhumb-distance@5.1.x", "@turf/rhumb-distance@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/rhumb-distance/-/rhumb-distance-5.1.5.tgz#1806857625f4225384dad413e69f39538ff5f765"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/rhumb-distance@6.x":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@turf/rhumb-distance/-/rhumb-distance-6.0.1.tgz#ae1c5c823b4b04f75cd7fc240f7f93647db8bdd4"
+ dependencies:
+ "@turf/helpers" "6.x"
+ "@turf/invariant" "6.x"
+
+"@turf/sample@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/sample/-/sample-5.1.5.tgz#e9cb448a4789cc56ee3de2dd6781e2343435b411"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/sector@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/sector/-/sector-5.1.5.tgz#ac2bb94c13edd6034f6fdc2b67008135d20f5e07"
+ dependencies:
+ "@turf/circle" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/line-arc" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/shortest-path@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/shortest-path/-/shortest-path-5.1.5.tgz#854ae8096f6bc3e1300faca77f3e8f67d8f935ab"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/bbox-polygon" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/clean-coords" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/transform-scale" "^5.1.5"
+
+"@turf/simplify@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/simplify/-/simplify-5.1.5.tgz#0ac8f27a2eb4218183edd9998c3275abe408b926"
+ dependencies:
+ "@turf/clean-coords" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/square-grid@5.1.x", "@turf/square-grid@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/square-grid/-/square-grid-5.1.5.tgz#1bd5f7b9eb14f0b60bc231fefe7351d1a32f1a51"
+ dependencies:
+ "@turf/boolean-contains" "^5.1.5"
+ "@turf/boolean-overlap" "^5.1.5"
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/intersect" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/square@5.1.x", "@turf/square@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/square/-/square-5.1.5.tgz#aa7b21e6033cc9252c3a5bd6f3d88dabd6fed180"
+ dependencies:
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+
+"@turf/standard-deviational-ellipse@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/standard-deviational-ellipse/-/standard-deviational-ellipse-5.1.5.tgz#85cd283b5e1aca58f21bd66412e414b56d852324"
+ dependencies:
+ "@turf/center-mean" "^5.1.5"
+ "@turf/ellipse" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/points-within-polygon" "^5.1.5"
+
+"@turf/tag@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/tag/-/tag-5.1.5.tgz#d1ee1a5088ecfd4a1411019c98239ccf2a497d20"
+ dependencies:
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/tesselate@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/tesselate/-/tesselate-5.1.5.tgz#32a594e9c21a00420a9f90d2c43df3e1166061cd"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ earcut "^2.0.0"
+
+"@turf/tin@5.1.x", "@turf/tin@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/tin/-/tin-5.1.5.tgz#28223eafc5fbe9ae9acca81cdcfea5d1424c917d"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+
+"@turf/transform-rotate@5.1.x", "@turf/transform-rotate@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/transform-rotate/-/transform-rotate-5.1.5.tgz#d096edd9e300fe315069d54d8e458c409221edfb"
+ dependencies:
+ "@turf/centroid" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/rhumb-bearing" "^5.1.5"
+ "@turf/rhumb-destination" "^5.1.5"
+ "@turf/rhumb-distance" "^5.1.5"
+
+"@turf/transform-scale@5.1.x", "@turf/transform-scale@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/transform-scale/-/transform-scale-5.1.5.tgz#70fd3ae01856cf7bae9f15ad561cdfe8f89001b9"
+ dependencies:
+ "@turf/bbox" "^5.1.5"
+ "@turf/center" "^5.1.5"
+ "@turf/centroid" "^5.1.5"
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/rhumb-bearing" "^5.1.5"
+ "@turf/rhumb-destination" "^5.1.5"
+ "@turf/rhumb-distance" "^5.1.5"
+
+"@turf/transform-translate@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/transform-translate/-/transform-translate-5.1.5.tgz#530a257fb1dc7268dadcab34e67901eb2a3dec63"
+ dependencies:
+ "@turf/clone" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ "@turf/rhumb-destination" "^5.1.5"
+
+"@turf/triangle-grid@5.1.x", "@turf/triangle-grid@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/triangle-grid/-/triangle-grid-5.1.5.tgz#7b36762108554c14f28caff3c48b1cfc82c8dc81"
+ dependencies:
+ "@turf/distance" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/intersect" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+
+"@turf/truncate@5.1.x", "@turf/truncate@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/truncate/-/truncate-5.1.5.tgz#9eedfb3b18ba81f2c98d3ead09431cca1884ad89"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+
+"@turf/turf@*":
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/@turf/turf/-/turf-5.1.6.tgz#c3122592887ed234b75468b8a8c45bf886fbf8f6"
+ dependencies:
+ "@turf/along" "5.1.x"
+ "@turf/area" "5.1.x"
+ "@turf/bbox" "5.1.x"
+ "@turf/bbox-clip" "5.1.x"
+ "@turf/bbox-polygon" "5.1.x"
+ "@turf/bearing" "5.1.x"
+ "@turf/bezier-spline" "5.1.x"
+ "@turf/boolean-clockwise" "5.1.x"
+ "@turf/boolean-contains" "5.1.x"
+ "@turf/boolean-crosses" "5.1.x"
+ "@turf/boolean-disjoint" "5.1.x"
+ "@turf/boolean-equal" "5.1.x"
+ "@turf/boolean-overlap" "5.1.x"
+ "@turf/boolean-parallel" "5.1.x"
+ "@turf/boolean-point-in-polygon" "5.1.x"
+ "@turf/boolean-point-on-line" "5.1.x"
+ "@turf/boolean-within" "5.1.x"
+ "@turf/buffer" "5.1.x"
+ "@turf/center" "5.1.x"
+ "@turf/center-mean" "5.1.x"
+ "@turf/center-median" "5.1.x"
+ "@turf/center-of-mass" "5.1.x"
+ "@turf/centroid" "5.1.x"
+ "@turf/circle" "5.1.x"
+ "@turf/clean-coords" "5.1.x"
+ "@turf/clone" "5.1.x"
+ "@turf/clusters" "5.1.x"
+ "@turf/clusters-dbscan" "5.1.x"
+ "@turf/clusters-kmeans" "5.1.x"
+ "@turf/collect" "5.1.x"
+ "@turf/combine" "5.1.x"
+ "@turf/concave" "5.1.x"
+ "@turf/convex" "5.1.x"
+ "@turf/destination" "5.1.x"
+ "@turf/difference" "5.1.x"
+ "@turf/dissolve" "5.1.x"
+ "@turf/distance" "5.1.x"
+ "@turf/ellipse" "5.1.x"
+ "@turf/envelope" "5.1.x"
+ "@turf/explode" "5.1.x"
+ "@turf/flatten" "5.1.x"
+ "@turf/flip" "5.1.x"
+ "@turf/great-circle" "5.1.x"
+ "@turf/helpers" "5.1.x"
+ "@turf/hex-grid" "5.1.x"
+ "@turf/interpolate" "5.1.x"
+ "@turf/intersect" "5.1.x"
+ "@turf/invariant" "5.1.x"
+ "@turf/isobands" "5.1.x"
+ "@turf/isolines" "5.1.x"
+ "@turf/kinks" "5.1.x"
+ "@turf/length" "5.1.x"
+ "@turf/line-arc" "5.1.x"
+ "@turf/line-chunk" "5.1.x"
+ "@turf/line-intersect" "5.1.x"
+ "@turf/line-offset" "5.1.x"
+ "@turf/line-overlap" "5.1.x"
+ "@turf/line-segment" "5.1.x"
+ "@turf/line-slice" "5.1.x"
+ "@turf/line-slice-along" "5.1.x"
+ "@turf/line-split" "5.1.x"
+ "@turf/line-to-polygon" "5.1.x"
+ "@turf/mask" "5.1.x"
+ "@turf/meta" "5.1.x"
+ "@turf/midpoint" "5.1.x"
+ "@turf/nearest-point" "5.1.x"
+ "@turf/nearest-point-on-line" "5.1.x"
+ "@turf/nearest-point-to-line" "5.1.x"
+ "@turf/planepoint" "5.1.x"
+ "@turf/point-grid" "5.1.x"
+ "@turf/point-on-feature" "5.1.x"
+ "@turf/point-to-line-distance" "5.1.x"
+ "@turf/points-within-polygon" "5.1.x"
+ "@turf/polygon-tangents" "5.1.x"
+ "@turf/polygon-to-line" "5.1.x"
+ "@turf/polygonize" "5.1.x"
+ "@turf/projection" "5.1.x"
+ "@turf/random" "5.1.x"
+ "@turf/rewind" "5.1.x"
+ "@turf/rhumb-bearing" "5.1.x"
+ "@turf/rhumb-destination" "5.1.x"
+ "@turf/rhumb-distance" "5.1.x"
+ "@turf/sample" "5.1.x"
+ "@turf/sector" "5.1.x"
+ "@turf/shortest-path" "5.1.x"
+ "@turf/simplify" "5.1.x"
+ "@turf/square" "5.1.x"
+ "@turf/square-grid" "5.1.x"
+ "@turf/standard-deviational-ellipse" "5.1.x"
+ "@turf/tag" "5.1.x"
+ "@turf/tesselate" "5.1.x"
+ "@turf/tin" "5.1.x"
+ "@turf/transform-rotate" "5.1.x"
+ "@turf/transform-scale" "5.1.x"
+ "@turf/transform-translate" "5.1.x"
+ "@turf/triangle-grid" "5.1.x"
+ "@turf/truncate" "5.1.x"
+ "@turf/union" "5.1.x"
+ "@turf/unkink-polygon" "5.1.x"
+ "@turf/voronoi" "5.1.x"
+
+"@turf/union@5.1.x", "@turf/union@^5.1.5":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/union/-/union-5.1.5.tgz#53285b6094047fc58d96aac0ea90865ec34d454b"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ turf-jsts "*"
+
+"@turf/unkink-polygon@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/unkink-polygon/-/unkink-polygon-5.1.5.tgz#7b01847c50fb574ae2579e19e44cba8526d213c3"
+ dependencies:
+ "@turf/area" "^5.1.5"
+ "@turf/boolean-point-in-polygon" "^5.1.5"
+ "@turf/helpers" "^5.1.5"
+ "@turf/meta" "^5.1.5"
+ rbush "^2.0.1"
+
+"@turf/voronoi@5.1.x":
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/@turf/voronoi/-/voronoi-5.1.5.tgz#e856e9406dcc2f25d66ddc898584e27c2ebfca66"
+ dependencies:
+ "@turf/helpers" "^5.1.5"
+ "@turf/invariant" "^5.1.5"
+ d3-voronoi "1.1.2"
+
"@types/d3@3.5.38":
version "3.5.38"
resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.38.tgz#76f8f2e9159ae562965b2fa0e6fbee1aa643a1bc"
@@ -2791,6 +3846,10 @@ comma-separated-tokens@^1.0.0:
dependencies:
trim "0.0.1"
+commander@2:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+
commander@2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -2840,6 +3899,16 @@ concat-stream@~1.2.1:
dependencies:
bops "0.0.6"
+concaveman@*:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/concaveman/-/concaveman-1.1.1.tgz#6c2482580b2523cef82fc2bec00a0415e6e68162"
+ dependencies:
+ monotone-convex-hull-2d "^1.0.1"
+ point-in-polygon "^1.0.1"
+ rbush "^2.0.1"
+ robust-orientation "^1.1.3"
+ tinyqueue "^1.1.0"
+
config-chain@~1.1.11:
version "1.1.11"
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
@@ -3192,6 +4261,12 @@ d3-geo-projection@0.2:
dependencies:
brfs "^1.3.0"
+d3-geo@1.7.1:
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.7.1.tgz#44bbc7a218b1fd859f3d8fd7c443ca836569ce99"
+ dependencies:
+ d3-array "1"
+
d3-hexbin@^0.2.1:
version "0.2.2"
resolved "https://registry.yarnpkg.com/d3-hexbin/-/d3-hexbin-0.2.2.tgz#9c5837dacfd471ab05337a9e91ef10bfc4f98831"
@@ -3295,7 +4370,7 @@ d3-transition@1:
d3-selection "^1.1.0"
d3-timer "1"
-d3-voronoi@^1.1.2:
+d3-voronoi@1.1.2, d3-voronoi@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
@@ -3420,6 +4495,10 @@ deep-eql@^3.0.0:
dependencies:
type-detect "^4.0.0"
+deep-equal@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -3502,6 +4581,10 @@ delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+density-clustering@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/density-clustering/-/density-clustering-1.3.0.tgz#dc9f59c8f0ab97e1624ac64930fd3194817dcac5"
+
des.js@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -3663,7 +4746,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"
-earcut@^2.0.6, earcut@^2.1.3:
+earcut@^2.0.0, earcut@^2.0.6, earcut@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.3.tgz#ca579545f351941af7c3d0df49c9f7d34af99b0c"
@@ -4563,6 +5646,12 @@ geojson-coords@0.0.0:
geojson-flatten "~0.1.0"
geojson-normalize "0.0.0"
+geojson-equality@0.1.6:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72"
+ dependencies:
+ deep-equal "^1.0.0"
+
geojson-extent@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/geojson-extent/-/geojson-extent-0.3.2.tgz#2ee5f3fabf0c7659c0509e05782910dfe1df27e8"
@@ -4584,6 +5673,14 @@ geojson-normalize@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/geojson-normalize/-/geojson-normalize-0.0.0.tgz#2dbc3678cd1b31b8179e876bda70cd120dde35c0"
+geojson-rbush@2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/geojson-rbush/-/geojson-rbush-2.1.0.tgz#3bd73be391fc10b0ae693d9b8acea2aae0b83a8d"
+ dependencies:
+ "@turf/helpers" "*"
+ "@turf/meta" "*"
+ rbush "*"
+
geojson-rewind@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.3.1.tgz#22240797c847cc2f0c1d313e4aa0c915afa7f29d"
@@ -4605,6 +5702,10 @@ get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+get-closest@*:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/get-closest/-/get-closest-0.0.4.tgz#269ac776d1e6022aa0fd586dd708e8a7d32269af"
+
get-func-name@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
@@ -6146,6 +7247,10 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"
+leaflet@^1.3.4:
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.4.tgz#7f006ea5832603b53d7269ef5c595fd773060a40"
+
less-loader@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
@@ -6174,6 +7279,10 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
+lineclip@^1.1.5:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/lineclip/-/lineclip-1.1.5.tgz#2bf26067d94354feabf91e42768236db5616fd13"
+
listr-silent-renderer@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
@@ -6893,6 +8002,12 @@ moment@^2.8.2:
version "2.22.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+monotone-convex-hull-2d@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz#47f5daeadf3c4afd37764baa1aa8787a40eee08c"
+ dependencies:
+ robust-orientation "^1.1.3"
+
mousetrap@^1.6.1:
version "1.6.2"
resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.2.tgz#caadd9cf886db0986fb2fee59a82f6bd37527587"
@@ -7377,14 +8492,14 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+object-assign@*, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
object-assign@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
object-copy@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -7823,6 +8938,10 @@ po2json@^0.4.5:
gettext-parser "1.1.0"
nomnom "1.8.1"
+point-in-polygon@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/point-in-polygon/-/point-in-polygon-1.0.1.tgz#d59b64e8fee41c49458aac82b56718c5957b2af7"
+
posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -8289,7 +9408,7 @@ querystring@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-quickselect@^1.0.0:
+quickselect@^1.0.0, quickselect@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"
@@ -8328,6 +9447,12 @@ randomfill@^1.0.3:
randombytes "^2.0.5"
safe-buffer "^5.1.0"
+rbush@*, rbush@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/rbush/-/rbush-2.0.2.tgz#bb6005c2731b7ba1d5a9a035772927d16a614605"
+ dependencies:
+ quickselect "^1.0.1"
+
rc-config-loader@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/rc-config-loader/-/rc-config-loader-2.0.1.tgz#8c8452f59bdd10d448a67762dccf7c1b247db860"
@@ -9295,6 +10420,30 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
+robust-orientation@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/robust-orientation/-/robust-orientation-1.1.3.tgz#daff5b00d3be4e60722f0e9c0156ef967f1c2049"
+ dependencies:
+ robust-scale "^1.0.2"
+ robust-subtract "^1.0.0"
+ robust-sum "^1.0.0"
+ two-product "^1.0.2"
+
+robust-scale@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/robust-scale/-/robust-scale-1.0.2.tgz#775132ed09542d028e58b2cc79c06290bcf78c32"
+ dependencies:
+ two-product "^1.0.2"
+ two-sum "^1.0.0"
+
+robust-subtract@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/robust-subtract/-/robust-subtract-1.0.0.tgz#e0b164e1ed8ba4e3a5dda45a12038348dbed3e9a"
+
+robust-sum@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/robust-sum/-/robust-sum-1.0.0.tgz#16646e525292b4d25d82757a286955e0bbfa53d9"
+
run-async@^2.0.0, run-async@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -9531,6 +10680,10 @@ sinon@^4.5.0:
supports-color "^5.1.0"
type-detect "^4.0.5"
+skmeans@0.9.7:
+ version "0.9.7"
+ resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d"
+
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -10113,6 +11266,18 @@ to-utf8@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852"
+topojson-client@3.x:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f"
+ dependencies:
+ commander "2"
+
+topojson-server@3.x:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/topojson-server/-/topojson-server-3.0.0.tgz#378e78e87c3972a7b5be2c5d604369b6bae69c5e"
+ dependencies:
+ commander "2"
+
topojson@^1.6.19:
version "1.6.27"
resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.27.tgz#adbe33a67e2f1673d338df12644ad20fc20b42ed"
@@ -10189,10 +11354,22 @@ tunnel-agent@~0.4.1:
version "0.4.3"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+turf-jsts@*:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/turf-jsts/-/turf-jsts-1.2.3.tgz#59757f542afbff9a577bbf411f183b8f48d38aa4"
+
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+two-product@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/two-product/-/two-product-1.0.2.tgz#67d95d4b257a921e2cb4bd7af9511f9088522eaa"
+
+two-sum@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/two-sum/-/two-sum-1.0.0.tgz#31d3f32239e4f731eca9df9155e2b297f008ab64"
+
type-check@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
diff --git a/superset/cli.py b/superset/cli.py
index 074e12f963..c3e0596e19 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -39,6 +39,16 @@ def init():
"""Inits the Superset application"""
utils.get_or_create_main_db()
security_manager.sync_role_definitions()
+ role_admin = security_manager.find_role(security_manager.auth_role_admin)
+ username = firstname = lastname = password = "superset"
+ email = "superset@fab.org"
+ user = security_manager.find_user(username)
+ if user is None:
+ user = security_manager.add_user(username, firstname, lastname, email, role_admin, password)
+ if user:
+ print(Fore.GREEN+'Admin User {0} created.'.format(username))
+ else:
+ print(Fore.RED+'No user created an error occured')
def debug_run(app, port, use_reloader):
diff --git a/superset/config.py b/superset/config.py
index a5e4f2988c..ddda8b4ab9 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -48,7 +48,7 @@
SUPERSET_WEBSERVER_ADDRESS = '0.0.0.0'
SUPERSET_WEBSERVER_PORT = 8088
-SUPERSET_WEBSERVER_TIMEOUT = 60 # deprecated
+SUPERSET_WEBSERVER_TIMEOUT = 60*30 # deprecated
SUPERSET_DASHBOARD_POSITION_DATA_LIMIT = 65535
EMAIL_NOTIFICATIONS = False
CUSTOM_SECURITY_MANAGER = None
@@ -98,7 +98,7 @@
APP_NAME = 'Superset'
# Uncomment to setup an App icon
-APP_ICON = '/static/assets/images/superset-logo@2x.png'
+APP_ICON = '/static/assets/images/guavus_logo.svg'
# Druid query timezone
# tz.tzutc() : Using utc timezone
@@ -246,6 +246,8 @@
DEFAULT_MODULE_DS_MAP = OrderedDict([
('superset.connectors.sqla.models', ['SqlaTable']),
('superset.connectors.druid.models', ['DruidDatasource']),
+ ('superset.connectors.elastic.models', ['ElasticDatasource']),
+ ('contrib.connectors.pandas.models', ['PandasDatasource']),
])
ADDITIONAL_MODULE_DS_MAP = {}
ADDITIONAL_MIDDLEWARE = []
@@ -317,7 +319,7 @@ class CeleryConfig(object):
DEFAULT_DB_ID = None
# Timeout duration for SQL Lab synchronous queries
-SQLLAB_TIMEOUT = 30
+SQLLAB_TIMEOUT = 30 * 60
# SQLLAB_DEFAULT_DBID
SQLLAB_DEFAULT_DBID = None
@@ -445,6 +447,10 @@ class CeleryConfig(object):
# using flask-compress
ENABLE_FLASK_COMPRESS = True
+#add timezone and copyright property for footer display
+TIMEZONE = 'UTC'
+COPYRIGHT = '© 2018 Guavus'
+
try:
if CONFIG_PATH_ENV_VAR in os.environ:
# Explicitly import config module that is not in pythonpath; useful
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index bee7e1c32d..eefe4615cd 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -186,7 +186,7 @@ def data(self):
'id': self.id,
'column_formats': self.column_formats,
'description': self.description,
- 'database': self.database.data, # pylint: disable=no-member
+ 'database': self.database.data,
'default_endpoint': self.default_endpoint,
'filter_select': self.filter_select_enabled,
'name': self.name,
@@ -404,8 +404,8 @@ def expression(self):
def data(self):
attrs = (
'id', 'column_name', 'verbose_name', 'description', 'expression',
- 'filterable', 'groupby', 'is_dttm', 'type',
- 'database_expression', 'python_date_format',
+ 'filterable', 'groupby', 'is_dttm', 'type',
+ 'database_expression', 'python_date_format', 'backend'
)
return {s: getattr(self, s) for s in attrs if hasattr(self, s)}
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 0554dfab31..4033f4afe6 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -749,7 +749,7 @@ def granularity(period_name, timezone=None, origin=None):
'30 minutes': 'PT30M',
'1 hour': 'PT1H',
'6 hour': 'PT6H',
- 'one day': 'P1D',
+ 'one_day': 'P1D',
'1 day': 'P1D',
'7 days': 'P7D',
'week': 'P1W',
diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py
index cc0cea9a08..cf77b53f6c 100644
--- a/superset/connectors/druid/views.py
+++ b/superset/connectors/druid/views.py
@@ -26,6 +26,8 @@
)
from . import models
+appbuilder.add_separator('Sources')
+
class DruidColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa
datamodel = SQLAInterface(models.DruidColumn)
diff --git a/superset/connectors/elastic/__init__.py b/superset/connectors/elastic/__init__.py
new file mode 100644
index 0000000000..a60249b87b
--- /dev/null
+++ b/superset/connectors/elastic/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models # noqa
+from . import views # noqa
diff --git a/superset/connectors/elastic/models.py b/superset/connectors/elastic/models.py
new file mode 100644
index 0000000000..a0570fd112
--- /dev/null
+++ b/superset/connectors/elastic/models.py
@@ -0,0 +1,583 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C,R,W
+# pylint: disable=invalid-unary-operand-type
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+
+from datetime import datetime
+import json
+import logging
+
+from elasticsearch import Elasticsearch
+from flask import escape, Markup
+from flask_appbuilder import Model
+from flask_appbuilder.models.decorators import renders
+import pandas as pd
+from six import string_types
+import sqlalchemy as sa
+from sqlalchemy import (Boolean, Column, DateTime, ForeignKey, Integer, String,
+ Text)
+from sqlalchemy.orm import backref, relationship
+
+from superset import db, import_util, security_manager, utils
+from superset.connectors.base.models import (BaseColumn, BaseDatasource,
+ BaseMetric)
+from superset.models.helpers import AuditMixinNullable, QueryResult, set_perm
+from superset.utils import flasher
+
+
+class ElasticCluster(Model, AuditMixinNullable):
+
+ """ORM object referencing the Elastic clusters"""
+
+ __tablename__ = 'elastic_clusters'
+ type = 'elastic'
+
+ id = Column(Integer, primary_key=True)
+ cluster_name = Column(String(250), unique=True)
+ hosts_json = Column(Text)
+ metadata_last_refreshed = Column(DateTime)
+ cache_timeout = Column(Integer)
+
+ def __repr__(self):
+ return self.cluster_name
+
+ @property
+ def data(self):
+ return {
+ 'name': self.cluster_name,
+ 'backend': 'elastic',
+ }
+
+ @property
+ def hosts(self):
+ return json.loads(self.hosts_json)
+
+ def get_client(self):
+ return Elasticsearch(self.hosts)
+
+ def get_mappings(self):
+ client = self.get_client()
+ return client.indices.get_mapping()
+
+ def refresh_datasources(self, datasource_name=None, merge_flag=False):
+ """Refresh metadata of all datasources in the cluster
+ If ``datasource_name`` is specified, only that datasource is updated
+ """
+ for index_name, index_metadata in self.get_mappings().items():
+ for name, mapping_metadata in index_metadata.get('mappings').items():
+ ElasticDatasource.sync_to_db(
+ '{}.{}'.format(index_name, name), mapping_metadata, self)
+
+ @property
+ def perm(self):
+ return '[{obj.cluster_name}].(id:{obj.id})'.format(obj=self)
+
+ def get_perm(self):
+ return self.perm
+
+ @property
+ def name(self):
+ return self.cluster_name
+
+ @property
+ def unique_name(self):
+ return self.cluster_name
+
+
+class ElasticColumn(Model, BaseColumn):
+ """ORM model for storing Elastic datasource column metadata"""
+
+ __tablename__ = 'elastic_columns'
+
+ datasource_name = Column(
+ String(255),
+ ForeignKey('elastic_datasources.datasource_name'))
+ # Setting enable_typechecks=False disables polymorphic inheritance.
+ datasource = relationship(
+ 'ElasticDatasource',
+ backref=backref('columns', cascade='all, delete-orphan'),
+ enable_typechecks=False)
+ json = Column(Text)
+
+ export_fields = (
+ 'datasource_name', 'column_name', 'is_active', 'type', 'groupby',
+ 'count_distinct', 'sum', 'avg', 'max', 'min', 'filterable',
+ 'description',
+ )
+
+ @property
+ def expression(self):
+ return self.json
+
+ def __repr__(self):
+ return self.column_name
+
+ def generate_metrics(self):
+ """Generate metrics based on the column metadata"""
+ M = ElasticMetric # noqa
+ metrics = []
+ metrics.append(ElasticMetric(
+ metric_name='count',
+ verbose_name='COUNT(*)',
+ metric_type='count',
+ json=json.dumps({'type': 'count', 'name': 'count'}),
+ ))
+ if self.sum and self.is_num:
+ name = 'sum__' + self.column_name
+ metrics.append(ElasticMetric(
+ metric_name=name,
+ metric_type='sum',
+ verbose_name='SUM({})'.format(self.column_name),
+ json=json.dumps({'sum': {'field': self.column_name}}),
+ ))
+
+ if self.avg and self.is_num:
+ name = 'avg__' + self.column_name
+ metrics.append(ElasticMetric(
+ metric_name=name,
+ metric_type='avg',
+ verbose_name='AVG({})'.format(self.column_name),
+ json=json.dumps({'avg': {'field': self.column_name}}),
+ ))
+
+ if self.min and self.is_num:
+ name = 'min__' + self.column_name
+ metrics.append(ElasticMetric(
+ metric_name=name,
+ metric_type='min',
+ verbose_name='MIN({})'.format(self.column_name),
+ json=json.dumps({'min': {'field': self.column_name}}),
+ ))
+ if self.max and self.is_num:
+ name = 'max__' + self.column_name
+ metrics.append(ElasticMetric(
+ metric_name=name,
+ metric_type='max',
+ verbose_name='MAX({})'.format(self.column_name),
+ json=json.dumps({'max': {'field': self.column_name}}),
+ ))
+ if self.count_distinct:
+ metrics.append(ElasticMetric(
+ metric_name=name,
+ verbose_name='COUNT(DISTINCT {})'.format(self.column_name),
+ metric_type='count_distinct',
+ json=json.dumps({'cardinality': {'field': self.column_name}}),
+ ))
+ session = db.session
+ new_metrics = []
+ for metric in metrics:
+ m = (
+ session.query(M)
+ .filter(M.metric_name == metric.metric_name)
+ .filter(M.datasource_name == self.datasource_name)
+ .filter(ElasticCluster.cluster_name == self.datasource.cluster_name)
+ .first()
+ )
+ metric.datasource_name = self.datasource_name
+ if not m:
+ new_metrics.append(metric)
+ session.add(metric)
+ session.flush()
+
+ @classmethod
+ def import_obj(cls, i_column):
+ def lookup_obj(lookup_column):
+ return db.session.query(ElasticColumn).filter(
+ ElasticColumn.datasource_name == lookup_column.datasource_name,
+ ElasticColumn.column_name == lookup_column.column_name).first()
+
+ return import_util.import_simple_obj(db.session, i_column, lookup_obj)
+
+
+class ElasticMetric(Model, BaseMetric):
+
+ """ORM object referencing Elastic metrics for a datasource"""
+
+ __tablename__ = 'elastic_metrics'
+ datasource_name = Column(
+ String(255),
+ ForeignKey('elastic_datasources.datasource_name'))
+ # Setting enable_typechecks=False disables polymorphic inheritance.
+ datasource = relationship(
+ 'ElasticDatasource',
+ backref=backref('metrics', cascade='all, delete-orphan'),
+ enable_typechecks=False)
+ json = Column(Text)
+
+ export_fields = (
+ 'metric_name', 'verbose_name', 'metric_type', 'datasource_name',
+ 'json', 'description', 'is_restricted', 'd3format',
+ )
+
+ @property
+ def expression(self):
+ return self.json
+
+ @property
+ def json_obj(self):
+ try:
+ obj = json.loads(self.json)
+ except Exception:
+ obj = {}
+ return obj
+
+ @property
+ def perm(self):
+ return (
+ '{parent_name}.[{obj.metric_name}](id:{obj.id})'
+ ).format(obj=self,
+ parent_name=self.datasource.full_name,
+ ) if self.datasource else None
+
+ @classmethod
+ def import_obj(cls, i_metric):
+ def lookup_obj(lookup_metric):
+ return db.session.query(ElasticMetric).filter(
+ ElasticMetric.datasource_name == lookup_metric.datasource_name,
+ ElasticMetric.metric_name == lookup_metric.metric_name).first()
+ return import_util.import_simple_obj(db.session, i_metric, lookup_obj)
+
+
+class ElasticDatasource(Model, BaseDatasource):
+
+ """ORM object referencing Elastic datasources (tables)"""
+
+ __tablename__ = 'elastic_datasources'
+
+ type = 'elastic'
+ query_langtage = 'json'
+ cluster_class = ElasticCluster
+ metric_class = ElasticMetric
+ column_class = ElasticColumn
+
+ baselink = 'elasticdatasourcemodelview'
+
+ # Columns
+ datasource_name = Column(String(255), unique=True)
+ is_hidden = Column(Boolean, default=False)
+ fetch_values_from = Column(String(100))
+ cluster_name = Column(
+ String(250), ForeignKey('elastic_clusters.cluster_name'))
+ cluster = relationship(
+ 'ElasticCluster', backref='datasources', foreign_keys=[cluster_name])
+ user_id = Column(Integer, ForeignKey('ab_user.id'))
+ owner = relationship(
+ security_manager.user_model,
+ backref=backref('elastic_datasources', cascade='all, delete-orphan'),
+ foreign_keys=[user_id])
+
+ export_fields = (
+ 'datasource_name', 'is_hidden', 'description', 'default_endpoint',
+ 'cluster_name', 'offset', 'cache_timeout', 'params',
+ )
+ slices = relationship(
+ 'Slice',
+ primaryjoin=(
+ 'ElasticDatasource.id == foreign(Slice.datasource_id) and '
+ 'Slice.datasource_type == "elastic"'))
+
+ @property
+ def database(self):
+ return self.cluster
+
+ @property
+ def num_cols(self):
+ return [c.column_name for c in self.columns if c.is_num]
+
+ @property
+ def name(self):
+ return self.datasource_name
+
+ @property
+ def schema(self):
+ ds_name = self.datasource_name or ''
+ name_pieces = ds_name.split('.')
+ if len(name_pieces) > 1:
+ return name_pieces[0]
+ else:
+ return None
+
+ @property
+ def schema_perm(self):
+ """Returns schema permission if present, cluster one otherwise."""
+ return security_manager.get_schema_perm(self.cluster, self.schema)
+
+ def get_perm(self):
+ return (
+ '[{obj.cluster_name}].[{obj.datasource_name}]'
+ '(id:{obj.id})').format(obj=self)
+
+ @property
+ def link(self):
+ name = escape(self.datasource_name)
+ return Markup('<a href="{self.url}">{name}</a>').format(**locals())
+
+ @property
+ def full_name(self):
+ return utils.get_datasource_full_name(
+ self.cluster_name, self.datasource_name)
+
+ @property
+ def time_column_grains(self):
+ return {
+ 'time_columns': [
+ 'all', '5 seconds', '30 seconds', '1 minute',
+ '5 minutes', '1 hour', '6 hour', '1 day', '7 days',
+ 'week', 'week_starting_sunday', 'week_ending_saturday',
+ 'month',
+ ],
+ 'time_grains': ['now'],
+ }
+
+ def __repr__(self):
+ return self.datasource_name
+
+ @renders('datasource_name')
+ def datasource_link(self):
+ url = '/superset/explore/{obj.type}/{obj.id}/'.format(obj=self)
+ name = escape(self.datasource_name)
+ return Markup('<a href="{url}">{name}</a>'.format(**locals()))
+
+ def get_metric_obj(self, metric_name):
+ return [
+ m.json_obj for m in self.metrics
+ if m.metric_name == metric_name
+ ][0]
+
+ @classmethod
+ def import_obj(cls, i_datasource, import_time=None):
+ """Imports the datasource from the object to the database.
+
+ Metrics and columns and datasource will be overridden if exists.
+ This function can be used to import/export dashboards between multiple
+ superset instances. Audit metadata isn't copies over.
+ """
+ def lookup_datasource(d):
+ return db.session.query(ElasticDatasource).join(ElasticCluster).filter(
+ ElasticDatasource.datasource_name == d.datasource_name,
+ ElasticCluster.cluster_name == d.cluster_name,
+ ).first()
+
+ def lookup_cluster(d):
+ return db.session.query(ElasticCluster).filter_by(
+ cluster_name=d.cluster_name).one()
+ return import_util.import_datasource(
+ db.session, i_datasource, lookup_cluster, lookup_datasource,
+ import_time)
+
+ @staticmethod
+ def version_higher(v1, v2):
+ """is v1 higher than v2
+
+ >>> ElasticDatasource.version_higher('0.8.2', '0.9.1')
+ False
+ >>> ElasticDatasource.version_higher('0.8.2', '0.6.1')
+ True
+ >>> ElasticDatasource.version_higher('0.8.2', '0.8.2')
+ False
+ >>> ElasticDatasource.version_higher('0.8.2', '0.9.BETA')
+ False
+ >>> ElasticDatasource.version_higher('0.8.2', '0.9')
+ False
+ """
+ def int_or_0(v):
+ try:
+ v = int(v)
+ except (TypeError, ValueError):
+ v = 0
+ return v
+ v1nums = [int_or_0(n) for n in v1.split('.')]
+ v2nums = [int_or_0(n) for n in v2.split('.')]
+ v1nums = (v1nums + [0, 0, 0])[:3]
+ v2nums = (v2nums + [0, 0, 0])[:3]
+ return v1nums[0] > v2nums[0] or \
+ (v1nums[0] == v2nums[0] and v1nums[1] > v2nums[1]) or \
+ (v1nums[0] == v2nums[0] and v1nums[1] == v2nums[1] and v1nums[2] > v2nums[2])
+
+ def generate_metrics(self):
+ for col in self.columns:
+ col.generate_metrics()
+
+ def query_str(self):
+ d = {'query': None}
+ return json.dumps(d)
+
+ @classmethod
+ def sync_to_db(cls, name, metadata, cluster):
+ """Fetches metadata for that datasource and merges the Superset db"""
+ logging.info('Syncing Elastic datasource [{}]'.format(name))
+ session = db.session
+ datasource = session.query(cls).filter_by(datasource_name=name).first()
+ if not datasource:
+ datasource = cls(datasource_name=name)
+ session.add(datasource)
+ flasher('Adding new datasource [{}]'.format(name), 'success')
+ else:
+ flasher('Refreshing datasource [{}]'.format(name), 'info')
+ session.flush()
+ datasource.cluster = cluster
+ session.flush()
+
+ for col_name, col_metadata in metadata.get('properties').items():
+ cls.merge_column(col_name, col_metadata, datasource, session)
+
+ @classmethod
+ def merge_column(cls, col_name, col_metadata, datasource, sesh):
+ col_obj = (
+ sesh
+ .query(ElasticColumn)
+ .filter_by(
+ datasource_name=datasource.datasource_name,
+ column_name=col_name)
+ .first()
+ )
+ datatype = col_metadata.get('type')
+ if not col_obj:
+ col_obj = ElasticColumn(
+ datasource_name=datasource.datasource_name,
+ column_name=col_name)
+ sesh.add(col_obj)
+ if datatype == 'string':
+ col_obj.groupby = True
+ col_obj.filterable = True
+ if col_obj.is_num:
+ col_obj.sum = True
+ if col_obj:
+ col_obj.type = datatype
+ sesh.flush()
+ col_obj.datasource = datasource
+ col_obj.generate_metrics()
+ sesh.flush()
+
+ @staticmethod
+ def time_offset(granularity):
+ if granularity == 'week_ending_saturday':
+ return 6 * 24 * 3600 * 1000 # 6 days
+ return 0
+
+ # uses https://en.wikipedia.org/wiki/ISO_8601
+ # http://elastic.io/docs/0.8.0/querying/granularities.html
+ # TODO: pass origin from the UI
+ @staticmethod
+ def granularity(period_name, timezone=None, origin=None):
+ if not period_name or period_name == 'all':
+ return 'all'
+ iso_8601_dict = {
+ '5 seconds': 'PT5S',
+ '30 seconds': 'PT30S',
+ '1 minute': 'PT1M',
+ '5 minutes': 'PT5M',
+ '1 hour': 'PT1H',
+ '6 hour': 'PT6H',
+ 'one_day': 'P1D',
+ '1 day': 'P1D',
+ '7 days': 'P7D',
+ 'week': 'P1W',
+ 'week_starting_sunday': 'P1W',
+ 'week_ending_saturday': 'P1W',
+ 'month': 'P1M',
+ }
+
+ granularity = {'type': 'period'}
+ if timezone:
+ granularity['timeZone'] = timezone
+
+ if origin:
+ dttm = utils.parse_human_datetime(origin)
+ granularity['origin'] = dttm.isoformat()
+
+ if period_name in iso_8601_dict:
+ granularity['period'] = iso_8601_dict[period_name]
+ if period_name in ('week_ending_saturday', 'week_starting_sunday'):
+ # use Sunday as start of the week
+ granularity['origin'] = '2016-01-03T00:00:00'
+ elif not isinstance(period_name, string_types):
+ granularity['type'] = 'duration'
+ granularity['duration'] = period_name
+ elif period_name.startswith('P'):
+ # identify if the string is the iso_8601 period
+ granularity['period'] = period_name
+ else:
+ granularity['type'] = 'duration'
+ granularity['duration'] = utils.parse_human_timedelta(
+ period_name).total_seconds() * 1000
+ return granularity
+
+ def values_for_column(self,
+ column_name,
+ limit=10000):
+ """Retrieve some values for the given column"""
+ # TODO
+
+ def get_query_str(self, query_obj, phase=1, client=None):
+ return self.run_query(client=client, phase=phase, **query_obj)
+
+ def run_query( # noqa / elastic
+ self,
+ groupby, metrics,
+ granularity,
+ from_dttm, to_dttm,
+ filter=None, # noqa
+ is_timeseries=True,
+ timeseries_limit=None,
+ timeseries_limit_metric=None,
+ row_limit=None,
+ inner_from_dttm=None, inner_to_dttm=None,
+ orderby=None,
+ extras=None, # noqa
+ select=None, # noqa
+ columns=None, phase=2, client=None, form_data=None):
+ """Runs a query against Elastic and returns a dataframe.
+ """
+ pass
+
+ @property
+ def index(self):
+ self.datasource_name.split('.')[0]
+
+ def query(self, query_obj):
+ client = self.cluster.get_client()
+ equery = {}
+
+ # Aggregations
+ equery['aggregations'] = {}
+ for m in self.metrics:
+ if m.metric_name in query_obj.get('metrics'):
+ equery['aggregations'][m.metric_name] = m.json_obj
+
+ data = client.search(index=self.index, body=equery)
+ print('-=' * 20)
+ print('query is: {}'.format(equery))
+ data = data['hits']['hits']
+ data = [k['_source'] for k in data]
+ print('-=' * 20)
+ query_str = self.query_str()
+ qry_start_dttm = datetime.now()
+ df = pd.DataFrame(data)
+ print('-=' * 20)
+ print(df)
+ return QueryResult(
+ df=df,
+ query=query_str,
+ duration=datetime.now() - qry_start_dttm)
+
+ def get_filters(self, raw_filters): # noqa
+ return
+
+ @classmethod
+ def query_datasources_by_name(
+ cls, session, database, datasource_name, schema=None):
+ return (
+ session.query(cls)
+ .filter_by(cluster_name=database.id)
+ .filter_by(datasource_name=datasource_name)
+ .all()
+ )
+
+
+sa.event.listen(ElasticDatasource, 'after_insert', set_perm)
+sa.event.listen(ElasticDatasource, 'after_update', set_perm)
diff --git a/superset/connectors/elastic/views.py b/superset/connectors/elastic/views.py
new file mode 100644
index 0000000000..efae4f0cf0
--- /dev/null
+++ b/superset/connectors/elastic/views.py
@@ -0,0 +1,294 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C,R,W
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from datetime import datetime
+import logging
+
+from flask import flash, Markup, redirect
+from flask_appbuilder import CompactCRUDMixin, expose
+from flask_appbuilder.models.sqla.interface import SQLAInterface
+from flask_appbuilder.security.decorators import has_access
+from flask_babel import gettext as __
+from flask_babel import lazy_gettext as _
+import sqlalchemy as sqla
+
+from superset import appbuilder, db, security_manager, utils
+from superset.connectors.connector_registry import ConnectorRegistry
+from superset.views.base import BaseSupersetView
+from superset.views.base import (
+ DatasourceFilter, DeleteMixin, get_datasource_exist_error_msg,
+ ListWidgetWithCheckboxes, SupersetModelView, validate_json)
+from . import models
+
+appbuilder.add_separator('Sources')
+
+
+class ElasticColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa
+ datamodel = SQLAInterface(models.ElasticColumn)
+ edit_columns = [
+ 'column_name', 'description', 'json', 'datasource',
+ 'groupby', 'filterable', 'count_distinct', 'sum', 'min', 'max']
+ add_columns = edit_columns
+ list_columns = [
+ 'column_name', 'type', 'groupby', 'filterable', 'count_distinct',
+ 'sum', 'min', 'max']
+ can_delete = False
+ page_size = 500
+ label_columns = {
+ 'column_name': _('Column'),
+ 'type': _('Type'),
+ 'datasource': _('Datasource'),
+ 'groupby': _('Groupable'),
+ 'filterable': _('Filterable'),
+ 'count_distinct': _('Count Distinct'),
+ 'sum': _('Sum'),
+ 'min': _('Min'),
+ 'max': _('Max'),
+ }
+ description_columns = {
+ 'filterable': _(
+ 'Whether this column is exposed in the `Filters` section '
+ 'of the explore view.'),
+ 'json': utils.markdown(
+ 'this field can be used to specify '
+ 'a `dimensionSpec` as documented [here]'
+ '(http://elastic.io/docs/latest/querying/dimensionspecs.html). '
+ 'Make sure to input valid JSON and that the '
+ '`outputName` matches the `column_name` defined '
+ 'above.',
+ True),
+ }
+
+ def post_update(self, col):
+ col.generate_metrics()
+ utils.validate_json(col.json)
+
+ def post_add(self, col):
+ self.post_update(col)
+
+
+appbuilder.add_view_no_menu(ElasticColumnInlineView)
+
+
+class ElasticMetricInlineView(CompactCRUDMixin, SupersetModelView): # noqa
+ datamodel = SQLAInterface(models.ElasticMetric)
+ list_columns = ['metric_name', 'verbose_name', 'metric_type']
+ edit_columns = [
+ 'metric_name', 'description', 'verbose_name', 'metric_type', 'json',
+ 'datasource', 'd3format', 'is_restricted']
+ add_columns = edit_columns
+ page_size = 500
+ validators_columns = {
+ 'json': [validate_json],
+ }
+ description_columns = {
+ 'metric_type': utils.markdown(
+ 'use `postagg` as the metric type if you are defining a '
+ '[Elastic Post Aggregation]'
+ '(http://elastic.io/docs/latest/querying/post-aggregations.html)',
+ True),
+ 'is_restricted': _('Whether the access to this metric is restricted '
+ 'to certain roles. Only roles with the permission '
+ '\'metric access on XXX (the name of this metric)\' '
+ 'are allowed to access this metric'),
+ }
+ label_columns = {
+ 'metric_name': _('Metric'),
+ 'description': _('Description'),
+ 'verbose_name': _('Verbose Name'),
+ 'metric_type': _('Type'),
+ 'json': _('JSON'),
+ 'datasource': _('Elastic Datasource'),
+ }
+
+ def post_add(self, metric):
+ if metric.is_restricted:
+ security_manager.merge_perm('metric_access', metric.get_perm())
+
+ def post_update(self, metric):
+ if metric.is_restricted:
+ security_manager.merge_perm('metric_access', metric.get_perm())
+
+
+appbuilder.add_view_no_menu(ElasticMetricInlineView)
+
+
+class ElasticClusterModelView(SupersetModelView, DeleteMixin): # noqa
+ datamodel = SQLAInterface(models.ElasticCluster)
+ add_columns = [
+ 'cluster_name', 'hosts_json', 'cache_timeout',
+ ]
+ edit_columns = add_columns
+ list_columns = ['cluster_name', 'metadata_last_refreshed']
+ search_columns = ('cluster_name',)
+ label_columns = {
+ 'cluster_name': _('Cluster'),
+ 'hosts_json': _('Hosts JSON configuration'),
+ }
+ description_columns = {
+ 'hosts_json': _(
+ 'A JSON string that represents a host, and array of host, '
+ 'or anything else that ``elasticsearch.Elasticsearch()`` will '
+ 'be able to interpret'),
+ }
+
+ def pre_add(self, cluster):
+ security_manager.merge_perm('database_access', cluster.perm)
+
+ def pre_update(self, cluster):
+ self.pre_add(cluster)
+
+ def _delete(self, pk):
+ DeleteMixin._delete(self, pk)
+
+
+appbuilder.add_view(
+ ElasticClusterModelView,
+ name='Elastic Clusters',
+ label=__('Elastic Clusters'),
+ icon='fa-cubes',
+ category='Sources',
+ category_label=__('Sources'),
+ category_icon='fa-database')
+
+
+class ElasticDatasourceModelView(SupersetModelView, DeleteMixin): # noqa
+ datamodel = SQLAInterface(models.ElasticDatasource)
+ list_widget = ListWidgetWithCheckboxes
+ list_columns = [
+ 'datasource_link', 'cluster', 'changed_by_', 'modified']
+ order_columns = [
+ 'datasource_link', 'changed_on_', 'offset']
+ related_views = [ElasticColumnInlineView, ElasticMetricInlineView]
+ edit_columns = [
+ 'datasource_name', 'cluster', 'slices', 'description', 'owner',
+ 'is_hidden',
+ 'filter_select_enabled', 'fetch_values_from',
+ 'default_endpoint', 'offset', 'cache_timeout']
+ search_columns = (
+ 'datasource_name', 'cluster', 'description', 'owner',
+ )
+ add_columns = edit_columns
+ show_columns = add_columns + ['perm']
+ page_size = 500
+ base_order = ('datasource_name', 'asc')
+ description_columns = {
+ 'slices': _(
+ 'The list of slices associated with this table. By '
+ 'altering this datasource, you may change how these associated '
+ 'slices behave. '
+ 'Also note that slices need to point to a datasource, so '
+ 'this form will fail at saving if removing slices from a '
+ 'datasource. If you want to change the datasource for a slice, '
+ 'overwrite the slice from the \'explore view\''),
+ 'offset': _('Timezone offset (in hours) for this datasource'),
+ 'description': Markup(
+ "Supports <a href='"
+ "https://daringfireball.net/projects/markdown/'>markdown</a>"),
+ 'fetch_values_from': _(
+ 'Time expression to use as a predicate when retrieving '
+ 'distinct values to populate the filter component. '
+ 'Only applies when `Enable Filter Select` is on. If '
+ 'you enter `7 days ago`, the distinct list of values in '
+ 'the filter will be populated based on the distinct value over '
+ 'the past week'),
+ 'filter_select_enabled': _(
+ 'Whether to populate the filter\'s dropdown in the explore '
+ 'view\'s filter section with a list of distinct values fetched '
+ 'from the backend on the fly'),
+ 'default_endpoint': _(
+ 'Redirects to this endpoint when clicking on the datasource '
+ 'from the datasource list'),
+ }
+ base_filters = [['id', DatasourceFilter, lambda: []]]
+ label_columns = {
+ 'slices': _('Associated Slices'),
+ 'datasource_link': _('Data Source'),
+ 'cluster': _('Cluster'),
+ 'description': _('Description'),
+ 'owner': _('Owner'),
+ 'is_hidden': _('Is Hidden'),
+ 'filter_select_enabled': _('Enable Filter Select'),
+ 'default_endpoint': _('Default Endpoint'),
+ 'offset': _('Time Offset'),
+ 'cache_timeout': _('Cache Timeout'),
+ }
+
+ def pre_add(self, datasource):
+ number_of_existing_datasources = db.session.query(
+ sqla.func.count('*')).filter(
+ models.ElasticDatasource.datasource_name ==
+ datasource.datasource_name,
+ models.ElasticDatasource.cluster_name == datasource.cluster.id,
+ ).scalar()
+
+ # table object is already added to the session
+ if number_of_existing_datasources > 1:
+ raise Exception(get_datasource_exist_error_msg(
+ datasource.full_name))
+
+ def post_add(self, datasource):
+ datasource.generate_metrics()
+ security_manager.merge_perm('datasource_access', datasource.get_perm())
+ if datasource.schema:
+ security_manager.merge_perm('schema_access', datasource.schema_perm)
+
+ def post_update(self, datasource):
+ self.post_add(datasource)
+
+ def _delete(self, pk):
+ DeleteMixin._delete(self, pk)
+
+
+appbuilder.add_view(
+ ElasticDatasourceModelView,
+ 'Elastic Datasources',
+ label=__('Elastic Datasources'),
+ category='Sources',
+ category_label=__('Sources'),
+ icon='fa-cube')
+
+
+class Elastic(BaseSupersetView):
+ """The base views for Superset!"""
+
+ @has_access
+ @expose('/refresh_datasources/')
+ def refresh_datasources(self):
+ """endpoint that refreshes elastic datasources metadata"""
+ session = db.session()
+ elastic_cluster = ConnectorRegistry.sources['elastic'].cluster_class
+ for cluster in session.query(elastic_cluster).all():
+ cluster_name = cluster.cluster_name
+ try:
+ cluster.refresh_datasources()
+ except Exception as e:
+ flash(
+ 'Error while processing cluster \'{}\'\n{}'.format(
+ cluster_name, utils.error_msg_from_exception(e)),
+ 'danger')
+ logging.exception(e)
+ return redirect('/elasticclustermodelview/list/')
+ cluster.metadata_last_refreshed = datetime.now()
+ flash(
+ 'Refreshed metadata from cluster '
+ '[' + cluster.cluster_name + ']',
+ 'info')
+ session.commit()
+ return redirect('/elasticdatasourcemodelview/list/')
+
+
+appbuilder.add_view_no_menu(Elastic)
+
+appbuilder.add_link(
+ 'Refresh Elastic Metadata',
+ label=__('Refresh Elastic Metadata'),
+ href='/elastic/refresh_datasources/',
+ category='Sources',
+ category_label=__('Sources'),
+ category_icon='fa-database',
+ icon='fa-cog')
diff --git a/superset/migrations/versions/52e79c1b094c_.py b/superset/migrations/versions/52e79c1b094c_.py
new file mode 100644
index 0000000000..3b15ce11a4
--- /dev/null
+++ b/superset/migrations/versions/52e79c1b094c_.py
@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: 52e79c1b094c
+Revises: ('b2cd059e8803', '8475d45ad108')
+Create Date: 2018-10-22 15:44:22.526222
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '52e79c1b094c'
+down_revision = ('b2cd059e8803', '8475d45ad108')
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ pass
+
+
+def downgrade():
+ pass
diff --git a/superset/migrations/versions/8475d45ad108_elasticsearch.py b/superset/migrations/versions/8475d45ad108_elasticsearch.py
new file mode 100644
index 0000000000..155921bfde
--- /dev/null
+++ b/superset/migrations/versions/8475d45ad108_elasticsearch.py
@@ -0,0 +1,114 @@
+"""elasticsearch
+
+Revision ID: 8475d45ad108
+Revises: 0c5070e96b57
+Create Date: 2018-08-13 12:30:10.792053
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '8475d45ad108'
+down_revision = '0c5070e96b57'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ op.create_table(
+ 'elastic_clusters',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('cluster_name', sa.String(length=250), nullable=True),
+ sa.Column('hosts_json', sa.Text(), nullable=True),
+ sa.Column('metadata_last_refreshed', sa.DateTime(), nullable=True),
+ sa.Column('cache_timeout', sa.Integer(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.PrimaryKeyConstraint('id'),
+ sa.UniqueConstraint('cluster_name')
+ )
+ op.create_table(
+ 'elastic_datasources',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('default_endpoint', sa.Text(), nullable=True),
+ sa.Column('is_featured', sa.Boolean(), nullable=True),
+ sa.Column('filter_select_enabled', sa.Boolean(), nullable=True),
+ sa.Column('offset', sa.Integer(), nullable=True),
+ sa.Column('cache_timeout', sa.Integer(), nullable=True),
+ sa.Column('params', sa.String(length=1000), nullable=True),
+ sa.Column('perm', sa.String(length=1000), nullable=True),
+ sa.Column('datasource_name', sa.String(length=255), nullable=True),
+ sa.Column('is_hidden', sa.Boolean(), nullable=True),
+ sa.Column('fetch_values_from', sa.String(length=100), nullable=True),
+ sa.Column('cluster_name', sa.String(length=250), nullable=True),
+ sa.Column('user_id', sa.Integer(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['cluster_name'], ['elastic_clusters.cluster_name'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['ab_user.id'], ),
+ sa.PrimaryKeyConstraint('id'),
+ sa.UniqueConstraint('datasource_name')
+ )
+ op.create_table(
+ 'elastic_columns',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('column_name', sa.String(length=255), nullable=True),
+ sa.Column('verbose_name', sa.String(length=1024), nullable=True),
+ sa.Column('is_active', sa.Boolean(), nullable=True),
+ sa.Column('type', sa.String(length=32), nullable=True),
+ sa.Column('groupby', sa.Boolean(), nullable=True),
+ sa.Column('count_distinct', sa.Boolean(), nullable=True),
+ sa.Column('sum', sa.Boolean(), nullable=True),
+ sa.Column('avg', sa.Boolean(), nullable=True),
+ sa.Column('max', sa.Boolean(), nullable=True),
+ sa.Column('min', sa.Boolean(), nullable=True),
+ sa.Column('filterable', sa.Boolean(), nullable=True),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('datasource_name', sa.String(length=255), nullable=True),
+ sa.Column('json', sa.Text(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['datasource_name'], ['elastic_datasources.datasource_name'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_table(
+ 'elastic_metrics',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('metric_name', sa.String(length=512), nullable=True),
+ sa.Column('verbose_name', sa.String(length=1024), nullable=True),
+ sa.Column('metric_type', sa.String(length=32), nullable=True),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('is_restricted', sa.Boolean(), nullable=True),
+ sa.Column('d3format', sa.String(length=128), nullable=True),
+ sa.Column('datasource_name', sa.String(length=255), nullable=True),
+ sa.Column('json', sa.Text(), nullable=True),
+ sa.Column('warning_text', sa.String(length=255), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['datasource_name'], ['elastic_datasources.datasource_name'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+
+
+def downgrade():
+ op.drop_table('elastic_metrics')
+ op.drop_table('elastic_columns')
+ op.drop_table('elastic_datasources')
+ op.drop_table('elastic_clusters')
diff --git a/superset/migrations/versions/b2cd059e8803_add_pandasdatasource.py b/superset/migrations/versions/b2cd059e8803_add_pandasdatasource.py
new file mode 100644
index 0000000000..ebd25a45f2
--- /dev/null
+++ b/superset/migrations/versions/b2cd059e8803_add_pandasdatasource.py
@@ -0,0 +1,98 @@
+"""Add PandasDatasource
+Revision ID: b2cd059e8803
+Revises: ca69c70ec99b
+Create Date: 2017-08-30 09:33:40.431377
+"""
+# revision identifiers, used by Alembic.
+revision = 'b2cd059e8803'
+down_revision = 'ca69c70ec99b'
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+FORMATS = [
+ ('csv', 'CSV'),
+ ('html', 'HTML')
+]
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table('pandas_datasources',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('default_endpoint', sa.Text(), nullable=True),
+ sa.Column('is_featured', sa.Boolean(), nullable=True),
+ sa.Column('filter_select_enabled', sa.Boolean(), nullable=True),
+ sa.Column('offset', sa.Integer(), nullable=True),
+ sa.Column('cache_timeout', sa.Integer(), nullable=True),
+ sa.Column('params', sa.String(length=1000), nullable=True),
+ sa.Column('perm', sa.String(length=1000), nullable=True),
+ sa.Column('name', sa.String(length=100), nullable=False),
+ sa.Column('source_url', sa.String(length=1000), nullable=False),
+ sa.Column('source_auth', sqlalchemy_utils.types.json.JSONType(), nullable=True),
+ sa.Column('source_parameters', sqlalchemy_utils.types.json.JSONType(), nullable=True),
+ sa.Column('format', sqlalchemy_utils.types.choice.ChoiceType(FORMATS), nullable=False),
+ sa.Column('additional_parameters', sqlalchemy_utils.types.json.JSONType(), nullable=True),
+ sa.Column('user_id', sa.Integer(), nullable=True),
+ sa.Column('fetch_values_predicate', sa.String(length=1000), nullable=True),
+ sa.Column('main_dttm_col', sa.String(length=250), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['user_id'], ['ab_user.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_table('pandas_columns',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('column_name', sa.String(length=255), nullable=True),
+ sa.Column('verbose_name', sa.String(length=1024), nullable=True),
+ sa.Column('is_active', sa.Boolean(), nullable=True),
+ sa.Column('type', sa.String(length=32), nullable=True),
+ sa.Column('groupby', sa.Boolean(), nullable=True),
+ sa.Column('count_distinct', sa.Boolean(), nullable=True),
+ sa.Column('sum', sa.Boolean(), nullable=True),
+ sa.Column('avg', sa.Boolean(), nullable=True),
+ sa.Column('max', sa.Boolean(), nullable=True),
+ sa.Column('min', sa.Boolean(), nullable=True),
+ sa.Column('filterable', sa.Boolean(), nullable=True),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('expression', sa.Text(), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('pandas_datasource_id', sa.Integer(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['pandas_datasource_id'], ['pandas_datasources.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ op.create_table('pandas_metrics',
+ sa.Column('created_on', sa.DateTime(), nullable=True),
+ sa.Column('changed_on', sa.DateTime(), nullable=True),
+ sa.Column('metric_name', sa.String(length=512), nullable=True),
+ sa.Column('verbose_name', sa.String(length=1024), nullable=True),
+ sa.Column('metric_type', sa.String(length=32), nullable=True),
+ sa.Column('description', sa.Text(), nullable=True),
+ sa.Column('warning_text', sa.Text(), nullable=True),
+ sa.Column('is_restricted', sa.Boolean(), nullable=True),
+ sa.Column('d3format', sa.String(length=128), nullable=True),
+ sa.Column('id', sa.Integer(), nullable=False),
+ sa.Column('pandas_datasource_id', sa.Integer(), nullable=True),
+ sa.Column('source', sa.Text(), nullable=True),
+ sa.Column('expression', sa.Text(), nullable=True),
+ sa.Column('created_by_fk', sa.Integer(), nullable=True),
+ sa.Column('changed_by_fk', sa.Integer(), nullable=True),
+ sa.ForeignKeyConstraint(['changed_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['created_by_fk'], ['ab_user.id'], ),
+ sa.ForeignKeyConstraint(['pandas_datasource_id'], ['pandas_datasources.id'], ),
+ sa.PrimaryKeyConstraint('id')
+ )
+ # ### end Alembic commands ###
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_table('pandas_metrics')
+ op.drop_table('pandas_columns')
+ op.drop_table('pandas_datasources')
+ # ### end Alembic commands ###
\ No newline at end of file
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index 113ec39911..ae2be0d9de 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -282,7 +282,7 @@ def changed_on_(self):
@renders('modified')
def modified(self):
- return humanize.naturaltime(datetime.now() - self.changed_on)
+ return humanize.naturaltime(datetime.now())
@property
def icons(self):
diff --git a/superset/security.py b/superset/security.py
index 0bfca36e9e..9326ac6e5a 100644
--- a/superset/security.py
+++ b/superset/security.py
@@ -319,6 +319,7 @@ def sync_role_definitions(self):
self.set_role('Gamma', self.is_gamma_pvm)
self.set_role('granter', self.is_granter_pvm)
self.set_role('sql_lab', self.is_sql_lab_pvm)
+ self.set_role('Dashboard_Viewer', self.is_dashboard_viewer_pvm)
if conf.get('PUBLIC_ROLE_LIKE_GAMMA', False):
self.set_role('Public', self.is_gamma_pvm)
@@ -379,6 +380,28 @@ def is_sql_lab_pvm(self, pvm):
'can_sqllab',
})
+ def is_dashboard_viewer_pvm(self, pvm):
+ return ( self.is_base_view_pvm(pvm) or self.is_base_security_pvm(pvm) or
+ pvm.permission.name in {
+ 'can_dashboard', 'can_explore_json',
+ } or (pvm.permission.name in {'can_list'} and pvm.view_menu.name in {'CssTemplateAsyncModelView', 'DashboardModelViewAsync' })
+ )
+
+ def is_base_view_pvm(self, pvm):
+ return (
+ pvm.permission.name in {
+ 'can_fave_slices', 'can_fave_dashboards', 'can_recent_activity',
+ })
+
+ def is_base_security_pvm(self, pvm):
+ return (
+ pvm.permission.name in {
+ 'can_userinfo' , 'resetmypassword' , 'can_this_form_get' , 'can_this_form_post'
+ } and pvm.view_menu.name in { 'UserDBModelView', 'ResetMyPasswordView' }
+ # above code will allow some options which are not in PVM
+ # but i am shortcircuiting thsi for now as those permission will be not added to role
+ )
+
def is_granter_pvm(self, pvm):
return pvm.permission.name in {
'can_override_role_permissions', 'can_approve',
diff --git a/superset/templates/appbuilder/baselayout.html b/superset/templates/appbuilder/baselayout.html
index 85c222eb1d..e340b20d86 100644
--- a/superset/templates/appbuilder/baselayout.html
+++ b/superset/templates/appbuilder/baselayout.html
@@ -29,11 +29,7 @@
{% block footer %}
<footer>
- <div class="img-rounded nav-fixed-bottom">
- <div class="container-fluid">
- {% include 'appbuilder/footer.html' %}
- </div>
- </div>
+ {% include 'appbuilder/footer.html' %}
</footer>
{% endblock %}
{% endblock %}
diff --git a/superset/templates/appbuilder/footer.html b/superset/templates/appbuilder/footer.html
new file mode 100644
index 0000000000..37bc342ebb
--- /dev/null
+++ b/superset/templates/appbuilder/footer.html
@@ -0,0 +1,10 @@
+{% set timezone = appbuilder.app.config.get('TIMEZONE') %}
+{% set copyright = appbuilder.app.config.get('COPYRIGHT') %}
+<div class="navbar navbar-default navbar-fixed-bottom navbar-template navbar-default-template navbar-fixed-bottom-template">
+ <div class="footer-left">
+ <label class='footer-left-label'>{{ timezone }}</label>
+ </div>
+ <div class="footer-right">
+ <label class='footer-right-label'>{{ copyright }}</label>
+ </div>
+</div>
\ No newline at end of file
diff --git a/superset/templates/appbuilder/navbar.html b/superset/templates/appbuilder/navbar.html
index 77248f03ac..6d6c824938 100644
--- a/superset/templates/appbuilder/navbar.html
+++ b/superset/templates/appbuilder/navbar.html
@@ -11,12 +11,19 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/superset/profile/{{ current_user.username }}/">
- <img
- width="126"
- src="{{ appbuilder.app_icon }}"
- alt="{{ appbuilder.app_name }}"
- />
+ <div class="header-img-div">
+ <img
+ src="{{ appbuilder.app_icon }}"
+ alt="{{ appbuilder.app_name }}"
+ />
+
+ <div class='header-divider-line'>
+ <span></span>
+ </div>
+ <span>{{ appbuilder.app_name }}</span>
+ </div>
</a>
+
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
diff --git a/superset/templates/superset/basic.html b/superset/templates/superset/basic.html
index 660ed10230..c4f72fea62 100644
--- a/superset/templates/superset/basic.html
+++ b/superset/templates/superset/basic.html
@@ -54,6 +54,13 @@
<div id="app" data-bootstrap="{{ bootstrap_data }}" >
<img src="/static/assets/images/loading.gif" style="width: 50px; margin: 10px;">
</div>
+
+ {% block footer %}
+ <footer>
+ {% include 'appbuilder/footer.html' %}
+ </footer>
+ {% endblock %}
+
{% endblock %}
<!-- Modal for misc messages / alerts -->
diff --git a/superset/views/core.py b/superset/views/core.py
index 71f6ff1f21..52ec33a85d 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -572,7 +572,7 @@ def mulexport(self, items):
items = [items]
ids = ''.join('&id={}'.format(d.id) for d in items)
return redirect(
- '/dashboard/export_dashboards_form?{}'.format(ids[1:]))
+ '/dashboard/export_dashboards_form?{}&action=go'.format(ids[1:]))
@expose('/export_dashboards_form')
def download_dashboards(self):
@@ -1449,6 +1449,11 @@ def checkbox(self, model_view, id_, attr, value):
'DruidColumnInlineView':
ConnectorRegistry.sources['druid'].column_class,
}
+
+ if 'pandas' in ConnectorRegistry.sources:
+ model = ConnectorRegistry.sources['pandas'].column_class
+ modelview_to_model[model_view] = model
+
model = modelview_to_model[model_view]
col = db.session.query(model).filter_by(id=id_).first()
checked = value == 'true'
diff --git a/superset/viz.py b/superset/viz.py
index b0a71d5a9d..ac0a7e7169 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -1686,6 +1686,48 @@ def get_data(self, df):
'matrix': m,
}
+class LeafletViz(BaseViz):
+ """A leaflet map"""
+ viz_type = 'leaflet_map'
+ verbose_name = _('Leaflet Map')
+ is_timeseries = False
+
+ def should_be_timeseries(self):
+ fd = self.form_data
+ # TODO handle datasource-type-specific code in datasource
+ conditions_met = (
+ (fd.get('granularity') and fd.get('granularity') != 'all') or
+ (fd.get('granularity_sqla') and fd.get('time_grain_sqla'))
+ )
+ if fd.get('include_time') and not conditions_met:
+ raise Exception(_(
+ 'Pick a granularity in the Time section or '
+ "uncheck 'Include Time'"))
+ return fd.get('include_time')
+
+ def query_obj(self):
+ d = super(LeafletViz, self).query_obj()
+ fd = self.form_data
+
+ d['columns'] = [fd.get('geojson'), fd.get('polygon')]
+ if fd.get('adhoc_columns') is not None and len(fd.get('adhoc_columns')) > 0 :
+ adhoc_columns = fd.get('adhoc_columns')
+ extra_cols = []
+ for col in adhoc_columns:
+ val1=col['subject']
+ extra_cols.append(val1)
+
+ d['columns'] += extra_cols
+
+ d['columns'] = list(set(d['columns']))
+ d['is_timeseries'] = self.should_be_timeseries()
+ return d
+
+ def get_data(self, df):
+ return {
+ 'data': df.to_dict('records')
+ }
+
class CountryMapViz(BaseViz):
diff --git a/tests/druid_tests.py b/tests/druid_tests.py
index 00df0f8ea6..47c533de9c 100644
--- a/tests/druid_tests.py
+++ b/tests/druid_tests.py
@@ -496,7 +496,7 @@ def test_druid_time_granularities(self, PyDruid):
'5 minutes': 'PT5M',
'1 hour': 'PT1H',
'6 hour': 'PT6H',
- 'one day': 'P1D',
+ 'one_day': 'P1D',
'1 day': 'P1D',
'7 days': 'P7D',
'week': 'P1W',
diff --git a/tox.ini b/tox.ini
index b73d276841..25a88e976b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,8 @@ exclude =
superset/data
superset/migrations
superset/templates
+ build
+ venv
ignore =
FI12
FI15
@@ -24,11 +26,11 @@ require-code = true
[testenv]
commands =
+ pipenv install
{toxinidir}/superset/bin/superset db upgrade
nosetests {posargs}
-deps =
- -rrequirements.txt
- -rrequirements-dev.txt
+deps =
+ pipenv
coverage
mock
nose
@@ -51,9 +53,8 @@ deps =
[testenv:flake8]
commands =
- flake8 {toxinidir}/
-deps =
- -rrequirements-dev.txt
+ pipenv install --dev
+ pipenv run flake8 {toxinidir}/
[testenv:javascript]
commands =
@@ -64,9 +65,7 @@ deps =
[testenv:pylint]
commands =
pylint superset
-deps =
- -rrequirements.txt
- -rrequirements-dev.txt
+
[tox]
envlist =
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index fb57ccd13a..0000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org