unisi 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

unisi/common.py

@@ -120,17 +120,17 @@ class Message:
 
     def fill_paths4(self, user):
         if hasattr(self, 'updates'):
-            invalid = []
+            invisible = []
             for update in self.updates:
                 data = update["data"]
                 path = user.find_path(data)
                 if path:
                     update['path'] = path
                 else:
-                    invalid.append(update)                    
-                    user.log(f'Invalid element update {data.name}, type {data.type}.\n\
-                    Such element not on the screen!')
-            for inv in invalid:
+                    invisible.append(update)                    
+                    user.log(f'Invisible element update {data.name}, type {data.type}.\n\
+                    Such element not on the screen!', type = 'warning')
+            for inv in invisible:
                 self.updates.remove(inv)
 
     def contains(self, unit):

unisi/llmrag.py

@@ -9,9 +9,50 @@ from langchain_google_genai import (
     HarmCategory,
 )
 from datetime import datetime
-import collections, inspect, re, json
+import os, inspect, re, json
 from typing import get_origin, get_args        
 
+class QueryCache:
+    ITEM_SEPARATOR = "§¶†‡◊•→±"
+    ENTRY_SEPARATOR = "€£¥¢≠≈∆√"    
+    
+    def __init__(self, file_path):
+        self.file_path = file_path
+        self.cache = {}
+        self._load_cache()
+
+    def _load_cache(self):
+        if os.path.exists(self.file_path):
+            with open(self.file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+                entries = content.split(self.ENTRY_SEPARATOR)
+                for entry in entries:
+                    if not entry.strip():
+                        continue
+                    parts = entry.split(self.ITEM_SEPARATOR)
+                    if len(parts) == 2:
+                        query, result = parts
+                        self.cache[query] = result
+
+    def get(self, query):
+        return self.cache.get(query)
+
+    def set(self, query, result):        
+        entry_data = f"{query}{self.ITEM_SEPARATOR}{result}"
+        prepend_separator = bool(self.cache)
+        
+        try:
+            with open(self.file_path, 'a', encoding='utf-8') as f:
+                if prepend_separator:
+                    f.write(self.ENTRY_SEPARATOR)
+                f.write(entry_data)
+            
+            self.cache[query] = result
+            return True
+        except Exception as e:
+            print(f"Error caching result: {e}")
+            return False
+
 def jstype(type_value):        
     if isinstance(type_value, type):         
         if type_value == int:
@@ -80,6 +121,13 @@ def is_type(variable, expected_type):
     
     return False
 
+def remove_comments(json_str):
+    # Regular expression to remove single-line comments (// ...)
+    json_str = re.sub(r'//.*', '', json_str)
+    # Regular expression to remove multi-line comments (/* ... */)
+    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"""    
     llm = Unishare.llm_model    
@@ -90,13 +138,26 @@ def Q(str_prompt, type_value = str, blank = True, **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 
+        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 Unishare.llm_cache:            
+            if content := Unishare.llm_cache.get(str_prompt):
+                pass
+            else:
+                io = await llm.ainvoke(str_prompt)
+                content = io.content
+                Unishare.llm_cache.set(str_prompt, content)
+        else:
+            io = await llm.ainvoke(str_prompt)
+            content = io.content
+        js = content.strip().strip('`').replace('json', '')                      
         if type_value == str or type_value == 'date':
             return js  
-        parsed = json.loads(js)
+        try:       
+            clean_js = remove_comments(js)     
+            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:
@@ -114,7 +175,7 @@ def Q(str_prompt, type_value = str, blank = True, **format_model):
                     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}')            
+                raise TypeError(f'Invalid type: {type(parsed)} != {type_value}')                    
         return parsed
     return f()
 
@@ -169,6 +230,9 @@ def setup_llmrag():
                     max_retries=2,
                     # other params...
                 )
+        
+        if hasattr(config, 'llm_cache'):
+            Unishare.llm_cache = QueryCache(config.llm_cache)
 
 async def get_property(name, context = '', type = str, options = None):  
     if type == str and re.search(r'date', name, re.IGNORECASE):

unisi/server.py

@@ -173,12 +173,12 @@ def start(user_type = User, http_handlers = []):
 
     User.type = user_type        
     run_tests(User.init_user())
-
-    http_handlers.insert(0, web.get('/ws', websocket_handler))        
-    http_handlers += [web.static(f'/{config.upload_dir}', upload_dir), 
-        web.get('/{tail:.*}', static_serve), web.post('/', post_handler)]
+                        #http_handlers has to be the first argument
+    server_handlers = http_handlers + [web.get('/ws', websocket_handler), 
+            web.static(f'/{config.upload_dir}', upload_dir), 
+        web.get('/{tail:.*}', static_serve), web.post('/', post_handler)] 
 
     app = web.Application()
-    app.add_routes(http_handlers)    
+    app.add_routes(server_handlers)    
     web.run_app(app, port = port)
     

unisi/units.py

@@ -111,11 +111,12 @@ class Unit:
         super().__setattr__(name, value)
 
     def mutate(self, obj):
-        self.__dict__.clear()
-        for key, value in obj.__dict__.items():
-            setattr(self, key, value)
-        if self._mark_changed:
-            self._mark_changed()
+        if self is not obj:
+            self.__dict__.clear()
+            for key, value in obj.__dict__.items():
+                setattr(self, key, value)
+            if self._mark_changed:
+                self._mark_changed()
     
     def accept(self, value):
         if hasattr(self, 'changed'):

unisi/users.py

@@ -229,7 +229,9 @@ class User:
             match raw:
                 case None: 
                     if self.changed_units:
-                        raw = Message(*self.changed_units, user = self) 
+                        raw = Message(*self.changed_units, user = self)
+                        if not raw.updates:
+                            raw = None
                 case Message():
                     if self.changed_units:
                         message_units = [x['data'] for x in raw.updates]

unisi/web/css/565.f35d8840.css

@@ -0,0 +1 @@
+thead tr:first-child th{-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);position:sticky;top:0;z-index:1000}:root{--scrollbar-width-height:10px;--scrollbar-thumb-hover:#2176d2;--scrollbar-thumb-dark:#2176d2;--scrollbar-thumb-hover-dark:#2176d2}::-webkit-scrollbar{height:var(--scrollbar-width-height);width:var(--scrollbar-width-height)}::-webkit-scrollbar-track{box-shadow:inset 0 0 4px var(--scrollbar-track-dark)}::-webkit-scrollbar-corner{background:var(--scrollbar-track-dark)}::-webkit-scrollbar-thumb{background:var(--scrollbar-thumb-dark);border-radius:5px}::-webkit-scrollbar-thumb:hover{background:var(--scrollbar-thumb-hover-dark)}body[data-v-6398f67f]{display:flex;justify-content:center}.custom-caption[data-v-6398f67f]{padding:5px!important}.web-camera-container[data-v-6398f67f]{align-items:center;border:1px solid #ccc;border-radius:4px;display:flex;flex-direction:column;justify-content:center;margin-bottom:2rem;margin-top:2rem;padding:2rem;width:500px}.web-camera-container .camera-button[data-v-6398f67f]{margin-bottom:2rem}.web-camera-container .camera-box .camera-shutter[data-v-6398f67f]{background-color:#fff;height:337.5px;opacity:0;position:absolute;width:450px}.web-camera-container .camera-box .camera-shutter.flash[data-v-6398f67f]{opacity:1}.web-camera-container .camera-shoot[data-v-6398f67f]{margin:1rem 0}.web-camera-container .camera-shoot button[data-v-6398f67f]{align-items:center;border-radius:100%;display:flex;height:60px;justify-content:center;width:60px}.web-camera-container .camera-shoot button img[data-v-6398f67f]{height:35px;object-fit:cover}.web-camera-container .camera-loading[data-v-6398f67f]{height:100%;margin:3rem 0 0 -1.2rem;min-height:150px;overflow:hidden;position:absolute;width:100%}.web-camera-container .camera-loading ul[data-v-6398f67f]{height:100%;margin:0;position:absolute;width:100%;z-index:999999}.web-camera-container .camera-loading .loader-circle[data-v-6398f67f]{display:block;height:14px;left:100%;margin:0 auto;padding:0;position:absolute;top:50%;transform:translateY(-50%);transform:translateX(-50%);width:100%}.web-camera-container .camera-loading .loader-circle li[data-v-6398f67f]{animation:preload-6398f67f 1s infinite;background:#999;border-radius:100%;display:block;float:left;height:10px;line-height:10px;margin:0 0 0 4px;padding:0;position:relative;top:-50%;width:10px}.web-camera-container .camera-loading .loader-circle li[data-v-6398f67f]:nth-child(2){animation-delay:.2s}.web-camera-container .camera-loading .loader-circle li[data-v-6398f67f]:nth-child(3){animation-delay:.4s}@keyframes preload-6398f67f{0%{opacity:1}50%{opacity:.4}to{opacity:1}}.container[data-v-6398f67f]{position:relative}.frame[data-v-6398f67f]{border:2px solid #573497;border-radius:8px;height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:10}.container{position:relative}.frame{border:2px solid #573497;border-radius:8px;height:100%;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:10}.q-tab__label{font-size:16px;font-weight:700}

unisi/web/css/72.9393078c.css

@@ -0,0 +1 @@
+#header[data-v-a6b7e7b0]{font-size:16px;font-weight:700;left:10px;pointer-events:none;position:absolute;top:10px;z-index:2}#graph[data-v-a6b7e7b0]{border:1px solid #ccc;height:600px;position:relative;width:100%}