langchain-timbr 2.1.4__tar.gz → 2.1.5__tar.gz

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 2.1.4
+Version: 2.1.5
 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/
@@ -19,44 +19,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: <3.13,>=3.10
-Requires-Dist: anthropic==0.42.0
-Requires-Dist: azure-identity==1.25.0; python_version >= '3.11'
-Requires-Dist: azure-identity>=1.16.1; python_version == '3.10'
 Requires-Dist: cryptography==45.0.7; python_version >= '3.11'
 Requires-Dist: cryptography>=44.0.3; python_version == '3.10'
-Requires-Dist: databricks-langchain==0.7.1
-Requires-Dist: databricks-sdk==0.64.0
-Requires-Dist: google-generativeai==0.8.4
-Requires-Dist: langchain-anthropic==0.3.5; python_version >= '3.11'
-Requires-Dist: langchain-anthropic>=0.3.1; python_version == '3.10'
 Requires-Dist: langchain-community==0.3.30; python_version >= '3.11'
-Requires-Dist: langchain-community>=0.3.20; python_version == '3.10'
-Requires-Dist: langchain-core==0.3.78; python_version >= '3.11'
+Requires-Dist: langchain-community>=0.3.27; python_version == '3.10'
 Requires-Dist: langchain-core>=0.3.58; python_version == '3.10'
-Requires-Dist: langchain-google-genai==2.0.10; python_version >= '3.11'
-Requires-Dist: langchain-google-genai>=2.0.9; python_version == '3.10'
-Requires-Dist: langchain-google-vertexai==2.1.2; python_version >= '3.11'
-Requires-Dist: langchain-google-vertexai>=2.0.28; python_version == '3.10'
-Requires-Dist: langchain-openai==0.3.34; python_version >= '3.11'
-Requires-Dist: langchain-openai>=0.3.16; python_version == '3.10'
-Requires-Dist: langchain-tests==0.3.22; python_version >= '3.11'
-Requires-Dist: langchain-tests>=0.3.20; python_version == '3.10'
+Requires-Dist: langchain-core>=0.3.80; python_version >= '3.11'
 Requires-Dist: langchain==0.3.27; python_version >= '3.11'
 Requires-Dist: langchain>=0.3.25; python_version == '3.10'
 Requires-Dist: langgraph==0.6.8; python_version >= '3.11'
 Requires-Dist: langgraph>=0.3.20; python_version == '3.10'
-Requires-Dist: openai==2.1.0; python_version >= '3.11'
-Requires-Dist: openai>=1.77.0; python_version == '3.10'
-Requires-Dist: opentelemetry-api==1.38.0; python_version == '3.10'
-Requires-Dist: opentelemetry-sdk==1.38.0; python_version == '3.10'
 Requires-Dist: pydantic==2.10.4
-Requires-Dist: pytest==8.3.4
-Requires-Dist: pytimbr-api==2.0.0; python_version >= '3.11'
-Requires-Dist: pytimbr-api>=2.0.0; python_version == '3.10'
-Requires-Dist: snowflake-snowpark-python==1.39.1; python_version >= '3.11'
-Requires-Dist: snowflake-snowpark-python>=1.39.1; python_version == '3.10'
-Requires-Dist: snowflake==1.8.0; python_version >= '3.11'
-Requires-Dist: snowflake>=1.8.0; python_version == '3.10'
+Requires-Dist: pytimbr-api>=2.0.0; python_version >= '3.11'
 Requires-Dist: tiktoken==0.8.0
 Requires-Dist: transformers==4.57.0; python_version >= '3.11'
 Requires-Dist: transformers>=4.53; python_version == '3.10'
@@ -70,6 +44,7 @@ Requires-Dist: databricks-sdk==0.64.0; extra == 'all'
 Requires-Dist: google-generativeai==0.8.4; extra == 'all'
 Requires-Dist: langchain-anthropic==0.3.5; (python_version >= '3.11') and extra == 'all'
 Requires-Dist: langchain-anthropic>=0.3.1; (python_version == '3.10') and extra == 'all'
+Requires-Dist: langchain-aws<1,>=0.2.35; extra == 'all'
 Requires-Dist: langchain-google-genai==2.0.10; (python_version >= '3.11') and extra == 'all'
 Requires-Dist: langchain-google-genai>=2.0.9; (python_version == '3.10') and extra == 'all'
 Requires-Dist: langchain-google-vertexai==2.1.2; (python_version >= '3.11') and extra == 'all'
@@ -97,6 +72,8 @@ Requires-Dist: langchain-openai==0.3.34; (python_version >= '3.11') and extra ==
 Requires-Dist: langchain-openai>=0.3.16; (python_version == '3.10') and extra == 'azure-openai'
 Requires-Dist: openai==2.1.0; (python_version >= '3.11') and extra == 'azure-openai'
 Requires-Dist: openai>=1.77.0; (python_version == '3.10') and extra == 'azure-openai'
+Provides-Extra: bedrock
+Requires-Dist: langchain-aws==0.2.35; extra == 'bedrock'
 Provides-Extra: databricks
 Requires-Dist: databricks-langchain==0.7.1; extra == 'databricks'
 Requires-Dist: databricks-sdk==0.64.0; extra == 'databricks'
@@ -158,7 +135,7 @@ python -m pip install langchain-timbr
 
 ### Install with selected LLM providers
 
-#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai (or 'all')
+#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai, bedrock (or 'all')
 
 ```bash
 python -m pip install 'langchain-timbr[<your selected providers, separated by comma w/o space>]'

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/README.md

@@ -29,7 +29,7 @@ python -m pip install langchain-timbr
 
 ### Install with selected LLM providers
 
-#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai (or 'all')
+#### One of: openai, anthropic, google, azure_openai, snowflake, databricks, vertex_ai, bedrock (or 'all')
 
 ```bash
 python -m pip install 'langchain-timbr[<your selected providers, separated by comma w/o space>]'

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/pyproject.toml

@@ -24,53 +24,25 @@ classifiers = [
 
 dependencies = [
   # Core dependencies that are the same across all Python versions
-  "anthropic==0.42.0",
-  "databricks-langchain==0.7.1",
-  "databricks-sdk==0.64.0",
-  "google-generativeai==0.8.4",
   "pydantic==2.10.4",
-  "pytest==8.3.4",
   "tiktoken==0.8.0",
   "uvicorn==0.34.0",
+  "pytimbr-api>=2.0.0; python_version>='3.11'",
 
   # Python 3.11+ versions (same for 3.11 and 3.12+)
-  "azure-identity==1.25.0; python_version>='3.11'",
   "cryptography==45.0.7; python_version>='3.11'",
   "langchain==0.3.27; python_version>='3.11'",
-  "langchain-anthropic==0.3.5; python_version>='3.11'",
   "langchain-community==0.3.30; python_version>='3.11'",
-  "langchain-core==0.3.78; python_version>='3.11'",
-  "langchain-google-genai==2.0.10; python_version>='3.11'",
-  "langchain-google-vertexai==2.1.2; python_version>='3.11'",
-  "langchain-openai==0.3.34; python_version>='3.11'",
-  "langchain-tests==0.3.22; python_version>='3.11'",
+  "langchain-core>=0.3.80; python_version>='3.11'",
   "langgraph==0.6.8; python_version>='3.11'",
-  "openai==2.1.0; python_version>='3.11'",
-  "opentelemetry-api==1.38.0; python_version=='3.10'",
-  "opentelemetry-sdk==1.38.0; python_version=='3.10'",
-  "pytimbr_api==2.0.0; python_version>='3.11'",
-  "snowflake==1.8.0; python_version>='3.11'",
-  "snowflake-snowpark-python==1.39.1; python_version>='3.11'",
   "transformers==4.57.0; python_version>='3.11'",
 
   # Python 3.10 specific versions
-  "azure-identity>=1.16.1; python_version=='3.10'",
   "cryptography>=44.0.3; python_version=='3.10'",
   "langchain>=0.3.25; python_version=='3.10'",
-  "langchain-anthropic>=0.3.1; python_version=='3.10'",
-  "langchain_community>=0.3.20; python_version=='3.10'",
+  "langchain-community>=0.3.27; python_version=='3.10'",
   "langchain-core>=0.3.58; python_version=='3.10'",
-  "langchain-google-genai>=2.0.9; python_version=='3.10'",
-  "langchain-google-vertexai>=2.0.28; python_version=='3.10'",
-  "langchain-openai>=0.3.16; python_version=='3.10'",
-  "langchain-tests>=0.3.20; python_version=='3.10'",
   "langgraph>=0.3.20; python_version=='3.10'",
-  "openai>=1.77.0; python_version=='3.10'",
-  "opentelemetry-api==1.38.0; python_version=='3.10'",
-  "opentelemetry-sdk==1.38.0; python_version=='3.10'",
-  "pytimbr-api>=2.0.0; python_version=='3.10'",
-  "snowflake>=1.8.0; python_version=='3.10'",
-  "snowflake-snowpark-python>=1.39.1; python_version=='3.10'",
   "transformers>=4.53; python_version=='3.10'",
 ]
 
@@ -117,6 +89,9 @@ databricks = [
   "databricks-langchain==0.7.1",
   "databricks-sdk==0.64.0"
 ]
+bedrock = [
+  "langchain-aws==0.2.35",
+]
 
 # Development and testing
 dev = [
@@ -128,12 +103,13 @@ dev = [
 
 # All optional dependencies
 all = [
-  "anthropic==0.42.0",
-  "google-generativeai==0.8.4",
   "pytest==8.3.4",
   "uvicorn==0.34.0",
+  "anthropic==0.42.0",
+  "google-generativeai==0.8.4",
   "databricks-langchain==0.7.1",
   "databricks-sdk==0.64.0",
+  "langchain-aws>=0.2.35,<1",
   # Python 3.11+ versions
   "azure-identity==1.25.0; python_version>='3.11'",
   "langchain-anthropic==0.3.5; python_version>='3.11'",

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/requirements.txt

@@ -6,8 +6,9 @@ databricks-sdk==0.64.0
 google-generativeai==0.8.4
 langchain==0.3.27
 langchain-anthropic==0.3.5
+langchain-aws==0.2.35
 langchain-community==0.3.30
-langchain-core==0.3.78
+langchain-core==0.3.80
 langchain-google-genai==2.0.10
 langchain-google-vertexai==2.1.2
 langchain-openai==0.3.34

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/requirements310.txt

@@ -6,7 +6,8 @@ databricks-sdk==0.64.0
 google-generativeai==0.8.4
 langchain>=0.3.25
 langchain-anthropic>=0.3.1
-langchain_community>=0.3.20
+langchain-aws==0.2.35
+langchain-community>=0.3.27
 langchain-core>=0.3.58
 langchain-google-genai>=2.0.9
 langchain-google-vertexai>=2.0.28

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/requirements311.txt

@@ -6,8 +6,9 @@ databricks-sdk==0.64.0
 google-generativeai==0.8.4
 langchain==0.3.27
 langchain-anthropic==0.3.5
+langchain-aws==0.2.35
 langchain-community==0.3.30
-langchain-core==0.3.78
+langchain-core==0.3.80
 langchain-google-genai==2.0.10
 langchain-google-vertexai==2.1.2
 langchain-openai==0.3.34

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/src/langchain_timbr/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.1.4'
-__version_tuple__ = version_tuple = (2, 1, 4)
+__version__ = version = '2.1.5'
+__version_tuple__ = version_tuple = (2, 1, 5)
 
 __commit_id__ = commit_id = None

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/src/langchain_timbr/langgraph/generate_response_node.py

@@ -20,6 +20,7 @@ class GenerateResponseNode:
         is_jwt: Optional[bool] = False,
         jwt_tenant_id: Optional[str] = None,
         conn_params: Optional[dict] = None,
+        note: Optional[str] = '',
         debug: Optional[bool] = False,
         **kwargs,
     ):
@@ -31,6 +32,7 @@ class GenerateResponseNode:
         :param is_jwt: Whether to use JWT authentication (default is False).
         :param jwt_tenant_id: JWT tenant ID for multi-tenant environments (required when is_jwt=True).
         :param conn_params: Extra Timbr connection parameters sent with every request (e.g., 'x-api-impersonate-user').
+        :param note: Optional additional note to extend our llm prompt
         """
         self.chain = GenerateAnswerChain(
             llm=llm,
@@ -40,6 +42,7 @@ class GenerateResponseNode:
             is_jwt=is_jwt,
             jwt_tenant_id=jwt_tenant_id,
             conn_params=conn_params,
+            note=note,
             debug=debug,
             **kwargs,
         )

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/src/langchain_timbr/llm_wrapper/llm_wrapper.py

@@ -15,6 +15,7 @@ class LlmTypes(Enum):
   Snowflake = 'snowflake-cortex'
   Databricks = 'chat-databricks'
   VertexAI = 'chat-vertexai'
+  Bedrock = 'amazon_bedrock_converse_chat'
   Timbr = 'timbr'
 
 
@@ -252,6 +253,28 @@ class LlmWrapper(LLM):
         credentials=creds,
         **params,
       )
+    elif is_llm_type(llm_type, LlmTypes.Bedrock):
+      from langchain_aws import ChatBedrockConverse
+      llm_model = model or "openai.gpt-oss-20b-1:0"
+      params = self._add_temperature(LlmTypes.Bedrock.name, llm_model, **llm_params)
+
+      aws_region = pop_param_value(params, ['aws_region', 'llm_region', 'region'])
+      if aws_region:
+        params['region_name'] = aws_region
+      aws_access_key_id = pop_param_value(params, ['aws_access_key_id', 'llm_access_key_id', 'access_key_id'])
+      if aws_access_key_id:
+        params['aws_access_key_id'] = aws_access_key_id
+      aws_secret_access_key = pop_param_value(params, ['aws_secret_access_key', 'llm_secret_access_key', 'secret_access_key'], default=api_key)
+      if aws_secret_access_key:
+        params['aws_secret_access_key'] = aws_secret_access_key
+      aws_session_token = pop_param_value(params, ['aws_session_token', 'llm_session_token', 'session_token'])
+      if aws_session_token:
+        params['aws_session_token'] = aws_session_token
+
+      return ChatBedrockConverse(
+        model=llm_model,
+        **params,
+      )
     else:
       raise ValueError(f"Unsupported LLM type: {llm_type}")
 
@@ -324,6 +347,31 @@ class LlmWrapper(LLM):
         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()]
+      elif is_llm_type(self._llm_type, LlmTypes.Bedrock):
+        import boto3
+        
+        # Extract SecretStr values properly
+        aws_access_key_id = getattr(self.client, 'aws_access_key_id', None)
+        if aws_access_key_id and hasattr(aws_access_key_id, '_secret_value'):
+          aws_access_key_id = aws_access_key_id._secret_value
+        
+        aws_secret_access_key = getattr(self.client, 'aws_secret_access_key', None)
+        if aws_secret_access_key and hasattr(aws_secret_access_key, '_secret_value'):
+          aws_secret_access_key = aws_secret_access_key._secret_value
+        
+        aws_session_token = getattr(self.client, 'aws_session_token', None)
+        if aws_session_token and hasattr(aws_session_token, '_secret_value'):
+          aws_session_token = aws_session_token._secret_value
+        
+        bedrock_client = boto3.client(
+          service_name='bedrock',
+          region_name=getattr(self.client, 'region_name', None),
+          aws_access_key_id=aws_access_key_id,
+          aws_secret_access_key=aws_secret_access_key,
+          aws_session_token=aws_session_token,
+        )
+        response = bedrock_client.list_foundation_models()
+        models = [model['modelId'] for model in response.get('modelSummaries', [])]
 
     except Exception:
       # If model list fetching throws an exception, return default value using get_supported_models
@@ -341,6 +389,9 @@ class LlmWrapper(LLM):
 
 
   def _call(self, prompt, **kwargs):
+    # TODO: Remove this condition on next langchain-timbr major release
+    if is_llm_type(self._llm_type, LlmTypes.Bedrock):
+      return self.client.invoke(prompt, **kwargs)
     return self.client(prompt, **kwargs)
 
 

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/tests/standard/test_optional_llm_integration.py

@@ -145,12 +145,7 @@ class TestOptionalLLMIntegration:
         
         # Mock the config values
         with patch('langchain_timbr.llm_wrapper.llm_wrapper.config.llm_type', 'openai-chat'),\
-             patch('langchain_timbr.llm_wrapper.llm_wrapper.config.llm_api_key', 'env-key'),\
-             patch.dict(os.environ, {
-                'TIMBR_URL': 'http://test-timbr.com',
-                'TIMBR_TOKEN': 'test-token',
-                'TIMBR_ONTOLOGY': 'test-ontology'
-             }):
+             patch('langchain_timbr.llm_wrapper.llm_wrapper.config.llm_api_key', 'env-key'):
             # Create explicit LLM
             explicit_llm = LlmWrapper(
                 llm_type='openai-chat',

{langchain_timbr-2.1.4 → langchain_timbr-2.1.5}/src/langchain_timbr/langchain/generate_answer_chain.py

@@ -34,8 +34,8 @@ class GenerateAnswerChain(Chain):
         :param verify_ssl: Whether to verify SSL certificates (default is True).
         :param is_jwt: Whether to use JWT authentication (default is False).
         :param jwt_tenant_id: JWT tenant ID for multi-tenant environments (required when is_jwt=True).
-        :param note: Optional additional note to extend our llm prompt
         :param conn_params: Extra Timbr connection parameters sent with every request (e.g., 'x-api-impersonate-user').
+        :param note: Optional additional note to extend our llm prompt
         
         ## Example
         ```