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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 2.1.3
+Version: 2.1.4
 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/

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/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.3'
-__version_tuple__ = version_tuple = (2, 1, 3)
+__version__ = version = '2.1.4'
+__version_tuple__ = version_tuple = (2, 1, 4)
 
 __commit_id__ = commit_id = None

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/langchain/execute_timbr_query_chain.py

@@ -169,6 +169,7 @@ class ExecuteTimbrQueryChain(Chain):
             "verify_ssl": self._verify_ssl,
             "is_jwt": self._is_jwt,
             "jwt_tenant_id": self._jwt_tenant_id,
+            "additional_headers": {"results-limit": str(self._max_limit)},
             **self._conn_params,
         }
 
@@ -265,7 +266,8 @@ class ExecuteTimbrQueryChain(Chain):
                 rows = run_query(
                     sql,
                     self._get_conn_params(),
-                    llm_prompt=prompt
+                    llm_prompt=prompt,
+                    use_query_limit=True,
                 ) if is_sql_valid and is_sql_not_tried else []
                 
                 if iteration < self._no_results_max_retries:

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

@@ -23,6 +23,7 @@ class GenerateAnswerChain(Chain):
         is_jwt: Optional[bool] = False,
         jwt_tenant_id: Optional[str] = None,
         conn_params: Optional[dict] = None,
+        note: Optional[str] = '',
         debug: Optional[bool] = False,
         **kwargs,
     ):
@@ -33,6 +34,7 @@ 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').
         
         ## Example
@@ -77,6 +79,7 @@ class GenerateAnswerChain(Chain):
         self._jwt_tenant_id = jwt_tenant_id
         self._debug = to_boolean(debug)
         self._conn_params = conn_params or {}
+        self._note = note
 
 
     @property
@@ -116,6 +119,7 @@ class GenerateAnswerChain(Chain):
             conn_params=self._get_conn_params(),
             results=rows,
             sql=sql,
+            note=self._note,
             debug=self._debug,
         )
 

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/langchain/generate_timbr_sql_chain.py

@@ -160,6 +160,7 @@ class GenerateTimbrSqlChain(Chain):
             "verify_ssl": self._verify_ssl,
             "is_jwt": self._is_jwt,
             "jwt_tenant_id": self._jwt_tenant_id,
+            "additional_headers": {"results-limit": str(self._max_limit)},
             **self._conn_params,
         }
 

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/langchain/timbr_sql_agent.py

@@ -126,6 +126,7 @@ class TimbrSqlAgent(BaseSingleActionAgent):
             is_jwt=to_boolean(is_jwt),
             jwt_tenant_id=jwt_tenant_id,
             conn_params=conn_params,
+            note=note,
             debug=to_boolean(debug),
         ) if self._generate_answer else None
 

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/langchain/validate_timbr_sql_chain.py

@@ -161,6 +161,7 @@ class ValidateTimbrSqlChain(Chain):
             "verify_ssl": self._verify_ssl,
             "is_jwt": self._is_jwt,
             "jwt_tenant_id": self._jwt_tenant_id,
+            "additional_headers": {"results-limit": str(self._max_limit)},
             **self._conn_params,
         }
 

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/timbr_llm_connector.py

@@ -115,6 +115,7 @@ class TimbrLlmConnector:
             "verify_ssl": self.verify_ssl,
             "is_jwt": self.is_jwt,
             "jwt_tenant_id": self.jwt_tenant_id,
+            "additional_headers": {"results-limit": str(self.max_limit)},
             **self.conn_params,
         }
 

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/utils/timbr_llm_utils.py

@@ -545,8 +545,9 @@ def answer_question(
     conn_params: dict,
     results: str,
     sql: Optional[str] = None,
-    debug: Optional[bool] = False,
     timeout: Optional[int] = None,
+    note: Optional[str] = '',
+    debug: Optional[bool] = False,
 ) -> dict[str, Any]:
     # Use config default timeout if none provided
     if timeout is None:
@@ -558,6 +559,7 @@ def answer_question(
         question=question,
         formatted_rows=results,
         additional_context=f"SQL QUERY:\n{sql}\n\n" if sql else "",
+        note=note,
     )
     
     apx_token_count = _calculate_token_count(llm, prompt)

{langchain_timbr-2.1.3 → langchain_timbr-2.1.4}/src/langchain_timbr/utils/timbr_utils.py

@@ -70,7 +70,7 @@ def cache_with_version_check(func):
     return wrapper
 
 
-def run_query(sql: str, conn_params: dict, llm_prompt: Optional[str] = None) -> list[list]:
+def run_query(sql: str, conn_params: dict, llm_prompt: Optional[str] = None, use_query_limit = False) -> list[list]:
     if not conn_params:
         raise("Please provide connection params.")
 
@@ -79,9 +79,22 @@ def run_query(sql: str, conn_params: dict, llm_prompt: Optional[str] = None) ->
         clean_prompt = llm_prompt.replace('\r\n', ' ').replace('\n', ' ').replace('?', '')
         query = f"-- LLM: {clean_prompt}\n{sql}"
 
+    query_conn_params = conn_params
+    if not use_query_limit:
+        # Remove results-limit
+        if 'additional_headers' in conn_params and 'results-limit' in conn_params['additional_headers']:
+            query_upper = query.strip().upper()
+            if query_upper.startswith('SHOW') or query_upper.startswith('DESC'):
+                query_conn_params = conn_params.copy()
+                query_conn_params['additional_headers'] = conn_params['additional_headers'].copy()
+                del query_conn_params['additional_headers']['results-limit']
+                # If no other additional_headers remain, delete the key entirely
+                if not query_conn_params['additional_headers']:
+                    del query_conn_params['additional_headers']
+
     results = timbr_http_connector.run_query(
         query=query,
-        **conn_params,
+        **query_conn_params,
     )
 
     return results