Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rayrayraykk committed Sep 18, 2024
1 parent f738287 commit 3b302ae
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/agentscope/message/msg.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(
self,
name: str,
content: Any,
role: Union[str, Literal["system", "user", "assistant"]],
role: Union[str, Literal["system", "user", "assistant"]] = "system",
url: Optional[Union[str, List[str]]] = None,
metadata: Optional[Union[dict, str]] = None,
echo: bool = False,
Expand Down
2 changes: 0 additions & 2 deletions src/agentscope/rag/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# -*- coding: utf-8 -*-
""" Import all pipeline related modules in the package. """
from .knowledge import Knowledge
from .llama_index_knowledge import LlamaIndexKnowledge
from .knowledge_bank import KnowledgeBank

__all__ = [
"Knowledge",
"LlamaIndexKnowledge",
"KnowledgeBank",
]
18 changes: 11 additions & 7 deletions src/agentscope/rag/knowledge_bank.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from typing import Optional, Union
from loguru import logger
from agentscope.agents import AgentBase
from .llama_index_knowledge import LlamaIndexKnowledge
from ..manager import ModelManager
from .knowledge import Knowledge

DEFAULT_INDEX_CONFIG = {
"knowledge_id": "",
Expand Down Expand Up @@ -49,7 +49,7 @@ def __init__(
self.configs = json.loads(fp.read())
else:
self.configs = configs
self.stored_knowledge: dict[str, LlamaIndexKnowledge] = {}
self.stored_knowledge: dict[str, Knowledge] = {}
self._init_knowledge()

def _init_knowledge(self) -> None:
Expand Down Expand Up @@ -104,6 +104,8 @@ def add_data_as_knowledge(
)
''
"""
from .llama_index_knowledge import LlamaIndexKnowledge

if knowledge_id in self.stored_knowledge:
raise ValueError(f"knowledge_id {knowledge_id} already exists.")

Expand All @@ -125,17 +127,19 @@ def add_data_as_knowledge(
knowledge_id=knowledge_id,
emb_model=model_manager.get_model_by_config_name(emb_model_name),
knowledge_config=knowledge_config,
model=model_manager.get_model_by_config_name(model_name)
if model_name
else None,
model=(
model_manager.get_model_by_config_name(model_name)
if model_name
else None
),
)
logger.info(f"data loaded for knowledge_id = {knowledge_id}.")

def get_knowledge(
self,
knowledge_id: str,
duplicate: bool = False,
) -> LlamaIndexKnowledge:
) -> Knowledge:
"""
Get a Knowledge object from the knowledge bank.
Args:
Expand All @@ -144,7 +148,7 @@ def get_knowledge(
duplicate (bool):
whether return a copy of the Knowledge object.
Returns:
LlamaIndexKnowledge:
Knowledge:
the Knowledge object defined with Llama-index
"""
if knowledge_id not in self.stored_knowledge:
Expand Down
3 changes: 2 additions & 1 deletion tests/knowledge_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import agentscope
from agentscope.manager import ASManager
from agentscope.rag import LlamaIndexKnowledge
from agentscope.models import OpenAIEmbeddingWrapper, ModelResponse


Expand Down Expand Up @@ -59,6 +58,8 @@ def tearDown(self) -> None:

def test_llamaindexknowledge(self) -> None:
"""test llamaindexknowledge"""
from agentscope.rag.llama_index_knowledge import LlamaIndexKnowledge

dummy_model = DummyModel()

knowledge_config = {
Expand Down

0 comments on commit 3b302ae

Please sign in to comment.