From 62464ce424c242ef26154a62d7affb349b79657a Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Fri, 9 May 2025 19:46:49 -0700 Subject: seperate route logic from actual flask route --- app.py | 219 +++++++---------------------------------------------------------- 1 file changed, 21 insertions(+), 198 deletions(-) (limited to 'app.py') diff --git a/app.py b/app.py index 20af9c2..d56674a 100644 --- a/app.py +++ b/app.py @@ -1,32 +1,14 @@ from flask import Flask, send_file, jsonify, request from flask_cors import CORS -from sql.pg_handler import PostgresHandler -import fileutil as fs -import datetime -import pandas -from sklearn.linear_model import Ridge -import numpy as np -import os -from dotenv import load_dotenv -from member_colors import member_groups, GRADUATED - -load_dotenv() +from routes import ( + get_subscribers_data, get_twitch_data, get_channel_timeseries, + get_channel_7d, get_channel_milestones, get_channel_diffs, + get_channel_info, get_group_mappings +) app = Flask(__name__) CORS(app) - -def create_database_connection(): - """ - Creates a database connection using the environment variables - :param: auth_append: str = "" - If you want to use a different set of variables for persisitance of sessions - """ - hostname = os.environ.get("POSTGRES_HOST") - user = os.environ.get("POSTGRES_USER") - password = os.environ.get("POSTGRES_PASSWORD") - database = os.environ.get("POSTGRES_DATABASE") - return PostgresHandler(host_name=hostname, username=user, password=password, database=database, port=5432) - @app.route("/") def index(): try: @@ -35,196 +17,37 @@ def index(): return jsonify({"error": str(e)}) @app.route("/api/subscribers") -def api_subscribers(): - server = create_database_connection() - query = 'SELECT sd.*, h.* FROM subscriber_data sd INNER JOIN "24h_historical" h ON sd.channel_id = h.channel_id ORDER BY sd.subscriber_count DESC' - data = server.execute_query(query) - channel_data_list = [{"channel_name": row[3], "profile_pic": row[2], "subscribers": row[4], "sub_org": row[5], "video_count": row[6], "views": row[8], "day_diff": int(row[4] - int(row[11]))} for row in data] - subscriber_data = {"timestamp": datetime.datetime.now(), "channel_data": channel_data_list} - return jsonify(subscriber_data) +def route_subscribers(): + return jsonify(get_subscribers_data()) @app.route("/api/twitch") -def api_twitch(): - server = create_database_connection() - query = ''' - SELECT sd.*, h.*, ts.follower_count - FROM subscriber_data sd - INNER JOIN "24h_historical" h ON sd.channel_id = h.channel_id - LEFT JOIN twitch_stats ts ON sd.channel_id = ts.channel_id - ORDER BY sd.subscriber_count DESC - ''' - data = server.execute_query(query) - channel_data_list = [] - for row in data: - youtube_subs = row[4] - twitch_followers = row[-1] if row[-1] is not None else 0 - total_followers = youtube_subs + twitch_followers - channel_data_list.append({ - "channel_name": row[3], - "profile_pic": row[2], - "subscribers": youtube_subs, - "sub_org": row[5], - "twitch_followers": twitch_followers, - "total_sum": total_followers, - }) - subscriber_data = { - "timestamp": datetime.datetime.now(), - "channel_data": channel_data_list - } - return jsonify(subscriber_data) +def route_twitch(): + return jsonify(get_twitch_data()) @app.route("/api/subscribers/") -def api_subscribers_channel(channel_name): - server = create_database_connection() - query = "SELECT * FROM subscriber_data_historical WHERE name = %s AND timestamp > %s ORDER BY TO_CHAR(timestamp, 'YYYY-MM-DD')" - data = server.execute_query(query, (channel_name, os.environ.get("START_DATE"),)) - labels = [] - data_points = [] - seen_dates = set() - for row in data: - date_string = row[5].strftime("%Y-%m-%d") - if date_string in seen_dates: - continue - labels.append(date_string) - data_points.append(row[4]) - seen_dates.add(date_string) - return jsonify({"labels": labels, "datasets": data_points}) +def route_subscriber_history(channel_name): + return jsonify(get_channel_timeseries(channel_name)) @app.route("/api/subscribers//7d") -def api_subscribers_channel_7d(channel_name): - server = create_database_connection() - query = "SELECT * FROM subscriber_data_historical WHERE name = %s ORDER BY TO_CHAR(timestamp, 'YYYY-MM-DD')" - data = server.execute_query(query, (channel_name,)) - labels = [] - data_points = [] - seen_dates = set() - for row in data: - date_string = row[5].strftime("%Y-%m-%d") - if date_string in seen_dates: - continue - labels.append(date_string) - data_points.append(row[4]) - seen_dates.add(date_string) - return jsonify({"labels": labels[-7:], "datasets": data_points[-7:]}) +def route_subscriber_7d(channel_name): + return jsonify(get_channel_7d(channel_name)) @app.route("/api/subscribers//milestones") -def get_channel_milestones(channel_name): - server = create_database_connection() +def route_milestones(channel_name): milestone_increment = int(request.args.get("q", 10000)) - initial_milestone = 10000 - current_milestone = initial_milestone - query = """ - SELECT subscriber_count, MIN(timestamp) - FROM subscriber_data_historical - WHERE name = %s - GROUP BY subscriber_count - ORDER BY subscriber_count ASC - """ - data = server.execute_query(query, (channel_name,)) - dates = [] - milestones = [] - for row in data: - subscriber_count = row[0] - while subscriber_count >= current_milestone: - date_string = row[1].strftime("%Y-%m-%d") - dates.append(date_string) - milestones.append(current_milestone) - current_milestone += milestone_increment - return jsonify({"milestones": milestones, "dates": dates}) + return jsonify(get_channel_milestones(channel_name, milestone_increment)) @app.route("/api/subscribers//past_diff") -def get_past_records(channel_name): - server = create_database_connection() - query = "SELECT * FROM subscriber_data_historical WHERE name = %s ORDER BY timestamp DESC" - data = server.execute_query(query, (channel_name,)) - if len(data) == 0: - return jsonify({"diff_1d": None, "diff_7d": None, "diff_30d": None}) - latest_sub_count = data[0][4] - sub_count_1d_ago = next((row[4] for row in data if (datetime.datetime.now() - row[5]).days >= 1), None) - sub_count_7d_ago = next((row[4] for row in data if (datetime.datetime.now() - row[5]).days >= 7), None) - sub_count_30d_ago = next((row[4] for row in data if (datetime.datetime.now() - row[5]).days >= 30), None) - diff_1d = latest_sub_count - sub_count_1d_ago if sub_count_1d_ago is not None else None - diff_7d = latest_sub_count - sub_count_7d_ago if sub_count_7d_ago is not None else None - diff_30d = latest_sub_count - sub_count_30d_ago if sub_count_30d_ago is not None else None - return jsonify({"diff_1d": diff_1d, "diff_7d": diff_7d, "diff_30d": diff_30d}) - +def route_diffs(channel_name): + return jsonify(get_channel_diffs(channel_name)) @app.route("/api/channel/") -def get_channel_information(channel_name): - def find_next_milestone(subscriber_count): - if subscriber_count < 100000: - return ((subscriber_count // 10000) + 1) * 10000 - elif subscriber_count < 1000000: - return ((subscriber_count // 100000) + 1) * 100000 - else: - return ((subscriber_count // 1000000) + 1) * 1000000 - server = create_database_connection() - query = "SELECT * FROM subscriber_data WHERE name = %s" - data = server.execute_query(query, (channel_name,)) - channel_data = {"channel_id": data[0][1], "channel_name": data[0][3], "profile_pic": data[0][2], "subscribers": data[0][4], "sub_org": data[0][5], "video_count": data[0][6], "view_count": data[0][8]} - query = "SELECT * FROM subscriber_data_historical WHERE name = %s ORDER BY timestamp DESC" - historical_data = server.execute_query(query, (channel_name,)) - if len(historical_data) == 0: - return jsonify({"diff_1d": None, "diff_7d": None, "diff_30d": None}) - current_subscriber_count = historical_data[0][4] - sub_count_1d_ago = next((row[4] for row in historical_data if (datetime.datetime.now() - row[5]).days >= 1), None) - sub_count_7d_ago = next((row[4] for row in historical_data if (datetime.datetime.now() - row[5]).days >= 7), None) - sub_count_30d_ago = next((row[4] for row in historical_data if (datetime.datetime.now() - row[5]).days >= 30), None) - diff_1d = current_subscriber_count - sub_count_1d_ago if sub_count_1d_ago is not None else None - diff_7d = current_subscriber_count - sub_count_7d_ago if sub_count_7d_ago is not None else None - diff_30d = current_subscriber_count - sub_count_30d_ago if sub_count_30d_ago is not None else None - channel_data["diff_1d"] = diff_1d - channel_data["diff_7d"] = diff_7d - channel_data["diff_30d"] = diff_30d - subscriber_points = [] - date_strings = [] - seen_dates = set() - for row in historical_data: - date_string = row[5].strftime("%Y-%m-%d") - if date_string in seen_dates: - continue - subscriber_points.append(row[4]) - date_strings.append(date_string) - seen_dates.add(date_string) - data = {"subscribers": subscriber_points, "dates": date_strings} - df = pandas.DataFrame(data=data) - df['dates'] = pandas.to_datetime(df['dates']) - df.set_index('dates', inplace=True) - df.sort_index(inplace=True) - three_months_ago = datetime.datetime.now() - datetime.timedelta(days=90) - df = df[df.index > three_months_ago] - try: - model = Ridge(alpha=100) - X = np.array(range(len(df))).reshape(-1, 1) - y = df['subscribers'] - model.fit(X, y) - next_milestone = find_next_milestone(current_subscriber_count) - days_until_next_milestone = (next_milestone - model.intercept_) / model.coef_ - days_until_next_milestone_scalar = int(days_until_next_milestone[0]) - today = datetime.datetime.now().date() - next_milestone_date = today + datetime.timedelta(days=days_until_next_milestone_scalar) - time_until_next_milestone = (next_milestone_date - today).days - if time_until_next_milestone < 0: - raise OverflowError - channel_data["next_milestone_date"] = str(next_milestone_date) - channel_data["days_until_next_milestone"] = str(time_until_next_milestone) - channel_data["next_milestone"] = str(next_milestone) - except OverflowError: - channel_data["next_milestone_date"] = "N/A" - channel_data["days_until_next_milestone"] = "N/A" - channel_data["next_milestone"] = "N/A" - return jsonify(channel_data) +def route_channel_info(channel_name): + return jsonify(get_channel_info(channel_name)) @app.route("/api/groups") -def api_groups(): - group_mappings = {} - for name, group in member_groups.items(): - if name in GRADUATED: - continue - if group not in group_mappings: - group_mappings[group] = [] - group_mappings[group].append(name) - return jsonify(group_mappings) +def route_groups(): + return jsonify(get_group_mappings()) @app.errorhandler(404) def not_found(error): -- cgit v1.2.3