[vertexai|community|genai] chore: Change the client_library_version to gapic_version

Author: shawn-yang-google

libs/community/langchain_google_community/_utils.py

@@ -35,14 +35,12 @@ def get_user_agent(module: Optional[str] = None) -> Tuple[str, str]:
         langchain_version = metadata.version("langchain-google-community")
     except metadata.PackageNotFoundError:
         langchain_version = "0.0.0"
-    client_library_version = (
-        f"{langchain_version}-{module}" if module else langchain_version
-    )
+    gapic_version = f"{langchain_version}-{module}" if module else langchain_version
     if os.environ.get(_TELEMETRY_ENV_VARIABLE_NAME):
-        client_library_version += f"+{_TELEMETRY_TAG}"
+        gapic_version += f"+{_TELEMETRY_TAG}"
     return (
-        client_library_version,
-        f"langchain-google-community/{client_library_version}",
+        gapic_version,
+        f"langchain-google-community/{gapic_version}",
     )
 
 
@@ -55,9 +53,9 @@ def get_client_info(module: Optional[str] = None) -> "ClientInfo":
     Returns:
         google.api_core.gapic_v1.client_info.ClientInfo
     """
-    client_library_version, user_agent = get_user_agent(module)
+    gapic_version, user_agent = get_user_agent(module)
     return ClientInfo(
-        client_library_version=client_library_version,
+        gapic_version=gapic_version,
         user_agent=user_agent,
     )
 

libs/community/tests/unit_tests/test_utils.py

@@ -12,8 +12,8 @@ def test_get_user_agent_with_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = True
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module+remote_reasoning_engine"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module+remote_reasoning_engine"
     assert user_agent_str == (
         "langchain-google-community/1.2.3-test-module+remote_reasoning_engine"
     )
@@ -26,6 +26,6 @@ def test_get_user_agent_without_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = False
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module"
     assert user_agent_str == "langchain-google-community/1.2.3-test-module"

libs/genai/langchain_google_genai/_common.py

@@ -129,12 +129,10 @@ def get_user_agent(module: Optional[str] = None) -> Tuple[str, str]:
         langchain_version = metadata.version("langchain-google-genai")
     except metadata.PackageNotFoundError:
         langchain_version = "0.0.0"
-    client_library_version = (
-        f"{langchain_version}-{module}" if module else langchain_version
-    )
+    gapic_version = f"{langchain_version}-{module}" if module else langchain_version
     if os.environ.get(_TELEMETRY_ENV_VARIABLE_NAME):
-        client_library_version += f"+{_TELEMETRY_TAG}"
-    return client_library_version, f"langchain-google-genai/{client_library_version}"
+        gapic_version += f"+{_TELEMETRY_TAG}"
+    return gapic_version, f"langchain-google-genai/{gapic_version}"
 
 
 def get_client_info(module: Optional[str] = None) -> "ClientInfo":
@@ -146,9 +144,9 @@ def get_client_info(module: Optional[str] = None) -> "ClientInfo":
     Returns:
         google.api_core.gapic_v1.client_info.ClientInfo
     """
-    client_library_version, user_agent = get_user_agent(module)
+    gapic_version, user_agent = get_user_agent(module)
     return ClientInfo(
-        client_library_version=client_library_version,
+        gapic_version=gapic_version,
         user_agent=user_agent,
     )
 

libs/genai/tests/unit_tests/test_common.py

@@ -12,8 +12,8 @@ def test_get_user_agent_with_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = True
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module+remote_reasoning_engine"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module+remote_reasoning_engine"
     assert user_agent_str == (
         "langchain-google-genai/1.2.3-test-module+remote_reasoning_engine"
     )
@@ -26,6 +26,6 @@ def test_get_user_agent_without_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = False
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module"
     assert user_agent_str == "langchain-google-genai/1.2.3-test-module"

libs/genai/tests/unit_tests/test_embeddings.py

@@ -28,7 +28,7 @@ def test_integration_initialization() -> None:
         client_info = mock_prediction_service.call_args.kwargs["client_info"]
         assert "langchain-google-genai" in client_info.user_agent
         assert "GoogleGenerativeAIEmbeddings" in client_info.user_agent
-        assert "GoogleGenerativeAIEmbeddings" in client_info.client_library_version
+        assert "GoogleGenerativeAIEmbeddings" in client_info.gapic_version
 
     with patch(
         "langchain_google_genai._genai_extension.v1betaGenerativeServiceClient"

libs/vertexai/langchain_google_vertexai/_utils.py

@@ -96,12 +96,10 @@ def get_user_agent(module: Optional[str] = None) -> Tuple[str, str]:
         langchain_version = metadata.version("langchain-google-vertexai")
     except metadata.PackageNotFoundError:
         langchain_version = "0.0.0"
-    client_library_version = (
-        f"{langchain_version}-{module}" if module else langchain_version
-    )
+    gapic_version = f"{langchain_version}-{module}" if module else langchain_version
     if os.environ.get(_TELEMETRY_ENV_VARIABLE_NAME):
-        client_library_version += f"+{_TELEMETRY_TAG}"
-    return client_library_version, f"langchain-google-vertexai/{client_library_version}"
+        gapic_version += f"+{_TELEMETRY_TAG}"
+    return gapic_version, f"langchain-google-vertexai/{gapic_version}"
 
 
 def get_client_info(module: Optional[str] = None) -> "ClientInfo":
@@ -113,9 +111,9 @@ def get_client_info(module: Optional[str] = None) -> "ClientInfo":
     Returns:
         google.api_core.gapic_v1.client_info.ClientInfo
     """
-    client_library_version, user_agent = get_user_agent(module)
+    gapic_version, user_agent = get_user_agent(module)
     return ClientInfo(
-        client_library_version=client_library_version,
+        gapic_version=gapic_version,
         user_agent=user_agent,
     )
 

libs/vertexai/tests/unit_tests/test_chat_models.py

@@ -125,8 +125,8 @@ def test_init_client(model: str, location: str) -> None:
         assert client_options.api_endpoint == f"{location}-aiplatform.googleapis.com"
         assert "langchain-google-vertexai" in client_info.user_agent
         assert "ChatVertexAI" in client_info.user_agent
-        assert "langchain-google-vertexai" in client_info.client_library_version
-        assert "ChatVertexAI" in client_info.client_library_version
+        assert "langchain-google-vertexai" in client_info.gapic_version
+        assert "ChatVertexAI" in client_info.gapic_version
         assert llm.full_model_name == (
             f"projects/test-proj/locations/{location}/publishers/google/models/gemini-1.0-pro-001"
         )

libs/vertexai/tests/unit_tests/test_utils.py

@@ -193,8 +193,8 @@ def test_get_user_agent_with_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = True
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module+remote_reasoning_engine"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module+remote_reasoning_engine"
     assert user_agent_str == (
         "langchain-google-vertexai/1.2.3-test-module+remote_reasoning_engine"
     )
@@ -207,6 +207,6 @@ def test_get_user_agent_without_telemetry_env_variable(
 ) -> None:
     mock_version.return_value = "1.2.3"
     mock_environ_get.return_value = False
-    client_lib_version, user_agent_str = get_user_agent(module="test-module")
-    assert client_lib_version == "1.2.3-test-module"
+    gapic_version, user_agent_str = get_user_agent(module="test-module")
+    assert gapic_version == "1.2.3-test-module"
     assert user_agent_str == "langchain-google-vertexai/1.2.3-test-module"