Skip to content

Commit 0de5f1d

Browse files
ZhuochengZhang98ZhuochengZhang98
committed
[REFACTOR] Unify names of flexrag modules
1 parent 14bd0bf commit 0de5f1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+26
-26
lines changed

‎src/flexrag/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from .assistant import ASSISTANTS
1+
from .assistants import ASSISTANTS
22
from .common import __VERSION__
33
from .models import ENCODERS, GENERATORS
44
from .ranker import RANKERS
5-
from .retriever import RETRIEVERS
5+
from .retrievers import RETRIEVERS
66

77
__all__ = [
88
"RETRIEVERS",

src/flexrag/assistant/__init__.py renamed to src/flexrag/assistants/__init__.py

File renamed without changes.

src/flexrag/assistant/assistant.py renamed to src/flexrag/assistants/assistant.py

File renamed without changes.

src/flexrag/assistant/chatqa_assistant.py renamed to src/flexrag/assistants/chatqa_assistant.py

File renamed without changes.

src/flexrag/assistant/document_chat_assistant.py renamed to src/flexrag/assistants/document_chat_assistant.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from flexrag.common import LOGGER_MANAGER, ChatMessages, ChatTurn, configure
22
from flexrag.models import GENERATORS, GenerationConfig, GeneratorConfig
3-
from flexrag.preprocessing.chunking import CHUNKERS, ChunkerConfig
4-
from flexrag.preprocessing.document_parser import DOCUMENTPARSERS, DocumentParserConfig
3+
from flexrag.processors.chunkers import CHUNKERS, ChunkerConfig
4+
from flexrag.processors.document_parsers import DOCUMENTPARSERS, DocumentParserConfig
55
from flexrag.ranker import RANKERS, RankerConfig
6-
from flexrag.retriever import FlexRetriever, FlexRetrieverConfig
6+
from flexrag.retrievers import FlexRetriever, FlexRetrieverConfig
77

88
from .assistant import ASSISTANTS, AssistantBase, AssistantResponse
99

src/flexrag/assistant/modular_rag_assistant.py renamed to src/flexrag/assistants/modular_rag_assistant.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from flexrag.context_refine import REFINERS, RefinerConfig
77
from flexrag.models import GENERATORS, GenerationConfig, GeneratorConfig
88
from flexrag.ranker import RANKERS, RankerConfig
9-
from flexrag.retriever import RETRIEVERS, RetrieverConfig
9+
from flexrag.retrievers import RETRIEVERS, RetrieverConfig
1010

1111
from .assistant import ASSISTANTS, AssistantBase, AssistantResponse
1212

src/flexrag/assistant/online_assistant.py renamed to src/flexrag/assistants/online_assistant.py

File renamed without changes.

‎src/flexrag/datasets/corpora/corpus_dataset.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from flexrag.common import LOGGER_MANAGER
99
from flexrag.common.dataclasses import Context
10-
from flexrag.preprocessing.text_processor import TextProcessPipeline
10+
from flexrag.processors.text_processors import TextProcessPipeline
1111

1212
from ..dataset import IterableDataset, MappingDataset
1313
from ..reader import LineDelimitedReader

‎src/flexrag/entrypoints/add_index.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from hydra.core.config_store import ConfigStore
55

66
from flexrag.common import configure, extract_config
7-
from flexrag.retriever import FlexRetriever
8-
from flexrag.retriever.index import MultiFieldIndexConfig, RetrieverIndexConfig
7+
from flexrag.retrievers import FlexRetriever
8+
from flexrag.retrievers.index import MultiFieldIndexConfig, RetrieverIndexConfig
99

1010

1111
@configure

‎src/flexrag/entrypoints/cache.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from hydra.core.config_store import ConfigStore
66

77
from flexrag.common import Choices, configure, extract_config
8-
from flexrag.retriever.retriever_base import RETRIEVAL_CACHE
8+
from flexrag.retrievers.retriever_base import RETRIEVAL_CACHE
99

1010

1111
@configure

0 commit comments

Comments
 (0)