Skip to content

fix: refactor AI Assistant page with bugs fixes #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thurstonchen wants to merge 8 commits into
base: feat/yem/53-create-webui-with-streamlit
Choose a base branch
from
Open

fix: refactor AI Assistant page with bugs fixes #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a60a15
fix: refactor AI Assistant page with bugs fixes
thurstonchen Sep 21, 2023
75416b3
fix: add tasks dependency checking logic
thurstonchen Sep 24, 2023
cc58b11
fix: unified session state object for std/srv editing tasks
thurstonchen Sep 25, 2023
e14cfca
fix: add dependency check for staging tables and fix some UI issues
thurstonchen Sep 26, 2023
b137bdb
refactor: generate one table at a time/request
thurstonchen Oct 7, 2023
0f30156
refactor: add exception handling and retry for OpenAI requests
thurstonchen Oct 8, 2023
68cd111
fix diff JAVA_HOME path in macos and win
Apr 18, 2024
772889d
fix fruit app visualization issues
Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ RUN apt-get update && \
apt-get clean;


ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
RUN export JAVA_HOME
# ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-arm64/
# ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
RUN export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which java))))"
RUN echo $JAVA_HOME

WORKDIR /usr/src/app
ENV FLASK_APP=./src/app.py
Expand Down
76 changes: 4 additions & 72 deletions example/pipeline_fruit_batch_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,16 +258,12 @@
],
"visualization": [
{
"name": "untitled1",
"name": "TotalSales",
"type": "Bar Chart",
"input": "srv_fruit_sales_total",
"description": ""
},
{
"name": "untitled2",
"type": "Line Chart",
"input": "srv_fruit_sales_total",
"description": ""
"description": "",
"x_axis": "fruit",
"y_axis": "total"
}
],
"industry": "Other",
Expand Down Expand Up @@ -416,70 +412,6 @@
"total": 17.0
}
]
},
"visualization": {
"untitled1": {
"xAxis": {
"type": "category",
"data": [
"Fiji Apple",
"Green Apple",
"Peach",
"Green Grape",
"Orange",
"Red Grape",
"Banana"
]
},
"yAxis": {
"type": "value"
},
"series": [
{
"data": [
56.0,
45.0,
39.0,
36.0,
28.0,
24.0,
17.0
],
"type": "bar"
}
]
},
"untitled2": {
"xAxis": {
"type": "category",
"data": [
"Fiji Apple",
"Green Apple",
"Peach",
"Green Grape",
"Orange",
"Red Grape",
"Banana"
]
},
"yAxis": {
"type": "value"
},
"series": [
{
"data": [
56.0,
45.0,
39.0,
36.0,
28.0,
24.0,
17.0
],
"type": "line"
}
]
}
}
}
}
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
setuptools
wheel
pandas==1.5.3
numpy==1.23.5
pyarrow
fastparquet
pyspark==3.3.0
Expand Down
972 changes: 438 additions & 534 deletions src/cddp/openai_api.py
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions src/streamlit/pages/1_Editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,13 @@ def run_task(task_name, stage="standard"):

def delete_task(type, index):
if type == "staging":
# Also sync checkbox status in the AI Assistant page
generated_tables = st.session_state["current_generated_tables"]["generated_tables"]
for table in generated_tables:
if table["table_name"] == current_pipeline_obj['staging'][index]["name"]:
table["staged_flag"] = False
break

del current_pipeline_obj['staging'][index]
elif type == "standard":
del current_pipeline_obj['standard'][index]
Expand Down Expand Up @@ -691,9 +698,9 @@ def clean_vis_data(vis_name):
selected_y_axis_index = 1 if len(cols) > 1 else 0

for j in range(len(cols)):
if cols[j] == current_pipeline_obj['visualization'][i]['x_axis']:
if 'x_axis' in current_pipeline_obj['visualization'] and cols[j] == current_pipeline_obj['visualization'][i]['x_axis']:
selected_x_axis_index = j
if cols[j] == current_pipeline_obj['visualization'][i]['y_axis']:
if 'y_axis' in current_pipeline_obj['visualization'] and cols[j] == current_pipeline_obj['visualization'][i]['y_axis']:
selected_y_axis_index = j

x_axis = st.selectbox('X Axis', cols, key=f'vis_x_axis_{i}', index=selected_x_axis_index)
Expand Down
Loading