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

langchain_timbr/langchain/execute_timbr_query_chain.py

@@ -248,6 +248,7 @@ class ExecuteTimbrQueryChain(Chain):
             is_sql_valid = True
             error = None
             reasoning_status = None
+            rows = []
             usage_metadata = {}
 
             if sql and self._should_validate_sql:

langchain_timbr/langchain/validate_timbr_sql_chain.py

@@ -178,6 +178,7 @@ class ValidateTimbrSqlChain(Chain):
         prompt = inputs["prompt"]
         schema = self._schema
         concept = self._concept
+        reasoning_status = None
 
         is_sql_valid, error = validate_sql(sql, self._get_conn_params())
         if not is_sql_valid:

langchain_timbr/utils/timbr_llm_utils.py

@@ -276,43 +276,37 @@ def determine_concept(
     
     determine_concept_prompt = get_determine_concept_prompt_template(conn_params)
     tags = get_tags(conn_params=conn_params, include_tags=include_tags)
-    concepts = get_concepts(
+    concepts_and_views = get_concepts(
         conn_params=conn_params,
         concepts_list=concepts_list,
         views_list=views_list,
         include_logic_concepts=include_logic_concepts,
     )
 
-    if not concepts:
+    if not concepts_and_views:
         raise Exception("No relevant concepts found for the query.")
 
     concepts_desc_arr = []
-    for concept in concepts.values():
-        concept_name = concept.get('concept')
-        concept_desc = concept.get('description')
-        concept_tags = tags.get('concept_tags').get(concept_name) if concept.get('is_view') == 'false' else tags.get('view_tags').get(concept_name)
+    for item in concepts_and_views.values():
+        item_name = item.get('concept')
+        item_desc = item.get('description')
+        item_tags = tags.get('concept_tags').get(item_name) if item.get('is_view') == 'false' else tags.get('view_tags').get(item_name)
 
-        if concept_tags:
-            concept_tags = str(concept_tags).replace('{', '').replace('}', '').replace("'", '')
+        if item_tags:
+            item_tags = str(item_tags).replace('{', '').replace('}', '').replace("'", '')
 
-        concept_verbose = f"`{concept_name}`"
-        if concept_desc:
-            concept_verbose += f" (description: {concept_desc})"
-        if concept_tags:
-            concept_verbose += f" [tags: {concept_tags}]"
-            concepts[concept_name]['tags'] = f"- Annotations and constraints: {concept_tags}\n"
+        concept_verbose = f"`{item_name}`"
+        if item_desc:
+            concept_verbose += f" (description: {item_desc})"
+        if item_tags:
+            concept_verbose += f" [tags: {item_tags}]"
+            concepts_and_views[item_name]['tags'] = f"- Annotations and constraints: {item_tags}\n"
 
         concepts_desc_arr.append(concept_verbose)
     
-    combined_list = concepts_list + views_list
-    
-    if len(combined_list) == 1 and not (combined_list[0].lower() == 'none' or combined_list[0].lower() == 'null'):
+    if len(concepts_and_views) == 1: # and not (concepts[0].lower() == 'none' or concepts[0].lower() == 'null'):
         # If only one concept is provided, return it directly
-        determined_concept_name = concepts_list[0] if concepts_list else views_list[0]
-
-        if determined_concept_name not in concepts:
-            raise Exception(f"'{determined_concept_name}' was not found in the ontology.")
-
+        determined_concept_name = list(concepts_and_views.keys())[0]
     else:
         # Use LLM to determine the concept based on the question
         iteration = 0
@@ -347,7 +341,7 @@ def determine_concept(
 
             response_text = _get_response_text(response)
             candidate = response_text.strip()
-            if should_validate and candidate not in concepts.keys():
+            if should_validate and candidate not in concepts_and_views.keys():
                 error = f"Concept '{determined_concept_name}' not found in the list of concepts."
                 continue
             
@@ -358,9 +352,9 @@ def determine_concept(
             raise Exception(f"Failed to determine concept: {error}")
 
     if determined_concept_name:
-        schema = 'vtimbr' if concepts.get(determined_concept_name).get('is_view') == 'true' else 'dtimbr'
+        schema = 'vtimbr' if concepts_and_views.get(determined_concept_name).get('is_view') == 'true' else 'dtimbr'
     return {
-        "concept_metadata": concepts.get(determined_concept_name) if determined_concept_name else None,
+        "concept_metadata": concepts_and_views.get(determined_concept_name) if determined_concept_name else None,
         "concept": determined_concept_name,
         "schema": schema,
         "usage_metadata": usage_metadata,

langchain_timbr/utils/timbr_utils.py

@@ -192,7 +192,7 @@ def _should_ignore_tag(tag_name: str) -> bool:
 def _prepare_tags_dict(
     type: Optional[str] = 'concept',
     tags_list: Optional[list] = [],
-    include_tags: Optional[str] = '',
+    include_tags: Optional[list] = [],
 ) -> dict:
     tags_dict = {}
     if not include_tags:
@@ -206,7 +206,7 @@ def _prepare_tags_dict(
         tag_name = tag.get('tag_name')
 
         # Check if the tag is included
-        if (include_tags != '*' and tag_name not in include_tags) or _should_ignore_tag(tag_name):
+        if (not _should_select_all(include_tags) and tag_name not in include_tags) or _should_ignore_tag(tag_name):
             continue
         
         key = tag.get('target_name')
@@ -242,11 +242,11 @@ def get_tags(conn_params: dict, include_tags: Optional[Any] = None) -> dict:
 
 
 def _should_ignore_list(list: list) -> bool:
-    return bool(list and len(list) == 1 and (list[0] == 'none' or list[0] == 'null'))
+    return bool(list and len(list) == 1 and (list[0].lower() in ['none', 'null']))
 
 
 def _should_select_all(list: list) -> bool:
-    return list and len(list) == 1 and list[0] == '*'
+    return bool(list and len(list) == 1 and list[0] == '*')
 
 
 @cache_with_version_check

{langchain_timbr-2.1.9.dist-info → langchain_timbr-2.1.10.dist-info}/METADATA

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

@@ -1,14 +1,14 @@
 langchain_timbr/__init__.py,sha256=qNyk3Rt-8oWr_OGuU_E-6siNZXuCnvVEkj65EIuVbbQ,824
-langchain_timbr/_version.py,sha256=s9-L9pODWuTXlE93i4rLKNGOkeUIbPcqOCYp3TMmNH8,704
+langchain_timbr/_version.py,sha256=17o5HAWEs2V5c2y1ZXOar4fpD2AlgrefncES8TLLxVk,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
-langchain_timbr/langchain/execute_timbr_query_chain.py,sha256=szc0CGYgUuH8JW8_PxU74MxrgPEKOjrvxS80Oz3k228,16379
+langchain_timbr/langchain/execute_timbr_query_chain.py,sha256=Ht6B63IEAESgfFMe3b6Q08VJ-pegxSS6A8kwE-U-0cY,16401
 langchain_timbr/langchain/generate_answer_chain.py,sha256=nteA4QZp9CAOskTBl_CokwaMlqnR2g2GvKz2mLs9WVY,4871
 langchain_timbr/langchain/generate_timbr_sql_chain.py,sha256=PE01noOzdkhLE5nxklSwTT_aQY3vjdKgZeXrwN5aYQ4,9853
 langchain_timbr/langchain/identify_concept_chain.py,sha256=kuzg0jJQpFGIiaxtNhdQ5K4HXveLVwONFNsoipPCteE,7169
 langchain_timbr/langchain/timbr_sql_agent.py,sha256=AaBNJz3qKwJZVd-mvEmlVp6REE8QEEwlOvtkkjdBxxc,20938
-langchain_timbr/langchain/validate_timbr_sql_chain.py,sha256=CaaTAgF-F2KHNex1q5iMa_0smzdi_a401wWirq3tIaY,10285
+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/generate_response_node.py,sha256=opwscNEXabaSyCFLbzGQFkDFEymJurhNU9aAtm1rnOk,2375
@@ -20,9 +20,9 @@ langchain_timbr/llm_wrapper/timbr_llm_wrapper.py,sha256=sDqDOz0qu8b4WWlagjNceswM
 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=qHHANB6rycAnLuH9qcpQEpOcSYpbIc7XyaLfsLaKLg4,34698
-langchain_timbr/utils/timbr_utils.py,sha256=x-z46NQn8nhRR8PJ5l23uh0qEpDWbhD8x4r-DyY4IYY,18864
-langchain_timbr-2.1.9.dist-info/METADATA,sha256=FtQqnvrvTQ0bNFw01ue5ZEXN3Vl_cCTR2ZN7AyXUmkA,10724
-langchain_timbr-2.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-langchain_timbr-2.1.9.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
-langchain_timbr-2.1.9.dist-info/RECORD,,
+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.10.dist-info/METADATA,sha256=nIJ6Gigjh9Bdxlo1f4QqRN9HD0rbc07HgFadW79EfWY,10725
+langchain_timbr-2.1.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+langchain_timbr-2.1.10.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
+langchain_timbr-2.1.10.dist-info/RECORD,,