langchain-timbr 1.5.2__py3-none-any.whl → 1.5.3__py3-none-any.whl

langchain_timbr/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.2'
-__version_tuple__ = version_tuple = (1, 5, 2)
+__version__ = version = '1.5.3'
+__version_tuple__ = version_tuple = (1, 5, 3)
 
 __commit_id__ = commit_id = None

langchain_timbr/llm_wrapper/llm_wrapper.py

@@ -12,13 +12,14 @@ class LlmTypes(Enum):
   Google = 'chat-google-generative-ai'
   AzureOpenAI = 'azure-openai-chat'
   Snowflake = 'snowflake-cortex'
+  Databricks = 'chat-databricks'
   Timbr = 'timbr'
 
 
 class LlmWrapper(LLM):
   """
   LlmWrapper is a unified interface for connecting to various Large Language Model (LLM) providers
-  (OpenAI, Anthropic, Google, Azure OpenAI, Snowflake Cortex, etc.) using LangChain. It abstracts
+  (OpenAI, Anthropic, Google, Azure OpenAI, Snowflake Cortex, Databricks, etc.) using LangChain. It abstracts
   the initialization and connection logic for each provider, allowing you to switch between them
   with a consistent API.
   """
@@ -95,12 +96,14 @@ class LlmWrapper(LLM):
         **params,
       )
     elif is_llm_type(llm_type, LlmTypes.Snowflake):
-      from langchain_community.chat_models import ChatSnowflakeCortex      
+      from langchain_community.chat_models import ChatSnowflakeCortex
       llm_model = model or "openai-gpt-4.1"
       params = self._add_temperature(LlmTypes.Snowflake.name, llm_model, **llm_params)
+      snowflake_password = params.pop('snowflake_api_key', params.pop('snowflake_password', api_key))
       
       return ChatSnowflakeCortex(
         model=llm_model,
+        snowflake_password=snowflake_password,
         **params,
       )
     elif is_llm_type(llm_type, LlmTypes.AzureOpenAI):
@@ -116,6 +119,19 @@ class LlmWrapper(LLM):
         openai_api_version=azure_api_version,
         **params,
       )
+    elif is_llm_type(llm_type, LlmTypes.Databricks):
+      from databricks.sdk import WorkspaceClient
+      from databricks_langchain import ChatDatabricks
+      llm_model = model or "databricks-claude-sonnet-4"
+      params = self._add_temperature(LlmTypes.Databricks.name, llm_model, **llm_params)
+
+      host = params.pop('databricks_host', params.pop('host', None))
+      w = WorkspaceClient(host=host, token=api_key)
+      return ChatDatabricks(
+        endpoint=llm_model,
+        workspace_client=w,  # Using authenticated client
+        **params,
+      )
     else:
       raise ValueError(f"Unsupported LLM type: {llm_type}")
 
@@ -163,12 +179,16 @@ class LlmWrapper(LLM):
           "llama3.1-70b",
           "llama3.1-405b"
         ]
+      elif is_llm_type(self._llm_type, LlmTypes.Databricks):
+        w = self.client.workspace_client
+        models = [ep.name for ep in w.serving_endpoints.list()]
+        
       # elif self._is_llm_type(self._llm_type, LlmTypes.Timbr):
         
     except Exception as e:
       models = []
     
-    return models
+    return sorted(models)
 
 
   def _call(self, prompt, **kwargs):

langchain_timbr/utils/general.py

@@ -44,7 +44,8 @@ def is_llm_type(llm_type, enum_value):
             llm_type_lower == enum_name_lower or
             llm_type_lower == enum_value_lower or
             llm_type_lower.startswith(enum_name_lower) or # Usecase for snowflake which its type is the provider name + the model name
-            llm_type_lower.startswith(enum_value_lower)
+            llm_type_lower.startswith(enum_value_lower) or
+            llm_type_lower in enum_value_lower # Check if the enum value includes the llm type - when providing partial name
         )
 
     return False

langchain_timbr/utils/prompt_service.py

@@ -22,7 +22,7 @@ class PromptService:
         jwt_tenant_id: Optional[str] = default_jwt_tenant_id,
         timeout: Optional[int] = llm_timeout,
     ):
-        self.base_url = base_url.rstrip('/')
+        self.base_url = base_url.rstrip('/') if base_url else ''
         self.token = token
         self.is_jwt = is_jwt
         self.jwt_tenant_id = jwt_tenant_id

langchain_timbr/utils/temperature_supported_models.json

@@ -2,61 +2,69 @@
   "OpenAI": [
     "gpt-4",
     "gpt-4-turbo",
-    "gpt-4o"
+    "gpt-4o",
+    "gpt-5",
+    "gpt-5-chat-latest",
+    "gpt-5-mini"
   ],
   "Anthropic": [
-    "claude-opus-4-20250514",
-    "claude-sonnet-4-20250514",
-    "claude-3-7-sonnet-20250219",
-    "claude-3-5-sonnet-20241022",
     "claude-3-5-haiku-20241022",
     "claude-3-5-sonnet-20240620",
+    "claude-3-5-sonnet-20241022",
+    "claude-3-7-sonnet-20250219",
     "claude-3-haiku-20240307",
     "claude-3-opus-20240229",
-    "claude-3-sonnet-20240229",
-    "claude-2.1",
-    "claude-2.0"
+    "claude-opus-4-20250514",
+    "claude-sonnet-4-20250514"
   ],
   "Google": [
-    "gemini-1.5-flash-latest",
     "gemini-1.5-flash",
     "gemini-1.5-flash-002",
     "gemini-1.5-flash-8b",
     "gemini-1.5-flash-8b-001",
     "gemini-1.5-flash-8b-latest",
-    "gemini-2.5-flash-preview-04-17",
-    "gemini-2.5-flash-preview-05-20",
-    "gemini-2.5-flash",
-    "gemini-2.5-flash-preview-04-17-thinking",
-    "gemini-2.5-flash-lite-preview-06-17",
-    "gemini-2.5-pro",
-    "gemini-2.0-flash-exp",
+    "gemini-1.5-flash-latest",
     "gemini-2.0-flash",
     "gemini-2.0-flash-001",
+    "gemini-2.0-flash-exp",
     "gemini-2.0-flash-exp-image-generation",
-    "gemini-2.0-flash-lite-001",
     "gemini-2.0-flash-lite",
-    "gemini-2.0-flash-lite-preview-02-05",
+    "gemini-2.0-flash-lite-001",
     "gemini-2.0-flash-lite-preview",
-    "gemini-2.0-flash-thinking-exp-01-21",
+    "gemini-2.0-flash-lite-preview-02-05",
     "gemini-2.0-flash-thinking-exp",
+    "gemini-2.0-flash-thinking-exp-01-21",
     "gemini-2.0-flash-thinking-exp-1219",
-    "learnlm-2.0-flash-experimental",
-    "gemma-3-1b-it",
-    "gemma-3-4b-it",
+    "gemini-2.5-flash",
+    "gemini-2.5-flash-lite",
+    "gemini-2.5-flash-lite-preview-06-17",
+    "gemini-2.5-flash-preview-05-20",
     "gemma-3-12b-it",
+    "gemma-3-1b-it",
     "gemma-3-27b-it",
-    "gemma-3n-e4b-it",
-    "gemma-3n-e2b-it"
+    "gemma-3-4b-it",
+    "gemma-3n-e2b-it",
+    "gemma-3n-e4b-it"
   ],
   "AzureOpenAI": [
     "gpt-4o"
   ],
   "Snowflake": [
-    "openai-gpt-4.1",
-    "mistral-large2",
+    "llama3.1-405b",
     "llama3.1-70b",
-    "llama3.1-405b"
+    "mistral-large2",
+    "openai-gpt-4.1"
+  ],
+  "Databricks": [
+    "databricks-claude-3-7-sonnet",
+    "databricks-claude-sonnet-4",
+    "databricks-gemma-3-12b",
+    "databricks-gpt-oss-120b",
+    "databricks-gpt-oss-20b",
+    "databricks-llama-4-maverick",
+    "databricks-meta-llama-3-1-405b-instruct",
+    "databricks-meta-llama-3-1-8b-instruct",
+    "databricks-meta-llama-3-3-70b-instruct"
   ],
   "Timbr": []
 }

langchain_timbr/utils/timbr_llm_utils.py

@@ -165,6 +165,40 @@ def _calculate_token_count(llm: LLM, prompt: str) -> int:
     return token_count
     
 
+def _get_response_text(response: Any) -> str:
+    if hasattr(response, "content"):
+        response_text = response.content
+
+        # Handle Databricks gpt-oss type of responses (having list of dicts with type + summary for reasoning or type + text for result)
+        if isinstance(response_text, list):
+            response_text = next(filter(lambda x: x.get('type') == 'text', response.content), None)
+        if isinstance(response_text, dict):
+            response_text = response_text.get('text', '')
+    elif isinstance(response, str):
+        response_text = response
+    else:
+        raise ValueError("Unexpected response format from LLM.")
+
+    return response_text
+
+def _extract_usage_metadata(response: Any) -> dict:
+    usage_metadata = response.response_metadata
+
+    if usage_metadata and 'usage' in usage_metadata:
+        usage_metadata = usage_metadata['usage']
+
+    if not usage_metadata and 'usage_metadata' in response:
+        usage_metadata = response.usage_metadata
+        if usage_metadata and 'usage' in usage_metadata:
+            usage_metadata = usage_metadata['usage']
+
+    if not usage_metadata and 'usage' in response:
+        usage_metadata = response.usage
+        if usage_metadata and 'usage' in usage_metadata:
+            usage_metadata = usage_metadata['usage']
+
+    return usage_metadata
+
 def determine_concept(
     question: str,
     llm: LLM,
@@ -253,20 +287,12 @@ def determine_concept(
                 continue
             usage_metadata['determine_concept'] = {
                 "approximate": apx_token_count,
-                # **(response.usage_metadata or response.usage or {}),
-                **(response.usage_metadata or {}),
+                **_extract_usage_metadata(response),
             }
             if debug:
                 usage_metadata['determine_concept']["p_hash"] = encrypt_prompt(prompt)
 
-            if hasattr(response, "content"):
-                response_text = response.content
-            elif isinstance(response, str):
-                response_text = response
-            else:
-                raise ValueError("Unexpected response format from LLM.")
-
-
+            response_text = _get_response_text(response)
             candidate = response_text.strip()
             if should_validate and candidate not in concepts.keys():
                 error = f"Concept '{determined_concept_name}' not found in the list of concepts."
@@ -351,13 +377,7 @@ def _build_rel_columns_str(relationships: list[dict], columns_tags: Optional[dic
 
 
 def _parse_sql_from_llm_response(response: Any) -> str:
-    if hasattr(response, "content"):
-        response_text = response.content
-    elif isinstance(response, str):
-        response_text = response
-    else:
-        raise ValueError("Unexpected response format from LLM.")
-    
+    response_text = _get_response_text(response)
     return (response_text
             .replace("```sql", "")
             .replace("```", "")
@@ -497,8 +517,7 @@ def generate_sql(
 
         usage_metadata['generate_sql'] = {
             "approximate": apx_token_count,
-            # **(response.usage_metadata or response.usage or {}),
-            **(response.usage_metadata or {}),
+            **_extract_usage_metadata(response),
         }
         if debug:
             usage_metadata['generate_sql']["p_hash"] = encrypt_prompt(prompt)
@@ -561,8 +580,7 @@ def answer_question(
     usage_metadata = {
         "answer_question": {
             "approximate": apx_token_count,
-            # **(response.usage_metadata or response.usage or {}),
-            **(response.usage_metadata or {}),
+            **_extract_usage_metadata(response),
         },
     }
     if debug:

{langchain_timbr-1.5.2.dist-info → langchain_timbr-1.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 1.5.2
+Version: 1.5.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/
@@ -28,15 +28,18 @@ Requires-Dist: langgraph>=0.3.20
 Requires-Dist: pydantic==2.10.4
 Requires-Dist: pytimbr-api>=2.0.0
 Requires-Dist: tiktoken==0.8.0
-Requires-Dist: transformers>=4.51.3
+Requires-Dist: transformers>=4.53
 Provides-Extra: all
 Requires-Dist: anthropic==0.42.0; 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-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: openai>=1.77.0; extra == 'all'
 Requires-Dist: pyarrow<19.0.0; extra == 'all'
 Requires-Dist: pytest==8.3.4; extra == 'all'
 Requires-Dist: snowflake-snowpark-python>=1.6.0; extra == 'all'
@@ -45,6 +48,13 @@ Requires-Dist: uvicorn==0.34.0; extra == 'all'
 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: langchain-openai>=0.3.16; extra == 'azure-openai'
+Requires-Dist: openai>=1.77.0; extra == 'azure-openai'
+Provides-Extra: databricks
+Requires-Dist: databricks-langchain==0.3.0; (python_version < '3.10') and extra == 'databricks'
+Requires-Dist: databricks-langchain==0.7.1; (python_version >= '3.10') and extra == 'databricks'
+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'
@@ -55,7 +65,7 @@ Requires-Dist: google-generativeai==0.8.4; extra == 'google'
 Requires-Dist: langchain-google-genai>=2.0.9; extra == 'google'
 Provides-Extra: openai
 Requires-Dist: langchain-openai>=0.3.16; extra == 'openai'
-Requires-Dist: openai==1.77.0; extra == 'openai'
+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'
@@ -80,15 +90,23 @@ Timbr LangChain LLM SDK is a Python SDK that extends LangChain and LangGraph wit
 
 ## Dependencies
 - Access to a timbr-server
-- Python from 3.9.13 or newer
+- Python 3.9.13 or newer
 
 ## Installation
 
 ### Using pip
+
 ```bash
 python -m pip install langchain-timbr
 ```
 
+### Install with selected LLM providers
+#### One of: openai, anthropic, google, azure_openai, snowflake, databricks (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-1.5.2.dist-info → langchain_timbr-1.5.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 langchain_timbr/__init__.py,sha256=gxd6Y6QDmYZtPlYVdXtPIy501hMOZXHjWh2qq4qzt_s,828
-langchain_timbr/_version.py,sha256=fUJ-NqWYnyaK1C9rKEno8BrEixvc59sizL4S-uoRUBE,704
+langchain_timbr/_version.py,sha256=YmPxci9z5OdhwvwXu2qOrZdFU4K4N2lTtMkI0KAJCh0,704
 langchain_timbr/config.py,sha256=NOMjSpo0TVkWT8BdbiGSADU08iknF2bRltFLwQRhpwk,832
 langchain_timbr/timbr_llm_connector.py,sha256=OXRttlEOJf-dTyilnXR6b6Cgl_cWDYrXGXQfmDV6vc8,13206
 langchain_timbr/langchain/__init__.py,sha256=ejcsZKP9PK0j4WrrCCcvBXpDpP-TeRiVb21OIUJqix8,580
@@ -15,14 +15,14 @@ langchain_timbr/langgraph/generate_response_node.py,sha256=gChNFSPjK9lKwblgWTia6
 langchain_timbr/langgraph/generate_timbr_sql_node.py,sha256=qyL7uqB5k-Bv8rE12f2Ub7wlcAw-pQibEPP1SvFKLu0,4638
 langchain_timbr/langgraph/identify_concept_node.py,sha256=ot9TFdRg8FA9JYVrtHLVi5k0vmUHUfL4ptQDFYYqOoA,3376
 langchain_timbr/langgraph/validate_timbr_query_node.py,sha256=TypUs60OaBhOx9Ceq-15qNVuuAvfrFBjQsPRjWK1StQ,4469
-langchain_timbr/llm_wrapper/llm_wrapper.py,sha256=sNMEqhtZx4S0ZKJCyg8OSE3fAWu1xI6Bp_GoRs7k4dI,6801
+langchain_timbr/llm_wrapper/llm_wrapper.py,sha256=qd6MHbmJsU02no7bAReec3Ps4oYc_m0WPrDFqRY2Dlc,7735
 langchain_timbr/llm_wrapper/timbr_llm_wrapper.py,sha256=sDqDOz0qu8b4WWlagjNceswMVyvEJ8yBWZq2etBh-T0,1362
-langchain_timbr/utils/general.py,sha256=753GNpYiyxhfYq59Bi8qvCyuHmTrD1fobcm6U2jZAF4,2394
-langchain_timbr/utils/prompt_service.py,sha256=pJcBz3MKR51ajdU9gkif1r9_K7FxYbpWBiTkKA0A2q0,11144
-langchain_timbr/utils/temperature_supported_models.json,sha256=e8j9O-68eCJhEK_NWowh3C6FE7UXFbR9icjDQfJBkdM,1596
-langchain_timbr/utils/timbr_llm_utils.py,sha256=Gpp3nKG1MiwNBpl2Uua3pmKyxd1OEirRLW0kkxI473E,22462
+langchain_timbr/utils/general.py,sha256=Psb9F9ylI0z-1Ddw0Hi74nKl03_aLanIV9YC-MJUdsw,2522
+langchain_timbr/utils/prompt_service.py,sha256=f-L2w-wRCF9GEMLC7GZy_gZ0pcnEQj0em-lDJvg2onY,11164
+langchain_timbr/utils/temperature_supported_models.json,sha256=d3UmBUpG38zDjjB42IoGpHTUaf0pHMBRSPY99ao1a3g,1832
+langchain_timbr/utils/timbr_llm_utils.py,sha256=Mn9Q9Wj97WuOZO3xKxZLjTQx31H22EACAPppz3B0JlE,23202
 langchain_timbr/utils/timbr_utils.py,sha256=p21DwTGhF4iKTLDQBkeBaJDFcXt-Hpu1ij8xzQt00Ng,16958
-langchain_timbr-1.5.2.dist-info/METADATA,sha256=oieqooi9i5wlYlZ3YXJYzZS0VqSljnao7JlqJTSylwM,5235
-langchain_timbr-1.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langchain_timbr-1.5.2.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
-langchain_timbr-1.5.2.dist-info/RECORD,,
+langchain_timbr-1.5.3.dist-info/METADATA,sha256=jt8vCwK1a1hwjgTPxG2DzhNF0KO0CkqY-3kPTftejTc,6129
+langchain_timbr-1.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langchain_timbr-1.5.3.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
+langchain_timbr-1.5.3.dist-info/RECORD,,