langchain-timbr 2.1.11__py3-none-any.whl → 2.1.13__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 = '2.1.11'
-__version_tuple__ = version_tuple = (2, 1, 11)
+__version__ = version = '2.1.13'
+__version_tuple__ = version_tuple = (2, 1, 13)
 
 __commit_id__ = commit_id = None

langchain_timbr/langgraph/execute_timbr_query_node.py

@@ -102,7 +102,7 @@ class ExecuteSemanticQueryNode:
 
     def run(self, state: StateGraph) -> dict:
         try:
-            prompt = state.messages[-1].content if state.messages[-1] else None
+            prompt = state.messages[-1].get('content') if state.messages[-1] and 'content' in state.messages[-1] else None
         except Exception:
             prompt = state.get('prompt', None)
 

langchain_timbr/langgraph/generate_timbr_sql_node.py

@@ -94,7 +94,7 @@ class GenerateTimbrSqlNode:
 
     def run(self, state: StateGraph) -> dict:
         try:
-            prompt = state.messages[-1].content if (state.messages and state.messages[-1]) else None
+            prompt = state.messages[-1].get('content') if state.messages[-1] and 'content' in state.messages[-1] else None
         except Exception:
             prompt = state.get('prompt', None)
 

langchain_timbr/langgraph/identify_concept_node.py

@@ -66,7 +66,7 @@ class IdentifyConceptNode:
 
     def run(self, state: StateGraph) -> dict:
         try:
-          prompt = state.messages[-1].content if state.messages[-1] else None
+          prompt = state.messages[-1].get('content') if state.messages[-1] and 'content' in state.messages[-1] else None
         except Exception:
           prompt = state.get('prompt', None)
 

langchain_timbr/utils/timbr_llm_utils.py

@@ -304,7 +304,7 @@ def determine_concept(
 
         concepts_desc_arr.append(concept_verbose)
     
-    if len(concepts_and_views) == 1: # and not (concepts[0].lower() == 'none' or concepts[0].lower() == 'null'):
+    if len(concepts_and_views) == 1:
         # If only one concept is provided, return it directly
         determined_concept_name = list(concepts_and_views.keys())[0]
     else:
@@ -763,42 +763,67 @@ def generate_sql(
                 if reasoning_status == "correct":
                     break
                 
-                # Step 2: Regenerate SQL with feedback
+                # Step 2: Regenerate SQL with feedback (with validation retries)
                 evaluation_note = note + f"\n\nThe previously generated SQL: `{sql_query}` was assessed as '{evaluation.get('assessment')}' because: {evaluation.get('reasoning', '*could not determine cause*')}. Please provide a corrected SQL query that better answers the question: '{question}'."
                 
                 # Increase graph depth for 2nd+ reasoning attempts, up to max of 3
                 context_graph_depth = min(3, int(graph_depth) + step) if graph_depth < 3 and step > 0 else graph_depth
-                regen_result = _generate_sql_with_llm(
-                    question=question,
-                    llm=llm,
-                    conn_params=conn_params,
-                    generate_sql_prompt=generate_sql_prompt,
-                    current_context=_build_sql_generation_context(
-                        conn_params=conn_params,
-                        schema=schema,
-                        concept=concept,
-                        concept_metadata=concept_metadata,
-                        graph_depth=context_graph_depth,
-                        include_tags=include_tags,
-                        exclude_properties=exclude_properties,
-                        db_is_case_sensitive=db_is_case_sensitive,
-                        max_limit=max_limit),
-                    note=evaluation_note,
-                    should_validate_sql=should_validate_sql,
-                    timeout=timeout,
-                    debug=debug,
-                )
                 
-                usage_metadata[f'generate_sql_reasoning_step_{step + 1}'] = {
-                    "approximate": regen_result['apx_token_count'],
-                    **regen_result['usage_metadata'],
-                }
-                if debug and 'p_hash' in regen_result:
-                    usage_metadata[f'generate_sql_reasoning_step_{step + 1}']['p_hash'] = regen_result['p_hash']
+                # Regenerate SQL with validation retries
+                # Always validate during reasoning to ensure quality, regardless of global should_validate_sql flag
+                validation_iteration = 0
+                regen_is_valid = False
+                regen_error = ''
+                regen_sql = None
+                
+                while validation_iteration < retries and (regen_sql is None or not regen_is_valid):
+                    validation_iteration += 1
+                    validation_err_txt = f"\nThe regenerated SQL (`{regen_sql}`) was invalid with error: {regen_error}. Please generate a corrected query." if regen_error and "snowflake" not in llm._llm_type else ""
+                    
+                    regen_result = _generate_sql_with_llm(
+                        question=question,
+                        llm=llm,
+                        conn_params=conn_params,
+                        generate_sql_prompt=generate_sql_prompt,
+                        current_context=_build_sql_generation_context(
+                            conn_params=conn_params,
+                            schema=schema,
+                            concept=concept,
+                            concept_metadata=concept_metadata,
+                            graph_depth=context_graph_depth,
+                            include_tags=include_tags,
+                            exclude_properties=exclude_properties,
+                            db_is_case_sensitive=db_is_case_sensitive,
+                            max_limit=max_limit),
+                        note=evaluation_note + validation_err_txt,
+                        should_validate_sql=True,  # Always validate during reasoning
+                        timeout=timeout,
+                        debug=debug,
+                    )
+                    
+                    regen_sql = regen_result['sql']
+                    regen_is_valid = regen_result['is_valid']
+                    regen_error = regen_result['error']
+                    
+                    # Track token usage for each validation iteration
+                    if validation_iteration == 1:
+                        usage_metadata[f'generate_sql_reasoning_step_{step + 1}'] = {
+                            "approximate": regen_result['apx_token_count'],
+                            **regen_result['usage_metadata'],
+                        }
+                        if debug and 'p_hash' in regen_result:
+                            usage_metadata[f'generate_sql_reasoning_step_{step + 1}']['p_hash'] = regen_result['p_hash']
+                    else:
+                        usage_metadata[f'generate_sql_reasoning_step_{step + 1}_validation_{validation_iteration}'] = {
+                            "approximate": regen_result['apx_token_count'],
+                            **regen_result['usage_metadata'],
+                        }
+                        if debug and 'p_hash' in regen_result:
+                            usage_metadata[f'generate_sql_reasoning_step_{step + 1}_validation_{validation_iteration}']['p_hash'] = regen_result['p_hash']
                 
-                sql_query = regen_result['sql']
-                is_sql_valid = regen_result['is_valid']
-                error = regen_result['error']
+                sql_query = regen_sql
+                is_sql_valid = regen_is_valid
+                error = regen_error
                 
             except TimeoutError as e:
                 raise Exception(f"LLM call timed out: {str(e)}")

langchain_timbr/utils/timbr_utils.py

@@ -241,24 +241,36 @@ def get_tags(conn_params: dict, include_tags: Optional[Any] = None) -> dict:
     }
 
 
-def _should_ignore_list(list: list) -> bool:
+def _should_ignore_list(list: list[Any] | None) -> bool:
     return bool(list and len(list) == 1 and (list[0].lower() in ['none', 'null']))
 
 
-def _should_select_all(list: list) -> bool:
+def _should_select_all(list: list[Any] | None) -> bool:
     return bool(list and len(list) == 1 and list[0] == '*')
 
 
+def _has_dtimbr_permissions(conn_params: dict) -> bool:
+    has_perms = True
+    dtimbr_query = "SHOW TABLES IN dtimbr"
+    try:
+        dtimbr_tables = run_query(dtimbr_query, conn_params)
+        has_perms = len(dtimbr_tables) > 0
+    except Exception:
+        has_perms = False
+
+    return has_perms
+
+
 @cache_with_version_check
 def get_concepts(
     conn_params,
-    concepts_list: Optional[list] = None,
-    views_list: Optional[list] = None,
+    concepts_list: Optional[list[Any]] = None,
+    views_list: Optional[list[Any]] = None,
     include_logic_concepts: Optional[bool] = False,
 ) -> dict:
     """Fetch concepts (or views) from timbr.sys_concepts and/or timbr.sys_views."""
     joined_views = ','.join(f"'{v}'" for v in views_list) if views_list else ''
-    should_ignore_concepts = _should_ignore_list(concepts_list)
+    should_ignore_concepts = _should_ignore_list(concepts_list) or not _has_dtimbr_permissions(conn_params)
     should_ignore_views = _should_ignore_list(views_list)
 
     filter_concepts = " WHERE concept IN (SELECT DISTINCT concept FROM timbr.sys_concept_properties)" if not include_logic_concepts else ""

{langchain_timbr-2.1.11.dist-info → langchain_timbr-2.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 2.1.11
+Version: 2.1.13
 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.11.dist-info → langchain_timbr-2.1.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 langchain_timbr/__init__.py,sha256=qNyk3Rt-8oWr_OGuU_E-6siNZXuCnvVEkj65EIuVbbQ,824
-langchain_timbr/_version.py,sha256=YcZH9BI82MuyYat9rPk3-bkH208lw51-ESc7NJVThf8,706
+langchain_timbr/_version.py,sha256=OCsbmwBvjsO5FZ5lUXj9InhdI3ucoauO2iZuo5VK5F8,706
 langchain_timbr/config.py,sha256=b-mLIrswgSez282ItJntb5mCa8poOe7kqXG1W_jGxvw,1971
 langchain_timbr/timbr_llm_connector.py,sha256=Y3nzWoocI5txvPGPAxwFsJde9k9l2J9ioB54MYRLrEQ,13288
 langchain_timbr/langchain/__init__.py,sha256=ejcsZKP9PK0j4WrrCCcvBXpDpP-TeRiVb21OIUJqix8,580
@@ -10,19 +10,19 @@ langchain_timbr/langchain/identify_concept_chain.py,sha256=kuzg0jJQpFGIiaxtNhdQ5
 langchain_timbr/langchain/timbr_sql_agent.py,sha256=AaBNJz3qKwJZVd-mvEmlVp6REE8QEEwlOvtkkjdBxxc,20938
 langchain_timbr/langchain/validate_timbr_sql_chain.py,sha256=ndFWSdb_LNI-BQg254hfTlzcZXOuM1opHHLdC0SALDo,10317
 langchain_timbr/langgraph/__init__.py,sha256=mKBFd0x01jWpRujUWe-suX3FFhenPoDxrvzs8I0mum0,457
-langchain_timbr/langgraph/execute_timbr_query_node.py,sha256=FUsDHQAEMKYETi3lxNuF_PU8yvq9z5PYPyRFsHjLPbs,6057
+langchain_timbr/langgraph/execute_timbr_query_node.py,sha256=CYFN2VW7eKdgAylX0fktJQFEEHu8RgA8n1q32QwMFtI,6100
 langchain_timbr/langgraph/generate_response_node.py,sha256=opwscNEXabaSyCFLbzGQFkDFEymJurhNU9aAtm1rnOk,2375
-langchain_timbr/langgraph/generate_timbr_sql_node.py,sha256=tLO0tosmMxpNq1EBBjma4QVw0mNzYN_6bY8uG6QG3uo,5412
-langchain_timbr/langgraph/identify_concept_node.py,sha256=aiLDFEcz_vM4zZ_ULe1SvJKmI-e4Fb2SibZQaEPz_eY,3649
+langchain_timbr/langgraph/generate_timbr_sql_node.py,sha256=hyrnUwgQTKLV5bw-NmPgNYGZXGh-pgVeBg5gbGaJKb0,5434
+langchain_timbr/langgraph/identify_concept_node.py,sha256=zskaVAeY473j_hBbjULoAi1cV0D4hfKVapklBmmukBM,3692
 langchain_timbr/langgraph/validate_timbr_query_node.py,sha256=hPDa0fXgChxpIXSrZ3M70PFtcIkZ4HMdePMEc6W3nxw,5272
 langchain_timbr/llm_wrapper/llm_wrapper.py,sha256=j94DqIGECXyfAVayLC7VaNxs_8n1qYFiHY2Qvt2B3Bc,17537
 langchain_timbr/llm_wrapper/timbr_llm_wrapper.py,sha256=sDqDOz0qu8b4WWlagjNceswMVyvEJ8yBWZq2etBh-T0,1362
 langchain_timbr/utils/general.py,sha256=KkehHvIj8GoQ_0KVXLcUVeaYaTtkuzgXmYYx2TXJhI4,10253
 langchain_timbr/utils/prompt_service.py,sha256=QVmfA9cHO2IPVsKG8V5cuMm2gPfvRq2VzLcx04sqT88,12197
 langchain_timbr/utils/temperature_supported_models.json,sha256=d3UmBUpG38zDjjB42IoGpHTUaf0pHMBRSPY99ao1a3g,1832
-langchain_timbr/utils/timbr_llm_utils.py,sha256=AlEvwncFFLarLAea4wteyJxxMHTNweHKL4L_M8KYGLw,34494
-langchain_timbr/utils/timbr_utils.py,sha256=0LqA7ain_cXse_KH1Zgg0zox-JAwAlPK8gNK7rNgm8s,18885
-langchain_timbr-2.1.11.dist-info/METADATA,sha256=Fv8REnC25-YkhFJsp0CFUI7XrnnainPzru9_0QfBZns,10768
-langchain_timbr-2.1.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-langchain_timbr-2.1.11.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
-langchain_timbr-2.1.11.dist-info/RECORD,,
+langchain_timbr/utils/timbr_llm_utils.py,sha256=0Fn8CHcs7hydvCRqXEwU2gvKvlnqufq6hOIzPcVSADw,36163
+langchain_timbr/utils/timbr_utils.py,sha256=rhnGQndTIm4Hb5R_vAuJydnjYd88nbzm1I0yp5L8oEQ,19268
+langchain_timbr-2.1.13.dist-info/METADATA,sha256=NXba1vBmwR3pbjYP5DDMHdAoI_f7pegsdkteVCVBC1A,10768
+langchain_timbr-2.1.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+langchain_timbr-2.1.13.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
+langchain_timbr-2.1.13.dist-info/RECORD,,