unisi 0.3.19__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:
@@ -99,8 +140,17 @@ def Q(str_prompt, type_value = str, blank = True, **format_model):
         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 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  
         try:       
@@ -125,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()
 
@@ -180,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,9 +173,10 @@ def start(user_type = User, http_handlers = []):
 
     User.type = user_type        
     run_tests(User.init_user())
-
-    server_handlers = [web.get('/ws', websocket_handler), web.static(f'/{config.upload_dir}', upload_dir), 
-        web.get('/{tail:.*}', static_serve), web.post('/', post_handler)] + http_handlers
+                        #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(server_handlers)    

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-0.3.19.dist-info → unisi-0.3.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unisi
-Version: 0.3.19
+Version: 0.3.20
 Summary: Unified System Interface, GUI and Remote API
 Author-Email: UNISI Tech <g.dernovoy@gmail.com>
 License: Apache-2.0

{unisi-0.3.19.dist-info → unisi-0.3.20.dist-info}/RECORD

@@ -1,10 +1,10 @@
-unisi-0.3.19.dist-info/METADATA,sha256=TRxYSei9SHZzjQcu7HSLB9JalHBt9oBeW1btTtEOGos,27266
-unisi-0.3.19.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-unisi-0.3.19.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.19.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.20.dist-info/METADATA,sha256=9flP9a_TPB8sf1t3-_sNI7dXckrxGYG8m0QGO5U8-qc,27266
+unisi-0.3.20.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+unisi-0.3.20.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.20.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=S9xioaMH0IRxdpKukTaRdO4oJ7eJWUHJeaGnG7j_xYg,5765
+unisi/common.py,sha256=QHSS-pQDtLZxeZls0eDl8-EmYJZuaRmYO1M9izCly-Y,5791
 unisi/containers.py,sha256=dmRHogzjIVoc0qu713bOPOPBp2QrN-LEA4Wn3owF0Yg,7223
 unisi/dbunits.py,sha256=g1h9pjoSwJrJ0Hmph-xv5jE1yfrxJeXGfuSnyVTg3j8,7438
 unisi/graphs.py,sha256=DTyLUPzi9ErKY6ADXVMXf9-uJskNISZY_xDvsnhMs1Q,6959
@@ -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=yzhcqt3DQpS9VQovQJsMbkWAPU3k2si4BwvDqg-HDAw,7570
+unisi/llmrag.py,sha256=Ra462DhayMtcFg-QnF8HdZQGQL3mplzUu7Y9WZTjssM,9413
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=qml-ufoUME7mrWrPMwMo3T8Jsh4e26CBj564cHCB6I0,6749
-unisi/server.py,sha256=qKYp_AK6Fi8n_oSoe28pLTYW3h7DNkBxgk9U2xfsP9Y,6577
+unisi/server.py,sha256=owUV_siimohV-PZwMkkIRTnynY0wxpia2la3Vjqy9g8,6658
 unisi/tables.py,sha256=IBuN9f4AF0SkN9uRPf2WWwdXgAzDnj46y0_C09iC2h4,13809
-unisi/units.py,sha256=SCUZAOV0nu9khg6JE0lWwsKjiCVz29hiUCRXyZJffeA,11111
-unisi/users.py,sha256=WsgS9Fx0RAbk_3ht4S6u9Z41VdgxdRYtbg9w79PoFfs,16267
+unisi/units.py,sha256=egOpf1I6ckAtBR9Lj2ot-RVyecIVmmuc5Rkwffl3y6A,11159
+unisi/users.py,sha256=PM_87GQRV3KVG9TX4lEZnbmpZDpszPL2smCRUcE3fOY,16349
 unisi/utils.py,sha256=yNhDKCTjHL1H2Suk9DRQkXAZKYy6nqub-dNSdwPwl9I,2625
 unisi/voicecom.py,sha256=QzS1gIrBeGLO5dEwiu7KIEdJIIVbPBZFGb5nY632Ws8,16707
 unisi/web/css/565.f35d8840.css,sha256=DjftW1Df0hiHeuUVRz5kZgW2pmcWPDk73SyyI7A5cfM,3053
@@ -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.3.19.dist-info/RECORD,,
+unisi-0.3.20.dist-info/RECORD,,