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

langchain_timbr/llm_wrapper/llm_wrapper.py

@@ -203,7 +203,7 @@ class LlmWrapper(LLM):
       if azure_tenant_id and azure_client_id:
         from azure.identity import ClientSecretCredential, get_bearer_token_provider
         azure_client_secret = pop_param_value(params, ['azure_client_secret', 'llm_client_secret'], default=api_key)
-        scope = pop_param_value(params, ['azure_scope', 'llm_scope'], default=config.llm_scope)
+        scope = pop_param_value(params, ['azure_scope', 'llm_scope', 'scope'], default=config.llm_scope)
         credential = ClientSecretCredential(
           tenant_id=azure_tenant_id,
           client_id=azure_client_id,

langchain_timbr/utils/general.py

@@ -1,6 +1,7 @@
 import os
 from typing import Any, Optional, Union
 import json
+import re
 
 ### A global helper functions to use across the project
 
@@ -34,6 +35,7 @@ def to_integer(value) -> int:
 def parse_additional_params(value) -> dict:
     """
     Parse additional parameters from string format 'a=1,b=2' or return dict as-is.
+    Handles JSON values correctly, including nested structures with commas.
     
     Args:
         value: String in format 'key=value,key2=value2', JSON string, or dict
@@ -49,25 +51,156 @@ def parse_additional_params(value) -> dict:
             stripped_value = value.strip()
             if stripped_value.startswith('{') and stripped_value.endswith('}'):
                 try:
-                    return json.loads(stripped_value)
+                    return _try_parse_json_value(stripped_value)
                 except json.JSONDecodeError:
                     pass
             
-            # Fall back to key=value parsing
+            # Check if complex parsing is needed (presence of nested structures)
+            needs_complex_parsing = any(char in value for char in ['{', '}', '[', ']', '(', ')'])
+            
+            if not needs_complex_parsing:
+                # Fast path: simple key=value pairs
+                params = {}
+                for pair in value.split(','):
+                    if '=' in pair:
+                        key, val = pair.split('=', 1)
+                        params[key.strip().lower()] = _try_parse_json_value(val.strip())
+                return params
+            
+            # Complex parsing that handles JSON values with commas
             params = {}
-            for pair in (value.split('&') if '&' in value else value.split(',')):
-                if '=' in pair:
-                    key, val = pair.split('=', 1)
-                    params[key.strip().lower()] = val.strip()
-                elif ':' in pair:
-                    key, val = pair.split(':', 1)
-                    params[key.strip().lower()] = val.strip()
+            i = 0
+            while i < len(value):
+                # Find the next key=value pair
+                equals_pos = value.find('=', i)
+                if equals_pos == -1:
+                    break
+                
+                # Extract the key
+                key = value[i:equals_pos].strip()
+                
+                # Find where the value starts
+                value_start = equals_pos + 1
+                
+                # Determine where the value ends (considering nested structures)
+                value_end = _find_value_end(value, value_start)
+                
+                # Extract and parse the value
+                val = value[value_start:value_end].strip()
+                
+                # Try to parse the value as JSON if it looks like JSON
+                parsed_val = _try_parse_json_value(val)
+                
+                params[key.lower()] = parsed_val
+                
+                # Move to the next parameter (skip comma if present)
+                i = value_end
+                if i < len(value) and value[i] == ',':
+                    i += 1
+            
             return params
         return {}
     except Exception as e:
         raise ValueError(f"Failed to parse additional parameters: {e}")
 
 
+def _find_value_end(text: str, start: int) -> int:
+    """
+    Find the end position of a parameter value, considering nested structures.
+    
+    Args:
+        text: The full text being parsed
+        start: Starting position of the value
+        
+    Returns:
+        End position of the value
+    """
+    depth = {'brace': 0, 'bracket': 0, 'paren': 0}
+    in_quotes = False
+    quote_char = None
+    i = start
+    
+    while i < len(text):
+        char = text[i]
+        
+        # Handle quotes
+        if char in ('"', "'"):
+            if not in_quotes:
+                in_quotes = True
+                quote_char = char
+            elif char == quote_char:
+                # Check if it's escaped
+                if i > 0 and text[i-1] != '\\':
+                    in_quotes = False
+                    quote_char = None
+        
+        # Only process structural characters if not in quotes
+        elif not in_quotes:
+            if char == '{':
+                depth['brace'] += 1
+            elif char == '}':
+                depth['brace'] -= 1
+            elif char == '[':
+                depth['bracket'] += 1
+            elif char == ']':
+                depth['bracket'] -= 1
+            elif char == '(':
+                depth['paren'] += 1
+            elif char == ')':
+                depth['paren'] -= 1
+            elif char == ',' and all(d == 0 for d in depth.values()):
+                # Found a comma at the top level - this is the end of the value
+                return i
+        
+        i += 1
+    
+    return i
+
+
+def _try_parse_json_value(val: str) -> Any:
+    """
+    Try to parse a string value as JSON. If it fails, return the original string.
+    Supports both single and double quotes for JSON-like structures.
+    
+    Args:
+        val: String value to parse
+        
+    Returns:
+        Parsed JSON value or original string
+    """
+    val = val.strip()
+    
+    # Check if it looks like JSON
+    if (val.startswith('{') and val.endswith('}')) or \
+       (val.startswith('[') and val.endswith(']')) or \
+       val in ('true', 'false', 'null') or \
+       (val.startswith('"') and val.endswith('"')):
+        try:
+            return json.loads(val)
+        except json.JSONDecodeError:
+            # Try converting single quotes to double quotes for Python-style dicts
+            if val.startswith('{') or val.startswith('['):
+                try:
+                    # Replace single quotes with double quotes, handling escaped quotes
+                    normalized = val.replace("\\'", "<<<ESCAPED_SINGLE>>>")
+                    normalized = normalized.replace("'", '"')
+                    normalized = normalized.replace("<<<ESCAPED_SINGLE>>>", "'")
+                    return json.loads(normalized)
+                except json.JSONDecodeError:
+                    pass
+    # Try to parse as number - validate format first
+    if re.match(r'^-?\d+(\.\d+)?$', val):
+        try:
+            if '.' in val:
+                return float(val)
+            return int(val)
+        except ValueError:
+            pass
+        pass
+    
+    return val
+
+
 def is_llm_type(llm_type, enum_value):
     """Check if llm_type equals the enum value or its name, case-insensitive."""
     if llm_type == enum_value:

{langchain_timbr-2.1.1.dist-info → langchain_timbr-2.1.3.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 langchain_timbr/__init__.py,sha256=gxd6Y6QDmYZtPlYVdXtPIy501hMOZXHjWh2qq4qzt_s,828
-langchain_timbr/_version.py,sha256=10rtKChhKY7E9UCGIjqmwXBgTWP9LtAc0YieT2NpTzw,704
+langchain_timbr/_version.py,sha256=3XX6kpIyOtIVpdYtEgDoTVSW2L9cEQyXaBXhL9YIdM0,704
 langchain_timbr/config.py,sha256=PEtvNgvnA9UseZJjKgup_O6xdG-VYk3N11nH8p8W1Kg,1410
 langchain_timbr/timbr_llm_connector.py,sha256=1jDicBZkW7CKB-PvQiQ1_AMXYm9JJHaoNaPqy54nhh8,13096
 langchain_timbr/langchain/__init__.py,sha256=ejcsZKP9PK0j4WrrCCcvBXpDpP-TeRiVb21OIUJqix8,580
@@ -15,14 +15,14 @@ langchain_timbr/langgraph/generate_response_node.py,sha256=BLmsDZfbhncRpO7PEfDpy
 langchain_timbr/langgraph/generate_timbr_sql_node.py,sha256=wkau-NajblSVzNIro9IyqawULvz3XaCYSEdYW95vWco,4911
 langchain_timbr/langgraph/identify_concept_node.py,sha256=aiLDFEcz_vM4zZ_ULe1SvJKmI-e4Fb2SibZQaEPz_eY,3649
 langchain_timbr/langgraph/validate_timbr_query_node.py,sha256=-2fuieCz1hv6ua-17zfonme8LQ_OoPnoOBTdGSXkJgs,4793
-langchain_timbr/llm_wrapper/llm_wrapper.py,sha256=xLBTy2E6mTDny5tSSxIeeMUffos1r3a2BkBAjn3zxO4,14935
+langchain_timbr/llm_wrapper/llm_wrapper.py,sha256=_oQZQHJUWskIm2L-86jUGwM5ZhaE34fCsueLHhg4Le0,14944
 langchain_timbr/llm_wrapper/timbr_llm_wrapper.py,sha256=sDqDOz0qu8b4WWlagjNceswMVyvEJ8yBWZq2etBh-T0,1362
-langchain_timbr/utils/general.py,sha256=MtY-ZExKJrcBzV3EQNn6G1ESKpiQB2hJCp95BrUayUo,5707
+langchain_timbr/utils/general.py,sha256=KkehHvIj8GoQ_0KVXLcUVeaYaTtkuzgXmYYx2TXJhI4,10253
 langchain_timbr/utils/prompt_service.py,sha256=QT7kiq72rQno77z1-tvGGD7HlH_wdTQAl_1teSoKEv4,11373
 langchain_timbr/utils/temperature_supported_models.json,sha256=d3UmBUpG38zDjjB42IoGpHTUaf0pHMBRSPY99ao1a3g,1832
 langchain_timbr/utils/timbr_llm_utils.py,sha256=c50-dEDh8GnAkDfcbNKdXuOWjbSa-mXpZzDVuNt4jTY,23053
 langchain_timbr/utils/timbr_utils.py,sha256=p21DwTGhF4iKTLDQBkeBaJDFcXt-Hpu1ij8xzQt00Ng,16958
-langchain_timbr-2.1.1.dist-info/METADATA,sha256=R9nI1TJSS6jZ8OzdVFZurSacEOc2XOGLT944w3yWtss,12268
-langchain_timbr-2.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langchain_timbr-2.1.1.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
-langchain_timbr-2.1.1.dist-info/RECORD,,
+langchain_timbr-2.1.3.dist-info/METADATA,sha256=3etBzLd5lLYeXINYMxJwu6daB9feBxW1MReZaG_I6fU,12268
+langchain_timbr-2.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langchain_timbr-2.1.3.dist-info/licenses/LICENSE,sha256=0ITGFk2alkC7-e--bRGtuzDrv62USIiVyV2Crf3_L_0,1065
+langchain_timbr-2.1.3.dist-info/RECORD,,