Compare commits
3 Commits
12b453a14f
...
3c661b0024
Author | SHA1 | Date |
---|---|---|
|
3c661b0024 | |
|
bc66deb129 | |
|
9cb9d48466 |
|
@ -1,7 +1,13 @@
|
||||||
# Current Focus: Project Directory Reorganization, Testing, and Embedding Usage
|
# Current Focus: UI Bug Fixes, Project Directory Reorganization, and Embedding Usage
|
||||||
|
|
||||||
## Active Work
|
## Active Work
|
||||||
|
|
||||||
|
### UI Bug Fixes
|
||||||
|
- ✅ Fixed AttributeError in report generation progress callback
|
||||||
|
- ✅ Updated UI progress callback to use direct value assignment instead of update method
|
||||||
|
- ✅ Enhanced progress callback to use Gradio's built-in progress tracking mechanism for better UI updates during async operations
|
||||||
|
- ✅ Committed changes with message "Fix AttributeError in report progress callback by using direct value assignment instead of update method"
|
||||||
|
|
||||||
### Project Directory Reorganization
|
### Project Directory Reorganization
|
||||||
- ✅ Reorganized project directory structure for better maintainability
|
- ✅ Reorganized project directory structure for better maintainability
|
||||||
- ✅ Moved utility scripts to the `utils/` directory
|
- ✅ Moved utility scripts to the `utils/` directory
|
||||||
|
|
|
@ -1,5 +1,40 @@
|
||||||
# Session Log
|
# Session Log
|
||||||
|
|
||||||
|
## Session: 2025-03-17
|
||||||
|
|
||||||
|
### Overview
|
||||||
|
Fixed bugs in the UI progress callback mechanism for report generation and consolidated redundant progress indicators.
|
||||||
|
|
||||||
|
### Key Activities
|
||||||
|
1. Identified and fixed an AttributeError in the report generation progress callback:
|
||||||
|
- Diagnosed the issue: 'Textbox' object has no attribute 'update'
|
||||||
|
- Fixed by replacing `update(value=...)` method calls with direct value assignment (`component.value = ...`)
|
||||||
|
- Committed changes with message "Fix AttributeError in report progress callback by using direct value assignment instead of update method"
|
||||||
|
- Updated memory bank documentation with the fix details
|
||||||
|
|
||||||
|
2. Enhanced the progress indicator to ensure UI updates during async operations:
|
||||||
|
- Identified that the progress indicator wasn't updating in real-time despite fixing the AttributeError
|
||||||
|
- Implemented a solution using Gradio's built-in progress tracking mechanism
|
||||||
|
- Added `progress(current_progress, desc=status_message)` to leverage Gradio's internal update mechanisms
|
||||||
|
- Tested the solution to confirm progress indicators now update properly during report generation
|
||||||
|
|
||||||
|
3. Consolidated redundant progress indicators in the UI:
|
||||||
|
- Identified three separate progress indicators in the UI (Progress Status textbox, progress slider, and built-in Gradio progress bar)
|
||||||
|
- Removed the redundant Progress Status textbox and progress slider components
|
||||||
|
- Simplified the UI to use only Gradio's built-in progress tracking mechanism
|
||||||
|
- Updated the progress callback to work exclusively with the built-in progress mechanism
|
||||||
|
- Tested the changes to ensure a cleaner, more consistent user experience
|
||||||
|
|
||||||
|
### Insights
|
||||||
|
- Gradio Textbox and Slider components use direct value assignment for updates rather than an update method
|
||||||
|
- Asynchronous operations in Gradio require special handling to ensure UI elements update in real-time
|
||||||
|
- Using Gradio's built-in progress tracking mechanism is more effective than manual UI updates for async tasks
|
||||||
|
- The progress callback mechanism is critical for providing user feedback during long-running report generation tasks
|
||||||
|
- Proper error handling in UI callbacks is essential for a smooth user experience
|
||||||
|
- Simplifying the UI by removing redundant progress indicators improves user experience and reduces confusion
|
||||||
|
- Consolidating to a single progress indicator ensures consistent feedback and reduces code complexity
|
||||||
|
|
||||||
|
|
||||||
## Session: 2025-02-27
|
## Session: 2025-02-27
|
||||||
|
|
||||||
### Overview
|
### Overview
|
||||||
|
|
|
@ -40,6 +40,10 @@ class GradioInterface:
|
||||||
|
|
||||||
# The report generator will be initialized in the async init method
|
# The report generator will be initialized in the async init method
|
||||||
self.report_generator = None
|
self.report_generator = None
|
||||||
|
|
||||||
|
# Progress tracking elements (will be set in create_interface)
|
||||||
|
self.report_progress = None
|
||||||
|
self.report_progress_bar = None
|
||||||
|
|
||||||
async def async_init(self):
|
async def async_init(self):
|
||||||
"""Asynchronously initialize components that require async initialization."""
|
"""Asynchronously initialize components that require async initialization."""
|
||||||
|
@ -185,7 +189,8 @@ class GradioInterface:
|
||||||
return markdown
|
return markdown
|
||||||
|
|
||||||
async def generate_report(self, query, detail_level="standard", query_type="auto-detect", custom_model=None,
|
async def generate_report(self, query, detail_level="standard", query_type="auto-detect", custom_model=None,
|
||||||
results_file=None, process_thinking_tags=False, progress=gr.Progress()):
|
results_file=None, process_thinking_tags=False, initial_results=10, final_results=7,
|
||||||
|
progress=gr.Progress()):
|
||||||
"""
|
"""
|
||||||
Generate a report for the given query.
|
Generate a report for the given query.
|
||||||
|
|
||||||
|
@ -219,6 +224,14 @@ class GradioInterface:
|
||||||
# Get detail level configuration
|
# Get detail level configuration
|
||||||
config = self.detail_level_manager.get_detail_level_config(detail_level)
|
config = self.detail_level_manager.get_detail_level_config(detail_level)
|
||||||
|
|
||||||
|
# Override num_results if provided
|
||||||
|
if initial_results:
|
||||||
|
config["initial_results_per_engine"] = initial_results
|
||||||
|
|
||||||
|
# Set final results after reranking if provided
|
||||||
|
if final_results:
|
||||||
|
config["final_results_after_reranking"] = final_results
|
||||||
|
|
||||||
# If custom model is provided, use it
|
# If custom model is provided, use it
|
||||||
if custom_model:
|
if custom_model:
|
||||||
config["model"] = custom_model
|
config["model"] = custom_model
|
||||||
|
@ -257,9 +270,11 @@ class GradioInterface:
|
||||||
)
|
)
|
||||||
|
|
||||||
# Execute the search with the structured query
|
# Execute the search with the structured query
|
||||||
|
# Use initial_results_per_engine if available, otherwise fall back to num_results
|
||||||
|
num_results_to_fetch = config.get("initial_results_per_engine", config.get("num_results", 10))
|
||||||
search_results_dict = self.search_executor.execute_search(
|
search_results_dict = self.search_executor.execute_search(
|
||||||
structured_query,
|
structured_query,
|
||||||
num_results=config["num_results"]
|
num_results=num_results_to_fetch
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add debug logging
|
# Add debug logging
|
||||||
|
@ -324,28 +339,55 @@ class GradioInterface:
|
||||||
|
|
||||||
# Rerank results if we have a reranker
|
# Rerank results if we have a reranker
|
||||||
if hasattr(self, 'reranker') and self.reranker:
|
if hasattr(self, 'reranker') and self.reranker:
|
||||||
|
# Use final_results_after_reranking if available, otherwise fall back to num_results
|
||||||
|
top_n_results = config.get("final_results_after_reranking", config.get("num_results", 7))
|
||||||
search_results = self.reranker.rerank_with_metadata(
|
search_results = self.reranker.rerank_with_metadata(
|
||||||
query,
|
query,
|
||||||
search_results,
|
search_results,
|
||||||
document_key='snippet',
|
document_key='snippet',
|
||||||
top_n=config["num_results"]
|
top_n=top_n_results
|
||||||
)
|
)
|
||||||
|
|
||||||
# Set up progress tracking
|
# Set up progress tracking
|
||||||
self.progress_status = "Preparing documents..."
|
|
||||||
self.progress_value = 0
|
|
||||||
self.progress_total = 1 # Will be updated when we know the total chunks
|
|
||||||
|
|
||||||
# Define progress callback function
|
# Define progress callback function
|
||||||
def progress_callback(current_progress, total_chunks, current_report):
|
def progress_callback(current_progress, total_chunks, current_report):
|
||||||
self.progress_value = current_progress
|
# Calculate current chunk number
|
||||||
self.progress_total = total_chunks
|
current_chunk = int(current_progress * total_chunks) if total_chunks > 0 else 0
|
||||||
# Update the progress bar
|
|
||||||
progress(current_progress)
|
# Determine the status message based on progress
|
||||||
|
if current_progress == 0:
|
||||||
|
status_message = "Preparing documents..."
|
||||||
|
elif current_progress >= 1.0:
|
||||||
|
status_message = "Finalizing report..."
|
||||||
|
else:
|
||||||
|
status_message = f"Processing chunk {current_chunk}/{total_chunks}..."
|
||||||
|
|
||||||
|
# Add current chunk title if available
|
||||||
|
if hasattr(self.report_generator, 'current_chunk_title'):
|
||||||
|
chunk_title = self.report_generator.current_chunk_title
|
||||||
|
if chunk_title:
|
||||||
|
status_message += f" ({chunk_title})"
|
||||||
|
|
||||||
|
# Update the progress status directly
|
||||||
|
return status_message
|
||||||
|
|
||||||
# Set the progress callback for the report generator
|
# Set the progress callback for the report generator
|
||||||
if hasattr(self.report_generator, 'set_progress_callback'):
|
if hasattr(self.report_generator, 'set_progress_callback'):
|
||||||
self.report_generator.set_progress_callback(progress_callback)
|
# Create a wrapper function that updates the UI elements
|
||||||
|
def ui_progress_callback(current_progress, total_chunks, current_report):
|
||||||
|
status_message = progress_callback(current_progress, total_chunks, current_report)
|
||||||
|
|
||||||
|
# Use Gradio's built-in progress tracking mechanism
|
||||||
|
# This will properly update the UI during async operations
|
||||||
|
progress(current_progress, desc=status_message)
|
||||||
|
|
||||||
|
# Also update our custom UI elements
|
||||||
|
self.report_progress.value = status_message
|
||||||
|
self.report_progress_bar.value = int(current_progress * 100)
|
||||||
|
|
||||||
|
return status_message
|
||||||
|
|
||||||
|
self.report_generator.set_progress_callback(ui_progress_callback)
|
||||||
|
|
||||||
# Generate the report
|
# Generate the report
|
||||||
print(f"Generating report with {len(search_results)} search results")
|
print(f"Generating report with {len(search_results)} search results")
|
||||||
|
@ -358,8 +400,9 @@ class GradioInterface:
|
||||||
else:
|
else:
|
||||||
self.progress_status = "Processing document chunks..."
|
self.progress_status = "Processing document chunks..."
|
||||||
|
|
||||||
# Initial progress update
|
# Set up initial progress state
|
||||||
progress(0)
|
self.report_progress.value = "Preparing documents..."
|
||||||
|
self.report_progress_bar.value = 0
|
||||||
|
|
||||||
# Handle query_type parameter
|
# Handle query_type parameter
|
||||||
actual_query_type = None
|
actual_query_type = None
|
||||||
|
@ -556,7 +599,7 @@ class GradioInterface:
|
||||||
info="Controls the depth and breadth of the report"
|
info="Controls the depth and breadth of the report"
|
||||||
)
|
)
|
||||||
report_query_type = gr.Dropdown(
|
report_query_type = gr.Dropdown(
|
||||||
choices=["auto-detect", "factual", "exploratory", "comparative"],
|
choices=["auto-detect", "factual", "exploratory", "comparative", "code"],
|
||||||
value="auto-detect",
|
value="auto-detect",
|
||||||
label="Query Type",
|
label="Query Type",
|
||||||
info="Type of query determines the report structure"
|
info="Type of query determines the report structure"
|
||||||
|
@ -568,12 +611,63 @@ class GradioInterface:
|
||||||
label="Custom Model (Optional)",
|
label="Custom Model (Optional)",
|
||||||
info="Select a custom model for report generation"
|
info="Select a custom model for report generation"
|
||||||
)
|
)
|
||||||
report_process_thinking = gr.Checkbox(
|
|
||||||
label="Process Thinking Tags",
|
with gr.Row():
|
||||||
value=False,
|
with gr.Column():
|
||||||
info="Process <thinking> tags in model output"
|
gr.Markdown("### Advanced Settings")
|
||||||
|
|
||||||
|
with gr.Row():
|
||||||
|
with gr.Column():
|
||||||
|
with gr.Accordion("Search Parameters", open=False):
|
||||||
|
with gr.Row():
|
||||||
|
initial_results_slider = gr.Slider(
|
||||||
|
minimum=5,
|
||||||
|
maximum=50,
|
||||||
|
value=10,
|
||||||
|
step=5,
|
||||||
|
label="Initial Results Per Engine",
|
||||||
|
info="Number of results to fetch from each search engine"
|
||||||
|
)
|
||||||
|
final_results_slider = gr.Slider(
|
||||||
|
minimum=3,
|
||||||
|
maximum=30,
|
||||||
|
value=7,
|
||||||
|
step=1,
|
||||||
|
label="Final Results After Reranking",
|
||||||
|
info="Number of results to keep after reranking"
|
||||||
|
)
|
||||||
|
|
||||||
|
with gr.Accordion("Processing Options", open=False):
|
||||||
|
with gr.Row():
|
||||||
|
report_process_thinking = gr.Checkbox(
|
||||||
|
label="Process Thinking Tags",
|
||||||
|
value=False,
|
||||||
|
info="Process <thinking> tags in model output"
|
||||||
|
)
|
||||||
|
|
||||||
|
with gr.Row():
|
||||||
|
report_button = gr.Button("Generate Report", variant="primary", size="lg")
|
||||||
|
|
||||||
|
with gr.Row():
|
||||||
|
with gr.Column():
|
||||||
|
# Progress indicator that will be updated by the progress callback
|
||||||
|
self.report_progress = gr.Textbox(
|
||||||
|
label="Progress Status",
|
||||||
|
value="Ready",
|
||||||
|
interactive=False
|
||||||
|
)
|
||||||
|
|
||||||
|
with gr.Row():
|
||||||
|
with gr.Column():
|
||||||
|
# Progress bar to show visual progress
|
||||||
|
self.report_progress_bar = gr.Slider(
|
||||||
|
minimum=0,
|
||||||
|
maximum=100,
|
||||||
|
value=0,
|
||||||
|
step=1,
|
||||||
|
label="Progress",
|
||||||
|
interactive=False
|
||||||
)
|
)
|
||||||
report_button = gr.Button("Generate Report", variant="primary")
|
|
||||||
|
|
||||||
gr.Examples(
|
gr.Examples(
|
||||||
examples=[
|
examples=[
|
||||||
|
@ -609,6 +703,7 @@ class GradioInterface:
|
||||||
- **factual**: For queries seeking specific information (e.g., "What is...", "How does...")
|
- **factual**: For queries seeking specific information (e.g., "What is...", "How does...")
|
||||||
- **exploratory**: For queries investigating a topic broadly (e.g., "Tell me about...")
|
- **exploratory**: For queries investigating a topic broadly (e.g., "Tell me about...")
|
||||||
- **comparative**: For queries comparing multiple items (e.g., "Compare X and Y", "Differences between...")
|
- **comparative**: For queries comparing multiple items (e.g., "Compare X and Y", "Differences between...")
|
||||||
|
- **code**: For queries related to programming, software development, or technical implementation
|
||||||
"""
|
"""
|
||||||
|
|
||||||
gr.Markdown(f"### Detail Levels\n{detail_levels_info}")
|
gr.Markdown(f"### Detail Levels\n{detail_levels_info}")
|
||||||
|
@ -621,10 +716,25 @@ class GradioInterface:
|
||||||
outputs=[search_results_output, search_file_output]
|
outputs=[search_results_output, search_file_output]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Connect the progress callback to the report button
|
||||||
|
def update_progress_display(progress_value, status_message):
|
||||||
|
percentage = int(progress_value * 100)
|
||||||
|
return status_message, percentage
|
||||||
|
|
||||||
|
# Update the progress tracking in the generate_report method
|
||||||
|
async def generate_report_with_progress(query, detail_level, query_type, model_name, rerank, token_budget, initial_results, final_results):
|
||||||
|
# Set up progress tracking
|
||||||
|
progress_data = gr.Progress(track_tqdm=True)
|
||||||
|
|
||||||
|
# Call the original generate_report method
|
||||||
|
result = await self.generate_report(query, detail_level, query_type, model_name, rerank, token_budget, initial_results, final_results)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
report_button.click(
|
report_button.click(
|
||||||
fn=lambda q, d, t, m, r, p: asyncio.run(self.generate_report(q, d, t, m, r, p)),
|
fn=lambda q, d, t, m, r, p, i, f: asyncio.run(generate_report_with_progress(q, d, t, m, r, p, i, f)),
|
||||||
inputs=[report_query_input, report_detail_level, report_query_type, report_custom_model,
|
inputs=[report_query_input, report_detail_level, report_query_type, report_custom_model,
|
||||||
search_file_output, report_process_thinking],
|
search_file_output, report_process_thinking, initial_results_slider, final_results_slider],
|
||||||
outputs=[report_output, report_file_output]
|
outputs=[report_output, report_file_output]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue