unisi 0.3.14__py3-none-any.whl → 0.3.16__py3-none-any.whl

unisi/llmrag.py

@@ -2,62 +2,124 @@
 from .common import Unishare
 from langchain_groq import ChatGroq
 from langchain_openai import ChatOpenAI
+from langchain_mistralai import ChatMistralAI
 from langchain_google_genai import (
     ChatGoogleGenerativeAI,
     HarmBlockThreshold,
     HarmCategory,
 )
-from functools import lru_cache
-from pydantic import RootModel, create_model, BaseModel
-import collections, inspect
+from datetime import datetime
+import collections, inspect, re, json
+from typing import get_origin, get_args        
 
-def is_standard_type(obj):    
-    return isinstance(obj, (collections.abc.Sequence, collections.abc.Mapping, 
-        int, float, complex, bool, str, bytes, bytearray, range))
-        
-def Model(name, type_value = None, **parameters):
-    model = {}
-    if type_value is None:
-        for k, v in parameters.items():
-            vtype = is_standard_type(v)
-            if vtype:
-                model[k] = (v, ...)
+def jstype(type_value):        
+    if isinstance(type_value, type):         
+        if type_value == int:
+            return 'integer'
+        elif type_value == float:
+            return 'number'
+        elif type_value == bool:
+            return 'boolean'
+        elif type_value == str:
+            return 'string'
+        elif type_value == dict:            
+            return 'object'
+        elif type_value == list:            
+            return 'array'
+        else:
+            origin = get_origin(type_value) 
+            args = get_args(type_value)
+            if origin == list:
+                return f'array of {jstype(args[0])} '
+            elif origin == dict:
+                return f'object of {jstype(args[0])} to {jstype(args[1])} structure.'
             else:
-                model[k] = (vtype, v)
-        return create_model(name, **model) if model else RootModel[str]
-    return RootModel[type_value] 
+                return 'string'  
+    else: 
+        match type_value:
+            case str():
+                jtype = 'string'
+            case int():
+                jtype = 'integer'
+            case float():
+                jtype = 'number'
+            case bool():
+                jtype = 'boolean'
+            case dict():
+                if type_value:
+                    ptypes = ','.join(f'"{k}": "[Type: {jstype(v)}]"' for k, v in type_value.items())
+                    jtype = f'object with {{{ptypes}}} structure'
+                else:
+                    jtype = 'object'
+            case list():  
+                jtype = 'array'
+            case _:
+                jtype = 'string' 
+    return jtype
 
-class Question:
-    index = 0
-    """contains question, format of answer"""
-    def __init__(self, question, type_value = None, **format_model):
-        self.question = question        
-        self.format = Model(f'Question {Question.index}', type_value,  **format_model)
-        Question.index += 1
+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)
+    args = get_args(expected_type)
+    
+    # Check if the type matches the generic type
+    if not isinstance(variable, origin):
+        return False
         
-    def __str__(self):
-        return f'Qustion: {self.question} \n Format: {self.format}'     
-
-    @lru_cache(maxsize=None) 
-    def get(question, type_value = None, **format_model):
-        return Question(question, type_value, **format_model)
+    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())
     
-async def Q(question, type_value = None,  **format_model):
-    """returns LLM answer for a question"""
-    q = Question.get(question, type_value, **format_model)        
-    llm = Unishare.llm_model
-    str_prompt = q.question
-    if '{' in str_prompt:
-        caller_frame = inspect.currentframe().f_back    
-        str_prompt = str_prompt.format(**caller_frame.f_locals)            
-    io = await llm.ainvoke(str_prompt)
-    js = io.content.strip('`')    
-    js = js.replace('json', '').replace('\n', '')    
-    return q.format.parse_raw(js).root
+    return False
 
+def Q(str_prompt, type_value = str, blank = True, **format_model):
+    """returns LLM async call for a question"""    
+    llm = Unishare.llm_model    
+    if '{' 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 {format}. Do not output any commentary." + str_prompt 
+    async def f():            
+        io = await llm.ainvoke(str_prompt)
+        js = io.content.strip().strip('`').replace('json', '')                      
+        if type_value == str or type_value == 'date':
+            return js  
+        parsed = json.loads(js)
+        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}')            
+        return parsed
+    return f()
 
 def setup_llmrag():    
-    import config #the module is loaded before config.py    
+    import config #the module is loaded before config analysis    
     temperature = getattr(config, 'temperature', 0.0)
     if config.llm:
         match config.llm:
@@ -79,7 +141,7 @@ def setup_llmrag():
                     openai_api_base = address
                 ) 
             case 'openai':
-                Unishare.llm_model = ChatOpenAI(temperature=0.0)
+                Unishare.llm_model = ChatOpenAI(temperature = temperature)
 
             case 'groq':
                 Unishare.llm_model = ChatGroq(
@@ -100,43 +162,23 @@ def setup_llmrag():
                         HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE
                     }
                 )
+            case 'mistral':
+                Unishare.llm_model = ChatMistralAI(
+                    model = model,
+                    temperature=0,
+                    max_retries=2,
+                    # other params...
+                )
 
-numeric_types = ['number', 'int', 'float', 'double']
-
-async def get_property(name, context = '', type = 'string', options = None, attempts = 1, messages = None):
-    if messages is None:
-        limits = f'type is {type}'
-        if type == 'date':
-            limits = f'{limits}, use format "dd/mm/yyyy"'
-        if options:            
-            limits = f'{limits}, and its possible options are {",".join(opt for opt in options)}'        
-        messages = [
-            (
-                "system",
-                f"""You are an intelligent and extremely smart assistant."""        
-            ),
-            ("human",  f"""{context} . Reason and infer {name}, which {limits}. 
-                Do not include any additional text or commentary in your answer, just exact the property value.""")
-        ]
-    ai_msg =  await Unishare.llm_model.ainvoke(messages)
-    value = ai_msg.content
-    log_error = ''
-    if type in numeric_types:
-        try:
-            value = float(value)
-        except:
-            log_error = f'Invalid value {value} from llm-rag for {messages[1][1]}'
-            return value
-    else:
-        value = value.strip('""')
-
-    if not log_error and options and value not in options:
-        attempts -= 1
-        if attempts > 0:
-            value = get_property(name, context, type, options, attempts, messages)
-        else:
-            log_error = f'Invalid value {value} from llm-rag for {messages[1][1]}'
-
-    if log_error:
-        Unishare.message_logger(log_error)
-    return value
+async def get_property(name, context = '', type = str, options = None):  
+    if type == str and re.search(r'date', name, re.IGNORECASE):
+        type = 'date'
+    limits = f', which possible options are {",".join(opt for opt in options)},' if options else ''                    
+    prompt = """Context: {context} . Output ONLY "{name}" explicit value{limits} based on the context. """    
+    try:
+        value = await Q(prompt, type)
+    except Exception as e:        
+        Unishare.message_logger(e)
+        return None
+    return value
+    

unisi/server.py

@@ -9,7 +9,12 @@ from .llmrag import setup_llmrag
 from .dbunits import dbupdates
 from .kdb import Database
 from config import port, upload_dir
-import traceback, json
+import traceback, json, random, string
+from urllib.parse import parse_qs
+
+def generate_random_string(length=10):
+    characters = string.ascii_letters + string.digits 
+    return ''.join(random.choices(characters, k=length))
 
 def context_user():
     return context_object(User)
@@ -18,9 +23,13 @@ def context_screen():
     user = context_user()
     return user.screen if user else None
 
-def message_logger(str, type = 'error'):
+def message_logger(message, type = 'error'):
     user = context_user()
-    user.log(str, type)
+    if user:    
+        user.log(message, type)
+    else:
+        with logging_lock:
+            logging.error(message)
 
 Unishare.context_user = context_user
 Unishare.message_logger = message_logger
@@ -30,11 +39,17 @@ if config.db_dir:
     Unishare.db = Database(config.db_dir, message_logger) 
 
 def make_user(request):
-    session = f'{request.remote}-{User.count}'        
-    if requested_connect := request.query_string if config.share else None:
-        user = Unishare.sessions.get(requested_connect, None)
+    parsed_query = parse_qs(request.query_string)
+    if 'session' in parsed_query:
+        session = parsed_query['session'][0]
+        user_id = session.split('-')[1]
+    else:
+        user_id = parsed_query.get('id', [User.count])[0]
+        session = f'{generate_random_string()}-{user_id}'        
+    if config.share and 'session' in parsed_query:
+        user = Unishare.sessions.get(session, None)
         if not user:
-            error = f'Session id "{requested_connect}" is unknown. Connection refused!'
+            error = f'Session id "{session}" is unknown. Connection refused!'
             with logging_lock:
                 logging.error(error)
             return None, Error(error)
@@ -102,7 +117,7 @@ async def static_serve(request):
      
 async def websocket_handler(request):
     ws = web.WebSocketResponse()
-    await ws.prepare(request)
+    await ws.prepare(request)    
     user, status = make_user(request)
     if not user:
         await ws.send_str(toJson(status))

unisi/users.py

@@ -312,18 +312,18 @@ class User:
     def sync_send(self, obj):                    
         asyncio.run(self.send(obj))
     
-    def log(self, str, type = 'error'):        
+    def log(self, message, type = 'error'):        
         scr = self.screen.name if self.screens else 'void'
-        str = f"session: {self.session}, screen: {scr}, message: {self.last_message}\n  {str}"
+        message = f"session: {self.session}, screen: {scr}, message: {self.last_message}\n  {message}"
         with logging_lock:
             if type == 'error':
-                logging.error(str)
+                logging.error(message)
             elif type == 'warning':
-                logging.warning(str)    
+                logging.warning(message)    
             else:
                 func = logging.getLogger().setLevel
                 func(level = logging.INFO)
-                logging.info(str)
+                logging.info(message)
                 func(level = logging.WARNING)
 
     def init_user():

{unisi-0.3.14.dist-info → unisi-0.3.16.dist-info}/METADATA

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

{unisi-0.3.14.dist-info → unisi-0.3.16.dist-info}/RECORD

@@ -1,7 +1,7 @@
-unisi-0.3.14.dist-info/METADATA,sha256=dJlmgx4DW_-CzGkW4kUxEB1Te_Q34JFcKJLxbKZ347A,27231
-unisi-0.3.14.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-unisi-0.3.14.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.16.dist-info/METADATA,sha256=o3bi9eL509XYvMrr-juU0QEGBeRAAp3X_ST4itU5Ulk,27266
+unisi-0.3.16.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+unisi-0.3.16.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=prG4FwJzpNJRX1trto0x_4Bne3kkpEX1dUxcRnIxWVw,301
 unisi/autotest.py,sha256=qYKwSPEPUEio6koUSu1tc71pDkX-doCQJlyRppaXCtY,8709
 unisi/common.py,sha256=bMPZo7V9nlJW5HC0yJLRDbrh0DZ4oqmEtBuOvGyN6fw,5759
@@ -14,14 +14,14 @@ 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=gspPfYcdqCkRLJh8L3J2SkRl-ywwcAsNV_BySjGli1c,5293
+unisi/llmrag.py,sha256=xlye9OodtIZaoMWEV8hfF_Vjo4VtXVYxY3qiY3qaD74,7077
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=qml-ufoUME7mrWrPMwMo3T8Jsh4e26CBj564cHCB6I0,6749
-unisi/server.py,sha256=V0I3OAWcebttN1KXHd_-5Vx9tOZ_RzPfSg-3ZJVxWY0,6084
+unisi/server.py,sha256=9qgSH-HjQDQwSK2gor_dUGqHocrJS-Z-t5B54EjUDd0,6594
 unisi/tables.py,sha256=tszF62VToSchILzPhJgA4U02MFjv44LopXgD5mYg7fg,13822
 unisi/units.py,sha256=SCUZAOV0nu9khg6JE0lWwsKjiCVz29hiUCRXyZJffeA,11111
-unisi/users.py,sha256=h4kjPAo8LkUG9mKSDthLoDC-XVFLlPxjUvXcJdXT47g,16145
+unisi/users.py,sha256=JeIori4XsW1blkasLwqZeK8XloX7UjDV_0aHE7WNWjo,16169
 unisi/utils.py,sha256=yNhDKCTjHL1H2Suk9DRQkXAZKYy6nqub-dNSdwPwl9I,2625
 unisi/voicecom.py,sha256=QzS1gIrBeGLO5dEwiu7KIEdJIIVbPBZFGb5nY632Ws8,16707
 unisi/web/css/885.703d8f36.css,sha256=9O3mFR661UJ_WySZjYt69TbPXhKwz9yEPE7seHR_3aY,3264
@@ -46,4 +46,4 @@ unisi/web/js/885.d3e9dd2b.js,sha256=7A39S4SDApVc4iHHABjOd5julybSa4UwaH4kj8vSn0E,
 unisi/web/js/935.cc0c012c.js,sha256=FzVIRBr4vyQgW38ROCoh929gtzuXqM73Cf77vejfDWk,6561
 unisi/web/js/app.3d5227f7.js,sha256=lJkD2OPQOYlxivZmNY8FYKI1JMQ_bh1Pm4zC7y8Ayt0,6150
 unisi/web/js/vendor.1bb14e9d.js,sha256=7q80jaZcms7UhWSqHAk2pXSx67cYQJGlsp-6DBXBZuU,1253597
-unisi-0.3.14.dist-info/RECORD,,
+unisi-0.3.16.dist-info/RECORD,,