-"""
- )),
+""")),
Slice(
slice_name="Name Cloud",
viz_type='word_cloud',
diff --git a/dashed/data/countries.py b/dashed/data/countries.py
index f81ef32df27..663c7d57592 100644
--- a/dashed/data/countries.py
+++ b/dashed/data/countries.py
@@ -1,6 +1,4 @@
-"""
-This module contains data related to countries and is used for geo mapping
-"""
+"""This module contains data related to countries and is used for geo mapping"""
countries = [
{
@@ -2482,6 +2480,7 @@ for lookup in lookups:
for country in countries:
all_lookups[lookup][country[lookup].lower()] = country
+
def get(field, symbol):
"""
Get country data based on a standard code and a symbol
diff --git a/dashed/forms.py b/dashed/forms.py
index e5332ce5eb8..c4df90b4059 100644
--- a/dashed/forms.py
+++ b/dashed/forms.py
@@ -1,3 +1,5 @@
+"""Contains the logic to create cohesive forms on the explore view"""
+
from wtforms import (
Form, SelectMultipleField, SelectField, TextField, TextAreaField,
BooleanField, IntegerField, HiddenField)
@@ -10,8 +12,8 @@ config = app.config
class BetterBooleanField(BooleanField):
- """
- Fixes behavior of html forms omitting non checked
+ """Fixes the html checkbox to distinguish absent from unchecked
+
(which doesn't distinguish False from NULL/missing )
If value is unchecked, this hidden fills in False value
"""
@@ -61,9 +63,10 @@ class FreeFormSelect(widgets.Select):
class FreeFormSelectField(SelectField):
- """ A WTF SelectField that allows for free form input """
+ """A WTF SelectField that allows for free form input"""
widget = FreeFormSelect()
+
def pre_validate(self, form):
return
@@ -85,7 +88,9 @@ class OmgWtForm(Form):
class FormFactory(object):
+
"""Used to create the forms in the explore view dynamically"""
+
series_limits = [0, 5, 10, 25, 50, 100, 500]
fieltype_class = {
SelectField: 'select2',
@@ -278,7 +283,8 @@ class FormFactory(object):
description=(
"Timestamp from filter. This supports free form typing and "
"natural language as in '1 day ago', '28 days' or '3 years'")),
- 'until': FreeFormSelectField('Until', default="now",
+ 'until': FreeFormSelectField(
+ 'Until', default="now",
choices=self.choicify([
'now',
'1 day ago',
@@ -286,7 +292,7 @@ class FormFactory(object):
'28 days ago',
'90 days ago',
'1 year ago'])
- ),
+ ),
'max_bubble_size': FreeFormSelectField(
'Max Bubble Size', default="25",
choices=self.choicify([
@@ -297,8 +303,8 @@ class FormFactory(object):
'50',
'75',
'100',
- ])
- ),
+ ])
+ ),
'row_limit':
FreeFormSelectField(
'Row limit',
@@ -323,8 +329,8 @@ class FormFactory(object):
'Periods',
validators=[validators.optional()],
description=(
- "Defines the size of the rolling window function, "
- "relative to the time granularity selected")),
+ "Defines the size of the rolling window function, "
+ "relative to the time granularity selected")),
'series': SelectField(
'Series', choices=group_by_choices,
default=default_groupby,
@@ -332,14 +338,16 @@ class FormFactory(object):
"Defines the grouping of entities. "
"Each serie is shown as a specific color on the chart and "
"has a legend toggle")),
- 'entity': SelectField('Entity', choices=group_by_choices,
+ 'entity': SelectField(
+ 'Entity', choices=group_by_choices,
default=default_groupby,
description="This define the element to be plotted on the chart"),
'x': SelectField(
'X Axis', choices=datasource.metrics_combo,
default=default_metric,
description="Metric assigned to the [X] axis"),
- 'y': SelectField('Y Axis', choices=datasource.metrics_combo,
+ 'y': SelectField(
+ 'Y Axis', choices=datasource.metrics_combo,
default=default_metric,
description="Metric assigned to the [Y] axis"),
'size': SelectField(
@@ -355,19 +363,23 @@ class FormFactory(object):
"clause, as an AND to other criteria. You can include "
"complex expression, parenthesis and anything else "
"supported by the backend it is directed towards.")),
- 'having': TextField('Custom HAVING clause', default='',
+ 'having': TextField(
+ 'Custom HAVING clause', default='',
description=(
"The text in this box gets included in your query's HAVING"
" clause, as an AND to other criteria. You can include "
"complex expression, parenthesis and anything else "
"supported by the backend it is directed towards.")),
- 'compare_lag': TextField('Comparison Period Lag',
+ 'compare_lag': TextField(
+ 'Comparison Period Lag',
description=(
"Based on granularity, number of time periods to "
"compare against")),
- 'compare_suffix': TextField('Comparison suffix',
+ 'compare_suffix': TextField(
+ 'Comparison suffix',
description="Suffix to apply after the percentage display"),
- 'x_axis_format': FreeFormSelectField('X axis format',
+ 'x_axis_format': FreeFormSelectField(
+ 'X axis format',
default='smart_date',
choices=[
('smart_date', 'Adaptative formating'),
@@ -380,7 +392,8 @@ class FormFactory(object):
description="D3 format syntax for y axis "
"https://github.com/mbostock/\n"
"d3/wiki/Formatting"),
- 'y_axis_format': FreeFormSelectField('Y axis format',
+ 'y_axis_format': FreeFormSelectField(
+ 'Y axis format',
default='.3s',
choices=[
('.3s', '".3s" | 12.3k'),
@@ -506,10 +519,14 @@ class FormFactory(object):
field_css_classes[field] += ['input-sm']
class QueryForm(OmgWtForm):
+
+ """The dynamic form object used for the explore view"""
+
fieldsets = copy(viz.fieldsets)
css_classes = field_css_classes
standalone = HiddenField()
async = HiddenField()
+ force = HiddenField()
extra_filters = HiddenField()
json = HiddenField()
slice_id = HiddenField()
diff --git a/dashed/migrations/versions/836c0bf75904_cache_timeouts.py b/dashed/migrations/versions/836c0bf75904_cache_timeouts.py
new file mode 100644
index 00000000000..d050c49c0bb
--- /dev/null
+++ b/dashed/migrations/versions/836c0bf75904_cache_timeouts.py
@@ -0,0 +1,28 @@
+"""cache_timeouts
+
+Revision ID: 836c0bf75904
+Revises: 18e88e1cc004
+Create Date: 2016-03-17 08:40:03.186534
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '836c0bf75904'
+down_revision = '18e88e1cc004'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ op.add_column('datasources', sa.Column('cache_timeout', sa.Integer(), nullable=True))
+ op.add_column('dbs', sa.Column('cache_timeout', sa.Integer(), nullable=True))
+ op.add_column('slices', sa.Column('cache_timeout', sa.Integer(), nullable=True))
+ op.add_column('tables', sa.Column('cache_timeout', sa.Integer(), nullable=True))
+
+
+def downgrade():
+ op.drop_column('tables', 'cache_timeout')
+ op.drop_column('slices', 'cache_timeout')
+ op.drop_column('dbs', 'cache_timeout')
+ op.drop_column('datasources', 'cache_timeout')
diff --git a/dashed/models.py b/dashed/models.py
index 025806ad041..358c1678519 100644
--- a/dashed/models.py
+++ b/dashed/models.py
@@ -1,6 +1,4 @@
-"""
-A collection of ORM sqlalchemy models for Dashed
-"""
+"""A collection of ORM sqlalchemy models for Dashed"""
from copy import deepcopy, copy
from collections import namedtuple
@@ -58,7 +56,8 @@ class AuditMixinNullable(AuditMixin):
@declared_attr
def changed_by_fk(cls):
- return Column(Integer, ForeignKey('ab_user.id'),
+ return Column(
+ Integer, ForeignKey('ab_user.id'),
default=cls.get_user_id, onupdate=cls.get_user_id, nullable=True)
@property
@@ -103,6 +102,7 @@ class Slice(Model, AuditMixinNullable):
viz_type = Column(String(250))
params = Column(Text)
description = Column(Text)
+ cache_timeout = Column(Integer)
table = relationship(
'SqlaTable', foreign_keys=[table_id], backref='slices')
@@ -177,7 +177,8 @@ class Slice(Model, AuditMixinNullable):
url=url, self=self)
-dashboard_slices = Table('dashboard_slices', Model.metadata,
+dashboard_slices = Table(
+ 'dashboard_slices', Model.metadata,
Column('id', Integer, primary_key=True),
Column('dashboard_id', Integer, ForeignKey('dashboards.id')),
Column('slice_id', Integer, ForeignKey('slices.id')),
@@ -229,7 +230,9 @@ class Dashboard(Model, AuditMixinNullable):
class Queryable(object):
+
"""A common interface to objects that are queryable (tables and datasources)"""
+
@property
def column_names(self):
return sorted([c.column_name for c in self.columns])
@@ -260,6 +263,7 @@ class Database(Model, AuditMixinNullable):
database_name = Column(String(250), unique=True)
sqlalchemy_uri = Column(String(1024))
password = Column(EncryptedType(String(1024), config.get('SECRET_KEY')))
+ cache_timeout = Column(Integer)
def __repr__(self):
return self.database_name
@@ -280,7 +284,7 @@ class Database(Model, AuditMixinNullable):
this allows a mapping between database engines and actual functions.
"""
Grain = namedtuple('Grain', 'name function')
- DB_TIME_GRAINS = {
+ db_time_grains = {
'presto': (
Grain('Time Column', '{col}'),
Grain('week', "date_trunc('week', CAST({col} AS DATE))"),
@@ -297,7 +301,7 @@ class Database(Model, AuditMixinNullable):
Grain('month', 'DATE_SUB({col}, INTERVAL DAYOFMONTH({col}) - 1 DAY)'),
),
}
- for db_type, grains in DB_TIME_GRAINS.items():
+ for db_type, grains in db_time_grains.items():
if self.sqlalchemy_uri.startswith(db_type):
return grains
@@ -350,6 +354,7 @@ class SqlaTable(Model, Queryable, AuditMixinNullable):
database = relationship(
'Database', backref='tables', foreign_keys=[database_id])
offset = Column(Integer, default=0)
+ cache_timeout = Column(Integer)
baselink = "tablemodelview"
@@ -428,7 +433,7 @@ class SqlaTable(Model, Queryable, AuditMixinNullable):
def sql_link(self):
return '
-
-
+
+
-
{{ dashboard.dashboard_title }}
+
+
-
+
-
@@ -83,50 +86,44 @@
-
-
-
-
- ")
def index(self, url_id):
@@ -373,82 +379,37 @@ class Dashed(BaseView):
@expose("/datasource///") # Legacy url
@log_this
def explore(self, datasource_type, datasource_id):
- if datasource_type == "table":
- datasource = (
- db.session
- .query(models.SqlaTable)
- .filter_by(id=datasource_id)
+ datasource_class = models.SqlaTable \
+ if datasource_type == "table" else models.DruidDatasource
+ datasource = (
+ db.session
+ .query(datasource_class)
+ .filter_by(id=datasource_id)
+ .first()
+ )
+ slice_id = request.args.get("slice_id")
+ slc = None
+ if slice_id:
+ slc = (
+ db.session.query(models.Slice)
+ .filter_by(id=slice_id)
.first()
)
- else:
- datasource = (
- db.session
- .query(models.DruidDatasource)
- .filter_by(id=datasource_id)
- .first()
- )
-
- all_datasource_access = self.appbuilder.sm.has_access(
- 'all_datasource_access', 'all_datasource_access')
- datasource_access = self.appbuilder.sm.has_access(
- 'datasource_access', datasource.perm)
- if not (all_datasource_access or datasource_access):
- flash(
- "You don't seem to have access to this datasource",
- "danger")
- return redirect('/slicemodelview/list/')
- action = request.args.get('action')
- if action in ('save', 'overwrite'):
- session = db.session()
-
- # TODO use form processing form wtforms
- d = request.args.to_dict(flat=False)
- del d['action']
- del d['previous_viz_type']
- as_list = ('metrics', 'groupby', 'columns')
- for k in d:
- v = d.get(k)
- if k in as_list and not isinstance(v, list):
- d[k] = [v] if v else []
- if k not in as_list and isinstance(v, list):
- d[k] = v[0]
-
- table_id = druid_datasource_id = None
- datasource_type = request.args.get('datasource_type')
- if datasource_type in ('datasource', 'druid'):
- druid_datasource_id = request.args.get('datasource_id')
- elif datasource_type == 'table':
- table_id = request.args.get('datasource_id')
-
- slice_name = request.args.get('slice_name')
-
- if action == "save":
- slc = models.Slice()
- msg = "Slice [{}] has been saved".format(slice_name)
- elif action == "overwrite":
- slc = (
- session.query(models.Slice)
- .filter_by(id=request.args.get("slice_id"))
- .first()
- )
- msg = "Slice [{}] has been overwritten".format(slice_name)
-
- slc.params = json.dumps(d, indent=4, sort_keys=True)
- slc.datasource_name = request.args.get('datasource_name')
- slc.viz_type = request.args.get('viz_type')
- slc.druid_datasource_id = druid_datasource_id
- slc.table_id = table_id
- slc.datasource_type = datasource_type
- slc.slice_name = slice_name
-
- session.merge(slc)
- session.commit()
- flash(msg, "info")
- return redirect(slc.slice_url)
-
-
if not datasource:
flash("The datasource seem to have been deleted", "alert")
+
+ all_datasource_access = self.appbuilder.sm.has_access(
+ 'all_datasource_access', 'all_datasource_access')
+ datasource_access = self.appbuilder.sm.has_access(
+ 'datasource_access', datasource.perm)
+ if not (all_datasource_access or datasource_access):
+ flash("You don't seem to have access to this datasource", "danger")
+ return redirect('/slicemodelview/list/')
+
+ action = request.args.get('action')
+ if action in ('save', 'overwrite'):
+ return self.save(request.args, slc)
+
viz_type = request.args.get("viz_type")
if not viz_type and datasource.default_endpoint:
return redirect(datasource.default_endpoint)
@@ -456,45 +417,38 @@ class Dashed(BaseView):
viz_type = "table"
obj = viz.viz_types[viz_type](
datasource,
- form_data=request.args)
- if request.args.get("csv") == "true":
+ form_data=request.args,
+ slice=slc)
+ if request.args.get("json") == "true":
+ status = 200
+ try:
+ payload = obj.get_json()
+ except Exception as e:
+ logging.exception(e)
+ if config.get("DEBUG"):
+ raise e
+ payload = str(e)
+ status = 500
+ resp = Response(
+ payload,
+ status=status,
+ mimetype="application/json")
+ return resp
+ elif request.args.get("csv") == "true":
status = 200
payload = obj.get_csv()
return Response(
payload,
status=status,
mimetype="application/csv")
-
- slice_id = request.args.get("slice_id")
- slc = None
- if slice_id:
- slc = (
- db.session.query(models.Slice)
- .filter_by(id=request.args.get("slice_id"))
- .first()
- )
- if request.args.get("json") == "true":
- status = 200
- if config.get("DEBUG"):
- payload = obj.get_json()
- else:
- try:
- payload = obj.get_json()
- except Exception as e:
- logging.exception(e)
- payload = str(e)
- status = 500
- return Response(
- payload,
- status=status,
- mimetype="application/json")
else:
- if config.get("DEBUG"):
- resp = self.render_template(
- "dashed/viz.html", viz=obj, slice=slc)
+ if request.args.get("standalone") == "true":
+ template = "dashed/standalone.html"
+ else:
+ template = "dashed/explore.html"
+
try:
- resp = self.render_template(
- "dashed/viz.html", viz=obj, slice=slc)
+ resp = self.render_template(template, viz=obj, slice=slc)
except Exception as e:
if config.get("DEBUG"):
raise(e)
@@ -504,6 +458,53 @@ class Dashed(BaseView):
mimetype="application/json")
return resp
+ def save(self, args, slc):
+ """Saves (inserts or overwrite a slice) """
+ session = db.session()
+ slice_name = args.get('slice_name')
+ action = args.get('action')
+
+ # TODO use form processing form wtforms
+ d = args.to_dict(flat=False)
+ del d['action']
+ del d['previous_viz_type']
+ as_list = ('metrics', 'groupby', 'columns')
+ for k in d:
+ v = d.get(k)
+ if k in as_list and not isinstance(v, list):
+ d[k] = [v] if v else []
+ if k not in as_list and isinstance(v, list):
+ d[k] = v[0]
+
+ table_id = druid_datasource_id = None
+ datasource_type = args.get('datasource_type')
+ if datasource_type in ('datasource', 'druid'):
+ druid_datasource_id = args.get('datasource_id')
+ elif datasource_type == 'table':
+ table_id = args.get('datasource_id')
+
+ if action == "save":
+ slc = models.Slice()
+ msg = "Slice [{}] has been saved".format(slice_name)
+ elif action == "overwrite":
+ msg = "Slice [{}] has been overwritten".format(slice_name)
+
+ slc.params = json.dumps(d, indent=4, sort_keys=True)
+ slc.datasource_name = args.get('datasource_name')
+ slc.viz_type = args.get('viz_type')
+ slc.druid_datasource_id = druid_datasource_id
+ slc.table_id = table_id
+ slc.datasource_type = datasource_type
+ slc.slice_name = slice_name
+
+ if action == "save":
+ session.add(slc)
+ elif action == "overwrite":
+ session.merge(slc)
+ session.commit()
+ flash(msg, "info")
+ return redirect(slc.slice_url)
+
@has_access
@expose("/checkbox////", methods=['GET'])
def checkbox(self, model_view, id_, attr, value):
@@ -516,11 +517,10 @@ class Dashed(BaseView):
obj = db.session.query(model).filter_by(id=id_).first()
if obj:
- setattr(obj, attr, value=='true')
+ setattr(obj, attr, value == 'true')
db.session.commit()
return Response("OK", mimetype="application/json")
-
@has_access
@expose("/save_dash//", methods=['GET', 'POST'])
def save_dash(self, dashboard_id):
@@ -529,7 +529,7 @@ class Dashed(BaseView):
positions = data['positions']
slice_ids = [int(d['slice_id']) for d in positions]
session = db.session()
- Dash = models.Dashboard
+ Dash = models.Dashboard # noqa
dash = session.query(Dash).filter_by(id=dashboard_id).first()
dash.slices = [o for o in dash.slices if o.id in slice_ids]
dash.position_json = json.dumps(data['positions'], indent=4)
@@ -583,7 +583,7 @@ class Dashed(BaseView):
pos_dict = {}
if dash.position_json:
pos_dict = {
- int(o['slice_id']):o
+ int(o['slice_id']): o
for o in json.loads(dash.position_json)}
return self.render_template(
"dashed/dashboard.html", dashboard=dash,
@@ -599,7 +599,7 @@ class Dashed(BaseView):
engine = mydb.get_sqla_engine()
tables = engine.table_names()
- table_name=request.args.get('table_name')
+ table_name = request.args.get('table_name')
return self.render_template(
"dashed/sql.html",
tables=tables,
@@ -618,11 +618,11 @@ class Dashed(BaseView):
return self.render_template(
"dashed/ajah.html",
content=df.to_html(
- index=False,
- na_rep='',
- classes=(
- "dataframe table table-striped table-bordered "
- "table-condensed sql_results")))
+ index=False,
+ na_rep='',
+ classes=(
+ "dataframe table table-striped table-bordered "
+ "table-condensed sql_results")))
@has_access
@expose("/select_star///")
@@ -643,6 +643,7 @@ class Dashed(BaseView):
@expose("/runsql/", methods=['POST', 'GET'])
@log_this
def runsql(self):
+ """Runs arbitrary sql and returns and html table"""
session = db.session()
limit = 1000
data = json.loads(request.form.get('data'))
@@ -659,7 +660,7 @@ class Dashed(BaseView):
.select_from(TextAsFrom(text(sql), ['*']).alias('inner_qry'))
.limit(limit)
)
- sql= str(qry.compile(eng, compile_kwargs={"literal_binds": True}))
+ sql = str(qry.compile(eng, compile_kwargs={"literal_binds": True}))
try:
df = pd.read_sql_query(sql=sql, con=eng)
content = df.to_html(
@@ -679,6 +680,7 @@ class Dashed(BaseView):
@has_access
@expose("/refresh_datasources/")
def refresh_datasources(self):
+ """endpoint that refreshes druid datasources metadata"""
session = db.session()
for cluster in session.query(models.DruidCluster).all():
try:
@@ -700,6 +702,7 @@ class Dashed(BaseView):
@expose("/autocomplete///")
def autocomplete(self, datasource, column):
+ """used for filter autocomplete"""
client = utils.get_pydruid_client()
top = client.topn(
datasource=datasource,
@@ -731,6 +734,7 @@ class Dashed(BaseView):
@has_access
@expose("/featured", methods=['GET'])
def featured(self):
+ """views that shows the Featured Datasets"""
session = db.session()
datasets_sqla = (
session.query(models.SqlaTable)
@@ -769,6 +773,4 @@ appbuilder.add_view(
"CSS Templates",
icon="fa-css3",
category="Sources",
- category_icon='',)
-
-
+ category_icon='')
diff --git a/dashed/viz.py b/dashed/viz.py
index 56b15a70b34..274924fd84e 100644
--- a/dashed/viz.py
+++ b/dashed/viz.py
@@ -1,11 +1,13 @@
-"""
-This module contains the "Viz" objects that represent the backend of all
-the visualizations that Dashed can render
+"""This module contains the "Viz" objects
+
+These objects represent the backend of all the visualizations that
+Dashed can render.
"""
from collections import OrderedDict, defaultdict
from datetime import datetime, timedelta
import json
+import logging
import uuid
from flask import flash, request, Markup
@@ -15,7 +17,7 @@ from werkzeug.datastructures import ImmutableMultiDict
from werkzeug.urls import Href
import pandas as pd
-from dashed import app, utils
+from dashed import app, utils, cache
from dashed.forms import FormFactory
from six import string_types
@@ -30,8 +32,7 @@ class BaseViz(object):
viz_type = None
verbose_name = "Base Viz"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'metrics', 'groupby',
@@ -39,11 +40,12 @@ class BaseViz(object):
},)
form_overrides = {}
- def __init__(self, datasource, form_data):
+ def __init__(self, datasource, form_data, slice=None):
self.orig_form_data = form_data
self.datasource = datasource
self.request = request
self.viz_type = form_data.get("viz_type")
+ self.slice = slice
# TODO refactor all form related logic out of here and into forms.py
ff = FormFactory(self)
@@ -102,6 +104,7 @@ class BaseViz(object):
pass
def get_url(self, **kwargs):
+ """Returns the URL for the viz"""
d = self.orig_form_data.copy()
if 'json' in d:
del d['json']
@@ -210,28 +213,58 @@ class BaseViz(object):
}
return d
+ @property
+ def cache_timeout(self):
+ if self.slice and self.slice.cache_timeout:
+ return self.slice.cache_timeout
+ return (
+ self.datasource.cache_timeout or
+ self.datasource.database.cache_timeout or
+ config.get("CACHE_DEFAULT_TIMEOUT"))
+
def get_json(self):
- payload = {
- 'data': json.loads(self.get_json_data()),
- 'query': self.query,
- 'form_data': self.form_data,
- 'json_endpoint': self.json_endpoint,
- 'csv_endpoint': self.csv_endpoint,
- 'standalone_endpoint': self.standalone_endpoint,
- }
- return json.dumps(payload)
+ """Handles caching around the json payload retrieval"""
+ cache_key = self.cache_key
+ payload = None
+ if self.form_data.get('force') != 'true':
+ payload = cache.get(cache_key)
+ if payload:
+ is_cached = True
+ logging.info("Serving from cache")
+ else:
+ is_cached = False
+ cache_timeout = self.cache_timeout
+ payload = {
+ 'data': self.get_data(),
+ 'query': self.query,
+ 'form_data': self.form_data,
+ 'json_endpoint': cache_key,
+ 'csv_endpoint': self.csv_endpoint,
+ 'standalone_endpoint': self.standalone_endpoint,
+ 'cache_timeout': cache_timeout,
+ }
+ payload['cached_dttm'] = datetime.now().isoformat().split('.')[0]
+ logging.info("Caching for the next {} seconds".format(
+ cache_timeout))
+ cache.set(cache_key, payload, timeout=self.cache_timeout)
+ payload['is_cached'] = is_cached
+ return dumps(payload)
def get_csv(self):
df = self.get_df()
return df.to_csv(index=False)
- def get_json_data(self):
- return json.dumps([])
+ def get_data(self):
+ return []
@property
def json_endpoint(self):
return self.get_url(json="true")
+ @property
+ def cache_key(self):
+ return self.get_url(json="true", force="false")
+
@property
def csv_endpoint(self):
return self.get_url(csv="true")
@@ -256,33 +289,33 @@ class BaseViz(object):
def json_data(self):
return dumps(self.data)
+
class TableViz(BaseViz):
+
+ """A basic html table that is sortable and searchable"""
+
viz_type = "table"
verbose_name = "Table View"
- fieldsets = (
- {
+ fieldsets = ({
'label': "Chart Options",
'fields': (
'row_limit',
('include_search', None),
)
- },
- {
+ }, {
'label': "GROUP BY",
'fields': (
'groupby',
'metrics',
)
- },
- {
+ }, {
'label': "NOT GROUPED BY",
'fields': (
'all_columns',
)
- },)
+ })
is_timeseries = False
-
def query_obj(self):
d = super(TableViz, self).query_obj()
fd = self.form_data
@@ -303,23 +336,22 @@ class TableViz(BaseViz):
del df['timestamp']
return df
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
- return json.dumps(
- dict(
- records=df.to_dict(orient="records"),
- columns=list(df.columns),
- ),
- default=utils.json_iso_dttm_ser,
+ return dict(
+ records=df.to_dict(orient="records"),
+ columns=list(df.columns),
)
class PivotTableViz(BaseViz):
+
+ """A pivot table view, define your rows, columns and metrics"""
+
viz_type = "pivot_table"
verbose_name = "Pivot Table"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'groupby',
@@ -365,19 +397,21 @@ class PivotTableViz(BaseViz):
)
return df
- def get_json_data(self):
- return dumps(self.get_df().to_html(
+ def get_data(self):
+ return self.get_df().to_html(
na_rep='',
classes=(
"dataframe table table-striped table-bordered "
- "table-condensed table-hover")))
+ "table-condensed table-hover"))
class MarkupViz(BaseViz):
+
+ """Use html or markdown to create a free form widget"""
+
viz_type = "markup"
verbose_name = "Markup Widget"
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': ('markup_type', 'code')
},)
@@ -391,22 +425,22 @@ class MarkupViz(BaseViz):
elif markup_type == "html":
return code
- def get_json_data(self):
- return dumps(dict(html=self.rendered()))
+ def get_data(self):
+ return dict(html=self.rendered())
class WordCloudViz(BaseViz):
- """Integration with the nice library at:
+ """Build a colorful word cloud
+ Uses the nice library at:
https://github.com/jasondavies/d3-cloud
"""
viz_type = "word_cloud"
verbose_name = "Word Cloud"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'series', 'metric', 'limit',
@@ -422,13 +456,13 @@ class WordCloudViz(BaseViz):
d['groupby'] = [self.form_data.get('series')]
return d
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
# Ordering the columns
df = df[[self.form_data.get('series'), self.form_data.get('metric')]]
# Labeling the columns for uniform json schema
df.columns = ['text', 'size']
- return df.to_json(orient="records")
+ return df.to_dict(orient="records")
class NVD3Viz(BaseViz):
@@ -447,16 +481,14 @@ class BubbleViz(NVD3Viz):
viz_type = "bubble"
verbose_name = "Bubble Chart"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'series', 'entity',
'x', 'y',
'size', 'limit',
)
- },
- {
+ }, {
'label': 'Chart Options',
'fields': (
('x_log_scale', 'y_log_scale'),
@@ -497,7 +529,7 @@ class BubbleViz(NVD3Viz):
df['group'] = df[[self.series]]
return df
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
series = defaultdict(list)
for row in df.to_dict(orient='records'):
@@ -506,15 +538,18 @@ class BubbleViz(NVD3Viz):
for k, v in series.items():
chart_data.append({
'key': k,
- 'values': v })
- return dumps(chart_data)
+ 'values': v})
+ return chart_data
+
class BigNumberViz(BaseViz):
+
+ """Put emphasis on a single metric with this big number viz"""
+
viz_type = "big_number"
verbose_name = "Big Number"
is_timeseries = True
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'metric',
@@ -534,7 +569,6 @@ class BigNumberViz(BaseViz):
if not metric:
self.form_data['metric'] = self.orig_form_data.get('metrics')
-
def query_obj(self):
d = super(BigNumberViz, self).query_obj()
metric = self.form_data.get('metric')
@@ -544,56 +578,56 @@ class BigNumberViz(BaseViz):
self.form_data['metric'] = metric
return d
- def get_json_data(self):
+ def get_data(self):
form_data = self.form_data
df = self.get_df()
df = df.sort(columns=df.columns[0])
compare_lag = form_data.get("compare_lag", "")
compare_lag = int(compare_lag) if compare_lag and compare_lag.isdigit() else 0
- d = {
+ return {
'data': df.values.tolist(),
'compare_lag': compare_lag,
'compare_suffix': form_data.get('compare_suffix', ''),
}
- return dumps(d)
class NVD3TimeSeriesViz(NVD3Viz):
+
+ """A rich line chart component with tons of options"""
+
viz_type = "line"
verbose_name = "Time Series - Line Chart"
sort_series = False
is_timeseries = True
- fieldsets = (
- {
- 'label': None,
- 'fields': (
- 'metrics',
- 'groupby', 'limit',
- ),
- }, {
- 'label': 'Chart Options',
- 'fields': (
- ('show_brush', 'show_legend'),
- ('rich_tooltip', 'y_axis_zero'),
- ('y_log_scale', 'contribution'),
- ('x_axis_format', 'y_axis_format'),
- ('line_interpolation', 'x_axis_showminmax'),
- ),
- }, {
- 'label': 'Advanced Analytics',
- 'description': (
- "This section contains options "
- "that allow for advanced analytical post processing "
- "of query results"),
- 'fields': (
- ('rolling_type', 'rolling_periods'),
- 'time_compare',
- 'num_period_compare',
- None,
- ('resample_how', 'resample_rule',), 'resample_fillmethod'
- ),
- },
- )
+ fieldsets = ({
+ 'label': None,
+ 'fields': (
+ 'metrics',
+ 'groupby', 'limit',
+ ),
+ }, {
+ 'label': 'Chart Options',
+ 'fields': (
+ ('show_brush', 'show_legend'),
+ ('rich_tooltip', 'y_axis_zero'),
+ ('y_log_scale', 'contribution'),
+ ('x_axis_format', 'y_axis_format'),
+ ('line_interpolation', 'x_axis_showminmax'),
+ ),
+ }, {
+ 'label': 'Advanced Analytics',
+ 'description': (
+ "This section contains options "
+ "that allow for advanced analytical post processing "
+ "of query results"),
+ 'fields': (
+ ('rolling_type', 'rolling_periods'),
+ 'time_compare',
+ 'num_period_compare',
+ None,
+ ('resample_how', 'resample_rule',), 'resample_fillmethod'
+ ),
+ },)
def get_df(self, query_obj=None):
form_data = self.form_data
@@ -618,7 +652,6 @@ class NVD3TimeSeriesViz(NVD3Viz):
if not fm:
df = df.fillna(0)
-
if self.sort_series:
dfs = df.sum()
dfs.sort(ascending=False)
@@ -676,7 +709,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
chart_data.append(d)
return chart_data
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
chart_data = self.to_series(df)
@@ -694,10 +727,13 @@ class NVD3TimeSeriesViz(NVD3Viz):
chart_data += self.to_series(
df2, classed='dashed', title_suffix="---")
chart_data = sorted(chart_data, key=lambda x: x['key'])
- return dumps(chart_data)
+ return chart_data
class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz):
+
+ """A bar chart where the x axis is time"""
+
viz_type = "bar"
sort_series = True
verbose_name = "Time Series - Bar Chart"
@@ -714,11 +750,17 @@ class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz):
class NVD3CompareTimeSeriesViz(NVD3TimeSeriesViz):
+
+ """A line chart component where you can compare the % change over time"""
+
viz_type = 'compare'
verbose_name = "Time Series - Percent Change"
class NVD3TimeSeriesStackedViz(NVD3TimeSeriesViz):
+
+ """A rich stack area chart"""
+
viz_type = "area"
verbose_name = "Time Series - Stacked"
sort_series = True
@@ -735,11 +777,13 @@ class NVD3TimeSeriesStackedViz(NVD3TimeSeriesViz):
class DistributionPieViz(NVD3Viz):
+
+ """Annoy visualization snobs with this controversial pie chart"""
+
viz_type = "pie"
verbose_name = "Distribution - NVD3 - Pie Chart"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'metrics', 'groupby',
@@ -761,19 +805,21 @@ class DistributionPieViz(NVD3Viz):
df = df.sort(self.metrics[0], ascending=False)
return df
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
df = df.reset_index()
df.columns = ['x', 'y']
- return dumps(df.to_dict(orient="records"))
+ return df.to_dict(orient="records")
class DistributionBarViz(DistributionPieViz):
+
+ """A good old bar chart"""
+
viz_type = "dist_bar"
verbose_name = "Distribution - Bar Chart"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': 'Chart Options',
'fields': (
'groupby',
@@ -822,7 +868,7 @@ class DistributionBarViz(DistributionPieViz):
pt = pt.reindex(row.index)
return pt
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
series = df.to_dict('series')
chart_data = []
@@ -843,15 +889,17 @@ class DistributionBarViz(DistributionPieViz):
for i, v in ys.iteritems()]
}
chart_data.append(d)
- return dumps(chart_data)
+ return chart_data
class SunburstViz(BaseViz):
+
+ """A multi level sunburst chart"""
+
viz_type = "sunburst"
verbose_name = "Sunburst"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'groupby',
@@ -883,7 +931,7 @@ class SunburstViz(BaseViz):
df = super(SunburstViz, self).get_df(query_obj)
return df
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
# if m1 == m2 duplicate the metric column
@@ -898,7 +946,7 @@ class SunburstViz(BaseViz):
cols += [
self.form_data['metric'], self.form_data['secondary_metric']]
ndf = df[cols]
- return ndf.to_json(orient="values")
+ return json.loads(ndf.to_json(orient="values")) # TODO fix this nonsense
def query_obj(self):
qry = super(SunburstViz, self).query_obj()
@@ -908,11 +956,13 @@ class SunburstViz(BaseViz):
class SankeyViz(BaseViz):
+
+ """A Sankey diagram that requires a parent-child dataset"""
+
viz_type = "sankey"
verbose_name = "Sankey"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'groupby',
@@ -935,27 +985,27 @@ class SankeyViz(BaseViz):
self.form_data['metric']]
return qry
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
df.columns = ['source', 'target', 'value']
- d = df.to_dict(orient='records')
- return dumps(d)
+ return df.to_dict(orient='records')
class DirectedForceViz(BaseViz):
+
+ """An animated directed force layout graph visualization"""
+
viz_type = "directed_force"
verbose_name = "Directed Force Layout"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'groupby',
'metric',
'row_limit',
)
- },
- {
+ }, {
'label': 'Force Layout',
'fields': (
'link_length',
@@ -968,6 +1018,7 @@ class DirectedForceViz(BaseViz):
'description': "Choose a source and a target",
},
}
+
def query_obj(self):
qry = super(DirectedForceViz, self).query_obj()
if len(self.form_data['groupby']) != 2:
@@ -975,27 +1026,27 @@ class DirectedForceViz(BaseViz):
qry['metrics'] = [self.form_data['metric']]
return qry
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
df.columns = ['source', 'target', 'value']
- d = df.to_dict(orient='records')
- return dumps(d)
+ return df.to_dict(orient='records')
class WorldMapViz(BaseViz):
+
+ """A country centric world map"""
+
viz_type = "world_map"
verbose_name = "World Map"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'entity',
'country_fieldtype',
'metric',
)
- },
- {
+ }, {
'label': 'Bubbles',
'fields': (
('show_bubbles', None),
@@ -1017,6 +1068,7 @@ class WorldMapViz(BaseViz):
'description': ("Metric that defines the size of the bubble"),
},
}
+
def query_obj(self):
qry = super(WorldMapViz, self).query_obj()
qry['metrics'] = [
@@ -1024,7 +1076,7 @@ class WorldMapViz(BaseViz):
qry['groupby'] = [self.form_data['entity']]
return qry
- def get_json_data(self):
+ def get_data(self):
from dashed.data import countries
df = self.get_df()
cols = [self.form_data.get('entity')]
@@ -1050,15 +1102,17 @@ class WorldMapViz(BaseViz):
row['name'] = country['name']
else:
row['country'] = "XXX"
- return dumps(d)
+ return d
class FilterBoxViz(BaseViz):
+
+ """A multi filter, multi-choice filter box to make dashboards interactive"""
+
viz_type = "filter_box"
verbose_name = "Filters"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'groupby',
@@ -1071,6 +1125,7 @@ class FilterBoxViz(BaseViz):
'description': "The fields you want to filter on",
},
}
+
def query_obj(self):
qry = super(FilterBoxViz, self).query_obj()
groupby = self.form_data['groupby']
@@ -1080,44 +1135,48 @@ class FilterBoxViz(BaseViz):
self.form_data['metric']]
return qry
- def get_df(self, query_obj=None):
+ def get_data(self):
qry = self.query_obj()
-
filters = [g for g in qry['groupby']]
d = {}
for flt in filters:
qry['groupby'] = [flt]
df = super(FilterBoxViz, self).get_df(qry)
- d[flt] = [
- {'id': row[0],
+ d[flt] = [{
+ 'id': row[0],
'text': row[0],
'filter': flt,
'metric': row[1]}
- for row in df.itertuples(index=False)]
+ for row in df.itertuples(index=False)
+ ]
return d
- def get_json_data(self):
- d = self.get_df()
- return dumps(d)
-
class IFrameViz(BaseViz):
+
+ """You can squeeze just about anything in this iFrame component"""
+
viz_type = "iframe"
verbose_name = "iFrame"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': ('url',)
},)
class ParallelCoordinatesViz(BaseViz):
+
+ """Interactive parallel coordinate implementation
+
+ Uses this amazing javascript library
+ https://github.com/syntagmatic/parallel-coordinates
+ """
+
viz_type = "para"
verbose_name = "Parallel Coordinates"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'series',
@@ -1127,6 +1186,7 @@ class ParallelCoordinatesViz(BaseViz):
('show_datatable', None),
)
},)
+
def query_obj(self):
d = super(ParallelCoordinatesViz, self).query_obj()
fd = self.form_data
@@ -1137,25 +1197,27 @@ class ParallelCoordinatesViz(BaseViz):
d['groupby'] = [fd.get('series')]
return d
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
df = df[[self.form_data.get('series')] + self.form_data.get('metrics')]
- return df.to_json(orient="records")
+ return df.to_dict(orient="records")
+
class HeatmapViz(BaseViz):
+
+ """A nice heatmap visualization that support high density through canvas"""
+
viz_type = "heatmap"
verbose_name = "Heatmap"
is_timeseries = False
- fieldsets = (
- {
+ fieldsets = ({
'label': None,
'fields': (
'all_columns_x',
'all_columns_y',
'metric',
)
- },
- {
+ }, {
'label': 'Heatmap Options',
'fields': (
'linear_color_scheme',
@@ -1164,6 +1226,7 @@ class HeatmapViz(BaseViz):
'normalize_across',
)
},)
+
def query_obj(self):
d = super(HeatmapViz, self).query_obj()
fd = self.form_data
@@ -1171,7 +1234,7 @@ class HeatmapViz(BaseViz):
d['groupby'] = [fd.get('all_columns_x'), fd.get('all_columns_y')]
return d
- def get_json_data(self):
+ def get_data(self):
df = self.get_df()
fd = self.form_data
x = fd.get('all_columns_x')
@@ -1199,7 +1262,7 @@ class HeatmapViz(BaseViz):
v = df.v
min_ = v.min()
df['perc'] = (v - min_) / (v.max() - min_)
- return df.to_json(orient="records")
+ return df.to_dict(orient="records")
viz_types_list = [
diff --git a/docs/index.rst b/docs/index.rst
index 026bf737a9d..43e212ce841 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,9 +13,9 @@ Features
providers (database, OpenID, LDAP, OAuth & REMOTE_USER through
Flask AppBuilder)
- A simple semantic layer, allowing users to control how data sources are
- displayed in the UI by defining which fields should show up in which
- drop-down and which aggregation and function metrics are made available
- to the user
+ displayed in the UI by defining which fields should show up in which
+ drop-down and which aggregation and function metrics are made available
+ to the user
- Integration with most RDBMS through SqlAlchemy
- Deep integration with Druid.io
@@ -25,10 +25,10 @@ Contents
.. toctree::
:maxdepth: 2
+ installation
user_guide
-
Indices and tables
------------------
diff --git a/docs/installation.rst b/docs/installation.rst
new file mode 100644
index 00000000000..dc293163893
--- /dev/null
+++ b/docs/installation.rst
@@ -0,0 +1,103 @@
+Installation & Configuration
+============================
+
+Getting Started
+---------------
+
+Panoramix is currently only tested using Python 2.7.*. Python 3 support is
+on the roadmap, Python 2.6 won't be supported.
+
+Follow these few simple steps to install Panoramix.::
+
+ # Install panoramix
+ pip install panoramix
+
+ # Create an admin user
+ fabmanager create-admin --app panoramix
+
+ # Initialize the database
+ panoramix db upgrade
+
+ # Create default roles and permissions
+ panoramix init
+
+ # Load some data to play with
+ panoramix load_examples
+
+ # Start the development web server
+ panoramix runserver -d
+
+
+After installation, you should be able to point your browser to the right
+hostname:port [http://localhost:8088](http://localhost:8088), login using
+the credential you entered while creating the admin account, and navigate to
+`Menu -> Admin -> Refresh Metadata`. This action should bring in all of
+your datasources for Panoramix to be aware of, and they should show up in
+`Menu -> Datasources`, from where you can start playing with your data!
+
+
+Configuration
+-------------
+
+To configure your application, you need to create a file (module)
+``panoramix_config.py`` and make sure it is in your PYTHONPATH. Here are some
+of the parameters you can copy / paste in that configuration module: ::
+
+ #---------------------------------------------------------
+ # Panoramix specifix config
+ #---------------------------------------------------------
+ ROW_LIMIT = 5000
+ WEBSERVER_THREADS = 8
+
+ PANORAMIX_WEBSERVER_PORT = 8088
+ #---------------------------------------------------------
+
+ #---------------------------------------------------------
+ # Flask App Builder configuration
+ #---------------------------------------------------------
+ # Your App secret key
+ SECRET_KEY = '\2\1thisismyscretkey\1\2\e\y\y\h'
+
+ # The SQLAlchemy connection string.
+ SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/panoramix.db'
+
+ # Flask-WTF flag for CSRF
+ CSRF_ENABLED = True
+
+ # Whether to run the web server in debug mode or not
+ DEBUG = True
+
+This file also allows you to define configuration parameters used by
+Flask App Builder, the web framework used by Panoramix. Please consult
+the `Flask App Builder Documentation
+`_
+for more information on how to configure Panoramix.
+
+
+Caching
+-------
+
+Panoramix uses `Flask-Cache
-
+
-
diff --git a/dashed/templates/dashed/explore.html b/dashed/templates/dashed/explore.html
index 106bd487ab3..50400ac9aa9 100644
--- a/dashed/templates/dashed/explore.html
+++ b/dashed/templates/dashed/explore.html
@@ -43,42 +43,47 @@
{% endif %}
-
{% for fieldset in form.fieldsets %} @@ -162,7 +167,7 @@ class="widget viz slice {{ viz.viz_type }}" data-slice="{{ viz.json_data }}" style="height: 700px;"> -
+
diff --git a/dashed/templates/dashed/viz.html b/dashed/templates/dashed/viz.html
deleted file mode 100644
index ea1dc7fc013..00000000000
--- a/dashed/templates/dashed/viz.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if viz.form_data.get("json") == "true" %}
- {{ viz.get_json() }}
-{% else %}
-
- {% if viz.request.args.get("standalone") == "true" %}
- {% extends 'dashed/standalone.html' %}
- {% else %}
- {% extends 'dashed/explore.html' %}
- {% endif %}
-
-{% endif %}
diff --git a/dashed/utils.py b/dashed/utils.py
index dee2cdd9b64..7ea42112d0c 100644
--- a/dashed/utils.py
+++ b/dashed/utils.py
@@ -13,9 +13,10 @@ import parsedatetime
from flask_appbuilder.security.sqla import models as ab_models
-class memoized(object):
+class memoized(object): # noqa
+
+ """Decorator that caches a function's return value each time it is called
- """Decorator that caches a function's return value each time it is called.
If called later with the same arguments, the cached value is returned, and
not re-evaluated.
"""
@@ -23,6 +24,7 @@ class memoized(object):
def __init__(self, func):
self.func = func
self.cache = {}
+
def __call__(self, *args):
try:
return self.cache[args]
@@ -34,13 +36,16 @@ class memoized(object):
# uncachable -- for instance, passing a list as an argument.
# Better to not cache than to blow up entirely.
return self.func(*args)
+
def __repr__(self):
"""Return the function's docstring."""
return self.func.__doc__
+
def __get__(self, obj, objtype):
"""Support instance methods."""
return functools.partial(self.__call__, obj)
+
def list_minus(l, minus):
"""Returns l without what is in minus
@@ -49,6 +54,7 @@ def list_minus(l, minus):
"""
return [o for o in l if o not in minus]
+
def parse_human_datetime(s):
"""
Returns ``datetime.datetime`` from human readable strings
@@ -113,6 +119,7 @@ class JSONEncodedDict(TypeDecorator):
"""Represents an immutable structure as a json-encoded string."""
impl = TEXT
+
def process_bind_param(self, value, dialect):
if value is not None:
value = json.dumps(value)
@@ -130,7 +137,7 @@ class ColorFactory(object):
"""Used to generated arrays of colors server side"""
BNB_COLORS = [
- #rausch hackb kazan babu lima beach barol
+ # rausch hackb kazan babu lima beach barol
'#ff5a5f', '#7b0051', '#007A87', '#00d1c1', '#8ce071', '#ffb400', '#b4a76c',
'#ff8083', '#cc0086', '#00a1b3', '#00ffeb', '#bbedab', '#ffd266', '#cbc29a',
'#ff3339', '#ff1ab1', '#005c66', '#00b3a5', '#55d12e', '#b37e00', '#988b4e',
@@ -202,9 +209,9 @@ def init(dashed):
sm.add_permission_role(gamma, perm)
session = db.session()
table_perms = [
- table.perm for table in session.query(models.SqlaTable).all()]
+ table.perm for table in session.query(models.SqlaTable).all()]
table_perms += [
- table.perm for table in session.query(models.DruidDatasource).all()]
+ table.perm for table in session.query(models.DruidDatasource).all()]
for table_perm in table_perms:
merge_perm(sm, 'datasource_access', table_perm)
@@ -239,7 +246,8 @@ def markdown(s):
return md(s, [
'markdown.extensions.tables',
'markdown.extensions.fenced_code',
- 'markdown.extensions.codehilite',])
+ 'markdown.extensions.codehilite',
+ ])
def readfile(filepath):
diff --git a/dashed/views.py b/dashed/views.py
index 9720dbdd4ba..5c814362d3b 100644
--- a/dashed/views.py
+++ b/dashed/views.py
@@ -122,18 +122,19 @@ class DatabaseView(DashedModelView, DeleteMixin): # noqa
datamodel = SQLAInterface(models.Database)
list_columns = ['database_name', 'sql_link', 'created_by_', 'changed_on']
order_columns = utils.list_minus(list_columns, ['created_by_'])
- add_columns = ['database_name', 'sqlalchemy_uri']
+ add_columns = ['database_name', 'sqlalchemy_uri', 'cache_timeout']
search_exclude_columns = ('password',)
edit_columns = add_columns
add_template = "dashed/models/database/add.html"
edit_template = "dashed/models/database/edit.html"
- base_order = ('changed_on','desc')
+ base_order = ('changed_on', 'desc')
description_columns = {
'sqlalchemy_uri': (
"Refer to the SqlAlchemy docs for more information on how "
"to structure your URI here: "
"http://docs.sqlalchemy.org/en/rel_1_0/core/engines.html")
}
+
def pre_add(self, db):
conn = sqla.engine.url.make_url(db.sqlalchemy_uri)
db.password = conn.password
@@ -157,12 +158,13 @@ class TableModelView(DashedModelView, DeleteMixin): # noqa
list_columns = [
'table_link', 'database', 'sql_link', 'is_featured',
'changed_by_', 'changed_on']
- add_columns = ['table_name', 'database', 'default_endpoint', 'offset']
+ add_columns = [
+ 'table_name', 'database', 'default_endpoint', 'offset', 'cache_timeout']
edit_columns = [
'table_name', 'is_featured', 'database', 'description', 'owner',
- 'main_dttm_col', 'default_endpoint', 'offset']
+ 'main_dttm_col', 'default_endpoint', 'offset', 'cache_timeout']
related_views = [TableColumnInlineView, SqlMetricInlineView]
- base_order = ('changed_on','desc')
+ base_order = ('changed_on', 'desc')
description_columns = {
'offset': "Timezone offset (in hours) for this datasource",
'description': Markup(
@@ -176,9 +178,9 @@ class TableModelView(DashedModelView, DeleteMixin): # noqa
except Exception as e:
logging.exception(e)
flash(
- "Table [{}] doesn't seem to exist, "
- "couldn't fetch metadata".format(table.table_name),
- "danger")
+ "Table [{}] doesn't seem to exist, "
+ "couldn't fetch metadata".format(table.table_name),
+ "danger")
utils.merge_perm(sm, 'datasource_access', table.perm)
def post_update(self, table):
@@ -221,8 +223,8 @@ class SliceModelView(DashedModelView, DeleteMixin): # noqa
order_columns = utils.list_minus(list_columns, ['created_by_'])
edit_columns = [
'slice_name', 'description', 'viz_type', 'druid_datasource',
- 'table', 'dashboards', 'params']
- base_order = ('changed_on','desc')
+ 'table', 'dashboards', 'params', 'cache_timeout']
+ base_order = ('changed_on', 'desc')
description_columns = {
'description': Markup(
"The content here can be displayed as widget headers in the "
@@ -248,7 +250,7 @@ class DashboardModelView(DashedModelView, DeleteMixin): # noqa
'dashboard_title', 'slug', 'slices', 'position_json', 'css',
'json_metadata']
add_columns = edit_columns
- base_order = ('changed_on','desc')
+ base_order = ('changed_on', 'desc')
description_columns = {
'position_json': (
"This json object describes the positioning of the widgets in "
@@ -261,6 +263,7 @@ class DashboardModelView(DashedModelView, DeleteMixin): # noqa
"visible"),
'slug': "To get a readable URL for your dashboard",
}
+
def pre_add(self, obj):
obj.slug = obj.slug.strip() or None
if obj.slug:
@@ -283,7 +286,7 @@ class LogModelView(DashedModelView):
datamodel = SQLAInterface(models.Log)
list_columns = ('user', 'action', 'dttm')
edit_columns = ('user', 'action', 'dttm', 'json')
- base_order = ('dttm','desc')
+ base_order = ('dttm', 'desc')
appbuilder.add_view(
LogModelView,
@@ -304,7 +307,8 @@ class DruidDatasourceModelView(DashedModelView, DeleteMixin): # noqa
related_views = [DruidColumnInlineView, DruidMetricInlineView]
edit_columns = [
'datasource_name', 'cluster', 'description', 'owner',
- 'is_featured', 'is_hidden', 'default_endpoint', 'offset']
+ 'is_featured', 'is_hidden', 'default_endpoint', 'offset',
+ 'cache_timeout']
page_size = 500
base_order = ('datasource_name', 'asc')
description_columns = {
@@ -340,6 +344,8 @@ def ping():
class R(BaseView):
+ """used for short urls"""
+
@log_this
@expose("/
-
+
-
-
-
-
-
+
+
+
+
+ cached
-
-
- .json
-
-
- .csv
-
- 0 sec
- query
+
- +
+
- {% if viz.form_data.slice_id %}
+ {% if viz.form_data.slice_id %}
- {% endif %}
+ {% endif %}
+
{% for fieldset in form.fieldsets %} @@ -162,7 +167,7 @@ class="widget viz slice {{ viz.viz_type }}" data-slice="{{ viz.json_data }}" style="height: 700px;"> -