From 4710635863e18bb1fe6bc8a1f04809e5398ea72e Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Thu, 16 Nov 2023 13:49:49 +0200 Subject: [PATCH 1/5] add support for password and username --- libs/langchain/langchain/graphs/falkordb_graph.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/langchain/langchain/graphs/falkordb_graph.py b/libs/langchain/langchain/graphs/falkordb_graph.py index 9829dac345b59..5aeb444a5b825 100644 --- a/libs/langchain/langchain/graphs/falkordb_graph.py +++ b/libs/langchain/langchain/graphs/falkordb_graph.py @@ -48,7 +48,8 @@ class FalkorDBGraph(GraphStore): """ def __init__( - self, database: str, host: str = "localhost", port: int = 6379 + self, database: str, host: str = "localhost", port: int = 6379, + username=None, password=None, ssl=False ) -> None: """Create a new FalkorDB graph wrapper instance.""" try: @@ -60,7 +61,7 @@ def __init__( "Please install it with `pip install redis`." ) - self._driver = redis.Redis(host=host, port=port) + self._driver = redis.Redis(host=host, port=port, username=username, password=password, ssl=ssl) self._graph = Graph(self._driver, database) self.schema: str = "" self.structured_schema: Dict[str, Any] = {} From 2d07d3818eedc5cfc3b24587bbc5ddd4727c6acb Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Thu, 16 Nov 2023 14:16:31 +0200 Subject: [PATCH 2/5] fix lint --- libs/langchain/langchain/graphs/falkordb_graph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/langchain/langchain/graphs/falkordb_graph.py b/libs/langchain/langchain/graphs/falkordb_graph.py index 5aeb444a5b825..6b21f1637a2e5 100644 --- a/libs/langchain/langchain/graphs/falkordb_graph.py +++ b/libs/langchain/langchain/graphs/falkordb_graph.py @@ -61,7 +61,8 @@ def __init__( "Please install it with `pip install redis`." ) - self._driver = redis.Redis(host=host, port=port, username=username, password=password, ssl=ssl) + self._driver = redis.Redis(host=host, port=port, username=username, + password=password, ssl=ssl) self._graph = Graph(self._driver, database) self.schema: str = "" self.structured_schema: Dict[str, Any] = {} From 1150611322b2a3fada0b96994f0e9b110d71a7c9 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Thu, 16 Nov 2023 14:31:17 +0200 Subject: [PATCH 3/5] format code --- libs/langchain/langchain/graphs/falkordb_graph.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/langchain/langchain/graphs/falkordb_graph.py b/libs/langchain/langchain/graphs/falkordb_graph.py index 6b21f1637a2e5..d2f221d32b341 100644 --- a/libs/langchain/langchain/graphs/falkordb_graph.py +++ b/libs/langchain/langchain/graphs/falkordb_graph.py @@ -48,8 +48,13 @@ class FalkorDBGraph(GraphStore): """ def __init__( - self, database: str, host: str = "localhost", port: int = 6379, - username=None, password=None, ssl=False + self, + database: str, + host: str = "localhost", + port: int = 6379, + username=None, + password=None, + ssl=False, ) -> None: """Create a new FalkorDB graph wrapper instance.""" try: @@ -61,8 +66,9 @@ def __init__( "Please install it with `pip install redis`." ) - self._driver = redis.Redis(host=host, port=port, username=username, - password=password, ssl=ssl) + self._driver = redis.Redis( + host=host, port=port, username=username, password=password, ssl=ssl + ) self._graph = Graph(self._driver, database) self.schema: str = "" self.structured_schema: Dict[str, Any] = {} From 493b40b32de0e6e1518ad93eb2390ab60c1b9ffc Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Thu, 16 Nov 2023 14:42:13 +0200 Subject: [PATCH 4/5] add hint to new fields --- libs/langchain/langchain/graphs/falkordb_graph.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/langchain/langchain/graphs/falkordb_graph.py b/libs/langchain/langchain/graphs/falkordb_graph.py index d2f221d32b341..f74de32cab993 100644 --- a/libs/langchain/langchain/graphs/falkordb_graph.py +++ b/libs/langchain/langchain/graphs/falkordb_graph.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, List +from typing import Any, Dict, List, Optional from langchain.graphs.graph_document import GraphDocument from langchain.graphs.graph_store import GraphStore @@ -52,9 +52,9 @@ def __init__( database: str, host: str = "localhost", port: int = 6379, - username=None, - password=None, - ssl=False, + username: Optional[str] = None, + password: Optional[str] = None, + ssl: Optional[bool] = False, ) -> None: """Create a new FalkorDB graph wrapper instance.""" try: From f81c03ca312df7d50cf060a037877ccf50baf71a Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Thu, 16 Nov 2023 14:48:13 +0200 Subject: [PATCH 5/5] ssl is not Optional --- libs/langchain/langchain/graphs/falkordb_graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/langchain/langchain/graphs/falkordb_graph.py b/libs/langchain/langchain/graphs/falkordb_graph.py index f74de32cab993..754455ce98b88 100644 --- a/libs/langchain/langchain/graphs/falkordb_graph.py +++ b/libs/langchain/langchain/graphs/falkordb_graph.py @@ -54,7 +54,7 @@ def __init__( port: int = 6379, username: Optional[str] = None, password: Optional[str] = None, - ssl: Optional[bool] = False, + ssl: bool = False, ) -> None: """Create a new FalkorDB graph wrapper instance.""" try: