Skip to content

fix: update user agent #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
averikitsch merged 10 commits into from
Mar 25, 2024
Merged

fix: update user agent #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6fbba4e
fix: update user agent
averikitsch Mar 22, 2024
c7dcca1
move user agent
averikitsch Mar 22, 2024
2ab6410
fix lint
averikitsch Mar 22, 2024
1f64dff
Update common.py
averikitsch Mar 23, 2024
7972ea7
lint
averikitsch Mar 25, 2024
771fa1a
fix lint
averikitsch Mar 25, 2024
04f4bb1
Update common.py
averikitsch Mar 25, 2024
f948ab0
Update pyproject.toml
averikitsch Mar 25, 2024
1eca3ad
Update pyproject.toml
averikitsch Mar 25, 2024
8dfd279
debug
averikitsch Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 7 additions & 6 deletions src/langchain_google_bigtable/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,30 @@
# 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, # type: ignore
)

from .version import __version__

PACKAGE_PREFIX = "langchain-google-bigtable-python:"
clients: Dict[str, bigtable.Client] = {}


def use_client_or_default(
client: Optional[bigtable.Client], client_name: str
) -> bigtable.Client:
user_agent = PACKAGE_PREFIX + client_name + "/" + __version__
global clients
client_info = DEFAULT_CLIENT_INFO
client_info.user_agent = user_agent
if not client:
client = clients.get(client_name, bigtable.Client(admin=True))
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