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

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

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

{langchain_timbr-2.1.8 → langchain_timbr-2.1.10}/src/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-2.1.8 → langchain_timbr-2.1.10}/src/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-2.1.8 → langchain_timbr-2.1.10}/src/langchain_timbr/timbr_llm_connector.py

@@ -279,7 +279,7 @@ class TimbrLlmConnector:
     ) -> dict[str, Any]:
         agent = create_timbr_sql_agent(
             llm=self._llm,
-            **self._get_conn_params(),
+            conn_params=self._get_conn_params(),
             concept=None,
             concepts_list=concepts_list,
             views_list=views_list,

{langchain_timbr-2.1.8 → langchain_timbr-2.1.10}/src/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-2.1.8 → langchain_timbr-2.1.10}/src/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