Update app.py

app.py

@@ -11,8 +11,6 @@ from dash.exceptions import PreventUpdate
 import PyPDF2
 import docx
 import chardet
-import json
-from dash.exceptions import PreventUpdate
 
 # Initialize the Dash app
 app = dash.Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
@@ -68,48 +66,30 @@ app.layout = dbc.Container([
                 },
                 multiple=True
             ),
-            html.Div([
-                html.H5("Uploaded Files"),
-                dbc.ListGroup(id='file-list')
-            ], className="mt-3"),
+            html.Div(id='file-list'),
             html.Hr(),
             html.Div([
                 dbc.Button(
                     matrix_type,
-                    id={'type': 'matrix-button', 'index': matrix_type},
-                    color="link",
-                    className="mb-2 w-100 text-left",
-                    style={
-                        'textAlign': 'left',
-                        'textDecoration': 'none',
-                        'padding': '0.375rem 0.75rem',
-                        'transition': 'background-color 0.3s'
-                    }
+                    id=f'btn-{matrix_type.lower().replace(" ", "-")}',
+                    color="primary",
+                    className="mb-2 w-100",
+                    style={'overflow': 'hidden', 'text-overflow': 'ellipsis', 'white-space': 'nowrap'}
                 ) for matrix_type in matrix_types.keys()
-            ], className="left-buttons-container")
+            ])
         ], width=3),
         dbc.Col([
-            html.Div(style={"height": "20px"}),  # Small gap
-            html.Div(id="loading-output"),  # Text status box
-            html.Div([  # New row for progress indicator
-                dcc.Loading(
-                    id="loading-indicator",
-                    type="dot",
-                    children=[html.Div(style={"height": "50px"})]  # Increased height for visibility
-                ),
-            ], className="my-3"),  # Add margin for separation
-            html.Div(id='matrix-preview', className="border p-3 mb-3"),
-            html.Div(id="loading-output"),  # Text status box
+            html.Div(style={"height": "20px"}),  # Added small gap
             dcc.Loading(
                 id="loading-indicator",
                 type="dot",
-                children=[html.Div()]  # Empty div for the blinking dots
+                children=[html.Div(id="loading-output")]
             ),
             html.Div(id='matrix-preview', className="border p-3 mb-3"),
             dbc.Button("Download Matrix", id="btn-download", color="success", className="mt-3"),
             dcc.Download(id="download-matrix"),
             html.Hr(),
-            html.Div(style={"height": "20px"}),  # Small gap
+            html.Div(style={"height": "20px"}),  # Added small gap
             dcc.Loading(
                 id="chat-loading",
                 type="dot",
@@ -120,10 +100,7 @@ app.layout = dbc.Container([
                 ]
             )
         ], width=9)
-    ]),
-    html.Div(id='uploaded-files-state', style={'display': 'none'}),
-    dcc.Store(id='matrix-type-store'),
-    html.Div(id='matrix-button-clicks', style={'display': 'none'})
+    ])
 ], fluid=True)
 
 def parse_file_content(contents, filename):
@@ -157,17 +134,17 @@ def update_output(list_of_contents, list_of_names, existing_files):
     global uploaded_files
     if list_of_contents is not None:
         new_files = []
-        for content, name in zip(list_of_contents, list_of_names):
+        for i, (content, name) in enumerate(zip(list_of_contents, list_of_names)):
             file_content = parse_file_content(content, name)
             uploaded_files[name] = file_content
-            new_files.append(dbc.ListGroupItem([
-                dbc.Button("×", id={'type': 'remove-file', 'index': name}, 
-                           color="danger", size="sm", className="me-2"),
+            new_files.append(html.Div([
+                html.Button('×', id={'type': 'remove-file', 'index': name}, style={'marginRight': '5px', 'fontSize': '10px'}),
                 html.Span(name)
             ]))
-        existing_files = existing_files or []
+        if existing_files is None:
+            existing_files = []
         return existing_files + new_files
-    return existing_files or []
+    return existing_files
 
 @app.callback(
     Output('file-list', 'children', allow_duplicate=True),
@@ -180,25 +157,10 @@ def remove_file(n_clicks, existing_files):
     ctx = dash.callback_context
     if not ctx.triggered:
         raise PreventUpdate
-    
-    triggered_id = ctx.triggered[0]['prop_id']
-    removed_file = triggered_id.split('"index":')[1].split('}')[0].strip('"')
-    
+    removed_file = ctx.triggered[0]['prop_id'].split(',')[0].split(':')[-1].strip('}')
     uploaded_files.pop(removed_file, None)
-    
-    # Updated file filtering logic
-    return [
-        file for file in existing_files 
-        if isinstance(file, dict) and 
-           'props' in file and 
-           'children' in file['props'] and 
-           isinstance(file['props']['children'], list) and 
-           len(file['props']['children']) > 1 and 
-           isinstance(file['props']['children'][1], dict) and 
-           'children' in file['props']['children'][1] and 
-           file['props']['children'][1]['children'] != removed_file
-    ]
-    
+    return [file for file in existing_files if file['props']['children'][1]['props']['children'] != removed_file]
+
 def generate_matrix_with_gpt(matrix_type, file_contents):
     prompt = f"""Generate a {matrix_type} based on the following project artifacts:
 {' '.join(file_contents)}
@@ -237,40 +199,27 @@ Now, generate the {matrix_type}:
 
     return pd.DataFrame(data, columns=headers)
 
-@app.callback(
-    Output('uploaded-files-state', 'children'),
-    Input('file-list', 'children')
-)
-def update_uploaded_files_state(file_list):
-    global uploaded_files
-    return json.dumps(list(uploaded_files.keys()))
-
 @app.callback(
     Output('matrix-preview', 'children'),
     Output('loading-output', 'children'),
-    Input({'type': 'matrix-button', 'index': dash.ALL}, 'n_clicks'),
-    State('uploaded-files-state', 'children'),
+    [Input(f'btn-{matrix_type.lower().replace(" ", "-")}', 'n_clicks') for matrix_type in matrix_types.keys()],
     prevent_initial_call=True
 )
-def generate_matrix(n_clicks, uploaded_files_json):
+def generate_matrix(*args):
     global current_matrix, matrix_type
     ctx = dash.callback_context
     if not ctx.triggered:
         raise PreventUpdate
+    button_id = ctx.triggered[0]['prop_id'].split('.')[0]
+    matrix_type = button_id.replace('btn-', '').replace('-', ' ').title()
     
-    button_id = ctx.triggered[0]['prop_id']
-    matrix_type = json.loads(button_id.split('.')[0])['index']
-    
-    if not uploaded_files_json:
+    if not uploaded_files:
         return html.Div("Please upload project artifacts before generating a matrix."), ""
 
-    uploaded_files_list = json.loads(uploaded_files_json)
-    
-    if not uploaded_files_list:
-        return html.Div("Please upload project artifacts before generating a matrix."), ""
+    file_contents = list(uploaded_files.values())
     
     try:
-        current_matrix = generate_matrix_with_gpt(matrix_type, [uploaded_files[file] for file in uploaded_files_list])
+        current_matrix = generate_matrix_with_gpt(matrix_type, file_contents)
         return dbc.Table.from_dataframe(current_matrix, striped=True, bordered=True, hover=True), f"{matrix_type} generated"
     except Exception as e:
         print(f"Error generating matrix: {str(e)}")