langchain-timbr 1.5.3__tar.gz → 1.5.5__tar.gz

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/PKG-INFO

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

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/_version.py

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

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/config.py

@@ -4,7 +4,7 @@ from .utils.general import to_boolean, to_integer, parse_list
 # MUST HAVE VARIABLES
 url = os.environ.get('TIMBR_URL')
 token = os.environ.get('TIMBR_TOKEN')
-ontology = os.environ.get('ONTOLOGY', 'system_db')
+ontology = os.environ.get('TIMBR_ONTOLOGY', os.environ.get('ONTOLOGY', 'system_db'))
 
 # OPTIONAL VARIABLES
 is_jwt = to_boolean(os.environ.get('IS_JWT', 'false'))
@@ -18,4 +18,5 @@ llm_type = os.environ.get('LLM_TYPE')
 llm_model = os.environ.get('LLM_MODEL')
 llm_api_key = os.environ.get('LLM_API_KEY')
 llm_temperature = os.environ.get('LLM_TEMPERATURE', 0.0)
+llm_additional_params = os.environ.get('LLM_ADDITIONAL_PARAMS', '')
 llm_timeout = to_integer(os.environ.get('LLM_TIMEOUT', 60))  # Default 60 seconds timeout

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/execute_timbr_query_chain.py

@@ -2,9 +2,11 @@ from typing import Optional, Union, Dict, Any
 from langchain.chains.base import Chain
 from langchain.llms.base import LLM
 
-from ..utils.general import parse_list, to_boolean, to_integer
+from ..utils.general import parse_list, to_boolean, to_integer, validate_timbr_connection_params
 from ..utils.timbr_utils import run_query, validate_sql
 from ..utils.timbr_llm_utils import generate_sql
+from ..llm_wrapper.llm_wrapper import LlmWrapper
+from .. import config
 
 class ExecuteTimbrQueryChain(Chain):
     """
@@ -17,10 +19,10 @@ class ExecuteTimbrQueryChain(Chain):
     
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
-        ontology: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
+        ontology: Optional[str] = None,
         schema: Optional[str] = 'dtimbr',
         concept: Optional[str] = None,
         concepts_list: Optional[Union[list[str], str]] = None,
@@ -44,10 +46,10 @@ class ExecuteTimbrQueryChain(Chain):
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
-        :param ontology: The name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: The name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param schema: The name of the schema to query
         :param concept: The name of the concept to query
         :param concepts_list: Optional specific concept options to query
@@ -72,6 +74,7 @@ class ExecuteTimbrQueryChain(Chain):
 
         ## Example
         ```
+        # Using explicit parameters
         execute_timbr_query_chain = ExecuteTimbrQueryChain(
             url=<url>,
             token=<token>,
@@ -85,14 +88,35 @@ class ExecuteTimbrQueryChain(Chain):
             note=<note>,
         )
 
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        execute_timbr_query_chain = ExecuteTimbrQueryChain(
+            llm=<llm or timbr_llm_wrapper instance>,
+        )
+
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        execute_timbr_query_chain = ExecuteTimbrQueryChain()
+
         return execute_timbr_query_chain.invoke({ "prompt": question }).get("rows", [])
         ```
         """
         super().__init__(**kwargs)
-        self._llm = llm
-        self._url = url
-        self._token = token
-        self._ontology = ontology
+        
+        # Initialize LLM - use provided one or create with LlmWrapper from env variables
+        if llm is not None:
+            self._llm = llm
+        else:
+            try:
+                self._llm = LlmWrapper()
+            except Exception as e:
+                raise ValueError(f"Failed to initialize LLM from environment variables. Either provide an llm parameter or ensure LLM_TYPE and LLM_API_KEY environment variables are set. Error: {e}")
+        
+        self._url = url if url is not None else config.url
+        self._token = token if token is not None else config.token
+        self._ontology = ontology if ontology is not None else config.ontology
+        
+        # Validate required parameters
+        validate_timbr_connection_params(self._url, self._token)
+        
         self._schema = schema
         self._concept = concept
         self._concepts_list = parse_list(concepts_list)
@@ -181,7 +205,7 @@ class ExecuteTimbrQueryChain(Chain):
             should_validate_sql=self._should_validate_sql,
             retries=self._retries,
             max_limit=self._max_limit,
-            note=self._note + err_txt,
+            note=(self._note or '') + err_txt,
             db_is_case_sensitive=self._db_is_case_sensitive,
             graph_depth=self._graph_depth,
             debug=self._debug,
@@ -251,7 +275,7 @@ class ExecuteTimbrQueryChain(Chain):
                             generated.append(sql)
                             # If the SQL is valid but no rows are returned, create an error message to be sent to the LLM
                             if is_sql_valid:
-                                error = f"No rows returned. Please revise the SQL considering if the question was ambiguous (e.g., which ID or name to use), try use alternative columns in the WHERE clause part in a way that could match the user's intent, without adding new columns with new filters."
+                                error = "No rows returned. Please revise the SQL considering if the question was ambiguous (e.g., which ID or name to use), try use alternative columns in the WHERE clause part in a way that could match the user's intent, without adding new columns with new filters."
                                 error += "\nConsider that this queries already generated and returned 0 rows:\n" + "\n".join(generated)
                                 is_sql_valid = False
                         else:

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/generate_answer_chain.py

@@ -2,8 +2,10 @@ from typing import Optional, Dict, Any
 from langchain.chains.base import Chain
 from langchain.llms.base import LLM
 
-from ..utils.general import to_boolean
+from ..utils.general import to_boolean, validate_timbr_connection_params
 from ..utils.timbr_llm_utils import answer_question
+from ..llm_wrapper.llm_wrapper import LlmWrapper
+from .. import config
 
 class GenerateAnswerChain(Chain):
     """
@@ -14,9 +16,9 @@ class GenerateAnswerChain(Chain):
     """
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
         verify_ssl: Optional[bool] = True,
         is_jwt: Optional[bool] = False,
         jwt_tenant_id: Optional[str] = None,
@@ -25,9 +27,9 @@ class GenerateAnswerChain(Chain):
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
         :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).
@@ -35,17 +37,41 @@ class GenerateAnswerChain(Chain):
         
         ## Example
         ```
+        # Using explicit parameters
+        generate_answer_chain = GenerateAnswerChain(
+            llm=<llm or timbr_llm_wrapper instance>,
+            url=<url>,
+            token=<token>
+        )
+
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN)
         generate_answer_chain = GenerateAnswerChain(
             llm=<llm or timbr_llm_wrapper instance>
         )
+        
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, LLM_TYPE, LLM_API_KEY, etc.)
+        generate_answer_chain = GenerateAnswerChain()
 
         return generate_answer_chain.invoke({ "prompt": prompt, "rows": rows }).get("answer", [])
         ```
         """
         super().__init__(**kwargs)
-        self._llm = llm
-        self._url = url
-        self._token = token
+        
+        # Initialize LLM - use provided one or create with LlmWrapper from env variables
+        if llm is not None:
+            self._llm = llm
+        else:
+            try:
+                self._llm = LlmWrapper()
+            except Exception as e:
+                raise ValueError(f"Failed to initialize LLM from environment variables. Either provide an llm parameter or ensure LLM_TYPE and LLM_API_KEY environment variables are set. Error: {e}")
+        
+        self._url = url if url is not None else config.url
+        self._token = token if token is not None else config.token
+        
+        # Validate required parameters
+        validate_timbr_connection_params(self._url, self._token)
+        
         self._verify_ssl = to_boolean(verify_ssl)
         self._is_jwt = to_boolean(is_jwt)
         self._jwt_tenant_id = jwt_tenant_id

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/generate_timbr_sql_chain.py

@@ -2,8 +2,10 @@ from typing import Optional, Union, Dict, Any
 from langchain.chains.base import Chain
 from langchain.llms.base import LLM
 
-from ..utils.general import parse_list, to_boolean, to_integer
+from ..utils.general import parse_list, to_boolean, to_integer, validate_timbr_connection_params
 from ..utils.timbr_llm_utils import generate_sql
+from ..llm_wrapper.llm_wrapper import LlmWrapper
+from .. import config
 
 class GenerateTimbrSqlChain(Chain):
     """
@@ -16,10 +18,10 @@ class GenerateTimbrSqlChain(Chain):
     
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
-        ontology: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
+        ontology: Optional[str] = None,
         schema: Optional[str] = 'dtimbr',
         concept: Optional[str] = None,
         concepts_list: Optional[Union[list[str], str]] = None,
@@ -41,10 +43,10 @@ class GenerateTimbrSqlChain(Chain):
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
-        :param ontology: The name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: The name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param schema: The name of the schema to query
         :param concept: The name of the concept to query
         :param concepts_list: Optional specific concept options to query
@@ -66,6 +68,7 @@ class GenerateTimbrSqlChain(Chain):
         
         ## Example
         ```
+        # Using explicit parameters
         generate_timbr_sql_chain = GenerateTimbrSqlChain(
             url=<url>,
             token=<token>,
@@ -79,14 +82,35 @@ class GenerateTimbrSqlChain(Chain):
             note=<note>,
         )
 
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        generate_timbr_sql_chain = GenerateTimbrSqlChain(
+            llm=<llm or timbr_llm_wrapper instance>,
+        )
+
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        generate_timbr_sql_chain = GenerateTimbrSqlChain()
+
         return generate_timbr_sql_chain.invoke({ "prompt": question }).get("sql", [])
         ```
         """
         super().__init__(**kwargs)
-        self._llm = llm
-        self._url = url
-        self._token = token
-        self._ontology = ontology
+        
+        # Initialize LLM - use provided one or create with LlmWrapper from env variables
+        if llm is not None:
+            self._llm = llm
+        else:
+            try:
+                self._llm = LlmWrapper()
+            except Exception as e:
+                raise ValueError(f"Failed to initialize LLM from environment variables. Either provide an llm parameter or ensure LLM_TYPE and LLM_API_KEY environment variables are set. Error: {e}")
+        
+        self._url = url if url is not None else config.url
+        self._token = token if token is not None else config.token
+        self._ontology = ontology if ontology is not None else config.ontology
+        
+        # Validate required parameters
+        validate_timbr_connection_params(self._url, self._token)
+        
         self._schema = schema
         self._concept = concept
         self._concepts_list = parse_list(concepts_list)

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/identify_concept_chain.py

@@ -2,8 +2,10 @@ from typing import Optional, Union, Dict, Any
 from langchain.chains.base import Chain
 from langchain.llms.base import LLM
 
-from ..utils.general import parse_list, to_boolean, to_integer
+from ..utils.general import parse_list, to_boolean, to_integer, validate_timbr_connection_params
 from ..utils.timbr_llm_utils import determine_concept
+from ..llm_wrapper.llm_wrapper import LlmWrapper
+from .. import config
 
 
 class IdentifyTimbrConceptChain(Chain):
@@ -17,10 +19,10 @@ class IdentifyTimbrConceptChain(Chain):
     
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
-        ontology: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
+        ontology: Optional[str] = None,
         concepts_list: Optional[Union[list[str], str]] = None,
         views_list: Optional[Union[list[str], str]] = None,
         include_logic_concepts: Optional[bool] = False,
@@ -36,10 +38,10 @@ class IdentifyTimbrConceptChain(Chain):
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
-        :param ontology: The name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: The name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param concepts_list: Optional specific concept options to query
         :param views_list: Optional specific view options to query
         :param include_logic_concepts: Optional boolean to include logic concepts (concepts without unique properties which only inherits from an upper level concept with filter logic) in the query.
@@ -55,10 +57,11 @@ class IdentifyTimbrConceptChain(Chain):
         
         ## Example
         ```
+        # Using explicit parameters
         identify_timbr_concept_chain = IdentifyTimbrConceptChain(
+            llm=<llm or timbr_llm_wrapper instance>,
             url=<url>,
             token=<token>,
-            llm=<llm or timbr_llm_wrapper instance>,
             ontology=<ontology_name>,
             concepts_list=<concepts>,
             views_list=<views>,
@@ -66,14 +69,35 @@ class IdentifyTimbrConceptChain(Chain):
             note=<note>,
         )
 
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        identify_timbr_concept_chain = IdentifyTimbrConceptChain(
+            llm=<llm or timbr_llm_wrapper instance>,
+        )
+
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        identify_timbr_concept_chain = IdentifyTimbrConceptChain()
+
         return identify_timbr_concept_chain.invoke({ "prompt": question }).get("concept", None)
         ```
         """
         super().__init__(**kwargs)
-        self._llm = llm
-        self._url = url
-        self._token = token
-        self._ontology = ontology
+        
+        # Initialize LLM - use provided one or create with LlmWrapper from env variables
+        if llm is not None:
+            self._llm = llm
+        else:
+            try:
+                self._llm = LlmWrapper()
+            except Exception as e:
+                raise ValueError(f"Failed to initialize LLM from environment variables. Either provide an llm parameter or ensure LLM_TYPE and LLM_API_KEY environment variables are set. Error: {e}")
+        
+        self._url = url if url is not None else config.url
+        self._token = token if token is not None else config.token
+        self._ontology = ontology if ontology is not None else config.ontology
+        
+        # Validate required parameters
+        validate_timbr_connection_params(self._url, self._token)
+        
         self._concepts_list = parse_list(concepts_list)
         self._views_list = parse_list(views_list)
         self._include_logic_concepts = to_boolean(include_logic_concepts)

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/timbr_sql_agent.py

@@ -10,10 +10,10 @@ from .generate_answer_chain import GenerateAnswerChain
 class TimbrSqlAgent(BaseSingleActionAgent):
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
-        ontology: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
+        ontology: Optional[str] = None,
         schema: Optional[str] = 'dtimbr',
         concept: Optional[str] = None,
         concepts_list: Optional[Union[list[str], str]] = None,
@@ -37,10 +37,10 @@ class TimbrSqlAgent(BaseSingleActionAgent):
         debug: Optional[bool] = False
     ):
         """
-        :param llm: Language model to use
-        :param url: Timbr server URL
-        :param token: Timbr authentication token
-        :param ontology: Name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server URL (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr authentication token (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: Name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param schema: Optional specific schema name to query
         :param concept: Optional specific concept name to query
         :param concepts_list: Optional specific concept options to query
@@ -64,6 +64,7 @@ class TimbrSqlAgent(BaseSingleActionAgent):
 
         ## Example
         ```
+        # Using explicit parameters
         agent = TimbrSqlAgent(
             llm=<llm>,
             url=<url>,
@@ -77,6 +78,14 @@ class TimbrSqlAgent(BaseSingleActionAgent):
             retries=<retries>,
             note=<note>,
         )
+
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        agent = TimbrSqlAgent(
+            llm=<llm>,
+        )
+
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        agent = TimbrSqlAgent()
         ```
         """
         super().__init__()
@@ -298,10 +307,10 @@ class TimbrSqlAgent(BaseSingleActionAgent):
 
 
 def create_timbr_sql_agent(
-    llm: LLM,
-    url: str,
-    token: str,
-    ontology: str,
+    llm: Optional[LLM] = None,
+    url: Optional[str] = None,
+    token: Optional[str] = None,
+    ontology: Optional[str] = None,
     schema: Optional[str] = 'dtimbr',
     concept: Optional[str] = None,
     concepts_list: Optional[Union[list[str], str]] = None,
@@ -327,10 +336,10 @@ def create_timbr_sql_agent(
     """
     Create and configure a Timbr agent with its executor.
     
-    :param llm: Language model to use
-    :param url: Timbr server URL
-    :param token: Timbr authentication token
-    :param ontology: Name of the ontology/knowledge graph
+    :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+    :param url: Timbr server URL (optional, defaults to TIMBR_URL environment variable)
+    :param token: Timbr authentication token (optional, defaults to TIMBR_TOKEN environment variable)
+    :param ontology: Name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
     :param schema: Optional specific schema name to query
     :param concept: Optional specific concept name to query
     :param concepts_list: Optional specific concept options to query
@@ -357,6 +366,7 @@ def create_timbr_sql_agent(
     
     ## Example
         ```
+        # Using explicit parameters
         agent = create_timbr_sql_agent(
             llm=<llm>,
             url=<url>,
@@ -372,7 +382,15 @@ def create_timbr_sql_agent(
             retries=<retries>,
             note=<note>,
         )
-        
+
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        agent = create_timbr_sql_agent(
+            llm=<llm>,
+        )
+
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        agent = create_timbr_sql_agent()
+
         result = agent.invoke("What are the total sales for last month?")
         
         # Access the components of the result:

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langchain/validate_timbr_sql_chain.py

@@ -2,9 +2,11 @@ from typing import Optional, Union, Dict, Any
 from langchain.chains.base import Chain
 from langchain.llms.base import LLM
 
-from ..utils.general import parse_list, to_integer, to_boolean
+from ..utils.general import parse_list, to_integer, to_boolean, validate_timbr_connection_params
 from ..utils.timbr_llm_utils import generate_sql
 from ..utils.timbr_utils import validate_sql
+from ..llm_wrapper.llm_wrapper import LlmWrapper
+from .. import config
 
 
 class ValidateTimbrSqlChain(Chain):
@@ -18,10 +20,10 @@ class ValidateTimbrSqlChain(Chain):
     
     def __init__(
         self,
-        llm: LLM,
-        url: str,
-        token: str,
-        ontology: str,
+        llm: Optional[LLM] = None,
+        url: Optional[str] = None,
+        token: Optional[str] = None,
+        ontology: Optional[str] = None,
         schema: Optional[str] = 'dtimbr',
         concept: Optional[str] = None,
         retries: Optional[int] = 3,
@@ -42,10 +44,10 @@ class ValidateTimbrSqlChain(Chain):
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
-        :param ontology: The name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: The name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param schema: The name of the schema to query
         :param concept: The name of the concept to query
         :param retries: The maximum number of retries to attempt
@@ -66,6 +68,7 @@ class ValidateTimbrSqlChain(Chain):
         
         ## Example
         ```
+        # Using explicit parameters
         validate_timbr_sql_chain = ValidateTimbrSqlChain(
             url=<url>,
             token=<token>,
@@ -80,14 +83,35 @@ class ValidateTimbrSqlChain(Chain):
             note=<note>,
         )
 
+        # Using environment variables for timbr environment (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY)
+        validate_timbr_sql_chain = ValidateTimbrSqlChain(
+            llm=<llm or timbr_llm_wrapper instance>,
+        )
+        
+        # Using environment variables for both timbr environment & llm (TIMBR_URL, TIMBR_TOKEN, TIMBR_ONTOLOGY, LLM_TYPE, LLM_API_KEY, etc.)
+        validate_timbr_sql_chain = ValidateTimbrSqlChain()
+
         return validate_timbr_sql_chain.invoke({ "prompt": question, "sql": <latest_query_to_validate> }).get("sql", [])
         ```
         """
         super().__init__(**kwargs)
-        self._llm = llm
-        self._url = url
-        self._token = token
-        self._ontology = ontology
+        
+        # Initialize LLM - use provided one or create with LlmWrapper from env variables
+        if llm is not None:
+            self._llm = llm
+        else:
+            try:
+                self._llm = LlmWrapper()
+            except Exception as e:
+                raise ValueError(f"Failed to initialize LLM from environment variables. Either provide an llm parameter or ensure LLM_TYPE and LLM_API_KEY environment variables are set. Error: {e}")
+        
+        self._url = url if url is not None else config.url
+        self._token = token if token is not None else config.token
+        self._ontology = ontology if ontology is not None else config.ontology
+        
+        # Validate required parameters
+        validate_timbr_connection_params(self._url, self._token)
+        
         self._schema = schema
         self._concept = concept
         self._retries = retries

{langchain_timbr-1.5.3 → langchain_timbr-1.5.5}/src/langchain_timbr/langgraph/execute_timbr_query_node.py

@@ -13,7 +13,7 @@ class ExecuteSemanticQueryNode:
     """
     def __init__(
         self,
-        llm: LLM,
+        llm: Optional[LLM] = None,
         url: Optional[str] = None,
         token: Optional[str] = None,
         ontology: Optional[str] = None,
@@ -40,10 +40,10 @@ class ExecuteSemanticQueryNode:
         **kwargs,
     ):
         """
-        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM’s response
-        :param url: Timbr server url
-        :param token: Timbr password or token value
-        :param ontology: The name of the ontology/knowledge graph
+        :param llm: An LLM instance or a function that takes a prompt string and returns the LLM's response (optional, will use LlmWrapper with env variables if not provided)
+        :param url: Timbr server url (optional, defaults to TIMBR_URL environment variable)
+        :param token: Timbr password or token value (optional, defaults to TIMBR_TOKEN environment variable)
+        :param ontology: The name of the ontology/knowledge graph (optional, defaults to ONTOLOGY/TIMBR_ONTOLOGY environment variable)
         :param schema: The name of the schema to query
         :param concept: The name of the concept to query
         :param concepts_list: Optional specific concept options to query
@@ -97,7 +97,7 @@ class ExecuteSemanticQueryNode:
     def run(self, state: StateGraph) -> dict:
         try:
             prompt = state.messages[-1].content if state.messages[-1] else None
-        except:
+        except Exception:
             prompt = state.get('prompt', None)
 
         return self.chain.invoke({ "prompt": prompt })