QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[viz flow] detect TIMESTAMP, transition to line chart (#5634)

Browse Source 
* [viz flow] detect TIMESTAMP, transition to line chart

* Refactor is_date
This commit is contained in:
Maxime Beauchemin
2018-08-21 21:33:34 -07:00
committed by GitHub
parent 6959b70c1c
commit 6e8c7f7b20
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
superset/assets/src/explore/controls.jsx
View File

@@ -898,7 +898,7 @@ export const controls = {
time_grain_sqla: {
type: 'SelectControl',
label: t('Time Grain'),
default: control => control.choices && control.choices.length ? control.choices[0][0] : null,
default: 'P1D',
description: t('The time granularity for the visualization. This ' +
'applies a date transformation to alter ' +
'your time column and defines a new time granularity. ' +

3
superset/assets/src/explore/visTypes.jsx
View File

@@ -948,9 +948,6 @@ export const visTypes = {
metrics: {
validators: [],
},
time_grain_sqla: {
default: null,
},
},
},

27
superset/dataframe.py
View File

@@ -132,13 +132,18 @@ class SupersetDataFrame(object):
continue
return 100 * success / total
@classmethod
def is_date(cls, dtype):
if dtype and dtype.name:
return any([
dtype.name.lower().startswith(s)
for s in ['date', 'time']
])
@staticmethod
def is_date(np_dtype, db_type_str):
def looks_daty(s):
if isinstance(s, basestring):
return any([s.lower().startswith(ss) for ss in ('time', 'date')])
return False
if looks_daty(db_type_str):
return True
if np_dtype and np_dtype.name and looks_daty(np_dtype.name):
return True
return False
@classmethod
@@ -176,19 +181,19 @@ class SupersetDataFrame(object):
if sample_size:
sample = self.df.sample(sample_size)
for col in self.df.dtypes.keys():
col_db_type = (
db_type_str = (
self._type_dict.get(col) or
self.db_type(self.df.dtypes[col])
)
column = {
'name': col,
'agg': self.agg_func(self.df.dtypes[col], col),
'type': col_db_type,
'is_date': self.is_date(self.df.dtypes[col]),
'type': db_type_str,
'is_date': self.is_date(self.df.dtypes[col], db_type_str),
'is_dim': self.is_dimension(self.df.dtypes[col], col),
}
if column['type'] in ('OBJECT', None):
if not db_type_str or db_type_str.upper() == 'OBJECT':
v = sample[col].iloc[0] if not sample[col].empty else None
if isinstance(v, basestring):
column['type'] = 'STRING'

10
tests/dataframe_test.py
View File

@@ -122,10 +122,14 @@ class SupersetDataFrameTestCase(SupersetTestCase):
def test_is_date(self):
f = SupersetDataFrame.is_date
self.assertEquals(f(np.dtype('M')), True)
self.assertEquals(f(np.dtype('M'), ''), True)
self.assertEquals(f(np.dtype('f'), 'DATETIME'), True)
self.assertEquals(f(np.dtype('i'), 'TIMESTAMP'), True)
self.assertEquals(f(None, 'DATETIME'), True)
self.assertEquals(f(None, 'TIMESTAMP'), True)
self.assertEquals(f(None), False)
self.assertEquals(f(np.dtype(np.int32)), False)
self.assertEquals(f(None, ''), False)
self.assertEquals(f(np.dtype(np.int32), ''), False)
def test_dedup_with_data(self):
data = [