Remove namespace_prefix
This commit is contained in:
parent
6c75bcbaae
commit
1b2d295a4f
2 changed files with 9 additions and 30 deletions
|
|
@ -51,7 +51,7 @@ from .base import (
|
||||||
StoragesStatus,
|
StoragesStatus,
|
||||||
DeletionResult,
|
DeletionResult,
|
||||||
)
|
)
|
||||||
from .namespace import NameSpace, make_namespace
|
from .namespace import NameSpace
|
||||||
from .operate import (
|
from .operate import (
|
||||||
chunking_by_token_size,
|
chunking_by_token_size,
|
||||||
extract_entities,
|
extract_entities,
|
||||||
|
|
@ -242,9 +242,6 @@ class LightRAG:
|
||||||
vector_db_storage_cls_kwargs: dict[str, Any] = field(default_factory=dict)
|
vector_db_storage_cls_kwargs: dict[str, Any] = field(default_factory=dict)
|
||||||
"""Additional parameters for vector database storage."""
|
"""Additional parameters for vector database storage."""
|
||||||
|
|
||||||
# TODO:deprecated, remove in the future, use WORKSPACE instead
|
|
||||||
namespace_prefix: str = field(default="")
|
|
||||||
"""Prefix for namespacing stored data across different environments."""
|
|
||||||
|
|
||||||
enable_llm_cache: bool = field(default=True)
|
enable_llm_cache: bool = field(default=True)
|
||||||
"""Enables caching for LLM responses to avoid redundant computations."""
|
"""Enables caching for LLM responses to avoid redundant computations."""
|
||||||
|
|
@ -382,9 +379,7 @@ class LightRAG:
|
||||||
self.doc_status_storage_cls = self._get_storage_class(self.doc_status_storage)
|
self.doc_status_storage_cls = self._get_storage_class(self.doc_status_storage)
|
||||||
|
|
||||||
self.llm_response_cache: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
self.llm_response_cache: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.KV_STORE_LLM_RESPONSE_CACHE,
|
||||||
self.namespace_prefix, NameSpace.KV_STORE_LLM_RESPONSE_CACHE
|
|
||||||
),
|
|
||||||
global_config=asdict(
|
global_config=asdict(
|
||||||
self
|
self
|
||||||
), # Add global_config to ensure cache works properly
|
), # Add global_config to ensure cache works properly
|
||||||
|
|
@ -392,51 +387,39 @@ class LightRAG:
|
||||||
)
|
)
|
||||||
|
|
||||||
self.full_docs: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
self.full_docs: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.KV_STORE_FULL_DOCS,
|
||||||
self.namespace_prefix, NameSpace.KV_STORE_FULL_DOCS
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.text_chunks: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
self.text_chunks: BaseKVStorage = self.key_string_value_json_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.KV_STORE_TEXT_CHUNKS,
|
||||||
self.namespace_prefix, NameSpace.KV_STORE_TEXT_CHUNKS
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.chunk_entity_relation_graph: BaseGraphStorage = self.graph_storage_cls( # type: ignore
|
self.chunk_entity_relation_graph: BaseGraphStorage = self.graph_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.GRAPH_STORE_CHUNK_ENTITY_RELATION,
|
||||||
self.namespace_prefix, NameSpace.GRAPH_STORE_CHUNK_ENTITY_RELATION
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.entities_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
self.entities_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.VECTOR_STORE_ENTITIES,
|
||||||
self.namespace_prefix, NameSpace.VECTOR_STORE_ENTITIES
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
meta_fields={"entity_name", "source_id", "content", "file_path"},
|
meta_fields={"entity_name", "source_id", "content", "file_path"},
|
||||||
)
|
)
|
||||||
self.relationships_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
self.relationships_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.VECTOR_STORE_RELATIONSHIPS,
|
||||||
self.namespace_prefix, NameSpace.VECTOR_STORE_RELATIONSHIPS
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
meta_fields={"src_id", "tgt_id", "source_id", "content", "file_path"},
|
meta_fields={"src_id", "tgt_id", "source_id", "content", "file_path"},
|
||||||
)
|
)
|
||||||
self.chunks_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
self.chunks_vdb: BaseVectorStorage = self.vector_db_storage_cls( # type: ignore
|
||||||
namespace=make_namespace(
|
namespace=NameSpace.VECTOR_STORE_CHUNKS,
|
||||||
self.namespace_prefix, NameSpace.VECTOR_STORE_CHUNKS
|
|
||||||
),
|
|
||||||
embedding_func=self.embedding_func,
|
embedding_func=self.embedding_func,
|
||||||
meta_fields={"full_doc_id", "content", "file_path"},
|
meta_fields={"full_doc_id", "content", "file_path"},
|
||||||
)
|
)
|
||||||
|
|
||||||
# Initialize document status storage
|
# Initialize document status storage
|
||||||
self.doc_status: DocStatusStorage = self.doc_status_storage_cls(
|
self.doc_status: DocStatusStorage = self.doc_status_storage_cls(
|
||||||
namespace=make_namespace(self.namespace_prefix, NameSpace.DOC_STATUS),
|
namespace=NameSpace.DOC_STATUS,
|
||||||
global_config=global_config,
|
global_config=global_config,
|
||||||
embedding_func=None,
|
embedding_func=None,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,6 @@ class NameSpace:
|
||||||
DOC_STATUS = "doc_status"
|
DOC_STATUS = "doc_status"
|
||||||
|
|
||||||
|
|
||||||
def make_namespace(prefix: str, base_namespace: str):
|
|
||||||
return prefix + base_namespace
|
|
||||||
|
|
||||||
|
|
||||||
def is_namespace(namespace: str, base_namespace: str | Iterable[str]):
|
def is_namespace(namespace: str, base_namespace: str | Iterable[str]):
|
||||||
if isinstance(base_namespace, str):
|
if isinstance(base_namespace, str):
|
||||||
return namespace.endswith(base_namespace)
|
return namespace.endswith(base_namespace)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue