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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-timbr
-Version: 1.5.3
+Version: 1.5.4
 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.4}/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.4'
+__version_tuple__ = version_tuple = (1, 5, 4)
 
 __commit_id__ = commit_id = None

{langchain_timbr-1.5.3 → langchain_timbr-1.5.4}/src/langchain_timbr/utils/prompt_service.py

@@ -1,32 +1,45 @@
 import requests
 from typing import Dict, Any, Optional, List, Union
-from langchain.schema import SystemMessage, HumanMessage
 from langchain.prompts.chat import ChatPromptTemplate
 from langchain.prompts import SystemMessagePromptTemplate, HumanMessagePromptTemplate
 import json
 import logging
-
-from ..config import url, token as default_token, is_jwt, jwt_tenant_id as default_jwt_tenant_id, llm_timeout
+from ..config import url as default_url, token as default_token, is_jwt, jwt_tenant_id as default_jwt_tenant_id, llm_timeout
 
 logger = logging.getLogger(__name__)
 
 # Global template cache shared across all PromptService instances
-_global_template_cache = {}
+_global_template_cache: dict[Any, Any] = {}
 
 class PromptService:
     def __init__(
         self, 
-        base_url: Optional[str] = url, 
-        token: Optional[str] = default_token,
-        is_jwt: Optional[bool] = is_jwt,
-        jwt_tenant_id: Optional[str] = default_jwt_tenant_id,
-        timeout: Optional[int] = llm_timeout,
+        conn_params: Optional[Dict[str, Any]] = None,
+        **kwargs
     ):
-        self.base_url = base_url.rstrip('/') if base_url else ''
-        self.token = token
-        self.is_jwt = is_jwt
-        self.jwt_tenant_id = jwt_tenant_id
-        self.timeout = timeout
+        """
+        Initialize PromptService with connection parameters.
+        
+        Args:
+            conn_params: Dictionary containing connection parameters
+            **kwargs: Additional parameters for backward compatibility
+        """
+        # Extract relevant parameters from conn_params or use defaults
+        if conn_params:
+            url_value = conn_params.get('url') or default_url
+            self.base_url = url_value.rstrip('/') if url_value else ''
+            self.token = conn_params.get('token') or default_token
+            self.is_jwt = conn_params.get('is_jwt', is_jwt)
+            self.jwt_tenant_id = conn_params.get('jwt_tenant_id') or default_jwt_tenant_id
+            self.timeout = conn_params.get('timeout') or llm_timeout
+        else:
+            # Fallback to kwargs for backward compatibility
+            url_value = kwargs.get('url') or default_url
+            self.base_url = url_value.rstrip('/') if url_value else ''
+            self.token = str(kwargs.get('token') or default_token)
+            self.is_jwt = kwargs.get('is_jwt', is_jwt)
+            self.jwt_tenant_id = kwargs.get('jwt_tenant_id') or default_jwt_tenant_id
+            self.timeout = kwargs.get('timeout') or llm_timeout
 
     
     def _get_headers(self) -> Dict[str, str]:
@@ -220,99 +233,67 @@ class PromptTemplateWrapper:
 
 # Individual prompt template getter functions
 def get_determine_concept_prompt_template(
-    token: Optional[str] = None,
-    is_jwt: Optional[bool] = None,
-    jwt_tenant_id: Optional[str] = None
+    conn_params: Optional[dict] = None
 ) -> PromptTemplateWrapper:
     """
     Get determine concept prompt template wrapper
     
     Args:
-        token: Authentication token
-        is_jwt: Whether the token is a JWT
-        jwt_tenant_id: JWT tenant ID
-        
+        conn_params: Connection parameters including url, token, is_jwt, and jwt_tenant_id
+
     Returns:
         PromptTemplateWrapper for determine concept
     """
-    prompt_service = PromptService(
-        token=token,
-        is_jwt=is_jwt,
-        jwt_tenant_id=jwt_tenant_id
-    )
+    prompt_service = PromptService(conn_params=conn_params)
     return PromptTemplateWrapper(prompt_service, "get_identify_concept_template")
 
 
 def get_generate_sql_prompt_template(
-    token: Optional[str] = None,
-    is_jwt: Optional[bool] = None,
-    jwt_tenant_id: Optional[str] = None
+    conn_params: Optional[dict] = None
 ) -> PromptTemplateWrapper:
     """
     Get generate SQL prompt template wrapper
     
     Args:
-        token: Authentication token
-        is_jwt: Whether the token is a JWT
-        jwt_tenant_id: JWT tenant ID
+        conn_params: Connection parameters including url, token, is_jwt, and jwt_tenant_id
         
     Returns:
         PromptTemplateWrapper for generate SQL
     """
-    prompt_service = PromptService(
-        token=token,
-        is_jwt=is_jwt,
-        jwt_tenant_id=jwt_tenant_id
-    )
+    prompt_service = PromptService(conn_params=conn_params)
     return PromptTemplateWrapper(prompt_service, "get_generate_sql_template")
 
 
 def get_qa_prompt_template(
-    token: Optional[str] = None,
-    is_jwt: Optional[bool] = None,
-    jwt_tenant_id: Optional[str] = None
+    conn_params: Optional[dict] = None
 ) -> PromptTemplateWrapper:
     """
     Get QA prompt template wrapper
     
     Args:
-        token: Authentication token
-        is_jwt: Whether the token is a JWT
-        jwt_tenant_id: JWT tenant ID
-        
+        conn_params: Connection parameters including url, token, is_jwt, and jwt_tenant_id
+
     Returns:
         PromptTemplateWrapper for QA
     """
-    prompt_service = PromptService(
-        token=token,
-        is_jwt=is_jwt,
-        jwt_tenant_id=jwt_tenant_id
-    )
+    prompt_service = PromptService(conn_params=conn_params)
     return PromptTemplateWrapper(prompt_service, "get_generate_answer_template")
 
 
 # Global prompt service instance (updated signature)
 def get_prompt_service(
-    token: str = None,
-    is_jwt: bool = None, 
-    jwt_tenant_id: str = None
+    conn_params: Optional[dict] = None
 ) -> PromptService:
     """
     Get or create a prompt service instance
     
     Args:
-        token: Authentication token (API key or JWT token)
-        is_jwt: Whether the token is a JWT
-        jwt_tenant_id: JWT tenant ID
-        
+        conn_params: Connection parameters including url, token, is_jwt, and jwt_tenant_id
+
     Returns:
         PromptService instance
     """
-    return PromptService(
-        token=token,
-        is_jwt=is_jwt,
-        jwt_tenant_id=jwt_tenant_id
-    )
+    return PromptService(conn_params=conn_params)
 
 
 # Global cache management functions

{langchain_timbr-1.5.3 → langchain_timbr-1.5.4}/src/langchain_timbr/utils/timbr_llm_utils.py

@@ -212,7 +212,7 @@ def determine_concept(
     note: Optional[str] = '',
     debug: Optional[bool] = False,
     timeout: Optional[int] = None,
-) -> dict[str, any]:
+) -> dict[str, Any]:
     usage_metadata = {}
     determined_concept_name = None
     schema = 'dtimbr'
@@ -221,7 +221,7 @@ def determine_concept(
     if timeout is None:
         timeout = llm_timeout
     
-    determine_concept_prompt = get_determine_concept_prompt_template(conn_params["token"], conn_params["is_jwt"], conn_params["jwt_tenant_id"])
+    determine_concept_prompt = get_determine_concept_prompt_template(conn_params)
     tags = get_tags(conn_params=conn_params, include_tags=include_tags)
     concepts = get_concepts(
         conn_params=conn_params,
@@ -418,7 +418,7 @@ def generate_sql(
     if timeout is None:
         timeout = llm_timeout
     
-    generate_sql_prompt = get_generate_sql_prompt_template(conn_params["token"], conn_params["is_jwt"], conn_params["jwt_tenant_id"])
+    generate_sql_prompt = get_generate_sql_prompt_template(conn_params)
    
     if concept and concept != "" and (schema is None or schema != "vtimbr"):
         concepts_list = [concept]
@@ -550,7 +550,7 @@ def answer_question(
     if timeout is None:
         timeout = llm_timeout
 
-    qa_prompt = get_qa_prompt_template(conn_params["token"], conn_params["is_jwt"], conn_params["jwt_tenant_id"])
+    qa_prompt = get_qa_prompt_template(conn_params)
 
     prompt = qa_prompt.format_messages(
         question=question,