AmineTMIRI/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixing

Browse Source
This commit is contained in:
MuslemRahimi 2024-12-10 23:56:56 +01:00
parent ab55bd72f1
commit 0efef220e3
1 changed files with 71 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/cron_dashboard.py
View File

@ -180,12 +180,16 @@ async def get_upcoming_earnings(session, end_date, filter_today=True):
async def get_recent_earnings(session): async def get_recent_earnings(session):
url = "https://api.benzinga.com/api/v2.1/calendar/earnings" url = "https://api.benzinga.com/api/v2.1/calendar/earnings"
res_list = [] res_list = []
importance_list = ["1","2","3","4","5"] importance_list = ["1","2","3","4","5"]
res_list = []
for importance in importance_list:
querystring = {"token": benzinga_api_key,"parameters[importance]":importance, "parameters[date_from]":yesterday,"parameters[date_to]":today,"parameters[date_sort]":"date"} for importance in importance_list:
querystring = {
"token": benzinga_api_key,
"parameters[importance]": importance,
"parameters[date_from]": yesterday,
"parameters[date_to]": today,
"parameters[date_sort]": "date"
}
try: try:
async with session.get(url, params=querystring, headers=headers) as response: async with session.get(url, params=querystring, headers=headers) as response:
res = ujson.loads(await response.text())['earnings'] res = ujson.loads(await response.text())['earnings']
@ -194,38 +198,58 @@ async def get_recent_earnings(session):
symbol = item['ticker'] symbol = item['ticker']
name = item['name'] name = item['name']
time = item['time'] time = item['time']
eps_prior = float(item['eps_prior']) if item['eps_prior'] != '' else 0 updated = int(item['updated']) # Convert to integer for proper comparison
eps_surprise = float(item['eps_surprise']) if item['eps_surprise'] != '' else 0
# Convert numeric fields, handling empty strings
eps_prior = float(item['eps_prior']) if item['eps_prior'] != '' else None
eps_surprise = float(item['eps_surprise']) if item['eps_surprise'] != '' else None
eps = float(item['eps']) if item['eps'] != '' else 0 eps = float(item['eps']) if item['eps'] != '' else 0
revenue_prior = float(item['revenue_prior']) if item['revenue_prior'] != '' else 0 revenue_prior = float(item['revenue_prior']) if item['revenue_prior'] != '' else None
revenue_surprise = float(item['revenue_surprise']) if item['revenue_surprise'] != '' else 0 revenue_surprise = float(item['revenue_surprise']) if item['revenue_surprise'] != '' else None
revenue = float(item['revenue']) if item['revenue'] != '' else 0 revenue = float(item['revenue']) if item['revenue'] != '' else None
if symbol in stock_symbols and revenue != 0 and revenue_prior != 0 and eps_prior != 0 and eps != 0 and revenue_surprise != 0 and eps_surprise != 0:
if (symbol in stock_symbols and
revenue is not None and
revenue_prior is not None and
eps_prior is not None and
eps is not None and
revenue_surprise is not None and
eps_surprise is not None):
df = pd.read_sql_query(query_template, con, params=(symbol,)) df = pd.read_sql_query(query_template, con, params=(symbol,))
market_cap = float(df['marketCap'].iloc[0]) if df['marketCap'].iloc[0] != '' else 0 market_cap = float(df['marketCap'].iloc[0]) if df['marketCap'].iloc[0] != '' else 0
res_list.append({ res_list.append({
'symbol': symbol, 'symbol': symbol,
'name': name, 'name': name,
'time': time, 'time': time,
'marketCap': market_cap, 'marketCap': market_cap,
'epsPrior':eps_prior, 'epsPrior': eps_prior,
'epsSurprise': eps_surprise, 'epsSurprise': eps_surprise,
'eps': eps, 'eps': eps,
'revenuePrior': revenue_prior, 'revenuePrior': revenue_prior,
'revenueSurprise': revenue_surprise, 'revenueSurprise': revenue_surprise,
'revenue': revenue 'revenue': revenue,
'updated': updated
}) })
except Exception as e: except Exception as e:
print('Recent Earnings:', e) print('Recent Earnings:', e)
pass pass
except Exception as e: except Exception as e:
print('API Request Error:', e)
pass pass
# Remove duplicates
res_list = remove_duplicates(res_list) res_list = remove_duplicates(res_list)
res_list.sort(key=lambda x: x['marketCap'], reverse=True)
#res_list.sort(key=lambda x: (-parse_time(x['time']).timestamp(), -x['marketCap'])) # Sort first by the most recent 'updated' timestamp, then by market cap
res_list = [{k: v for k, v in d.items() if k != 'marketCap'} for d in res_list] res_list.sort(key=lambda x: (-x['updated'], -x['marketCap']))
return res_list[0:10]
# Remove market cap before returning and limit to top 10
res_list = [{k: v for k, v in d.items() if k not in ['marketCap', 'updated']} for d in res_list]
return res_list[:10]
''' '''
async def get_recent_dividends(session): async def get_recent_dividends(session):
url = "https://api.benzinga.com/api/v2.1/calendar/dividends" url = "https://api.benzinga.com/api/v2.1/calendar/dividends"