langchain-timbr 2.1.7__tar.gz → 2.1.8__tar.gz

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 2.1.7
+Version: 2.1.8
 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.7 → langchain_timbr-2.1.8}/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.7'
-__version_tuple__ = version_tuple = (2, 1, 7)
+__version__ = version = '2.1.8'
+__version_tuple__ = version_tuple = (2, 1, 8)
 
 __commit_id__ = commit_id = None

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/config.py

@@ -31,4 +31,8 @@ llm_scope = os.environ.get('LLM_SCOPE', "https://cognitiveservices.azure.com/.de
 
 # Whether to enable reasoning during SQL generation
 enable_reasoning = to_boolean(os.environ.get('ENABLE_REASONING', 'false'))
-reasoning_steps = to_integer(os.environ.get('REASONING_STEPS', 2))
+reasoning_steps = to_integer(os.environ.get('REASONING_STEPS', 2))
+
+should_validate_sql = to_boolean(os.environ.get('SHOULD_VALIDATE_SQL', os.environ.get('LLM_SHOULD_VALIDATE_SQL', 'true')))
+retry_if_no_results = to_boolean(os.environ.get('RETRY_IF_NO_RESULTS', os.environ.get('LLM_RETRY_IF_NO_RESULTS', 'true')))
+llm_default_limit = to_integer(os.environ.get('LLM_DEFAULT_LIMIT', 500))  # Default max tokens limit for LLM responses

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langchain/execute_timbr_query_chain.py

@@ -30,10 +30,10 @@ class ExecuteTimbrQueryChain(Chain):
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
-        retry_if_no_results: Optional[bool] = False,
+        max_limit: Optional[int] = config.llm_default_limit,
+        retry_if_no_results: Optional[bool] = config.retry_if_no_results,
         no_results_max_retries: Optional[int] = 2,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langchain/generate_timbr_sql_chain.py

@@ -29,9 +29,9 @@ class GenerateTimbrSqlChain(Chain):
         include_tags: Optional[Union[list[str], str]] = None,
         include_logic_concepts: Optional[bool] = False,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,
         graph_depth: Optional[int] = 1,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langchain/timbr_sql_agent.py

@@ -22,10 +22,10 @@ class TimbrSqlAgent(BaseSingleActionAgent):
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        should_validate_sql: Optional[bool] = True,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
-        retry_if_no_results: Optional[bool] = False,
+        max_limit: Optional[int] = config.llm_default_limit,
+        retry_if_no_results: Optional[bool] = config.retry_if_no_results,
         no_results_max_retries: Optional[int] = 2,
         generate_answer: Optional[bool] = False,
         note: Optional[str] = '',
@@ -332,10 +332,10 @@ def create_timbr_sql_agent(
     include_logic_concepts: Optional[bool] = False,
     include_tags: Optional[Union[list[str], str]] = None,
     exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-    should_validate_sql: Optional[bool] = True,
+    should_validate_sql: Optional[bool] = config.should_validate_sql,
     retries: Optional[int] = 3,
-    max_limit: Optional[int] = 500,
-    retry_if_no_results: Optional[bool] = False,
+    max_limit: Optional[int] = config.llm_default_limit,
+    retry_if_no_results: Optional[bool] = config.retry_if_no_results,
     no_results_max_retries: Optional[int] = 2,
     generate_answer: Optional[bool] = False,
     note: Optional[str] = '',

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langchain/validate_timbr_sql_chain.py

@@ -32,7 +32,7 @@ class ValidateTimbrSqlChain(Chain):
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,
         graph_depth: Optional[int] = 1,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langgraph/execute_timbr_query_node.py

@@ -24,10 +24,10 @@ class ExecuteSemanticQueryNode:
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
-        retry_if_no_results: Optional[bool] = False,
+        max_limit: Optional[int] = config.llm_default_limit,
+        retry_if_no_results: Optional[bool] = config.retry_if_no_results,
         no_results_max_retries: Optional[int] = 2,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langgraph/generate_timbr_sql_node.py

@@ -23,9 +23,9 @@ class GenerateTimbrSqlNode:
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,
         graph_depth: Optional[int] = 1,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/langgraph/validate_timbr_query_node.py

@@ -3,7 +3,7 @@ from langchain.llms.base import LLM
 from langgraph.graph import StateGraph
 
 from ..langchain.validate_timbr_sql_chain import ValidateTimbrSqlChain
-
+from .. import config
 
 class ValidateSemanticSqlNode:
     """
@@ -25,7 +25,7 @@ class ValidateSemanticSqlNode:
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[Union[list[str], str]] = None,
         exclude_properties: Optional[Union[list[str], str]] = ['entity_id', 'entity_type', 'entity_label'],
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         note: Optional[str] = None,
         db_is_case_sensitive: Optional[bool] = False,
         graph_depth: Optional[int] = 1,
@@ -33,8 +33,8 @@ class ValidateSemanticSqlNode:
         is_jwt: Optional[bool] = False,
         jwt_tenant_id: Optional[str] = None,
         conn_params: Optional[dict] = None,
-        enable_reasoning: Optional[bool] = False,
-        reasoning_steps: Optional[int] = 2,
+        enable_reasoning: Optional[bool] = config.enable_reasoning,
+        reasoning_steps: Optional[int] = config.reasoning_steps,
         debug: Optional[bool] = False,
         **kwargs,
     ):

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/timbr_llm_connector.py

@@ -30,7 +30,7 @@ class TimbrLlmConnector:
         url: Optional[str] = config.url,
         token: Optional[str] = config.token,
         ontology: Optional[str] = config.ontology,
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         verify_ssl: Optional[bool] = True,
         is_jwt: Optional[bool] = False,
         jwt_tenant_id: Optional[str] = None,
@@ -185,7 +185,7 @@ class TimbrLlmConnector:
         views_list: Optional[list] = None,
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[str] = None,
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
         note: Optional[str] = '',
         **chain_kwargs: Any,
@@ -243,7 +243,7 @@ class TimbrLlmConnector:
         views_list: Optional[list] = None,
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[str] = None,
-        should_validate_sql: Optional[bool] = True,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
         note: Optional[str] = '',
         **chain_kwargs: Any,
@@ -272,7 +272,7 @@ class TimbrLlmConnector:
         views_list: Optional[list] = None,
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[str] = None,
-        should_validate_sql: Optional[bool] = True,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
         note: Optional[str] = '',
         **agent_kwargs: Any,
@@ -302,7 +302,7 @@ class TimbrLlmConnector:
         views_list: Optional[list] = None,
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[str] = None,
-        should_validate_sql: Optional[bool] = True,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
         note: Optional[str] = '',
         **nodes_kwargs: Any,

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/src/langchain_timbr/utils/timbr_llm_utils.py

@@ -11,7 +11,7 @@ from .prompt_service import (
     get_generate_sql_reasoning_prompt_template,
     get_qa_prompt_template
 )
-from ..config import llm_timeout
+from .. import config
 
 def _clean_snowflake_prompt(prompt: Any) -> None:
     import re
@@ -272,7 +272,7 @@ def determine_concept(
     
     # Use config default timeout if none provided
     if timeout is None:
-        timeout = llm_timeout
+        timeout = config.llm_timeout
     
     determine_concept_prompt = get_determine_concept_prompt_template(conn_params)
     tags = get_tags(conn_params=conn_params, include_tags=include_tags)
@@ -648,9 +648,9 @@ def generate_sql(
         include_logic_concepts: Optional[bool] = False,
         include_tags: Optional[str] = None,
         exclude_properties: Optional[list] = None,
-        should_validate_sql: Optional[bool] = False,
+        should_validate_sql: Optional[bool] = config.should_validate_sql,
         retries: Optional[int] = 3,
-        max_limit: Optional[int] = 500,
+        max_limit: Optional[int] = config.llm_default_limit,
         note: Optional[str] = '',
         db_is_case_sensitive: Optional[bool] = False,
         graph_depth: Optional[int] = 1,
@@ -665,7 +665,7 @@ def generate_sql(
     
     # Use config default timeout if none provided
     if timeout is None:
-        timeout = llm_timeout
+        timeout = config.llm_timeout
     
     generate_sql_prompt = get_generate_sql_prompt_template(conn_params)
    
@@ -835,7 +835,7 @@ def answer_question(
 ) -> dict[str, Any]:
     # Use config default timeout if none provided
     if timeout is None:
-        timeout = llm_timeout
+        timeout = config.llm_timeout
 
     qa_prompt = get_qa_prompt_template(conn_params)
 

{langchain_timbr-2.1.7 → langchain_timbr-2.1.8}/tests/integration/test_chain_reasoning.py

@@ -23,7 +23,7 @@ class TestLangchainChainsReasoningIntegration:
 
     # SKIP THIS TESTS UNTIL API WILL BE UPDATED
 
-    def skip_test_generate_timbr_sql_chain(self, llm, config):
+    def test_generate_timbr_sql_chain(self, llm, config):
         chain = GenerateTimbrSqlChain(
             llm=llm,
             url=config["timbr_url"],
@@ -36,7 +36,7 @@ class TestLangchainChainsReasoningIntegration:
         print("GenerateTimbrSqlChain result:", result)
         self._assert_reasoning(chain, result)
 
-    def skip_test_validate_timbr_sql_chain(self, llm, config):
+    def test_validate_timbr_sql_chain(self, llm, config):
         chain = ValidateTimbrSqlChain(
             llm=llm,
             url=config["timbr_url"],
@@ -54,7 +54,7 @@ class TestLangchainChainsReasoningIntegration:
         print("ValidateTimbrSqlChain result:", result)
         self._assert_reasoning(chain, result)
 
-    def skip_test_execute_timbr_query_chain(self, llm, config):
+    def test_execute_timbr_query_chain(self, llm, config):
         chain = ExecuteTimbrQueryChain(
             llm=llm,
             url=config["timbr_url"],
@@ -70,7 +70,7 @@ class TestLangchainChainsReasoningIntegration:
         print("ExecuteTimbrQueryChain result:", result)
         self._assert_reasoning(chain, result)
 
-    def skip_test_create_timbr_sql_agent(self, llm, config):
+    def test_create_timbr_sql_agent(self, llm, config):
         agent = create_timbr_sql_agent(
             llm=llm,
             url=config["timbr_url"],