lionagi 0.0.316__py3-none-any.whl → 0.1.1__py3-none-any.whl

lionagi/integrations/loader/load.py

@@ -1,6 +1,6 @@
 from typing import Callable
 
-from lionagi.core.schema import DataNode
+from lionagi.core.generic import Node
 from ..bridge.langchain_.langchain_bridge import LangchainBridge
 from ..bridge.llamaindex_.llama_index_bridge import LlamaIndexBridge
 
@@ -9,14 +9,14 @@ from .load_util import dir_to_nodes, ReaderType, _datanode_parser
 
 def text_reader(args, kwargs):
     """
-    Reads text files from a directory and converts them to DataNode instances.
+    Reads text files from a directory and converts them to Node instances.
 
     Args:
         args: Positional arguments for the dir_to_nodes function.
         kwargs: Keyword arguments for the dir_to_nodes function.
 
     Returns:
-        A list of DataNode instances.
+        A list of Node instances.
 
     Example usage:
         >>> args = ['path/to/text/files']
@@ -96,7 +96,7 @@ def _plain_reader(reader, reader_args, reader_kwargs):
 def _langchain_reader(reader, reader_args, reader_kwargs, to_datanode: bool | Callable):
     nodes = LangchainBridge.langchain_loader(reader, reader_args, reader_kwargs)
     if isinstance(to_datanode, bool) and to_datanode is True:
-        nodes = [DataNode.from_langchain(i) for i in nodes]
+        nodes = [Node.from_langchain(i) for i in nodes]
 
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
@@ -115,7 +115,7 @@ def _llama_index_reader(
         reader, reader_args, reader_kwargs, load_args, load_kwargs
     )
     if isinstance(to_datanode, bool) and to_datanode is True:
-        nodes = [DataNode.from_llama_index(i) for i in nodes]
+        nodes = [Node.from_llama_index(i) for i in nodes]
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes
@@ -138,7 +138,7 @@ def _self_defined_reader(
         ) from e
 
     if isinstance(to_datanode, bool) and to_datanode is True:
-        raise ValueError("Please define a valid parser to DataNode.")
+        raise ValueError("Please define a valid parser to Node.")
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes

lionagi/integrations/loader/load_util.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import List, Union, Dict, Any, Tuple
 
 from lionagi.libs import convert, func_call
-from lionagi.core.schema import DataNode
+from lionagi.core.generic import Node
 
 
 class ReaderType(str, Enum):
@@ -62,11 +62,11 @@ def dir_to_nodes(
     recursive: bool = False,
     flatten: bool = True,
     clean_text: bool = True,
-) -> List[DataNode]:
+) -> List[Node]:
     """
-    Converts directory contents into DataNode objects based on specified file extensions.
+    Converts directory contents into Node objects based on specified file extensions.
 
-    This function first retrieves a list of file paths from the specified directory, matching the given file extension. It then reads the content of these files, optionally cleaning the text, and converts each file's content into a DataNode object.
+    This function first retrieves a list of file paths from the specified directory, matching the given file extension. It then reads the content of these files, optionally cleaning the text, and converts each file's content into a Node object.
 
     Parameters:
         dir (str): The directory path from which to read files.
@@ -76,17 +76,17 @@ def dir_to_nodes(
         clean_text (bool, optional): If True, cleans the text read from files. Defaults to True.
 
     Returns:
-        list: A list of DataNode objects created from the files in the specified directory.
+        list: A list of Node objects created from the files in the specified directory.
 
     Example:
         nodes = dir_to_nodes("/path/to/dir", ".txt", recursive=True)
         # This would read all .txt files in /path/to/dir and its subdirectories,
-        # converting them into DataNode objects.
+        # converting them into Node objects.
     """
 
     path_list = dir_to_path(dir, ext, recursive, flatten)
     files_info = func_call.lcall(path_list, read_text, clean=clean_text)
-    return func_call.lcall(files_info, lambda x: DataNode(content=x[0], metadata=x[1]))
+    return func_call.lcall(files_info, lambda x: Node(content=x[0], metadata=x[1]))
 
 
 def chunk_text(
@@ -263,4 +263,4 @@ def _datanode_parser(nodes, parser):
     try:
         return parser(nodes)
     except Exception as e:
-        raise ValueError(f"DataNode parser {parser} failed. Error:{e}") from e
+        raise ValueError(f"Node parser {parser} failed. Error:{e}") from e

lionagi/integrations/storage/__init__.py

@@ -0,0 +1,3 @@
+from lionagi.integrations.storage.neo4j import Neo4j
+
+__all__ = ["Neo4j"]