Feature/retrieval optimization#51
Open
farshad68 wants to merge 12 commits into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hey, I've resolved the merge conflicts between the optimization and the retrieval_optimization branch. Could you review the changes and verify your feature functionality remains intact?
Here is a summary of how the conflicts were handled:
Pipeline Execution (Main): I kept your old_loaders.json_loader ingestion logic, but I rejected the commented-out search and generation blocks. The active asyncio search and generation logic from the baseline is retained.
Search Logging & Dependency Injection (search.py):
I kept your profilingLogger additions and the user_config/opt_config dependency injections in search_authorized (critical for the optimizer).
Ingestion ETA (ingestion.py): I completely accepted your progress bar, batch tracking, and perf_counter logic.
Dataset Loading (tools.py): I rejected the custom pandas CSVDataset wrapper because it hardcoded paths. Instead, I kept the native HuggingFace datasets.load_dataset logic, but I added your sep=';' argument to ensure your specific European CSV formats still parse correctly.
SMAC Optimizer Fix (retrieval_optimization.py): Your optimization script was crashing with a RuntimeError because the tight ForbiddenAndConjunction rules caused SMAC to discard all random initial configurations. I added an initial_design injection to force SMAC to evaluate the default config so it can always start successfully.
Please pull the latest branch, run a test optimization, and let me know if the logging or CSV ingestion behaves as you expect.