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.

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

Reformat and improve RAG module and agents #184

Merged
merged 101 commits into from
Jun 12, 2024

Conversation

ZiTao-Li
Copy link
Collaborator

@ZiTao-Li ZiTao-Li commented Apr 28, 2024

Description

Updates

Changes on code structure

  • migrate and reformat RAG/knowledge module(s) and RAG agent(s) from examples to a module in src
  • add llama-index as rag_requires in setup.py

Changes on the RAG agent module

  • be compatible with the new KnowledgeBank feature
  • the configurations for the RAG-related functionalities are relocated back to knowledge modules
  • the retrieve method merges the retrievers from the KnowledgeBank members

Changes on the RAG/knowledge module

  • Rename the RAG modules to Knowledge (e.g., LlamaIndexRAG -> LlamaIndexKnowledge)
  • store and persist processed embeddings/indices/documents
  • support loading multiple doc types and dirs for one index
  • support docs management in the obtained (persisted) index
  • add a refresh function to update the index when needed
  • enable agents to reset or add new retrievers

Improving utility of knowledge module

  • reformat easy-to-use knowledge module config: the new format only configure the KnowledgeBank
  • introduce KnowledgeBank:
    • KnowledgeBank provides an easier way to initialize a knowledge object, just call add_data_as_knowledge with knowledge_id (a string as the identifier for this knowledge object), emb_model_name (the name of the embedding model config) and data_dirs_and_types (a dictionary of data directories and the wanted file extensions). As shown in the rag_example.py
       knowledge_bank.add_data_as_knowledge(
          knowledge_id="agentscope_tutorial_rag",
          emb_model_name="qwen_emb_config",
          data_dirs_and_types={
              "../../docs/sphinx_doc/en/source/tutorial": [".md"],
          },
      )
      
    • Knowledge objects in KnowledgeBank can be shared and duplicated by multiple agents, which can avoid embedding duplicated documents.
    • RAG agents can load multiple Knowledge objects (based on the "knowledge_id" in knowledge_config.json) with associated retrievers to perform multi-source information retrieval. Just need to pass the agent into KnowledgeBank.equip function.

Toturial

Both English and Chinese tutorial are added as 209-rag.md .


Checklist

Please check the following items before code is ready to be reviewed.

  • Code has passed all tests
  • Docstrings have been added/updated in Google Style
  • Documentation has been updated
  • Code is ready for review

update as comments suggest (for docs)
Copy link
Collaborator

@garyzhang99 garyzhang99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the inline comments.

docs/sphinx_doc/zh_CN/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
src/agentscope/rag/llama_index_knowledge.py Outdated Show resolved Hide resolved
src/agentscope/rag/llama_index_knowledge.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@pan-x-c pan-x-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the inline comments.

The current version of rag is not compatible with distributed mode. We can add support in future PRs

src/agentscope/rag/knowledge.py Outdated Show resolved Hide resolved
src/agentscope/agents/rag_agents.py Outdated Show resolved Hide resolved
src/agentscope/agents/rag_agents.py Outdated Show resolved Hide resolved
src/agentscope/rag/knowledge_bank.py Outdated Show resolved Hide resolved
ZiTao-Li and others added 4 commits May 22, 2024 19:05
…s used in previous versions, but no longer needed.
# Conflicts:
#	examples/conversation_with_RAG_agents/README.md
Copy link
Collaborator

@DavdGao DavdGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please see inline comments

docs/sphinx_doc/zh_CN/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
docs/sphinx_doc/zh_CN/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
examples/conversation_with_RAG_agents/README.md Outdated Show resolved Hide resolved
examples/conversation_with_RAG_agents/README.md Outdated Show resolved Hide resolved
docs/sphinx_doc/zh_CN/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
docs/sphinx_doc/zh_CN/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@DavdGao DavdGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz see inline comments

docs/sphinx_doc/en/source/tutorial/209-rag.md Outdated Show resolved Hide resolved
src/agentscope/agents/rag_agents.py Outdated Show resolved Hide resolved
@DavdGao
Copy link
Collaborator

DavdGao commented Jun 9, 2024

The ImportError of LlamaIndex library is still exposed to users who don't use RAG module.

Copy link
Collaborator

@DavdGao DavdGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DavdGao DavdGao merged commit a29c0bc into modelscope:main Jun 12, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants