Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hsm207/ai-powered-search
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: treygrainger/ai-powered-search
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 102 files changed
  • 3 contributors

Commits on Jun 23, 2024

  1. Odds and ends (treygrainger#182)

    * Adds log4j2 configuration for solr 9.4.1. Cleans up non-existant solr ltr depdency in solr 9.4.1
    
    * - Ch9.18 updates print lines
    - Ch7: Removes Charolette business partner odd review
    - Removes notebook password
    
    ---------
    
    Co-authored-by: Daniel Crouch <dcrouch26@users.noreply.github.com>
    treygrainger and Daniel Crouch authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    5923a14 View commit details
    Browse the repository at this point in the history
  2. Hybrid Search + Rerank + Quantization (treygrainger#183)

    * hybrid search WIP + collection abstraction refactor
    
    * More WIP
    
    * Hybrid search functionally working. Need to move into collection and cleanup
    
    * hybrid_search and vector_search/search merge
    
    * Improvements to collection + hybrid search + dockerfile
    
    * Refactor lexical/vector/hybrid methods for reuse
    
    * Make hybrid_search take arbitrary queries, finish chapter examples/figures/data selection
    
    * Improve display styles and function modularity
    
    * Ch3: Quantization
    
    * Clean up notebook / styles
    
    * Fixes rerank param name
    
    * hybrid search refactor + solrcollection reranking
    
    * Move hybrid to Collection, revert to previous images (not posters), notebook cleanup
    
    * Remove old comment since 'self' already was removed
    
    ---------
    
    Co-authored-by: Daniel Crouch <dcrouch26@users.noreply.github.com>
    treygrainger and Daniel Crouch authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    1ff1880 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Revert sentence-transformers upgrade due to broken dependencies (ch13…

    … semantic search, for example)
    treygrainger authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    6148f7d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    53deccb View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Ch12 + Ch14 + LTR - Accurate, Consistent, Code Complete (treygrainger…

    …#175)
    
    * - changes .gitignore config file name
    - updates root readme to reference to engines readme
    - pushes products dataloader cleaning into product data file
    - Chapter 12 is now functional and aligned with the book's points
    - adds missing transformers images. Images still need to be moved to another repository
    - moves random document exploration out of Collection into LTR
    - SolrCollection to correctly rely on paraent search function
    - SolrEngine cleans product schema
    - LTR - implements exploration search function and moves collection into constructor
    - LTR - renames feature attribute being return on documents
    
    * - Ch12: All examples correct and in line with manuscript's examples
    - Ch12: Fixes bug with session exploration generation
    - Ch12: Removes scaling of judgment grades
    
    * Syncs ch10, ch12 and LTR code with manuscript requirements. Fixes small bugs in ch10 related to LTR refactor
    
    * Merges with hybrid_search, move enable_ltr function
    
    * Chapter 14:
     - Merges cpu and gpu 3rd notebook
     - optomizes 14.5 to run batch question searches
     - Refactors several functions
     - Refactors and corrects get_query_from_question
     - Tunes/fixes question answering examples
    
    * Ch14 small tweaks for manuscript update
    
    * - Verifies modified chapters
    - Fixes requirements broken from hybrid_search branch merge
    Daniel Crouch authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    d732095 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Configuration menu
    Copy the full SHA
    f18d1ba View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Updates, environment improvement, verification, organization, etc. (t…

    …reygrainger#186)
    
    * - All chapters verified, functional and consistent (See lingering issues)
    - Sets Jupyter to use environment home directory instead of notebook director for execution
    - Product Display: Updates templates\search-results.html product search result html rendering to have better spacing and image sizes
    - Adds missing product images that emerged from removing "\N"
    - SolrCollection Vector Search: De-normalize returned score to be accurate with Cos/Dot similarity
    --------------------------------------------
    - Ch5: Paramiterizes print_graph() to de-dup
    - Ch5: Remove old sections at end of SKG notebook
    - Ch6: Reduces listing complexity by extracting noisy print logic
    - Ch6: Tidys outputs and corrects organization of listings across cha
    - Ch6: Adds missing Listing 6.4 to notebook
    - Ch6: Refactors various spell check functions for specificity
    - Ch7: Further refactors SS functions
    - Ch7: Organizes and orders listings (and links/refs) from each notebook to be consistent with manuscript
    - Ch7: Fixes semantic function bug and get_enrichment NRE bug
    - Ch7: Adds Listing 7.14 Splade
    - Ch8: Minor formatting, typo correction and cell order
    - Ch9: Minor formatting, search result limit=10, and small refactorings
    - Ch10: Correctly uses LTR.enable_ltr (not engine.enable_ltr)
    - Ch11: Cell organization/labelling
    - Ch12: Locks numpy to 1.23.5 and adds Numpy seed for consistent session synthesis
    - Ch13: Cell organization, consistent result ranking, formatting, Fix 13.12 bug,
    - Ch13: De-normalize vector scores from engine vector search
    - Ch13: Tidy's cross-encoder code
    - Ch14: Minor formatting, path corrections
    ------------------------------------------
    Lingering issues:
    - Image path: Undo hack when image is rendered from HTML (not using Jupyter Home path, using Chapter path), Fix image renderings in Ch11
    - Ch7: Still needs fix for Iframe clearing 5 seconds after being rendered, verify semantic-search endpoint
    - Ch12: Still 2 squirelly results. 99% consistent otherwise
    - Ch13: 13.3 Amendum failing (Has been for some time?)
    
    * Finalizes cross encoder code
    Daniel Crouch authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    3a7a686 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Corrects engine readme link to be the relative path

    Daniel Crouch committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    570599a View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Corrects path for search result rendering. Path still needs to be set…

    … correctly in Jupyter kernel
    Daniel Crouch committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    ef7540c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Root directory fix for jupyter notebooks (treygrainger#189)

    * Properly sets root for notesbooks. --notebook-dir and .root_dir flags were not properly working
    
    * Fix remaining path issues
    
    * Uncomment data loading in 2.multimodal-and-hybrid-search.ipynb
    
    ---------
    
    Co-authored-by: Trey Grainger <code@treygrainger.com>
    Daniel Crouch and treygrainger authored Jul 31, 2024
    Configuration menu
    Copy the full SHA
    69e8dd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Listing updates and bug fixes (treygrainger#191)

    * - 4.7 - listing organization
    - skg.generate_request => skg.transform_request
    - Fixes Ch6 bugs
    - 15.18 listing organization
    
    * - Applies listing print standards to all chapters
    - Ch3. Updates print statements, organizes variable positioning
    - rerank_quantity => rerank_count
    - What happened to 10's feature calculater?
    - Finish rerank_query refactor
    - Chapter 11: Updates formatting of displaying data
    - SKG: {!${defType} ...}
    
    * SKG debug fix
    
    * Rework ch3 tf-idf calculations; sync with manuscript
    
    * Ch4, 5, 6: Listings and results synchronized
    
    * Ch7 and Ch8: Listings synced
    
    * Ch9 mostly consistent
    
    * Syncs listing 8.1
    
    * Ch10, Ch11 sync'd with manuscript and signed off
    
    * Ch8 sync, ch10 n => k
    
    * ch9: Correct, Deterministic, sync'd with manuscript, signing off
    
    * - ch12, 13, 14, and 15 finalized and sync with Manuscript
    
    Ch12 still has minor numeric variance.
    Ch14 still uses pre-computed model
    
    * replace -(-len(x) //  y) with math.ceil(len(x) / y) to improve readability (treygrainger#194)
    
    * Uncomment cached model loading (like in book) so Max can debug more easily
    
    * Formatting, organization, notes and small adjustments across codebase
    
    * Stubbed 7.14 to fix M.2 issue
    
    ---------
    
    Co-authored-by: Daniel Crouch <dcrouch26@users.noreply.github.com>
    treygrainger and Daniel Crouch authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    0cff592 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Update README.md

    fix link error
    flaxsearch authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    7728f02 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge pull request treygrainger#199 from flaxsearch/patch-1

    Update README.md - fixed bad link to aipoweredsearch.com
    Daniel Crouch authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    71c49d1 View commit details
    Browse the repository at this point in the history
Loading