langchain-timbr 2.0.2__tar.gz → 2.0.3__tar.gz

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 2.0.2
+Version: 2.0.3
 Summary: LangChain & LangGraph extensions that parse LLM prompts into Timbr semantic SQL and execute them.
 Project-URL: Homepage, https://github.com/WPSemantix/langchain-timbr
 Project-URL: Documentation, https://docs.timbr.ai/doc/docs/integration/langchain-sdk/
@@ -31,17 +31,18 @@ Requires-Dist: tiktoken==0.8.0
 Requires-Dist: transformers>=4.53
 Provides-Extra: all
 Requires-Dist: anthropic==0.42.0; extra == 'all'
-Requires-Dist: azure-identity==1.16.1; extra == 'all'
+Requires-Dist: azure-identity>=1.16.1; extra == 'all'
 Requires-Dist: databricks-langchain==0.3.0; (python_version < '3.10') and extra == 'all'
 Requires-Dist: databricks-langchain==0.7.1; (python_version >= '3.10') and extra == 'all'
 Requires-Dist: databricks-sdk==0.64.0; extra == 'all'
 Requires-Dist: google-generativeai==0.8.4; extra == 'all'
 Requires-Dist: langchain-anthropic>=0.3.1; extra == 'all'
 Requires-Dist: langchain-google-genai>=2.0.9; extra == 'all'
+Requires-Dist: langchain-google-vertexai>=2.0.28; extra == 'all'
 Requires-Dist: langchain-openai>=0.3.16; extra == 'all'
 Requires-Dist: langchain-tests>=0.3.20; extra == 'all'
 Requires-Dist: openai>=1.77.0; extra == 'all'
-Requires-Dist: pyarrow<19.0.0; extra == 'all'
+Requires-Dist: pyarrow<20.0.0,>=19.0.1; extra == 'all'
 Requires-Dist: pytest==8.3.4; extra == 'all'
 Requires-Dist: snowflake-snowpark-python>=1.6.0; extra == 'all'
 Requires-Dist: snowflake>=0.8.0; extra == 'all'
@@ -50,7 +51,7 @@ Provides-Extra: anthropic
 Requires-Dist: anthropic==0.42.0; extra == 'anthropic'
 Requires-Dist: langchain-anthropic>=0.3.1; extra == 'anthropic'
 Provides-Extra: azure-openai
-Requires-Dist: azure-identity==1.16.1; extra == 'azure-openai'
+Requires-Dist: azure-identity>=1.16.1; extra == 'azure-openai'
 Requires-Dist: langchain-openai>=0.3.16; extra == 'azure-openai'
 Requires-Dist: openai>=1.77.0; extra == 'azure-openai'
 Provides-Extra: databricks
@@ -59,7 +60,7 @@ Requires-Dist: databricks-langchain==0.7.1; (python_version >= '3.10') and extra
 Requires-Dist: databricks-sdk==0.64.0; extra == 'databricks'
 Provides-Extra: dev
 Requires-Dist: langchain-tests>=0.3.20; extra == 'dev'
-Requires-Dist: pyarrow<19.0.0; extra == 'dev'
+Requires-Dist: pyarrow<20.0.0,>=19.0.1; extra == 'dev'
 Requires-Dist: pytest==8.3.4; extra == 'dev'
 Requires-Dist: uvicorn==0.34.0; extra == 'dev'
 Provides-Extra: google
@@ -71,6 +72,9 @@ Requires-Dist: openai>=1.77.0; extra == 'openai'
 Provides-Extra: snowflake
 Requires-Dist: snowflake-snowpark-python>=1.6.0; extra == 'snowflake'
 Requires-Dist: snowflake>=0.8.0; extra == 'snowflake'
+Provides-Extra: vertex-ai
+Requires-Dist: google-generativeai==0.8.4; extra == 'vertex-ai'
+Requires-Dist: langchain-google-vertexai>=2.0.28; extra == 'vertex-ai'
 Description-Content-Type: text/markdown
 
 ![Timbr logo description](https://timbr.ai/wp-content/uploads/2025/01/logotimbrai230125.png)
@@ -89,8 +93,8 @@ Timbr LangChain LLM SDK is a Python SDK that extends LangChain and LangGraph wit
 
 ![Timbr LangGraph pipeline](https://docs.timbr.ai/doc/assets/images/timbr-langgraph-fcf8e2eb7e26dc9dfa8b56b62937281e.png)
 
-
 ## Dependencies
+
 - Access to a timbr-server
 - Python 3.9.13 or newer
 
@@ -103,13 +107,15 @@ python -m pip install langchain-timbr
 ```
 
 ### Install with selected LLM providers
-#### One of: openai, anthropic, google, azure_openai, snowflake, databricks (or 'all')
+
+#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai (or 'all')
 
 ```bash
 python -m pip install 'langchain-timbr[<your selected providers, separated by comma w/o space>]'
 ```
 
 ### Using pip from github
+
 ```bash
 pip install git+https://github.com/WPSemantix/langchain-timbr
 ```

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/README.md

@@ -14,8 +14,8 @@ Timbr LangChain LLM SDK is a Python SDK that extends LangChain and LangGraph wit
 
 ![Timbr LangGraph pipeline](https://docs.timbr.ai/doc/assets/images/timbr-langgraph-fcf8e2eb7e26dc9dfa8b56b62937281e.png)
 
-
 ## Dependencies
+
 - Access to a timbr-server
 - Python 3.9.13 or newer
 
@@ -28,13 +28,15 @@ python -m pip install langchain-timbr
 ```
 
 ### Install with selected LLM providers
-#### One of: openai, anthropic, google, azure_openai, snowflake, databricks (or 'all')
+
+#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai (or 'all')
 
 ```bash
 python -m pip install 'langchain-timbr[<your selected providers, separated by comma w/o space>]'
 ```
 
 ### Using pip from github
+
 ```bash
 pip install git+https://github.com/WPSemantix/langchain-timbr
 ```

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/pyproject.toml

@@ -32,15 +32,16 @@ dependencies = [
   "pydantic==2.10.4",
   "pytimbr-api>=2.0.0",
   "tiktoken==0.8.0",
-  "transformers>=4.53"
+  "transformers>=4.53",
 ]
 
 [project.optional-dependencies]
 # LLM providers
 openai = ["openai>=1.77.0", "langchain-openai>=0.3.16"]
-azure_openai = ["azure-identity==1.16.1", "openai>=1.77.0", "langchain-openai>=0.3.16"]
+azure_openai = ["azure-identity>=1.16.1", "openai>=1.77.0", "langchain-openai>=0.3.16"]
 anthropic = ["anthropic==0.42.0", "langchain-anthropic>=0.3.1"]
 google = ["langchain-google-genai>=2.0.9", "google-generativeai==0.8.4"]
+vertex_ai = ["langchain-google-vertexai>=2.0.28", "google-generativeai==0.8.4"]
 snowflake = ["snowflake>=0.8.0", "snowflake-snowpark-python>=1.6.0"]
 databricks = [
   "databricks-langchain==0.3.0; python_version < '3.10'",
@@ -52,24 +53,25 @@ databricks = [
 dev = [
   "pytest==8.3.4",
   "langchain-tests>=0.3.20",
-  "pyarrow<19.0.0",
+  "pyarrow>=19.0.1,<20.0.0",
   "uvicorn==0.34.0"
 ]
 
 # All optional dependencies
 all = [
   "anthropic==0.42.0",
-  "azure-identity==1.16.1",
+  "azure-identity>=1.16.1",
   "google-generativeai==0.8.4",
   "langchain-anthropic>=0.3.1",
   "openai>=1.77.0",
   "langchain-openai>=0.3.16",
   "langchain-google-genai>=2.0.9",
+  "langchain-google-vertexai>=2.0.28",
   "snowflake>=0.8.0",
   "snowflake-snowpark-python>=1.6.0",
   "pytest==8.3.4",
   "langchain-tests>=0.3.20",
-  "pyarrow<19.0.0",
+  "pyarrow>=19.0.1,<20.0.0",
   "uvicorn==0.34.0",
   "databricks-langchain==0.3.0; python_version < '3.10'",
   "databricks-langchain==0.7.1; python_version >= '3.10'",

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/requirements.txt

@@ -1,5 +1,5 @@
 anthropic==0.42.0
-azure-identity==1.16.1
+azure-identity>=1.16.1
 cryptography>=44.0.3
 databricks-langchain==0.3.0; python_version < '3.10'
 databricks-langchain==0.7.1; python_version >= '3.10'
@@ -10,11 +10,12 @@ langchain-anthropic>=0.3.1
 langchain_community>=0.3.20
 langchain-core>=0.3.58
 langchain-google-genai>=2.0.9
+langchain-google-vertexai>=2.0.28
 langchain-openai>=0.3.16
 langchain-tests>=0.3.20
 langgraph>=0.3.20
 openai>=1.77.0
-pyarrow<19.0.0
+pyarrow>=19.0.1,<20.0.0
 pydantic==2.10.4
 pytest==8.3.4
 pytimbr-api>=2.0.0

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/src/langchain_timbr/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.0.2'
-__version_tuple__ = version_tuple = (2, 0, 2)
+__version__ = version = '2.0.3'
+__version_tuple__ = version_tuple = (2, 0, 3)
 
 __commit_id__ = commit_id = None

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/src/langchain_timbr/llm_wrapper/llm_wrapper.py

@@ -14,6 +14,7 @@ class LlmTypes(Enum):
   AzureOpenAI = 'azure-openai-chat'
   Snowflake = 'snowflake-cortex'
   Databricks = 'chat-databricks'
+  VertexAI = 'chat-vertexai'
   Timbr = 'timbr'
 
 
@@ -54,10 +55,7 @@ class LlmWrapper(LLM):
       # Validation: Ensure we have the required parameters
       if not selected_llm_type:
           raise ValueError("llm_type must be provided either as parameter or in config (LLM_TYPE environment variable)")
-      
-      if not selected_api_key:
-          raise ValueError("api_key must be provided either as parameter or in config (LLM_API_KEY environment variable)")
-      
+            
       self.client = self._connect_to_llm(
         selected_llm_type,
         selected_api_key,
@@ -80,8 +78,75 @@ class LlmWrapper(LLM):
         llm_params["temperature"] = config.llm_temperature
     return llm_params
 
-  
-  def _connect_to_llm(self, llm_type, api_key, model, **llm_params):
+  def _try_build_vertexai_credentials(self,params, api_key):
+    from google.oauth2 import service_account
+    from google.auth import default
+
+    # Try multiple authentication methods in order of preference
+    creds = None
+    scope = pop_param_value(params, ['vertex_scope', 'llm_scope', 'scope'], default=config.llm_scope)
+    scopes = [scope] if scope else ["https://www.googleapis.com/auth/cloud-platform"]
+    
+    # Method 1: Service Account File (json_path)
+    json_path = pop_param_value(params, ['azure_json_path', 'llm_json_path', 'json_path'])
+    if json_path:
+      try:
+        creds = service_account.Credentials.from_service_account_file(
+          json_path,
+          scopes=scopes,
+        )
+      except Exception as e:
+        raise ValueError(f"Failed to load service account from file '{json_path}': {e}")
+    
+    # Method 2: Service Account Info (as dictionary)
+    if not creds:
+      service_account_info = pop_param_value(params, ['service_account_info', 'vertex_service_account_info'])
+      if service_account_info:
+        try:
+          creds = service_account.Credentials.from_service_account_info(
+            service_account_info,
+            scopes=scopes,
+          )
+        except Exception as e:
+          raise ValueError(f"Failed to load service account from info: {e}")
+    
+    # Method 3: Service Account Email + Private Key
+    if not creds:
+      service_account_email = pop_param_value(params, ['service_account_email', 'vertex_email', 'service_account'])
+      private_key = pop_param_value(params, ['private_key', 'vertex_private_key']) or api_key
+      
+      if service_account_email and private_key:
+        try:
+          service_account_info = {
+            "type": "service_account",
+            "client_email": service_account_email,
+            "private_key": private_key,
+            "token_uri": "https://oauth2.googleapis.com/token",
+          }
+          creds = service_account.Credentials.from_service_account_info(
+            service_account_info,
+            scopes=scopes,
+          )
+        except Exception as e:
+          raise ValueError(f"Failed to create service account from email and private key: {e}")
+    
+    # Method 4: Default Google Cloud Credentials (fallback)
+    if not creds:
+      try:
+        creds, _ = default(scopes=scopes)
+      except Exception as e:
+        raise ValueError(
+          "VertexAI authentication failed. Please provide one of:\n"
+          "1. 'json_path' - path to service account JSON file\n"
+          "2. 'service_account_info' - service account info as dictionary\n"
+          "3. 'service_account_email' + 'private_key' - service account credentials\n"
+          "4. Set up default Google Cloud credentials (gcloud auth application-default login)\n"
+          f"Error: {e}"
+        )
+
+    return creds  
+
+  def _connect_to_llm(self, llm_type, api_key = None, model = None, **llm_params):
     if is_llm_type(llm_type, LlmTypes.OpenAI):
       from langchain_openai import ChatOpenAI as OpenAI
       llm_model = model or "gpt-4o-2024-11-20"
@@ -171,6 +236,21 @@ class LlmWrapper(LLM):
         endpoint=llm_model,
         workspace_client=w,  # Using authenticated client
         **params,
+      )    
+    elif is_llm_type(llm_type, LlmTypes.VertexAI):
+      from langchain_google_vertexai import ChatVertexAI
+      llm_model = model or "gemini-2.5-flash-lite"
+      params = self._add_temperature(LlmTypes.VertexAI.name, llm_model, **llm_params)
+
+      project = pop_param_value(params, ['vertex_project', 'llm_project', 'project'])
+      if project:
+        params['project'] = project
+
+      creds = self._try_build_vertexai_credentials(params, api_key)
+      return ChatVertexAI(
+        model_name=llm_model,
+        credentials=creds,
+        **params,
       )
     else:
       raise ValueError(f"Unsupported LLM type: {llm_type}")
@@ -179,6 +259,8 @@ class LlmWrapper(LLM):
   def get_model_list(self) -> list[str]:
     """Return the list of available models for the LLM."""
     models = []
+    llm_type_name = None
+
     try:
       if is_llm_type(self._llm_type, LlmTypes.OpenAI):
         from openai import OpenAI
@@ -237,10 +319,14 @@ class LlmWrapper(LLM):
           models = [ep.name for ep in w.serving_endpoints.list()]
 
       # elif self._is_llm_type(self._llm_type, LlmTypes.Timbr):
-        
+      elif is_llm_type(self._llm_type, LlmTypes.VertexAI):
+        from google import genai
+        if self.client.credentials:
+          client = genai.Client(credentials=self.client.credentials, vertexai=True, project=self.client.project, location=self.client.location)
+          models = [m.name.split('/')[-1] for m in client.models.list()]
+
     except Exception:
       # If model list fetching throws an exception, return default value using get_supported_models
-      llm_type_name = None
       if hasattr(self, '_llm_type'):
         # Try to extract the LLM type name from the _llm_type
         for llm_enum in LlmTypes:

{langchain_timbr-2.0.2 → langchain_timbr-2.0.3}/tests/standard/test_llm_wrapper_optional_params.py

@@ -47,7 +47,8 @@ class TestLlmWrapperOptionalParams:
                 with pytest.raises(ValueError, match="llm_type must be provided"):
                     LlmWrapper(api_key="test-key")
     
-    def test_missing_api_key_raises_error(self):
+    # This test is deprecated because api_key is now mandatory
+    def skip_test_missing_api_key_raises_error(self):
         """Test that missing api_key raises appropriate error"""
         with patch.dict(os.environ, {}, clear=True):
             # Mock the config values to ensure they're None