From c1e9328c8470655d8fe0f3eaae0ac05e80d6a398 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 26 Feb 2024 11:40:13 -0800 Subject: [PATCH 1/4] chore: update kokoro release deps --- .github/header-checker-lint.yml | 28 ++++++++++++------------ .kokoro/requirements.in | 6 ++++-- .kokoro/requirements.txt | 38 +++++++++++++++++++++------------ README.md | 19 ++++++++++------- 4 files changed, 53 insertions(+), 38 deletions(-) diff --git a/.github/header-checker-lint.yml b/.github/header-checker-lint.yml index f259a98..38ffbfd 100644 --- a/.github/header-checker-lint.yml +++ b/.github/header-checker-lint.yml @@ -1,15 +1,15 @@ -{"allowedCopyrightHolders": ["Google LLC"], - "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"], - "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt", "**/__init__.py", "samples/**/constraints.txt", "samples/**/constraints-test.txt", "docs/state_of_the_union.txt"], - "sourceFileExtensions": [ - "ts", - "js", - "java", - "sh", - "Dockerfile", - "yaml", - "py", - "html", - "txt" - ] +{ + "allowedCopyrightHolders": ["Google LLC"], + "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"], + "ignoreFiles": + [ + "**/requirements.txt", + "**/requirements-test.txt", + "**/__init__.py", + "samples/**/constraints.txt", + "samples/**/constraints-test.txt", + "docs/state_of_the_union.txt", + ], + "sourceFileExtensions": + ["ts", "js", "java", "sh", "Dockerfile", "yaml", "py", "html", "txt"], } diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index 58b015f..76fc1c2 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -1,5 +1,5 @@ gcp-docuploader -gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x +gcp-releasetool>=1.17.0 # required for compatibility with cryptography>=39.x importlib-metadata typing-extensions twine @@ -8,4 +8,6 @@ setuptools nox>=2022.11.21 # required to remove dependency on py charset-normalizer<3 click<8.1.0 -build \ No newline at end of file +build +tomli +secretstorage \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 8c11c9f..908ab45 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --generate-hashes requirements.in +# pip-compile --generate-hashes requirements.in # argcomplete==3.1.4 \ --hash=sha256:72558ba729e4c468572609817226fb0a6e7e9a0a7d477b882be168c0b4a62b94 \ @@ -12,6 +12,10 @@ attrs==23.1.0 \ --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \ --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 # via gcp-releasetool +build==1.0.3 \ + --hash=sha256:538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b \ + --hash=sha256:589bf99a67df7c9cf07ec0ac0e5e2ea5d4b37ac63301c4986d1acb126aa83f8f + # via -r requirements.in cachetools==5.3.2 \ --hash=sha256:086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 \ --hash=sha256:861f35a13a451f94e301ce2bec7cac63e881232ccce7ed67fab9b5df4d3beaa1 @@ -145,9 +149,9 @@ gcp-docuploader==0.6.5 \ --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \ --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea # via -r requirements.in -gcp-releasetool==1.16.0 \ - --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \ - --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63 +gcp-releasetool==1.17.0 \ + --hash=sha256:1a759f4b0906f4ea9dc7db3649aa11a632c72f6dc6a54f10cf57c1925d034a1c \ + --hash=sha256:f23db51d85484998af5549181be726f177bf90b481de238fe7a99ec970266b6b # via -r requirements.in google-api-core==2.12.0 \ --hash=sha256:c22e01b1e3c4dcd90998494879612c38d0a3411d1f7b679eb89e2abe3ce1f553 \ @@ -269,9 +273,7 @@ jaraco-classes==3.3.0 \ jeepney==0.8.0 \ --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 - # via - # keyring - # secretstorage + # via secretstorage jinja2==3.1.3 \ --hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \ --hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90 @@ -382,6 +384,7 @@ packaging==23.2 \ --hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \ --hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7 # via + # build # gcp-releasetool # nox pkginfo==1.9.6 \ @@ -447,6 +450,10 @@ pyjwt==2.8.0 \ pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 # via gcp-releasetool +pyproject-hooks==1.0.0 \ + --hash=sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8 \ + --hash=sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 + # via build python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 @@ -483,13 +490,17 @@ rsa==4.9 \ secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - # via keyring + # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via # gcp-docuploader # python-dateutil +tomli==2.0.1 \ + --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ + --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f + # via -r requirements.in twine==4.0.2 \ --hash=sha256:929bc3c280033347a00f847236564d1c52a3e61b1ac2516c97c48f3ceab756d8 \ --hash=sha256:9e102ef5fdd5a20661eb88fad46338806c3bd32cf1db729603fe3697b1bc83c8 @@ -517,8 +528,7 @@ zipp==3.17.0 \ --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 # via importlib-metadata -# The following packages are considered to be unsafe in a requirements file: -setuptools==68.2.2 \ - --hash=sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 \ - --hash=sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a - # via -r requirements.in +# WARNING: The following packages were not pinned, but pip requires them to be +# pinned when the requirements file includes hashes and the requirement is not +# satisfied by a package already installed. Consider using the --allow-unsafe flag. +# setuptools diff --git a/README.md b/README.md index f1c6533..120143a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This package contains the [LangChain][langchain] integrations for Memorystore fo > **🧪 Preview:** This feature is covered by the Pre-GA Offerings Terms of the Google Cloud Terms of Service. Please note that pre-GA products and features might have limited support, and changes to pre-GA products and features might not be compatible with other pre-GA versions. For more information, see the [launch stage descriptions](https://cloud.google.com/products#product-launch-stages) -* [Documentation](docs/) +* [Documentation][docs] * [API Reference]() ## Getting Started @@ -92,15 +92,15 @@ See the full [Chat Message History][history] tutorial. Contributions to this library are always welcome and highly encouraged. -See [CONTRIBUTING](CONTRIBUTING.md) for more information how to get started. +See [CONTRIBUTING][contributing] for more information how to get started. Please note that this project is released with a Contributor Code of Conduct. By participating in -this project you agree to abide by its terms. See [Code of Conduct](CODE_OF_CONDUCT.md) for more +this project you agree to abide by its terms. See [Code of Conduct][coc] for more information. ## License -Apache 2.0 - See [LICENSE](LICENSE) for more information. +Apache 2.0 - See [LICENSE][license] for more information. ## Disclaimer @@ -108,10 +108,13 @@ This is not an officially supported Google product. [project]: https://console.cloud.google.com/project [billing]: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project -[api]: https://console.cloud.google.com/flows/enableapi?apiid=memorystore.googleapis.com +[api]: https://console.cloud.google.com/flows/enableapi?apiid=sqladmin.googleapis.com [auth]: https://googleapis.dev/python/google-api-core/latest/auth.html [venv]: https://virtualenv.pypa.io/en/latest/ -[vectorstore]: ./docs/vector_store.ipynb -[loader]: ./docs/document_loader.ipynb -[history]: ./docs/chat_message_history.ipynb +[loader]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/document_loader.ipynb +[history]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/chat_message_history.ipynb [langchain]: https://github.com/langchain-ai/langchain +[docs]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs +[license]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/LICENSE +[contributing]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/CONTRIBUTING.md +[coc]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/CODE_OF_CONDUCT.md \ No newline at end of file From 23d96662895cf293bf68efbb81be47c6d964f6f3 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 26 Feb 2024 11:43:01 -0800 Subject: [PATCH 2/4] fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 120143a..9bf81af 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ This is not an officially supported Google product. [project]: https://console.cloud.google.com/project [billing]: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project -[api]: https://console.cloud.google.com/flows/enableapi?apiid=sqladmin.googleapis.com +[api]: https://console.cloud.google.com/flows/enableapi?apiid=memorystore.googleapis.com [auth]: https://googleapis.dev/python/google-api-core/latest/auth.html [venv]: https://virtualenv.pypa.io/en/latest/ [loader]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/document_loader.ipynb From 6c7046b40fb5a80074c4205ec5619a363c325a23 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 26 Feb 2024 11:44:55 -0800 Subject: [PATCH 3/4] Update header-checker-lint.yml --- .github/header-checker-lint.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/header-checker-lint.yml b/.github/header-checker-lint.yml index 38ffbfd..f259a98 100644 --- a/.github/header-checker-lint.yml +++ b/.github/header-checker-lint.yml @@ -1,15 +1,15 @@ -{ - "allowedCopyrightHolders": ["Google LLC"], - "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"], - "ignoreFiles": - [ - "**/requirements.txt", - "**/requirements-test.txt", - "**/__init__.py", - "samples/**/constraints.txt", - "samples/**/constraints-test.txt", - "docs/state_of_the_union.txt", - ], - "sourceFileExtensions": - ["ts", "js", "java", "sh", "Dockerfile", "yaml", "py", "html", "txt"], +{"allowedCopyrightHolders": ["Google LLC"], + "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"], + "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt", "**/__init__.py", "samples/**/constraints.txt", "samples/**/constraints-test.txt", "docs/state_of_the_union.txt"], + "sourceFileExtensions": [ + "ts", + "js", + "java", + "sh", + "Dockerfile", + "yaml", + "py", + "html", + "txt" + ] } From a01d23db4d628b9e504d65a982b761cb1b2fb9c3 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 26 Feb 2024 11:45:46 -0800 Subject: [PATCH 4/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bf81af..5ad8b15 100644 --- a/README.md +++ b/README.md @@ -111,10 +111,11 @@ This is not an officially supported Google product. [api]: https://console.cloud.google.com/flows/enableapi?apiid=memorystore.googleapis.com [auth]: https://googleapis.dev/python/google-api-core/latest/auth.html [venv]: https://virtualenv.pypa.io/en/latest/ +[vectorstore]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/vector_store.ipynb [loader]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/document_loader.ipynb [history]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs/chat_message_history.ipynb [langchain]: https://github.com/langchain-ai/langchain [docs]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/docs [license]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/LICENSE [contributing]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/CONTRIBUTING.md -[coc]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/CODE_OF_CONDUCT.md \ No newline at end of file +[coc]: https://github.com/googleapis/langchain-google-memorystore-redis-python/tree/main/CODE_OF_CONDUCT.md