From 6fbba4e8e54dc72ebeb1cbf49ac04b0699994d73 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Fri, 22 Mar 2024 11:50:04 -0700 Subject: [PATCH 01/10] fix: update user agent --- src/langchain_google_bigtable/common.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index f87add8..1506bea 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -12,10 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from importlib.metadata import version from typing import Dict, Optional from google.cloud import bigtable # type: ignore +from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( + DEFAULT_CLIENT_INFO, +) from .version import __version__ @@ -27,9 +29,13 @@ def use_client_or_default( client: Optional[bigtable.Client], client_name: str ) -> bigtable.Client: user_agent = PACKAGE_PREFIX + client_name + "/" + __version__ + client_info = DEFAULT_CLIENT_INFO + client_info.user_agent = user_agent global clients if not client: - client = clients.get(client_name, bigtable.Client(admin=True)) + client = clients.get( + client_name, bigtable.Client(admin=True, client_info=client_info) + ) clients[client_name] = client client_agent = client._client_info.user_agent From c7dcca1291a3bcd51576f43853c1fc1ec800102a Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Fri, 22 Mar 2024 12:36:05 -0700 Subject: [PATCH 02/10] move user agent --- src/langchain_google_bigtable/common.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index 1506bea..33dd3ff 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -22,7 +22,6 @@ from .version import __version__ PACKAGE_PREFIX = "langchain-google-bigtable-python:" -clients: Dict[str, bigtable.Client] = {} def use_client_or_default( @@ -31,16 +30,12 @@ def use_client_or_default( user_agent = PACKAGE_PREFIX + client_name + "/" + __version__ client_info = DEFAULT_CLIENT_INFO client_info.user_agent = user_agent - global clients if not client: - client = clients.get( - client_name, bigtable.Client(admin=True, client_info=client_info) - ) - clients[client_name] = client + client = bigtable.Client(admin=True, client_info=client_info) client_agent = client._client_info.user_agent if not client_agent: client._client_info.user_agent = user_agent elif user_agent not in client_agent: - client._client_info.user_agent = " ".join([client_agent, user_agent]) + client._client_info.user_agent = " ".join([user_agent, client_agent]) return client From 2ab64100e58e82ece4e9414fd40764c9c297c0bf Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Fri, 22 Mar 2024 13:04:33 -0700 Subject: [PATCH 03/10] fix lint --- src/langchain_google_bigtable/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index 33dd3ff..52c395d 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -15,7 +15,7 @@ from typing import Dict, Optional from google.cloud import bigtable # type: ignore -from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( +from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore DEFAULT_CLIENT_INFO, ) From 1f64dffcfe5ad39a1400f0606538f6aadf492b6b Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Sat, 23 Mar 2024 08:21:54 -0700 Subject: [PATCH 04/10] Update common.py --- src/langchain_google_bigtable/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index 52c395d..6bd2595 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -15,8 +15,8 @@ from typing import Dict, Optional from google.cloud import bigtable # type: ignore -from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore - DEFAULT_CLIENT_INFO, +from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore + DEFAULT_CLIENT_INFO, # type: ignore ) from .version import __version__ From 7972ea73cbc0691efe818ecdf424770088bb5f76 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 10:55:29 -0700 Subject: [PATCH 05/10] lint --- src/langchain_google_bigtable/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index 6bd2595..52c395d 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -15,8 +15,8 @@ from typing import Dict, Optional from google.cloud import bigtable # type: ignore -from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore - DEFAULT_CLIENT_INFO, # type: ignore +from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore + DEFAULT_CLIENT_INFO, ) from .version import __version__ From 771fa1a4cd8ae0baa94e2ff1ab04de54e681926c Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 12:42:44 -0700 Subject: [PATCH 06/10] fix lint --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b60a96c..a90c688 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ Changelog = "https://github.com/googleapis/langchain-google-bigtable-python/blob test = [ "black[jupyter]==23.12.1", "isort==5.13.2", - "mypy==1.9.0", + "mypy==1.7.1", "pytest-asyncio==0.23.5.post1", "pytest==7.4.4" ] From 04f4bb1d78b9f4ad8cd350cde36ea137afa8daaa Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 13:31:32 -0700 Subject: [PATCH 07/10] Update common.py --- src/langchain_google_bigtable/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/langchain_google_bigtable/common.py b/src/langchain_google_bigtable/common.py index 52c395d..4d11568 100644 --- a/src/langchain_google_bigtable/common.py +++ b/src/langchain_google_bigtable/common.py @@ -15,8 +15,8 @@ from typing import Dict, Optional from google.cloud import bigtable # type: ignore -from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( # type: ignore - DEFAULT_CLIENT_INFO, +from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports.base import ( + DEFAULT_CLIENT_INFO, # type: ignore ) from .version import __version__ From f948ab08dabffe75f4216cac4d9d84b2f05e4537 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 13:43:53 -0700 Subject: [PATCH 08/10] Update pyproject.toml --- pyproject.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a90c688..44fac1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ Changelog = "https://github.com/googleapis/langchain-google-bigtable-python/blob test = [ "black[jupyter]==23.12.1", "isort==5.13.2", - "mypy==1.7.1", + "mypy==1.9.0", "pytest-asyncio==0.23.5.post1", "pytest==7.4.4" ] @@ -42,3 +42,7 @@ profile = "black" [tool.mypy] python_version = "3.11" warn_unused_configs = true + +[mypy-google] +ignore_missing_imports = true + From 1eca3ad88c759b630e86288f0ad42c09f4bdab02 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 13:46:08 -0700 Subject: [PATCH 09/10] Update pyproject.toml --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 44fac1a..b60a96c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,3 @@ profile = "black" [tool.mypy] python_version = "3.11" warn_unused_configs = true - -[mypy-google] -ignore_missing_imports = true - From 8dfd2792efdb46ae76b4b9e7ef16f8422a5df714 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Mon, 25 Mar 2024 13:59:01 -0700 Subject: [PATCH 10/10] debug --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index b60a96c..b646a46 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,3 +42,7 @@ profile = "black" [tool.mypy] python_version = "3.11" warn_unused_configs = true + +[[tool.mypy.overrides]] +module="google.cloud.*" +ignore_missing_imports = true \ No newline at end of file