From 05cafeb654949c9b6f002a5675d7fc0e90e1625f Mon Sep 17 00:00:00 2001 From: Yuan Teoh Date: Fri, 16 Feb 2024 15:16:32 -0800 Subject: [PATCH 1/2] chore(ci): update repo files --- pyproject.toml | 5 ++++- .../__init__.py | 8 +++++--- .../{document_loader.py => loader.py} | 0 .../{document_saver.py => saver.py} | 0 .../{vector_store.py => vectorstore.py} | 0 src/langchain_google_memorystore_redis/version.py | 15 +++++++++++++++ ...est_memorystore_redis_chat_message_history.py} | 0 ...loader.py => test_memorystore_redis_loader.py} | 0 ...t_saver.py => test_memorystore_redis_saver.py} | 0 ...e.py => test_memorystore_redis_vectorstore.py} | 0 10 files changed, 24 insertions(+), 4 deletions(-) rename src/langchain_google_memorystore_redis/{document_loader.py => loader.py} (100%) rename src/langchain_google_memorystore_redis/{document_saver.py => saver.py} (100%) rename src/langchain_google_memorystore_redis/{vector_store.py => vectorstore.py} (100%) create mode 100644 src/langchain_google_memorystore_redis/version.py rename tests/{test_chat_message_history.py => test_memorystore_redis_chat_message_history.py} (100%) rename tests/{test_document_loader.py => test_memorystore_redis_loader.py} (100%) rename tests/{test_document_saver.py => test_memorystore_redis_saver.py} (100%) rename tests/{test_vector_store.py => test_memorystore_redis_vectorstore.py} (100%) diff --git a/pyproject.toml b/pyproject.toml index d28e669..6d0f71e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "langchain-google-memorystore-redis" -version = "0.0.1" +dynamic = ["version"] description = "LangChain integrations for Google Cloud Memorystore" readme = "README.md" license = {file = "LICENSE"} @@ -11,6 +11,9 @@ dependencies = [ "numpy>=1.21.0", ] +[tool.setuptools.dynamic] +version = {attr = "langchain_google_memorystore_redis.version.__version__"} + [project.urls] Homepage = "https://github.com/googleapis/langchain-google-memorystore-redis-python" Repository = "https://github.com/googleapis/langchain-google-memorystore-redis-python.git" diff --git a/src/langchain_google_memorystore_redis/__init__.py b/src/langchain_google_memorystore_redis/__init__.py index fc99e16..417556a 100644 --- a/src/langchain_google_memorystore_redis/__init__.py +++ b/src/langchain_google_memorystore_redis/__init__.py @@ -12,15 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. from .chat_message_history import MemorystoreChatMessageHistory -from .document_loader import MemorystoreDocumentLoader -from .document_saver import MemorystoreDocumentSaver -from .vector_store import ( +from .loader import MemorystoreDocumentLoader +from .saver import MemorystoreDocumentSaver +from .vectorstore import ( DistanceStrategy, FLATConfig, HNSWConfig, RedisVectorStore, VectorIndexConfig, ) +from .version import __version__ __all__ = [ "MemorystoreChatMessageHistory", @@ -31,4 +32,5 @@ "FLATConfig", "HNSWConfig", "RedisVectorStore", + "__version__", ] diff --git a/src/langchain_google_memorystore_redis/document_loader.py b/src/langchain_google_memorystore_redis/loader.py similarity index 100% rename from src/langchain_google_memorystore_redis/document_loader.py rename to src/langchain_google_memorystore_redis/loader.py diff --git a/src/langchain_google_memorystore_redis/document_saver.py b/src/langchain_google_memorystore_redis/saver.py similarity index 100% rename from src/langchain_google_memorystore_redis/document_saver.py rename to src/langchain_google_memorystore_redis/saver.py diff --git a/src/langchain_google_memorystore_redis/vector_store.py b/src/langchain_google_memorystore_redis/vectorstore.py similarity index 100% rename from src/langchain_google_memorystore_redis/vector_store.py rename to src/langchain_google_memorystore_redis/vectorstore.py diff --git a/src/langchain_google_memorystore_redis/version.py b/src/langchain_google_memorystore_redis/version.py new file mode 100644 index 0000000..31c05dd --- /dev/null +++ b/src/langchain_google_memorystore_redis/version.py @@ -0,0 +1,15 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +__version__ = "0.0.1" diff --git a/tests/test_chat_message_history.py b/tests/test_memorystore_redis_chat_message_history.py similarity index 100% rename from tests/test_chat_message_history.py rename to tests/test_memorystore_redis_chat_message_history.py diff --git a/tests/test_document_loader.py b/tests/test_memorystore_redis_loader.py similarity index 100% rename from tests/test_document_loader.py rename to tests/test_memorystore_redis_loader.py diff --git a/tests/test_document_saver.py b/tests/test_memorystore_redis_saver.py similarity index 100% rename from tests/test_document_saver.py rename to tests/test_memorystore_redis_saver.py diff --git a/tests/test_vector_store.py b/tests/test_memorystore_redis_vectorstore.py similarity index 100% rename from tests/test_vector_store.py rename to tests/test_memorystore_redis_vectorstore.py From 56b7df94a2a6528f0c154881571c1ac2aa08b9b7 Mon Sep 17 00:00:00 2001 From: Yuan Teoh Date: Fri, 16 Feb 2024 15:21:20 -0800 Subject: [PATCH 2/2] update tests imports --- tests/test_memorystore_redis_loader.py | 4 ++-- tests/test_memorystore_redis_saver.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_memorystore_redis_loader.py b/tests/test_memorystore_redis_loader.py index 6d76003..e3488f6 100644 --- a/tests/test_memorystore_redis_loader.py +++ b/tests/test_memorystore_redis_loader.py @@ -20,8 +20,8 @@ import redis from langchain_core.documents.base import Document -from langchain_google_memorystore_redis.document_loader import MemorystoreDocumentLoader -from langchain_google_memorystore_redis.document_saver import MemorystoreDocumentSaver +from langchain_google_memorystore_redis.loader import MemorystoreDocumentLoader +from langchain_google_memorystore_redis.saver import MemorystoreDocumentSaver @pytest.mark.parametrize( diff --git a/tests/test_memorystore_redis_saver.py b/tests/test_memorystore_redis_saver.py index 389303a..7a768a5 100644 --- a/tests/test_memorystore_redis_saver.py +++ b/tests/test_memorystore_redis_saver.py @@ -20,7 +20,7 @@ import redis from langchain_core.documents.base import Document -from langchain_google_memorystore_redis.document_saver import MemorystoreDocumentSaver +from langchain_google_memorystore_redis.saver import MemorystoreDocumentSaver @pytest.mark.parametrize(