Spaces:
Running
Running
RobertCastagna
commited on
Commit
•
5a37415
1
Parent(s):
6fe5328
Update pages/1_Fundamentals.py
Browse files- pages/1_Fundamentals.py +2 -1
pages/1_Fundamentals.py
CHANGED
@@ -135,6 +135,7 @@ with st.form(key="selecting columns"):
|
|
135 |
for ticker in symbols:
|
136 |
# make all the API calls and capture return json
|
137 |
basic_info = get_industry(ticker)
|
|
|
138 |
metric_data, annual_series_data, quarterly_series_data = get_company_metrics(ticker)
|
139 |
|
140 |
# reformat all JSON returns to be flattened dictionaries
|
@@ -163,7 +164,7 @@ with st.form(key="selecting columns"):
|
|
163 |
df_final = df_1.join(df_2)
|
164 |
|
165 |
# calculate additional columns
|
166 |
-
df_final['5Y_SP500_growth'], _, _ = get_equity_gains(ticker= '^GSPC', period=
|
167 |
df_final['90_day_tbill'] = 4.06
|
168 |
df_final['dividendGrowthRate5Y'] = df_final['dividendGrowthRate5Y']/100
|
169 |
df_final['CAPM'] = df_final['90_day_tbill']/100 + df_final['beta']*(df_final['5Y_SP500_growth'] - df_final['90_day_tbill']/100)
|
|
|
135 |
for ticker in symbols:
|
136 |
# make all the API calls and capture return json
|
137 |
basic_info = get_industry(ticker)
|
138 |
+
st.write(metric_data)
|
139 |
metric_data, annual_series_data, quarterly_series_data = get_company_metrics(ticker)
|
140 |
|
141 |
# reformat all JSON returns to be flattened dictionaries
|
|
|
164 |
df_final = df_1.join(df_2)
|
165 |
|
166 |
# calculate additional columns
|
167 |
+
df_final['5Y_SP500_growth'], _, _ = get_equity_gains(ticker= '^GSPC', period=365)
|
168 |
df_final['90_day_tbill'] = 4.06
|
169 |
df_final['dividendGrowthRate5Y'] = df_final['dividendGrowthRate5Y']/100
|
170 |
df_final['CAPM'] = df_final['90_day_tbill']/100 + df_final['beta']*(df_final['5Y_SP500_growth'] - df_final['90_day_tbill']/100)
|