Update app.py

app.py

@@ -13,7 +13,7 @@ import hvplot.pandas
 
 import yfinance as yf
 
-# from dotenv import load_dotenv
+from dotenv import load_dotenv
 # from datasets import load_dataset
 
 from utils import upload_to_hf_dataset, download_from_hf_dataset, load_hf_dataset
@@ -68,7 +68,7 @@ def get_text(df):
 
 
 # Load environment variables from .env file
-# load_dotenv()
+load_dotenv()
 
 # Get the Hugging Face API token from the environment; either set in .env file or in the environment directly in GitHub
 HF_TOKEN = os.getenv('HF_TOKEN')
@@ -97,7 +97,7 @@ def get_marketbeat(current_datetime):
 @pn.cache()
 def get_gurufocus(current_datetime):
   #Rading gurufocus from github action pipeline
-  # daily_gurufocus_csvfile = f"https://raw.githubusercontent.com//GurusFocusCrawl/main/gurufocusuruFocus_merged_{current_datetime}.csv"
+  # daily_gurufocus_csvfile = f"https://raw.githubusercontent.com/alirezax2/GurusFocusCrawl/main/gurufocusuruFocus_merged_{current_datetime}.csv"
   # daily_gurufocus_DF = pd.read_csv(daily_gurufocus_csvfile)
   # daily_gurufocus_DF = load_dataset(dataset_name_GuruFocus_output , data_files="GuruFocus_merged.csv", split="train" , token=HF_TOKEN ).to_pandas()
   return load_hf_dataset("GuruFocus_merged.csv", HF_TOKEN, dataset_name_GuruFocus_input)
@@ -114,6 +114,7 @@ def get_tipranks(current_datetime):
 #Reading gurufocus,finviz from local crawling pipeline; Need to update github action to merge gurufocus daily with monthly tiprank
 daily_gurufocus_DF = get_gurufocus(current_datetime)
 daily_finviz_DF = get_finviz(current_datetime)
+daily_marketbeat = get_marketbeat(current_datetime)
 monthly_tiprank_DF = get_tipranks(current_datetime)
 monthly_tiprank_DF = monthly_tiprank_DF[['Ticker','SmartScore','Market Capitalization','Sector','Industry']]
 
@@ -130,6 +131,15 @@ DFmerge_tipranks_gurufocus = DFgurufocus.merge(monthly_tiprank_DF)
 #Merging Finviz with Merged last one
 DFmerge_tipranks_gurufocus = DFmerge_tipranks_gurufocus.merge(daily_finviz_DF_filtered)
 
+print(daily_marketbeat.columns)
+# ['Ticker', 'AverageTarget', 'MaxTarget', 'LowTarget', 'CurrentPrice']
+daily_marketbeat['AllTargetsAbovePrice'] = ((daily_marketbeat['MaxTarget'] > daily_marketbeat['CurrentPrice']) & 
+                       (daily_marketbeat['LowTarget'] > daily_marketbeat['CurrentPrice']) & 
+                       (daily_marketbeat['AverageTarget'] > daily_marketbeat['CurrentPrice'])).astype(int)
+
+#Merging daily_marketbeat with Merged last one
+DFmerge_tipranks_gurufocus = DFmerge_tipranks_gurufocus.merge(daily_marketbeat)
+
 if 'Price' in DFmerge_tipranks_gurufocus.columns and 'GFValue' in DFmerge_tipranks_gurufocus.columns:
   DFmerge_tipranks_gurufocus['GFValuepercent'] = 100* ( DFmerge_tipranks_gurufocus['GFValue'] - DFmerge_tipranks_gurufocus['Price']) / DFmerge_tipranks_gurufocus['Price']
   DFmerge_tipranks_gurufocus['GFValuepercent'] = DFmerge_tipranks_gurufocus['GFValuepercent'].round(2)
@@ -143,33 +153,52 @@ if 'Price' in DFmerge_tipranks_gurufocus.columns and 'GFValue' in DFmerge_tipran
 ticker = pn.widgets.AutocompleteInput(name='Ticker', options=list(DFmerge_tipranks_gurufocus.Ticker) , placeholder='Write Ticker here همین جا',value='ALL', restrict=False)
 SmartScore = pn.widgets.EditableRangeSlider(name='Smart Score', start=0, end=10, value=(9, 10), step=1)
 Industry = pn.widgets.CheckBoxGroup( name='Select Industry', value=list(set(DFmerge_tipranks_gurufocus.Industry)), options=list(set(DFmerge_tipranks_gurufocus.Industry)), inline=True)
-Sector = pn.widgets.CheckBoxGroup( name='Select Sector', value=list(set(DFmerge_tipranks_gurufocus.Sector)), options=list(set(DFmerge_tipranks_gurufocus.Sector)), inline=False)
+Sector = pn.widgets.MultiSelect( name='Select Sector', value=list(set(DFmerge_tipranks_gurufocus.Sector)), options=list(set(DFmerge_tipranks_gurufocus.Sector)) )#, inline=False)
 GFValuepercent = pn.widgets.FloatSlider(name='GF Value %', start=-100, end=100, step=1, value=12.0)
 FinVizTargetpercent = pn.widgets.FloatSlider(name='FinViz Target %', start=-100, end=100, step=1, value=12.0)
 MarketCap = pn.widgets.FloatSlider(name='Market Capital (B$)', start=0, end=1000, step=1, value=10)
+MarketBeat_radio_group = pn.widgets.RadioButtonGroup(name='MarketBeat', options=['Default', 'Above all Targets'], button_type='success')
+
 # Create a file download link
 download_button_GuruFocus = pn.widgets.FileDownload(
     filename=f'GuruFocus_merged_{current_datetime}.csv',
     callback=pn.bind(get_csv,daily_gurufocus_DF),
     button_type='primary',
-    label='Download GuruFocus'
+    label='Download GuruFocus', width=250
 )
 
 download_button_FinViz = pn.widgets.FileDownload(
     filename=f'FinViz_{current_datetime}.csv',
     callback=pn.bind(get_csv,daily_finviz_DF),
     button_type='primary',
-    label='Download FinViz'
+    label='Download FinViz', width=250
+)
+
+download_button_MarketBeat = pn.widgets.FileDownload(
+    filename=f'MarketBeat_{current_datetime}.csv',
+    callback=pn.bind(get_csv,daily_marketbeat),
+    button_type='warning',
+    label='Download MarketBeat', width=250
+)
+
+download_button_TipRanks = pn.widgets.FileDownload(
+    filename=f'TipRanks_{current_datetime}.csv',
+    callback=pn.bind(get_csv,monthly_tiprank_DF),
+    button_type='warning',
+    label='Download TipRanks', width=250
 )
 
 png_pane = pn.pane.GIF('https://tuozi.vip/shqu/wordpress/wp-content/themes/CorePress/static/img/loading.gif', width=200) #, height=150)
-def get_DF(DF,ticker,SmartScore,GFValuepercent, FinVizTargetpercent, Sector,MarketCap):
+def get_DF(DF,ticker,SmartScore,GFValuepercent, FinVizTargetpercent, Sector,MarketCap,MarketBeat):
   if ticker and ticker!="ALL":
     table1 = pn.widgets.Tabulator(DF.query("Ticker == @ticker"), height=200, widths=200, show_index=False)
     chart1 = make_candle_stick(ticker)
     return pn.Column(table1,chart1)
   else:
-    return pn.widgets.Tabulator( DF.query("SmartScore>=@SmartScore[0] & SmartScore <= @SmartScore[1] & GFValuepercent>=@GFValuepercent & FinVizTargetpercent>@FinVizTargetpercent & Sector in @Sector & MarketCap>@MarketCap"), height=800, widths=200, show_index=False)
+    if MarketBeat == 0:
+      return pn.widgets.Tabulator( DF.query("SmartScore>=@SmartScore[0] & SmartScore <= @SmartScore[1] & GFValuepercent>=@GFValuepercent & FinVizTargetpercent>@FinVizTargetpercent & Sector in @Sector & MarketCap>@MarketCap & AllTargetsAbovePrice==1"), height=800, widths=200, show_index=False ,theme='modern')
+    else:
+      return pn.widgets.Tabulator( DF.query("SmartScore>=@SmartScore[0] & SmartScore <= @SmartScore[1] & GFValuepercent>=@GFValuepercent & FinVizTargetpercent>@FinVizTargetpercent & Sector in @Sector & MarketCap>@MarketCap"), height=800, widths=200, show_index=False ,theme='modern')
 
 def get_DF_filter(DF,ticker,SmartScore,GFValuepercent, FinVizTargetpercent, Sector,MarketCap):
   return DF.query("SmartScore>=@SmartScore[0] & SmartScore <= @SmartScore[1] & GFValuepercent>=@GFValuepercent & FinVizTargetpercent>@FinVizTargetpercent & Sector in @Sector & MarketCap>@MarketCap")
@@ -178,17 +207,18 @@ download_button_Filter = pn.widgets.FileDownload(
     filename=f'Filter_{current_datetime}.csv',
     callback=pn.bind(get_csv,pn.bind(get_DF_filter, DF=DFmerge_tipranks_gurufocus,ticker=ticker,SmartScore=SmartScore,GFValuepercent=GFValuepercent, FinVizTargetpercent=FinVizTargetpercent, Sector=Sector ,MarketCap=MarketCap) ),
     button_type='danger',
-    label='Download your Filter'
+    label='Download your Filter', width=250
+
 )
 
 download_button_watchlist = pn.widgets.FileDownload(
     filename=f'watchlist_{current_datetime}.txt',
     callback=pn.bind(get_text,pn.bind(get_DF_filter, DF=DFmerge_tipranks_gurufocus,ticker=ticker,SmartScore=SmartScore,GFValuepercent=GFValuepercent, FinVizTargetpercent=FinVizTargetpercent, Sector=Sector ,MarketCap=MarketCap) ),
     button_type='success',
-    label='Download Watchlist'
+    label='Download Watchlist', width=250
 )
 
 pn.extension('tabulator')
-bound_plot = pn.bind(get_DF, DF=DFmerge_tipranks_gurufocus,ticker=ticker,SmartScore=SmartScore,GFValuepercent=GFValuepercent, FinVizTargetpercent=FinVizTargetpercent, Sector=Sector ,MarketCap=MarketCap)
+bound_plot = pn.bind(get_DF, DF=DFmerge_tipranks_gurufocus,ticker=ticker,SmartScore=SmartScore,GFValuepercent=GFValuepercent, FinVizTargetpercent=FinVizTargetpercent, Sector=Sector ,MarketCap=MarketCap,MarketBeat=MarketBeat_radio_group)
 
-pn.Column(pn.Row(pn.Column(ticker,SmartScore,GFValuepercent, FinVizTargetpercent, MarketCap, Sector, download_button_GuruFocus,download_button_FinViz ,download_button_Filter, download_button_watchlist, png_pane),bound_plot)).servable(title="Fair Value Ranking - Merged Gurufocus & Tipranks & FinViz & MorningStars")
+pn.Column(pn.Row(pn.Column(ticker,SmartScore,GFValuepercent, FinVizTargetpercent, MarketCap, MarketBeat_radio_group, png_pane, download_button_GuruFocus,download_button_FinViz , download_button_MarketBeat, download_button_TipRanks, download_button_Filter, download_button_watchlist),bound_plot)).servable(title="Fair Value Ranking - Merged Gurufocus & Tipranks & FinViz & MorningStars")