working callback, known minor visual with total spend
This commit is contained in:
+14
-5
@@ -53,8 +53,17 @@ spend_per_payee = master_transactions.sql('''
|
|||||||
'''
|
'''
|
||||||
)
|
)
|
||||||
|
|
||||||
# print(spend_per_day)
|
def update_dates(start_date, end_date):
|
||||||
today = date(date.today())
|
print("start date", start_date)
|
||||||
# Convert the dates to datetime objects that are compatible with Polars
|
print("end date", end_date)
|
||||||
start_date = pl.Date(today)
|
print(master_transactions)
|
||||||
print(start_date)
|
master_data = master_transactions.filter(
|
||||||
|
pl.col("date").is_between(start_date, end_date)
|
||||||
|
)
|
||||||
|
return master_data
|
||||||
|
|
||||||
|
today = date.today()
|
||||||
|
one_year_ago = today - timedelta(days=5)
|
||||||
|
|
||||||
|
data = update_dates(start_date=one_year_ago, end_date=today)
|
||||||
|
print(data)
|
||||||
+16
-12
@@ -6,35 +6,37 @@ import sys
|
|||||||
import config.exit_codes as ec
|
import config.exit_codes as ec
|
||||||
# import datetime
|
# import datetime
|
||||||
|
|
||||||
try:
|
class data_components():
|
||||||
accounts = pl.read_parquet('data/warehouse/accounts.parquet')
|
accounts = pl.read_parquet('data/warehouse/accounts.parquet')
|
||||||
categories = pl.read_parquet('data/warehouse/categories.parquet')
|
categories = pl.read_parquet('data/warehouse/categories.parquet')
|
||||||
dates = pl.read_parquet('data/warehouse/dates.parquet')
|
dates = pl.read_parquet('data/warehouse/dates.parquet')
|
||||||
payees = pl.read_parquet('data/warehouse/payees.parquet')
|
payees = pl.read_parquet('data/warehouse/payees.parquet')
|
||||||
scheduled_transactions = pl.read_parquet('data/warehouse/scheduled_transactions.parquet')
|
scheduled_transactions = pl.read_parquet('data/warehouse/scheduled_transactions.parquet')
|
||||||
transactions = pl.read_parquet('data/warehouse/transactions.parquet')
|
transactions = pl.read_parquet('data/warehouse/transactions.parquet')
|
||||||
except FileNotFoundError:
|
|
||||||
logging.error('Data warehouse files not found. Run the data pipeline to create them.')
|
|
||||||
sys.exit(ec.MISSING_DATA_FILES)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Join transactions with accounts, categories, and payees to create a master DataFrame
|
|
||||||
master_transactions = transactions.join(categories, left_on='category_id', right_on='category_id', suffix='_category')\
|
master_transactions = transactions.join(categories, left_on='category_id', right_on='category_id', suffix='_category')\
|
||||||
.join(accounts, left_on='account_id', right_on='account_id', suffix='_account')\
|
.join(accounts, left_on='account_id', right_on='account_id', suffix='_account')\
|
||||||
.join(payees, left_on='payee_id', right_on='payee_id', suffix='_payee')\
|
.join(payees, left_on='payee_id', right_on='payee_id', suffix='_payee')\
|
||||||
.join(dates, left_on='transaction_date', right_on='date_id', suffix='_date')
|
.join(dates, left_on='transaction_date', right_on='date_id', suffix='_date')
|
||||||
|
|
||||||
except Exception as e:
|
def __init__(self):
|
||||||
logging.error(f'Error joining DataFrames: {e}')
|
logging.info("Initializing data components")
|
||||||
sys.exit(ec.BAD_JOIN)
|
pass
|
||||||
|
|
||||||
def update_dates(start_date, end_date):
|
def update_dates(start_date, end_date):
|
||||||
master_data = master_transactions.filter(
|
logging.info("Updating dates")
|
||||||
|
logging.debug(f"start_date: {start_date}, end_date: {end_date}")
|
||||||
|
logging.debug(data_components.master_transactions.columns)
|
||||||
|
try:
|
||||||
|
master_data = data_components.master_transactions.filter(
|
||||||
pl.col("date").is_between(start_date, end_date)
|
pl.col("date").is_between(start_date, end_date)
|
||||||
)
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"Error updating dates: {e}")
|
||||||
|
raise e
|
||||||
return master_data
|
return master_data
|
||||||
|
|
||||||
def update_data(master_data):
|
def update_data(master_data,callback=0):
|
||||||
# Create aggregations
|
# Create aggregations
|
||||||
spend_per_day = master_data.sql('''
|
spend_per_day = master_data.sql('''
|
||||||
SELECT
|
SELECT
|
||||||
@@ -117,5 +119,7 @@ def update_data(master_data):
|
|||||||
"spend_per_category_bar": spend_per_category_bar,
|
"spend_per_category_bar": spend_per_category_bar,
|
||||||
"spend_per_payee_bar": spend_per_payee_bar,
|
"spend_per_payee_bar": spend_per_payee_bar,
|
||||||
"total_spend": total_spend}
|
"total_spend": total_spend}
|
||||||
|
if callback == 0:
|
||||||
return data
|
return data
|
||||||
|
else:
|
||||||
|
return spend_per_day_line,spend_per_category_bar,spend_per_payee_bar,total_spend
|
||||||
|
|||||||
+11
-8
@@ -4,14 +4,15 @@ from dash import dcc, html
|
|||||||
from dash.dependencies import Input, Output, State
|
from dash.dependencies import Input, Output, State
|
||||||
import dash_bootstrap_components as dbc
|
import dash_bootstrap_components as dbc
|
||||||
from visuals.layout import create_layout
|
from visuals.layout import create_layout
|
||||||
from visuals.components import update_data, update_dates
|
from visuals.components import data_components
|
||||||
from datetime import date, timedelta
|
from datetime import date, timedelta
|
||||||
|
import datetime
|
||||||
|
|
||||||
today = date.today()
|
today = date.today()
|
||||||
one_year_ago = today - timedelta(days=365)
|
one_year_ago = today - timedelta(days=365)
|
||||||
|
|
||||||
master_data = update_dates(start_date=one_year_ago, end_date=today)
|
master_data = data_components.update_dates(start_date=one_year_ago, end_date=today)
|
||||||
data = update_data(master_data)
|
data = data_components.update_data(master_data)
|
||||||
|
|
||||||
|
|
||||||
app = dash.Dash(__name__, external_stylesheets=[dbc.themes.DARKLY])
|
app = dash.Dash(__name__, external_stylesheets=[dbc.themes.DARKLY])
|
||||||
@@ -22,12 +23,14 @@ app = dash.Dash(__name__, external_stylesheets=[dbc.themes.DARKLY])
|
|||||||
Output("spend_per_payee","figure"),
|
Output("spend_per_payee","figure"),
|
||||||
Output("total_spend","children"),
|
Output("total_spend","children"),
|
||||||
|
|
||||||
[Input('date-picker-range', 'start_date'),
|
Input('date-picker-range', 'start_date'),
|
||||||
Input('date-picker-range', 'end_date')]
|
Input('date-picker-range', 'end_date')
|
||||||
)
|
)
|
||||||
def update_layout(start_date,end_date):
|
def update_layout(start_date,end_date):
|
||||||
master_data = update_dates(start_date, end_date)
|
actual_start_date = datetime.date.fromisoformat(start_date)
|
||||||
data = update_data(master_data)
|
actual_end_date = datetime.date.fromisoformat(end_date)
|
||||||
return create_layout(data)
|
master_data = data_components.update_dates(actual_start_date,actual_end_date)
|
||||||
|
# spend_per_day_line,spend_per_category_bar,spend_per_payee_bar,total_spend = data_components.update_data(master_data,callback=1)
|
||||||
|
return data_components.update_data(master_data,callback=1)
|
||||||
|
|
||||||
app.layout = create_layout(data)
|
app.layout = create_layout(data)
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ def create_topbar():
|
|||||||
[
|
[
|
||||||
dbc.Col(
|
dbc.Col(
|
||||||
dcc.DatePickerRange(
|
dcc.DatePickerRange(
|
||||||
|
first_day_of_week=1,
|
||||||
|
display_format="YYYY-MM-DD",
|
||||||
id="date-picker-range",
|
id="date-picker-range",
|
||||||
start_date=one_year_ago,
|
start_date=one_year_ago,
|
||||||
end_date=today,
|
end_date=today,
|
||||||
|
|||||||
Reference in New Issue
Block a user