Skip to content
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

Jump to bottom

Merge develop into master #384

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Merge develop into master #384

wants to merge 26 commits into from

Commits on Aug 2, 2024

  1. some changes

    @vipul-maheshwari
    vipul-maheshwari committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b048ea4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev/rag' into dev/proxy-server

    @vipul-maheshwari
    vipul-maheshwari committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    2e89d54 View commit details
    Browse the repository at this point in the history

  3. adding extra config schema in the LLM , missed

    @vipul-maheshwari
    vipul-maheshwari committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    431f324 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into dev/proxy-server

    @vipul-maheshwari
    vipul-maheshwari committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    4807bab View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. some minor fixes

    @vipul-maheshwari
    vipul-maheshwari committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    fd154ff View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. change llama_index_agent to knowledgebase agent

    @marmikcfc
    marmikcfc committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    7bb3487 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. refactor rag agent

    @marmikcfc
    marmikcfc committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    507cf06 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Merge branch 'dev/proxy-server' into develop

    @vipul-maheshwari
    vipul-maheshwari committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    5d29845 View commit details
    Browse the repository at this point in the history

  2. changes in quickstart_ingestion_server script

    @vipul-maheshwari
    vipul-maheshwari committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    3449352 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev/proxy-server' into develop

    @vipul-maheshwari
    vipul-maheshwari committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    6022691 View commit details
    Browse the repository at this point in the history

  4. some changes for LANCEDB rag

    @vipul-maheshwari
    vipul-maheshwari committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    6b2a7ba View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Revert "some changes for LANCEDB rag" 

    This reverts commit 6b2a7ba.
    @vipul-maheshwari
    vipul-maheshwari committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    962c658 View commit details
    Browse the repository at this point in the history

  2. Revert "Merge branch 'dev/proxy-server' into develop" 

    This reverts commit 6022691, reversing
changes made to 5d29845.
    @vipul-maheshwari
    vipul-maheshwari committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    5007c27 View commit details
    Browse the repository at this point in the history

  3. Revert "Merge branch 'dev/proxy-server' into develop" 

    This reverts commit 5d29845, reversing
changes made to 507cf06.
    @vipul-maheshwari
    vipul-maheshwari committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    20cd842 View commit details
    Browse the repository at this point in the history

  4. fixed some issues for RAG

    @vipul-maheshwari
    vipul-maheshwari committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    bd4a72a View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge dev/proxy-server into develop

    @vipul-maheshwari
    vipul-maheshwari committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c9c2f6b View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Update requirements.txt

    @marmikcfc
    marmikcfc authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e7333fa View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. rag is added with bolna package

    @vipul-maheshwari
    vipul-maheshwari committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1a15427 View commit details
    Browse the repository at this point in the history

  2. Union issue is resolved, uffff.

    @vipul-maheshwari
    vipul-maheshwari committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1d91ded View commit details
    Browse the repository at this point in the history

  3. changes

    @vipul-maheshwari
    vipul-maheshwari committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    7b0c338 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. RAG in local_setup

    @vipul-maheshwari
    vipul-maheshwari committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    e33c1ca View commit details
    Browse the repository at this point in the history

  2. changes

    @vipul-maheshwari
    vipul-maheshwari committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    33f8466 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. some changes in local setup for RAG

    @vipul-maheshwari
    vipul-maheshwari committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    4a94aad View commit details
    Browse the repository at this point in the history

  2. bring models up to speed with develop

    @marmikcfc
    marmikcfc committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    4673b4f View commit details
    Browse the repository at this point in the history

  3. merge with develop

    @marmikcfc
    marmikcfc committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    83f8271 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #386 from voxos-ai/master-bkp 

    Master bkp
    @marmikcfc
    marmikcfc authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    211f643 View commit details
    Browse the repository at this point in the history