Updated get_range_selector()

cufflinks/auth.py

@@ -7,6 +7,7 @@
 import json
 import warnings
 from .offline import go_offline
+from functools import lru_cache
 
 package='cufflinks'
 
@@ -176,7 +177,7 @@ def set_config_file(sharing=None,theme=None,colorscale=None,offline=None,offline
 	save_json_dict(CONFIG_FILE, config)
 	ensure_local_files()  
 
-
+@lru_cache(maxsize=32)
 def get_config_file(*args):
     """
     Return specified args from `~/.config`. as dict.
@@ -260,4 +261,4 @@ def save_json_dict(filename, json_dict):
 		with open(filename, "w") as f:
 			f.write(json.dumps(json_dict, indent=4))
 	else:
-		raise TypeError("json_dict was not a dictionary. couldn't save.")
+		raise TypeError("json_dict was not a dictionary. couldn't save.")

cufflinks/plotlytools.py

@@ -36,7 +36,7 @@ def dict_to_iplot(d):
 
 def _to_iplot(self,colors=None,colorscale=None,kind='scatter',mode='lines',interpolation='linear',symbol='dot',size='12',fill=False,
 		width=3,dash='solid',sortbars=False,keys=False,bestfit=False,bestfit_colors=None,opacity=0.6,
-		mean=False,mean_colors=None,asDates=False,asTimestamp=False,text=None,**kwargs):
+		mean=False,mean_colors=None,asDates=False,asTimestamp=False,text=None,hovertext=None,textangle=None,**kwargs):
 	"""
 	Generates a plotly Data object 
 
@@ -206,7 +206,7 @@ def _iplot(self,kind='scatter',data=None,layout=None,filename='',sharing=None,ti
 			bestfit_colors=None,mean=False,mean_colors=None,categories='',x='',y='',z='',text='',gridcolor=None,
 			zerolinecolor=None,margin=None,labels=None,values=None,secondary_y='',secondary_y_title='',subplots=False,shape=None,error_x=None,
 			error_y=None,error_type='data',locations=None,lon=None,lat=None,asFrame=False,asDates=False,asFigure=False,
-			asImage=False,dimensions=None,asPlot=False,asUrl=False,online=None,**kwargs):
+			asImage=False,dimensions=None,asPlot=False,asUrl=False,online=None,hovertemplate=None,hovertext=None,textangle=None,arrowlen=-50,**kwargs):
 	"""
 	Returns a plotly chart either as inline chart, image of Figure object
 
@@ -666,9 +666,9 @@ def _iplot(self,kind='scatter',data=None,layout=None,filename='',sharing=None,ti
 	"""
 
 	# Valid Kwargs
-	valid_kwargs = ['color','opacity','column','columns','labels','text','world_readable','colorbar']
+	valid_kwargs = ['color','opacity','column','columns','labels','text','world_readable','colorbar','hoverinfo','hovertext']
 	BUBBLE_KWARGS = ['abs_size']
-	TRACE_KWARGS = ['hoverinfo','connectgaps']
+	TRACE_KWARGS = ['hoverinfo','connectgaps','hovertext']
 	HEATMAP_SURFACE_KWARGS = ['center_scale','zmin','zmax']
 	PIE_KWARGS=['sort','pull','hole','textposition','textinfo','linecolor','linewidth','textcolor']
 	OHLC_KWARGS=['up_color','down_color','open','high','low','close','volume','name','decreasing','increasing']
@@ -770,7 +770,7 @@ def get_marker(marker={}):
 				df=self.copy()
 				df=df.set_index(categories)
 				fig=df.figure(kind=kind,colors=colors,colorscale=colorscale,fill=fill,width=width,sortbars=sortbars,opacity=opacity,
-						asDates=asDates,mode=mode,symbol=symbol,size=size,text=text,barmode=barmode,orientation=orientation)
+						asDates=asDates,mode=mode,symbol=symbol,size=size,text=text,barmode=barmode,orientation=orientation,textangle=textangle,hovertext=hovertext)
 				data=fig['data']			
 			else:
 				_keys=pd.unique(self[categories])
@@ -871,6 +871,8 @@ def get_marker(marker={}):
 					orientation = 'h' if kind=='barh' else orientation
 					for trace in data:
 						trace.update(orientation=orientation)
+						trace.update(textangle=textangle)
+						trace.update(hovertext=hovertext)
 						if orientation=='h':
 							trace['x'],trace['y']=trace['y'],trace['x']	
 
@@ -956,9 +958,11 @@ def get_marker(marker={}):
 						x=self.index.values.tolist()
 				y=self[y].values.tolist() if y else self.columns.values.tolist()
 				z=self[z].values.tolist() if z else self.values.transpose()
-				scale=get_scales('rdbu') if not colorscale else get_scales(colorscale)
-				scale=[normalize(_) for _ in scale]
-				colorscale=[[float(_)/(len(scale)-1),scale[_]] for _ in range(len(scale))]
+				# scale=get_scales('rdbu') if not colorscale else get_scales(colorscale)
+				scale=get_scales('rdbu') if not colorscale else colorscale
+				# scale=[normalize(_) for _ in scale]
+				# colorscale=[[float(_)/(len(scale)-1),scale[_]] for _ in range(len(scale))]
+
 				center_scale = kwargs.get('center_scale',None)
 
 				if is_list(z):				
@@ -1625,11 +1629,13 @@ def get_study(df,func,iplot_kwargs,iplot_study_kwargs,str=None,include=False,col
 	study_kwargs=check_kwargs(iplot_kwargs,__TA_KWARGS,{},clean_origin=True)
 	iplot_study_kwargs=kwargs_from_keyword(iplot_kwargs,{},'study')
 
+	# if not study == 'kalman': # Saran
+	# 	study_kwargs.update({'periods':periods})
 	study_kwargs.update({'periods':periods})
 
 	ta_func = eval('ta.{0}'.format(study))
 
-	inset=study in ('sma','boll','ema','atr','ptps')
+	inset=study in ('sma','boll','ema','atr','ptps','ama', 'kalman')
 	figure=get_study(self,ta_func,iplot_kwargs,iplot_study_kwargs,include=include,
 					 column=column,str=str,inset=inset)
 

cufflinks/quant_figure.py

@@ -239,6 +239,7 @@ def figure(self,**kwargs):
 
 		"""
 		kwargs['asFigure']=True
+		kwargs['auto_open']=auto_open #Saran
 		return self.iplot(**kwargs)
 
 	def _panel_domains(self,n=2,min_panel_size=.15,spacing=0.08,top_margin=1,bottom_margin=0):
@@ -713,8 +714,120 @@ def add_sma(self,periods=20,column=None,name='',
 			  'display':utils.merge_dict({'legendgroup':False},kwargs)}
 		self._add_study(study)
 
+	def add_line(self,column=None,name='',
+					str=None,**kwargs):
+		"""
+		#Saran: Add another security (line, not OHLC) to QuantFigure.studies
+
+		Parameters:
+			periods : int or list(int)
+				Number of periods
+			column :string
+				Defines the data column name that contains the 
+				data over which the study will be applied. 
+				Default: 'close'
+			name : string
+				Name given to the study
+			str : string
+				Label factory for studies
+				The following wildcards can be used:
+					{name} : Name of the column
+					{study} : Name of the study
+					{period} : Period used
+				Examples:
+					'study: {study} - period: {period}'
+		kwargs: 
+			legendgroup : bool
+				If true, all legend items are grouped into a 
+				single one
+			All formatting values available on iplot()
+		"""
+		if not column:
+			column=self._d['close']
+		study={'kind':'line',
+			   'name':name,
+			   'params':{'column':column,
+						 'str':str},
+			  'display':utils.merge_dict({'legendgroup':False},kwargs)}
+		self._add_study(study)
+
+	def add_ama(self,periods=9,column=None,name='',
+					str=None,**kwargs):
+		"""
+		Saran: Add Adaptive Moving Average (AMA) study to QuantFigure.studies
+
+		Parameters:
+			periods : int
+				Number of periods
+			fast_period : int
+				number of periods for the fastest EMA constant.
+			slow_period : int
+				number of periods for the slowest EMA constant.
+			column :string
+				Defines the data column name that contains the 
+				data over which the study will be applied. 
+				Default: 'close'
+			name : string
+				Name given to the study
+			str : string
+				Label factory for studies
+				The following wildcards can be used:
+					{name} : Name of the column
+					{study} : Name of the study
+					{period} : Period used
+				Examples:
+					'study: {study} - period: {period}'
+		kwargs: 
+			legendgroup : bool
+				If true, all legend items are grouped into a 
+				single one
+			All formatting values available on iplot()
+		"""
+		if not column:
+			column=self._d['close']
+		study={'kind':'ama',
+			   'name':name,
+			   'params':{'periods':periods,'column':column,
+						 'str':str},
+			  'display':utils.merge_dict({'legendgroup':False},kwargs)}
+		self._add_study(study)
+
+	def add_kalman(self,periods=1,column=None,name='',
+					str=None,**kwargs):
+		"""
+		Saran: Add a Kalman Filter study to QuantFigure.studies
+
+		Parameters:
+			column :string
+				Defines the data column name that contains the 
+				data over which the study will be applied. 
+				Default: 'close'
+			name : string
+				Name given to the study
+			str : string
+				Label factory for studies
+				The following wildcards can be used:
+					{name} : Name of the column
+					{study} : Name of the study
+				Examples:
+					'study: {study}'
+		kwargs: 
+			legendgroup : bool
+				If true, all legend items are grouped into a 
+				single one
+			All formatting values available on iplot()
+		"""
+		if not column:
+			column=self._d['close']
+		study={'kind':'kalman',
+			   'name':name,
+			   'params':{'periods':periods,'column':column,
+						 'str':str},
+			  'display':utils.merge_dict({'legendgroup':False},kwargs)}
+		self._add_study(study)
+
 	def add_rsi(self,periods=20,rsi_upper=70,rsi_lower=30,showbands=True,column=None,
-						   name='',str=None,**kwargs):
+						   name='',str='{name}({period})',**kwargs):
 		"""
 		Add Relative Strength Indicator (RSI) study to QuantFigure.studies
 
@@ -763,7 +876,7 @@ def add_rsi(self,periods=20,rsi_upper=70,rsi_lower=30,showbands=True,column=None
 		self._add_study(study)
 
 	def add_bollinger_bands(self,periods=20,boll_std=2,fill=True,column=None,name='',
-						   str='{name}({column},{period})',**kwargs):
+						   str='{name}({period})',**kwargs):
 		"""
 		Add Bollinger Bands (BOLL) study to QuantFigure.studies
 
@@ -1068,7 +1181,7 @@ def get_params(locals_list,params,display,append_study=True):
 			fig['data'][0].update(marker=dict(color=bar_colors,line=dict(color=bar_colors)),
 					  opacity=0.8)
 
-		if kind in ('sma','ema','atr','adx','dmi','ptps'):
+		if kind in ('sma','ema','atr','adx','dmi','ptps','ama','kalman', f'{df}'): #Saran
 			local_kwargs,params=get_params([],params,display)
 			fig=df.ta_figure(study=kind,**params)
 
@@ -1144,7 +1257,7 @@ def get_params(locals_list,params,display,append_study=True):
 
 	def iplot(self,**kwargs):
 		__QUANT_FIGURE_EXPORT = ['asFigure','asUrl','asImage','asPlot','display_image','validate',
-						 'sharing','online','filename','dimensions']
+						 'sharing','online','filename','dimensions','auto_open'] # Saran added auto_open
 
 		layout=copy.deepcopy(self.layout)
 		data=copy.deepcopy(self.data)
@@ -1154,6 +1267,7 @@ def iplot(self,**kwargs):
 		data['resample']=kwargs.pop('resample',data.pop('resample',None))
 
 		asFigure=kwargs.pop('asFigure',False)
+		auto_open=kwargs.pop('auto_open',False) # Saran
 		showstudies=kwargs.pop('showstudies',True)
 		study_kwargs=utils.kwargs_from_keyword(kwargs,{},'study',True)
 		datalegend=kwargs.pop('datalegend',data.pop('datalegend',data.pop('showlegend',True)))
@@ -1237,7 +1351,7 @@ def iplot(self,**kwargs):
 				if 'yaxis' in study_fig['layout']:
 					study_fig['layout']['yaxis1']=study_fig['layout']['yaxis'].copy()
 					del study_fig['layout']['yaxis']
-				if v['kind'] in ('boll','sma','ema','ptps'):
+				if v['kind'] in ('boll','sma','ema','ptps','ama','kalman',f'{df}'): #Saran
 					tools._move_axis(study_fig, yaxis='y2')  # FIXME TKP
 					pass
 				if v['kind'] in ('rsi','volume','macd','atr','adx','cci','dmi'):
@@ -1265,7 +1379,7 @@ def iplot(self,**kwargs):
 			except:
 				pass
 		if asFigure:
-			return go.Figure(fig)
+			return go.Figure(fig) # , write_html={'auto_open': auto_open}
 		else:
 			return pt_iplot(fig, **export_kwargs)