unisi 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

unisi/__init__.py

@@ -1,5 +1,5 @@
 from .utils import *
-from .llmrag import Q
+from .llmrag import Q, Qx
 from .units import *
 from .users import User
 from .server import start, handle, context_user, context_screen

unisi/llmrag.py

@@ -3,6 +3,7 @@ from .common import Unishare
 from langchain_groq import ChatGroq
 from langchain_openai import ChatOpenAI
 from langchain_mistralai import ChatMistralAI
+from langchain_xai import ChatXAI
 from langchain_google_genai import (
     ChatGoogleGenerativeAI,
     HarmBlockThreshold,
@@ -10,7 +11,7 @@ from langchain_google_genai import (
 )
 from datetime import datetime
 import os, inspect, re, json
-from typing import get_origin, get_args        
+from typing import get_origin, get_args, Any, Union
 
 class QueryCache:
     ITEM_SEPARATOR = "§¶†‡◊•→±"
@@ -102,24 +103,88 @@ def is_type(variable, expected_type):
     """
     Check if the variable matches the expected type hint.
     """
-    origin = get_origin(expected_type) 
-    if origin is None:
-        return isinstance(variable, expected_type)
+    # Handle explicit mapping of expected keys to types: {'name': str, 'age': int}
+    if isinstance(expected_type, dict):
+        if not isinstance(variable, dict):
+            return False
+        for key_pattern, sub_type in expected_type.items():
+            # direct key match
+            if key_pattern in variable:
+                if not is_type(variable[key_pattern], sub_type):
+                    return False
+                continue            
+        return True
+
+    # Handle typing hints (e.g., List[int], Dict[str,int], Union[..., ...], Optional[T], Tuple[T,...])
+    origin = get_origin(expected_type)
     args = get_args(expected_type)
-    
-    # Check if the type matches the generic type
-    if not isinstance(variable, origin):
+
+    # No typing origin: expected_type may be a bare type or typing.Any
+    if origin is None:
+        # typing.Any
+        if expected_type is Any:
+            return True
+        # None as expected type
+        if expected_type is None:
+            return variable is None
+        # expected_type could be a builtin type or a tuple of types
+        if isinstance(expected_type, type) or isinstance(expected_type, tuple):
+            return isinstance(variable, expected_type)
+        # fallback: try isinstance; for other unexpected cases, be permissive
+        try:
+            return isinstance(variable, expected_type)
+        except Exception:
+            return False
+
+    # Handle Union / Optional
+    if origin is Union:
+        return any(is_type(variable, arg) for arg in args)
+
+    # Handle List[...] and Set[...]
+    if origin in (list, set):
+        expected_container = list if origin is list else set
+        if not isinstance(variable, expected_container):
+            return False
+        if not args:
+            return True
+        return all(is_type(item, args[0]) for item in variable)
+
+    # Handle Tuple[...] or tuple
+    if origin is tuple:
+        if not isinstance(variable, tuple):
+            return False
+        if not args:
+            return True
+        # Homogeneous tuple: Tuple[T, ...]
+        if len(args) == 2 and args[1] is Ellipsis:
+            return all(is_type(item, args[0]) for item in variable)
+        # Fixed-length tuple: Tuple[T1, T2, ...]
+        if len(variable) != len(args):
+            return False
+        return all(is_type(item, typ) for item, typ in zip(variable, args))
+
+    # Handle Dict[K, V]
+    if origin is dict:
+        if not isinstance(variable, dict):
+            return False
+        if not args:
+            return True
+        key_type, val_type = args
+        return all(is_type(k, key_type) and is_type(v, val_type) for k, v in variable.items())
+
+    # Handle Literal[...] (available in typing)
+    try:
+        from typing import Literal
+        if origin is Literal:
+            return any(variable == lit for lit in args)
+    except Exception:
+        pass
+
+    # Fallback: check using isinstance against the origin if possible
+    try:
+        return isinstance(variable, origin)
+    except Exception:
         return False
-        
-    if not args:
-        return True
-        
-    if origin is list:
-        return all(isinstance(item, args[0]) for item in variable)
-    elif origin is dict:
-        return all(isinstance(k, args[0]) and isinstance(v, args[1]) for k, v in variable.items())
-    
-    return False
 
 def remove_comments(json_str):
     # Regular expression to remove single-line comments (// ...)
@@ -128,17 +193,20 @@ def remove_comments(json_str):
     json_str = re.sub(r'/\*.*?\*/', '', json_str, flags=re.DOTALL)
     return json_str
 
-def Q(str_prompt, type_value = str, blank = True, **format_model):
-    """returns LLM async call for a question"""    
+def Q(str_prompt, type_value = str, blank = True, extend = True, format = True, **format_model):
+    """returns LLM async call for a question, `extend = True` adds system prompt, 
+     'identity' in format_model can be used to set the assistant identity"""    
     llm = Unishare.llm_model    
-    if '{' in str_prompt:
+    if format and '{' in str_prompt:
         caller_frame = inspect.currentframe().f_back            
         format_model = caller_frame.f_locals | format_model if format_model else caller_frame.f_locals
         str_prompt = str_prompt.format(**format_model) 
-    if not re.search(r'json', str_prompt, re.IGNORECASE):           
-        jtype = jstype(type_value)
-        format = " dd/mm/yyyy string" if type_value == 'date' else f'a JSON {jtype}' if jtype != 'string' else jtype      
-        str_prompt = f"System: You are an intelligent and extremely smart assistant. Output STRONGLY in format {format}. DO NOT OUTPUT ANY COMMENTARY." + str_prompt 
+    if extend: 
+        if type_value is not None:          
+            jtype = jstype(type_value)
+            format = " dd/mm/yyyy string" if type_value == 'date' else f'a JSON {jtype}' if jtype != 'string' else jtype      
+            str_prompt = f" Output STRONGLY in format {format}. DO NOT OUTPUT ANY COMMENTARY." + str_prompt         
+        str_prompt = format_model.get('identity', 'You are an intelligent and extremely smart assistant.') + str_prompt
     async def f():            
         if Unishare.llm_cache:            
             if content := Unishare.llm_cache.get(str_prompt):
@@ -158,27 +226,16 @@ def Q(str_prompt, type_value = str, blank = True, **format_model):
             parsed = json.loads(clean_js)
         except json.JSONDecodeError as e:
             raise ValueError(f'Invalid JSON: {js}, \n Query: {str_prompt}') 
-        if isinstance(type_value, dict):
-            for k, v in type_value.items():
-                if k not in parsed:
-                    for k2, v2 in parsed.items():
-                        if re.fullmatch(k, k2, re.IGNORECASE) is not None:
-                            parsed[k] = parsed.pop(k2)
-                            break
-                    else:
-                        if blank:
-                            parsed[k] = None
-                            continue                        
-                        raise KeyError(f'Key {k} not found in {parsed}')
-                        
-                if not is_type(parsed[k], v):
-                    raise TypeError(f'Invalid type for {k}: {type(parsed[k])} != {v}')
-        else:
-            if not is_type(parsed, type_value):
-                raise TypeError(f'Invalid type: {type(parsed)} != {type_value}')                    
+        
+        if not is_type(parsed, type_value):
+            raise TypeError(f'Invalid type: {type(parsed)} != {type_value}')                    
         return parsed
     return f()
 
+def Qx(str_prompt, type_value = str):
+    """returns LLM async call for a question, without formatting or extending the prompt"""
+    return Q(str_prompt, type_value, format = False, extend = False)
+
 def setup_llmrag():    
     import config #the module is loaded before config analysis    
     temperature = getattr(config, 'temperature', 0.0)
@@ -197,6 +254,11 @@ def setup_llmrag():
                 return
                 
         type = type.lower()
+        model_kwargs={}
+        reasoning = getattr(config, 'reasoning', None)
+        if reasoning:
+            model_kwargs['reasoning'] = {"effort": reasoning, 'enabled': True}             
+
         match type:
             case 'host':  
                 api_key_from_config = os.environ.get(api_key_config) if api_key_config else None
@@ -205,10 +267,21 @@ def setup_llmrag():
                     api_key = api_key,
                     temperature = temperature,
                     openai_api_base = address,
+                    model_kwargs=model_kwargs,
                     model = model
                 ) 
             case 'openai':
-                Unishare.llm_model = ChatOpenAI(temperature = temperature)
+                
+                Unishare.llm_model = ChatOpenAI(temperature = temperature, model_kwargs=model_kwargs)
+
+            case 'xai':
+                Unishare.llm_model = ChatXAI(
+                    model = model,
+                    temperature = temperature,
+                    max_tokens = None,
+                    timeout = None,
+                    max_retries = 2, 
+                )
 
             case 'groq':
                 Unishare.llm_model = ChatGroq(
@@ -251,4 +324,3 @@ async def get_property(name, context = '', type = str, options = None):
         Unishare.message_logger(e)
         return None
     return value
-    

{unisi-0.4.4.dist-info → unisi-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unisi
-Version: 0.4.4
+Version: 0.4.5
 Summary: Unified System Interface, GUI and Remote API
 Author-Email: UNISI Tech <g.dernovoy@gmail.com>
 License: Apache-2.0
@@ -21,6 +21,7 @@ Requires-Dist: langchain-community
 Requires-Dist: langchain-openai
 Requires-Dist: langchain-google-genai
 Requires-Dist: langchain_mistralai
+Requires-Dist: langchain-xai
 Requires-Dist: word2number
 Description-Content-Type: text/markdown
 

{unisi-0.4.4.dist-info → unisi-0.4.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
-unisi-0.4.4.dist-info/METADATA,sha256=tiL_tGRdP0YggAdpr7dh6YheOxvp1ImzRHgqscxijYc,27265
-unisi-0.4.4.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-unisi-0.4.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.4.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-unisi/__init__.py,sha256=prG4FwJzpNJRX1trto0x_4Bne3kkpEX1dUxcRnIxWVw,301
+unisi-0.4.5.dist-info/METADATA,sha256=F9i5Z3CMamg7aIz3ozUXFaLyu9HtxwXKMuE1JT0h44M,27294
+unisi-0.4.5.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+unisi-0.4.5.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.4.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi/__init__.py,sha256=IDN0JIutBidYTSYd6mM8ST4YU7WufpOFt_8OqHoPHyg,305
 unisi/autotest.py,sha256=M6T8q1Yutqr1A1qUBBbdI3LpTlS7ejiGtfdZ9Yvyfqw,8942
 unisi/common.py,sha256=QHSS-pQDtLZxeZls0eDl8-EmYJZuaRmYO1M9izCly-Y,5791
 unisi/containers.py,sha256=yl5CZrTK3HmNJJxpO7SmzIIsBMehwfCb_otaWG7GriM,7416
@@ -14,7 +14,7 @@ unisi/jsoncomparison/config.py,sha256=LbdLJE1KIebFq_tX7zcERhPvopKhnzcTqMCnS3jN12
 unisi/jsoncomparison/errors.py,sha256=wqphE1Xn7K6n16uvUhDC45m2BxbsMUhIF2olPbhqf4o,1192
 unisi/jsoncomparison/ignore.py,sha256=xfF0a_BBEyGdZBoq-ovpCpawgcX8SRwwp7IrGnu1c2w,2634
 unisi/kdb.py,sha256=K-Lqc3e9hLTwO0i1ilTC6qrwZp90tXjLm7HFb_lM1Os,13621
-unisi/llmrag.py,sha256=ORITYgC--_QPyBRumoacQmUIsQG5d7UO10956l5Fg2c,9893
+unisi/llmrag.py,sha256=HCEP8apy0FtIbLm0koG8BxCxjXS12Xqlo-9fZkGbsDs,12576
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=t7z0NgaeJX52044ue_LxITa99WMuE5Jra9qkMEeGhTg,6941
@@ -55,4 +55,4 @@ unisi/web/js/sigma.ce21336a.js,sha256=ngST-065XWOdnR_Xn7U6oGNHTL8fyiOEI9V8-BWRvl
 unisi/web/js/sigma.ce21336a.js.gz,sha256=zv6oToZZFCfmrZ4G4fw0sOncVe8-dyYNWh2v5QLKZp4,51965
 unisi/web/js/vendor.6a64dcc5.js,sha256=OSNK2nadU2DnSOEYQQcAmelybITOFZXMxnRyaDoT3yU,747104
 unisi/web/js/vendor.6a64dcc5.js.gz,sha256=nmtqRzQRWaToxgHxI9hfJd3UrUCg2-fd-0Fjc4H4wu8,245827
-unisi-0.4.4.dist-info/RECORD,,
+unisi-0.4.5.dist-info/RECORD,,