bugfixing

This commit is contained in:
MuslemRahimi 2024-11-23 00:45:31 +01:00
parent cd2655142d
commit ad413dd223

View File

@ -81,45 +81,54 @@ async def process_category(cursor, category, condition, category_type='market-ca
async def get_etf_holding(etf_symbols, etf_con): async def get_etf_holding(etf_symbols, etf_con):
etf_symbols = ['AGG']
for ticker in tqdm(etf_symbols): for ticker in tqdm(etf_symbols):
res = [] res = []
df = pd.read_sql_query(query_etf_holding, etf_con, params=(ticker,)) df = pd.read_sql_query(query_etf_holding, etf_con, params=(ticker,))
try: try:
# Load holdings data from the SQL query result # Load holdings data from the SQL query result
data = orjson.loads(df['holding'].iloc[0]) data = orjson.loads(df['holding'].iloc[0])
last_update = data[0]['updated'][0:10] last_update = data[0]['updated'][0:10]
# Rename 'asset' to 'symbol' and keep other keys the same # Rename 'asset' to 'symbol' and keep other keys the same
res = [{'symbol': item['asset'], res = [
'weightPercentage': item['weightPercentage'], {
'sharesNumber': item['sharesNumber']} 'symbol': item.get('asset', None),
for item in data] 'name': item.get('name', None).capitalize() if item.get('name') else None,
'weightPercentage': item.get('weightPercentage', None),
'sharesNumber': item.get('marketValue', None) if not item.get('asset') and item.get('sharesNumber') == 0 else item.get('sharesNumber', None)
}
for item in data
if item.get('marketValue', 0) >= 0 # Exclude items with a negative marketValue
]
for item in res: for item in res:
symbol = item['symbol'] try:
symbol = item['symbol']
# Check if the symbol data is already in the cache
if symbol in quote_cache: # Check if the symbol data is already in the cache
quote_data = quote_cache[symbol] if symbol in quote_cache:
else: quote_data = quote_cache[symbol]
# Load the quote data from file if not in cache else:
try: # Load the quote data from file if not in cache
with open(f"json/quote/{symbol}.json") as file: try:
quote_data = orjson.loads(file.read()) with open(f"json/quote/{symbol}.json") as file:
quote_cache[symbol] = quote_data # Cache the loaded data quote_data = orjson.loads(file.read())
except: quote_cache[symbol] = quote_data # Cache the loaded data
quote_data = None item['price'] = round(quote_data.get('price'), 2) if quote_data else None
item['changesPercentage'] = round(quote_data.get('changesPercentage'), 2) if quote_data else None
item['name'] = quote_data.get('name') if quote_data else None
except:
quote_data = None
except:
pass
# Assign price and changesPercentage if available, otherwise set to None # Assign price and changesPercentage if available, otherwise set to None
item['weightPercentage'] = round(item.get('weightPercentage'), 2) if item['weightPercentage'] else None item['weightPercentage'] = round(item.get('weightPercentage'), 2) if item['weightPercentage'] else None
item['price'] = round(quote_data.get('price'), 2) if quote_data else None
item['changesPercentage'] = round(quote_data.get('changesPercentage'), 2) if quote_data else None
item['name'] = quote_data.get('name') if quote_data else None
except Exception as e: except Exception as e:
last_update = None last_update = None
res = [] res = []
# Save results to a file if there's data to write # Save results to a file if there's data to write
if res: if res:
for rank, item in enumerate(res, 1): for rank, item in enumerate(res, 1):