langchain-timbr 2.1.11__tar.gz → 2.1.12__tar.gz

{langchain_timbr-2.1.11 → langchain_timbr-2.1.12}/.github/workflows/install-dependencies-and-run-tests.yml

@@ -9,6 +9,8 @@ on:
 env:
   TIMBR_URL: ${{ secrets.TIMBR_URL }}
   TIMBR_TOKEN: ${{ secrets.TIMBR_TOKEN }}
+  TIMBR_ONTOLOGY_NO_DTIMBR_PERMS: ${{ secrets.TIMBR_ONTOLOGY_NO_DTIMBR_PERMS }}
+  TIMBR_TOKEN_NO_DTIMBR_PERMS: ${{ secrets.TIMBR_TOKEN_NO_DTIMBR_PERMS }}
   LLM_TYPE: ${{ secrets.LLM_TYPE }}
   LLM_MODEL: ${{ secrets.LLM_MODEL }}
   LLM_API_KEY: ${{ secrets.LLM_API_KEY }}

{langchain_timbr-2.1.11 → langchain_timbr-2.1.12}/PKG-INFO

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

{langchain_timbr-2.1.11 → langchain_timbr-2.1.12}/src/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:

{langchain_timbr-2.1.11 → langchain_timbr-2.1.12}/src/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 → langchain_timbr-2.1.12}/tests/conftest.py

@@ -13,6 +13,8 @@ def config():
         "timbr_url": os.environ.get("TIMBR_URL", "https://demo-env.timbr.ai"),
         "timbr_token": os.environ.get("TIMBR_TOKEN"),
         "timbr_ontology": os.environ.get("TIMBR_ONTOLOGY", "supply_metrics_llm_tests"),
+        "timbr_token_no_dtimbr_perms": os.environ.get("TIMBR_TOKEN_NO_DTIMBR_PERMS"),
+        "timbr_ontology_no_dtimbr_perms": os.environ.get("TIMBR_ONTOLOGY_NO_DTIMBR_PERMS", "timbr_calls"),
         "test_prompt": os.environ.get("TEST_PROMPT", "What are the total sales for consumer customers?"),
         "test_prompt_2": os.environ.get("TEST_PROMPT_2", "Get all customers"),
         "test_prompt_3": os.environ.get("TEST_PROMPT_3", "Get all products and materials"),

{langchain_timbr-2.1.11 → langchain_timbr-2.1.12}/tests/integration/test_langchain_chains.py

@@ -402,4 +402,17 @@ class TestGenerateAnswerChain:
         assert "answer" in result, "Chain should return an 'answer'"
         assert result["answer"], "Answer should not be empty"
         assert chain.usage_metadata_key in result, "Chain should return 'generate_answer_usage_metadata'"
-        assert len(result[chain.usage_metadata_key]) == 1 and 'answer_question' in result[chain.usage_metadata_key], "Generate answer chain usage metadata should contain only 'answer_question'"
+        assert len(result[chain.usage_metadata_key]) == 1 and 'answer_question' in result[chain.usage_metadata_key], "Generate answer chain usage metadata should contain only 'answer_question'"
+
+    def test_generate_timbr_sql_with_no_dtimbr_perms(self, llm, config):
+        """Test SQL generation with a user that lacks dtimbr schema permissions."""
+        chain = GenerateTimbrSqlChain(
+            llm=llm,
+            url=config["timbr_url"],
+            token=config["timbr_token_no_dtimbr_perms"],
+            ontology=config["timbr_ontology_no_dtimbr_perms"],
+            verify_ssl=config["verify_ssl"],
+        )
+        result = chain.invoke({ "prompt": "all calls" })
+        print("GenerateTimbrSqlChain with concepts_list=['plant'] result:", result)
+        assert "error" in result and "User doesn't have access to query Knowledge Graph schema: dtimbr" in result["error"], "Should return permission error message"