Skip to content
Merged
7 changes: 0 additions & 7 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -1536,13 +1536,6 @@
"hashed_secret": "35be14614e83fe56d9b2ca1c0e2c2a74890b6889",
"is_verified": false,
"line_number": 255
},
{
"type": "Hex High Entropy String",
"filename": "src/backend/base/langflow/initial_setup/starter_projects/Knowledge Retrieval.json",
"hashed_secret": "199d0299098f4097fd8926648d9977fe2d08fb15",
"is_verified": false,
"line_number": 534
}
],
"src/backend/base/langflow/initial_setup/starter_projects/Market Research.json": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Register redirected submodules in sys.modules for direct importlib.import_module() calls
# This allows imports like: import langflow.components.knowledge_bases.ingestion
_redirected_submodules = {
"langflow.components.knowledge_bases.ingestion": "lfx.components.files_and_knowledge.ingestion",
# "langflow.components.knowledge_bases.ingestion": "lfx.components.files_and_knowledge.ingestion",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

NP: We can actually remove this rather than comment this out.

"langflow.components.knowledge_bases.retrieval": "lfx.components.files_and_knowledge.retrieval",
}

Expand Down Expand Up @@ -52,12 +52,6 @@ def __repr__(self) -> str:
def __getattr__(attr_name: str) -> Any:
"""Forward attribute access to lfx.components.files_and_knowledge."""
# Handle submodule access for backwards compatibility
if attr_name == "ingestion":
from importlib import import_module

result = import_module("lfx.components.files_and_knowledge.ingestion")
globals()[attr_name] = result
return result
if attr_name == "retrieval":
from importlib import import_module

Expand Down

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@

import pytest
from langflow.base.knowledge_bases.knowledge_base_utils import get_knowledge_bases
from lfx.components.knowledge_bases.retrieval import KnowledgeRetrievalComponent
from lfx.components.files_and_knowledge.retrieval import KnowledgeBaseComponent
from pydantic import SecretStr

from tests.base import ComponentTestBaseWithClient


class TestKnowledgeRetrievalComponent(ComponentTestBaseWithClient):
class TestKnowledgeBaseComponent(ComponentTestBaseWithClient):
@pytest.fixture
def component_class(self):
"""Return the component class to test."""
return KnowledgeRetrievalComponent
return KnowledgeBaseComponent

@pytest.fixture(autouse=True)
def mock_knowledge_base_path(self, tmp_path):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,7 @@ export function FlowSidebarComponent({ isLoading }: FlowSidebarComponentProps) {
return rawData;
}

const knowledgeComponentNames = [
"KnowledgeIngestion",
"KnowledgeRetrieval",
];
const knowledgeComponentNames = ["KnowledgeBase"];

// Create a deep copy to avoid mutating the original
const filteredData = cloneDeep(rawData);
Expand Down
870 changes: 245 additions & 625 deletions src/lfx/src/lfx/_assets/component_index.json

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions src/lfx/src/lfx/components/files_and_knowledge/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,21 @@
if TYPE_CHECKING:
from lfx.components.files_and_knowledge.directory import DirectoryComponent
from lfx.components.files_and_knowledge.file import FileComponent
from lfx.components.files_and_knowledge.ingestion import KnowledgeIngestionComponent
from lfx.components.files_and_knowledge.retrieval import KnowledgeRetrievalComponent
from lfx.components.files_and_knowledge.retrieval import KnowledgeBaseComponent
from lfx.components.files_and_knowledge.save_file import SaveToFileComponent


_dynamic_imports = {
"DirectoryComponent": "directory",
"FileComponent": "file",
"KnowledgeIngestionComponent": "ingestion",
"KnowledgeRetrievalComponent": "retrieval",
"KnowledgeBaseComponent": "retrieval",
"SaveToFileComponent": "save_file",
}

__all__ = [
"DirectoryComponent",
"FileComponent",
"KnowledgeIngestionComponent",
"KnowledgeRetrievalComponent",
"KnowledgeBaseComponent",
"SaveToFileComponent",
]

Expand Down
6 changes: 3 additions & 3 deletions src/lfx/src/lfx/components/files_and_knowledge/retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ def _get_knowledge_bases_root_path() -> Path:
return _KNOWLEDGE_BASES_ROOT_PATH


class KnowledgeRetrievalComponent(Component):
display_name = "Knowledge Retrieval"
class KnowledgeBaseComponent(Component):
display_name = "Knowledge Base"
description = "Search and retrieve data from knowledge."
icon = "download"
name = "KnowledgeRetrieval"
name = "KnowledgeBase"

inputs = [
DropdownInput(
Expand Down
17 changes: 4 additions & 13 deletions src/lfx/src/lfx/components/knowledge_bases/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,17 @@
from lfx.components._importing import import_mod

if TYPE_CHECKING:
from lfx.components.files_and_knowledge.ingestion import KnowledgeIngestionComponent
from lfx.components.files_and_knowledge.retrieval import KnowledgeRetrievalComponent
from lfx.components.files_and_knowledge.retrieval import KnowledgeBaseComponent

_dynamic_imports = {
"KnowledgeIngestionComponent": "ingestion",
"KnowledgeRetrievalComponent": "retrieval",
"KnowledgeBaseComponent": "retrieval",
}

__all__ = ["KnowledgeIngestionComponent", "KnowledgeRetrievalComponent"]
__all__ = ["KnowledgeBaseComponent"]

# Register redirected submodules in sys.modules for direct importlib.import_module() calls
# This allows imports like: import lfx.components.knowledge_bases.ingestion
# This allows imports like: import lfx.components.knowledge_bases.retrieval
_redirected_submodules = {
"lfx.components.knowledge_bases.ingestion": "lfx.components.files_and_knowledge.ingestion",
"lfx.components.knowledge_bases.retrieval": "lfx.components.files_and_knowledge.retrieval",
}

Expand Down Expand Up @@ -56,12 +53,6 @@ def __repr__(self) -> str:
def __getattr__(attr_name: str) -> Any:
"""Forward attribute access to files_and_knowledge components."""
# Handle submodule access for backwards compatibility
if attr_name == "ingestion":
from importlib import import_module

result = import_module("lfx.components.files_and_knowledge.ingestion")
globals()[attr_name] = result
return result
if attr_name == "retrieval":
from importlib import import_module

Expand Down
Loading