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

revert back to old main

Browse Source
This commit is contained in:
MuslemRahimi 2024-12-12 11:25:47 +01:00
parent 42c300a918
commit 15c74f8f21
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/main.py
View File

@ -490,7 +490,6 @@ async def get_stock(data: HistoricalPrice, api_key: str = Security(get_api_key))
async def get_stock(data: HistoricalPrice, api_key: str = Security(get_api_key)): async def get_stock(data: HistoricalPrice, api_key: str = Security(get_api_key)):
ticker = data.ticker.upper() ticker = data.ticker.upper()
time_period = data.timePeriod time_period = data.timePeriod
print(time_period)
cache_key = f"export-price-data-{ticker}-{time_period}" cache_key = f"export-price-data-{ticker}-{time_period}"
cached_result = redis_client.get(cache_key) cached_result = redis_client.get(cache_key)
if cached_result: if cached_result:
@ -1205,7 +1204,6 @@ async def get_analyst_ticke_history(data: TickerData, api_key: str = Security(ge
@app.post("/indicator-data") @app.post("/indicator-data")
async def get_indicator(data: IndicatorListData, api_key: str = Security(get_api_key)): async def get_indicator(data: IndicatorListData, api_key: str = Security(get_api_key)):
rule_of_list = data.ruleOfList or ['volume', 'marketCap', 'changesPercentage', 'price', 'symbol', 'name'] rule_of_list = data.ruleOfList or ['volume', 'marketCap', 'changesPercentage', 'price', 'symbol', 'name']
# Ensure 'symbol' and 'name' are always included in the rule_of_list # Ensure 'symbol' and 'name' are always included in the rule_of_list
if 'symbol' not in rule_of_list: if 'symbol' not in rule_of_list:
rule_of_list.append('symbol') rule_of_list.append('symbol')
@ -1215,6 +1213,7 @@ async def get_indicator(data: IndicatorListData, api_key: str = Security(get_api
ticker_list = [t.upper() for t in data.tickerList if t is not None] ticker_list = [t.upper() for t in data.tickerList if t is not None]
combined_results = [] combined_results = []
# Load quote data in parallel # Load quote data in parallel
quote_data = await asyncio.gather(*[load_json_async(f"json/quote/{ticker}.json") for ticker in ticker_list]) quote_data = await asyncio.gather(*[load_json_async(f"json/quote/{ticker}.json") for ticker in ticker_list])
quote_dict = {ticker: data for ticker, data in zip(ticker_list, quote_data) if data} quote_dict = {ticker: data for ticker, data in zip(ticker_list, quote_data) if data}
@ -1223,28 +1222,28 @@ async def get_indicator(data: IndicatorListData, api_key: str = Security(get_api
for ticker, quote in quote_dict.items(): for ticker, quote in quote_dict.items():
# Determine the ticker type based on the sets # Determine the ticker type based on the sets
ticker_type = ( ticker_type = (
'etf' if ticker in etf_symbols else 'etf' if ticker in etf_set else
'crypto' if ticker in crypto_symbols else 'crypto' if ticker in crypto_set else
'stock' 'stock'
) )
# Filter the quote based on keys in rule_of_list # Filter the quote based on keys in rule_of_list (use data only from quote.json for these)
filtered_quote = {key: quote.get(key) for key in rule_of_list if key in quote} filtered_quote = {key: quote.get(key) for key in rule_of_list if key in quote}
filtered_quote['type'] = ticker_type filtered_quote['type'] = ticker_type
# Add the result to combined_results # Add the result to combined_results
combined_results.append(filtered_quote) combined_results.append(filtered_quote)
# Fetch and merge data from stock_screener_data, but exclude price, volume, and changesPercentage
# Fetch and merge data from stock_screener_data
screener_keys = [key for key in rule_of_list if key not in ['volume', 'marketCap', 'changesPercentage', 'price', 'symbol', 'name']] screener_keys = [key for key in rule_of_list if key not in ['volume', 'marketCap', 'changesPercentage', 'price', 'symbol', 'name']]
if screener_keys: if screener_keys:
screener_dict = {item['symbol']: {k: v for k, v in item.items() if k in screener_keys} for item in stock_screener_data} screener_dict = {item['symbol']: {k: v for k, v in item.items() if k in screener_keys} for item in stock_screener_data}
for result in combined_results: for result in combined_results:
symbol = result.get('symbol') symbol = result.get('symbol')
if symbol in screener_dict: if symbol in screener_dict:
# Only merge screener data for keys that are not price, volume, or changesPercentage
result.update(screener_dict[symbol]) result.update(screener_dict[symbol])
# Serialize and compress the response # Serialize and compress the response
res = orjson.dumps(combined_results) res = orjson.dumps(combined_results)
compressed_data = gzip.compress(res) compressed_data = gzip.compress(res)
@ -1261,9 +1260,9 @@ async def process_watchlist_ticker(ticker, rule_of_list, quote_keys_to_include,
"""Process a single ticker concurrently.""" """Process a single ticker concurrently."""
ticker = ticker.upper() ticker = ticker.upper()
ticker_type = 'stocks' ticker_type = 'stocks'
if ticker in etf_symbols: if ticker in etf_set:
ticker_type = 'etf' ticker_type = 'etf'
elif ticker in crypto_symbols: elif ticker in crypto_set:
ticker_type = 'crypto' ticker_type = 'crypto'
# Concurrent loading of quote, news, and earnings data # Concurrent loading of quote, news, and earnings data
@ -1283,11 +1282,20 @@ async def process_watchlist_ticker(ticker, rule_of_list, quote_keys_to_include,
key: quote_dict.get(key) key: quote_dict.get(key)
for key in rule_of_list if key in quote_dict or key in quote_keys_to_include for key in rule_of_list if key in quote_dict or key in quote_keys_to_include
} }
# Ensure price, volume, and changesPercentage are taken from quote_dict
for key in ['price', 'volume', 'changesPercentage']:
if key in quote_dict:
filtered_quote[key] = quote_dict[key]
filtered_quote['type'] = ticker_type filtered_quote['type'] = ticker_type
# Merge with screener data # Merge with screener data, but only for fields not in quote_dict
symbol = filtered_quote.get('symbol') symbol = filtered_quote.get('symbol')
if symbol and symbol in screener_dict: if symbol and symbol in screener_dict:
# Exclude price, volume, and changesPercentage from screener_dict update
for key in ['price', 'volume', 'changesPercentage']:
screener_dict[symbol].pop(key, None)
filtered_quote.update(screener_dict[symbol]) filtered_quote.update(screener_dict[symbol])
result = filtered_quote result = filtered_quote
@ -1308,7 +1316,6 @@ async def process_watchlist_ticker(ticker, rule_of_list, quote_keys_to_include,
@app.post("/get-watchlist") @app.post("/get-watchlist")
async def get_watchlist(data: GetWatchList, api_key: str = Security(get_api_key)): async def get_watchlist(data: GetWatchList, api_key: str = Security(get_api_key)):
"""Optimized watchlist endpoint with concurrent processing and earnings data.""" """Optimized watchlist endpoint with concurrent processing and earnings data."""
@ -1328,8 +1335,12 @@ async def get_watchlist(data: GetWatchList, api_key: str = Security(get_api_key)
# Normalize rule_of_list # Normalize rule_of_list
if not rule_of_list or not isinstance(rule_of_list, list): if not rule_of_list or not isinstance(rule_of_list, list):
rule_of_list = quote_keys_to_include rule_of_list = []
# Remove 'price', 'volume', and 'changesPercentage' from rule_of_list
rule_of_list = [rule for rule in rule_of_list if rule not in ['price', 'volume', 'changesPercentage']]
# Ensure 'symbol' and 'name' are included in rule_of_list
rule_of_list = list(set(rule_of_list + ['symbol', 'name'])) rule_of_list = list(set(rule_of_list + ['symbol', 'name']))
# Prepare screener dictionary for fast lookup # Prepare screener dictionary for fast lookup
@ -1379,7 +1390,6 @@ async def get_watchlist(data: GetWatchList, api_key: str = Security(get_api_key)
@app.post("/get-price-alert") @app.post("/get-price-alert")
async def get_price_alert(data: dict, api_key: str = Security(get_api_key)): async def get_price_alert(data: dict, api_key: str = Security(get_api_key)):
user_id = data.get('userId') user_id = data.get('userId')
@ -4055,6 +4065,7 @@ async def get_statistics(data: FilterStockList, api_key: str = Security(get_api_
except: except:
res = [] res = []
data = orjson.dumps(res) data = orjson.dumps(res)
print(res)
compressed_data = gzip.compress(data) compressed_data = gzip.compress(data)
redis_client.set(cache_key, compressed_data) redis_client.set(cache_key, compressed_data)