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

update cron job and watchlist api endpoint

Browse Source
This commit is contained in:
MuslemRahimi 2024-10-10 22:10:41 +02:00
parent 38aed4098e
commit c936d71e10
3 changed files with 184 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/main.py
View File

@ -1103,57 +1103,58 @@ async def get_watchlist(data: GetWatchList, api_key: str = Security(get_api_key)
watchlist_id = data['watchListId'] watchlist_id = data['watchListId']
result = pb.collection("watchlist").get_one(watchlist_id) result = pb.collection("watchlist").get_one(watchlist_id)
ticker_list = result.ticker ticker_list = result.ticker
rule_of_list = result.rule_of_list or []
print(rule_of_list)
combined_results = [] # List to store the combined results combined_results = [] # List to store the combined results
combined_news = [] combined_news = []
for ticker in ticker_list: def load_json(file_path):
ticker = ticker.upper() try:
with open(file_path, 'rb') as file:
return orjson.loads(file.read())
except FileNotFoundError:
return None
# Categorize tickers and fetch data
for ticker in map(str.upper, ticker_list):
ticker_type = 'stock'
if ticker in etf_symbols: if ticker in etf_symbols:
try: ticker_type = 'etf'
with open(f"json/quote/{ticker}.json", 'rb') as file:
quote_dict = orjson.loads(file.read())
quote_dict['type'] = 'etf'
combined_results.append(quote_dict)
except:
pass
try:
with open(f"json/market-news/companies/{ticker}.json", 'rb') as file:
news_dict = orjson.loads(file.read())[0]
combined_news.append(news_dict)
except:
pass
elif ticker in crypto_symbols: elif ticker in crypto_symbols:
try: ticker_type = 'crypto'
with open(f"json/quote/{ticker}.json", 'rb') as file:
quote_dict = orjson.loads(file.read()) # Load quote data
quote_dict['type'] = 'crypto' quote_dict = load_json(f"json/quote/{ticker}.json")
if quote_dict:
quote_dict['type'] = ticker_type
combined_results.append(quote_dict) combined_results.append(quote_dict)
except:
pass # Load news data
news_dict = load_json(f"json/market-news/companies/{ticker}.json")
if news_dict:
combined_news.append(news_dict[0])
# Keys to always include in the combined results
always_include = ['symbol', 'name', 'price', 'changesPercentage']
try: try:
with open(f"json/market-news/companies/{ticker}.json", 'rb') as file: # Create a mapping of stock_screener_data based on symbol for fast lookup
news_dict = orjson.loads(file.read())[0] screener_dict = {
combined_news.append(news_dict) item['symbol']: {key: item.get(key) for key in set(always_include + rule_of_list) if key in item}
except: for item in stock_screener_data
pass }
else:
try: # Merge the filtered stock_screener_data into combined_results
with open(f"json/quote/{ticker}.json", 'rb') as file: for result in combined_results:
quote_dict = orjson.loads(file.read()) symbol = result.get('symbol')
quote_dict['type'] = 'stock' if symbol in screener_dict:
combined_results.append(quote_dict) result.update(screener_dict[symbol])
except:
pass except Exception as e:
try: print(f"An error occurred while merging data: {e}")
with open(f"json/market-news/companies/{ticker}.json", 'rb') as file: print(combined_results)
news_dict = orjson.loads(file.read())[0] return [combined_results, combined_news]
combined_news.append(news_dict)
except:
pass
res = [combined_results, combined_news]
return res
def process_option_activity(item): def process_option_activity(item):
item['put_call'] = 'Calls' if item['put_call'] == 'CALL' else 'Puts' item['put_call'] = 'Calls' if item['put_call'] == 'CALL' else 'Puts'
@ -3207,7 +3208,6 @@ async def get_all_politician(api_key: str = Security(get_api_key)):
headers={"Content-Encoding": "gzip"} headers={"Content-Encoding": "gzip"}
) )
try: try:
with open(f"json/congress-trading/search_list.json", 'rb') as file: with open(f"json/congress-trading/search_list.json", 'rb') as file:
res_list = orjson.loads(file.read()) res_list = orjson.loads(file.read())

2
app/primary_cron_job.py
View File

@ -371,7 +371,7 @@ schedule.every(10).minutes.do(run_threaded, run_tracker).tag('tracker_job')
schedule.every(1).minutes.do(run_threaded, run_cron_quote).tag('quote_job') schedule.every(1).minutes.do(run_threaded, run_cron_quote).tag('quote_job')
schedule.every(15).minutes.do(run_threaded, run_market_moods).tag('market_moods_job') schedule.every(15).minutes.do(run_threaded, run_market_moods).tag('market_moods_job')
schedule.every(30).minutes.do(run_threaded, run_earnings).tag('earnings_job') schedule.every(10).minutes.do(run_threaded, run_earnings).tag('earnings_job')
#schedule.every(10).minutes.do(run_threaded, run_dark_pool_flow).tag('dark_pool_flow_job') #schedule.every(10).minutes.do(run_threaded, run_dark_pool_flow).tag('dark_pool_flow_job')
schedule.every(2).hours.do(run_threaded, run_fda_calendar).tag('fda_calendar_job') schedule.every(2).hours.do(run_threaded, run_fda_calendar).tag('fda_calendar_job')

124
fastify/get-post/server.js
View File

@ -27,29 +27,24 @@ function postHotness(upvotes, created) {
const interval = 45000; // or 69000 const interval = 45000; // or 69000
const createdDate = new Date(created); const createdDate = new Date(created);
const seconds = (createdDate.getTime() / 1000); const seconds = createdDate.getTime() / 1000;
const hotness = order + (sign * seconds) / interval; const hotness = order + (sign * seconds) / interval;
return Math.round(hotness * 10000000); return Math.round(hotness * 10000000);
} }
module.exports = function (fastify, opts, done) { module.exports = function (fastify, opts, done) {
const pb = opts.pb; const pb = opts.pb;
fastify.post('/get-post', async (request, reply) => { fastify.post("/get-post", async (request, reply) => {
const data = request.body; const data = request.body;
let filter; let filter;
const sort = data?.sortingPosts === 'hot' ? '-upvote' : '-created'; const sort = data?.sortingPosts === "hot" ? "-upvote" : "-created";
let pinnedPost; let pinnedPost;
let posts; let posts;
try { try {
if (data?.seenPostId.length !== 0) {
if (data?.seenPostId.length !==0)
{
filter = data?.seenPostId?.map((id) => `id!="${id}"`).join("&&"); filter = data?.seenPostId?.map((id) => `id!="${id}"`).join("&&");
//applies only for profile and user directory //applies only for profile and user directory
@ -61,129 +56,116 @@ module.exports = function (fastify, opts, done) {
filter += `&& tagline="${data?.filterTicker}" && pinned=false`; filter += `&& tagline="${data?.filterTicker}" && pinned=false`;
} }
if(data?.sortingPosts === 'hot') { if (data?.sortingPosts === "hot") {
//community page code space //community page code space
// In case of sort === 'hot' show the most recent post up to 7 week by ranking them with the function postHotness // In case of sort === 'hot' show the most recent post up to 7 week by ranking them with the function postHotness
let endDate = new Date(); let endDate = new Date();
// Get the date one week earlier // Get the date one week earlier
let startDate = new Date(); let startDate = new Date();
startDate.setDate(endDate.getDate() - 30); startDate.setDate(endDate.getDate() - 180);
endDate.setDate(endDate.getDate() + 1) endDate.setDate(endDate.getDate() + 1);
// Format the dates as needed (e.g., "YYYY-MM-DD") // Format the dates as needed (e.g., "YYYY-MM-DD")
let endDateStr = endDate.toISOString().split('T')[0]; let endDateStr = endDate.toISOString().split("T")[0];
let startDateStr = startDate.toISOString().split('T')[0]; let startDateStr = startDate.toISOString().split("T")[0];
filter += `&& created >= "${startDateStr}" && created <= "${endDateStr}" && pinned = false` filter += `&& created >= "${startDateStr}" && created <= "${endDateStr}" && pinned = false`;
} }
posts = (await pb.collection('posts').getList(data?.startPage, 5, { posts = (
sort: '-created', await pb.collection("posts").getList(data?.startPage, 10, {
sort: "-created",
filter: filter, filter: filter,
expand: 'user,comments(post),alreadyVoted(post)', expand: "user,comments(post),alreadyVoted(post)",
fields: "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type" fields:
"*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type",
})
)?.items;
}))?.items; if (data?.sortingPosts === "hot") {
if(data?.sortingPosts === 'hot') {
// Add hotness property to each post // Add hotness property to each post
posts?.forEach(post => { posts?.forEach((post) => {
post.hotness = postHotness(post?.upvote, post?.created); post.hotness = postHotness(post?.upvote, post?.created);
}); });
posts?.sort((a, b) => b?.hotness - a?.hotness); posts?.sort((a, b) => b?.hotness - a?.hotness);
} }
} else {
}
else {
if (data?.userId) { if (data?.userId) {
posts = (
posts = (await pb.collection('posts').getList(data?.startPage, 5, { await pb.collection("posts").getList(data?.startPage, 10, {
sort: sort, sort: sort,
filter: `user="${data?.userId}" && pinned=false`, filter: `user="${data?.userId}" && pinned=false`,
expand: `user,comments(post),alreadyVoted(post)`, expand: `user,comments(post),alreadyVoted(post)`,
fields: "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type" fields:
}))?.items; "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type",
})
)?.items;
} } else if (data?.filterTicker) {
posts = await pb.collection("posts").getList(data?.startPage, 10, {
else if (data?.filterTicker) {
posts = await pb.collection('posts').getList(data?.startPage, 5, {
sort: sort, sort: sort,
filter: `tagline="${data?.filterTicker}" && pinned=false`, filter: `tagline="${data?.filterTicker}" && pinned=false`,
expand: `user,comments(post),alreadyVoted(post)`, expand: `user,comments(post),alreadyVoted(post)`,
fields: "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type" fields:
"*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type",
}); });
} else {
}
else {
//community page code space //community page code space
// In case of sort === 'hot' show the most recent post up to 7 week by ranking them with the function postHotness // In case of sort === 'hot' show the most recent post up to 7 week by ranking them with the function postHotness
if(data?.sortingPosts === 'hot') { if (data?.sortingPosts === "hot") {
let endDate = new Date(); let endDate = new Date();
// Get the date one week earlier // Get the date one week earlier
let startDate = new Date(); let startDate = new Date();
startDate.setDate(endDate.getDate() - 30); startDate.setDate(endDate.getDate() - 30);
endDate.setDate(endDate.getDate() + 1) endDate.setDate(endDate.getDate() + 1);
// Format the dates as needed (e.g., "YYYY-MM-DD") // Format the dates as needed (e.g., "YYYY-MM-DD")
let endDateStr = endDate.toISOString().split('T')[0]; let endDateStr = endDate.toISOString().split("T")[0];
let startDateStr = startDate.toISOString().split('T')[0]; let startDateStr = startDate.toISOString().split("T")[0];
filter = `created >= "${startDateStr}" && created <= "${endDateStr}" && pinned = false` filter = `created >= "${startDateStr}" && created <= "${endDateStr}" && pinned = false`;
} } else {
else {
filter = `pinned=false`; filter = `pinned=false`;
} }
posts = await pb.collection('posts').getList(1, 5, { posts = await pb.collection("posts").getList(1, 10, {
sort: '-created', sort: "-created",
filter: filter, filter: filter,
expand: 'user, comments(post), alreadyVoted(post)', expand: "user, comments(post), alreadyVoted(post)",
fields: "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type" fields:
"*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type",
}); });
posts = posts.items posts = posts.items;
// Add hotness property to each post // Add hotness property to each post
if(data?.sortingPosts === 'hot') { if (data?.sortingPosts === "hot") {
posts?.forEach(post => { posts?.forEach((post) => {
post.hotness = postHotness(post?.upvote, post?.created); post.hotness = postHotness(post?.upvote, post?.created);
}); });
posts?.sort((a, b) => b?.hotness - a?.hotness); posts?.sort((a, b) => b?.hotness - a?.hotness);
} }
pinnedPost = await pb.collection('posts').getFullList({ pinnedPost = await pb.collection("posts").getFullList({
filter: `pinned=true`, filter: `pinned=true`,
sort: '-created', sort: "-created",
expand: `user,comments(post),alreadyVoted(post)`, expand: `user,comments(post),alreadyVoted(post)`,
fields: "*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type" fields:
"*,expand.user,expand.comments(post), expand.alreadyVoted(post).user,expand.alreadyVoted(post).type",
}); });
for (let i = pinnedPost?.length - 1; i >= 0; i--) { for (let i = pinnedPost?.length - 1; i >= 0; i--) {
posts?.unshift(pinnedPost[i]); posts?.unshift(pinnedPost[i]);
} }
} }
} }
} catch (e) {
}
catch(e)
{
//console.log(e) //console.log(e)
posts = []; posts = [];
} }
reply.send({ items: posts });
reply.send({ items: posts }) });
})
done(); done();
}; };