unisi 0.2.8__py3-none-any.whl → 0.3.1__py3-none-any.whl

unisi/__init__.py

@@ -1,7 +1,7 @@
 from .utils import *
 from .units import *
-from .users import User, handle, context_user, context_screen
-from .server import start
+from .users import User
+from .server import start, handle, context_user, context_screen
 from .tables import *
 from .containers import *
 from .proxy import *

unisi/autotest.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 import config, os, json, asyncio
 from .utils import *
 from .units import * 

unisi/common.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 import jsonpickle, inspect, asyncio
 
 UpdateScreen = True
@@ -42,12 +43,6 @@ class ArgObject:
     def __getattr__(self, _):
         """return None for unknown props"""
         return None
-
-class ReceivedMessage(ArgObject):
-    def __init__(self, kwargs):
-        self.__dict__.update(kwargs)
-    def __str__(self):
-        return f'{self.block}/{self.element}->{self.event}({self.value})'
     @property
     def screen_type(self):
         return self.block == 'root' and self.element is None
@@ -55,6 +50,12 @@ class ReceivedMessage(ArgObject):
     def voice_type(self):
         return self.block == 'voice' and self.element is None
 
+class ReceivedMessage(ArgObject):
+    def __init__(self, kwargs):
+        self.__dict__.update(kwargs)
+    def __str__(self):
+        return f'{self.block}/{self.element}->{self.event}({self.value})'    
+
 def toJson(obj):
     return jsonpickle.encode(obj,unpicklable = False)
 
@@ -64,6 +65,8 @@ def set_defaults(self, param_defaults : dict):
             setattr(self, param, value)
 
 def pretty4(name):
+    if name.startswith('_'):
+        name = name[1:]
     pretty_name = name.replace('_',' ')
     return pretty_name[0].upper() + pretty_name[1:]
 

unisi/containers.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .units import *
 from .common import pretty4, flatten, delete_unit
 from numbers import Number
@@ -50,8 +51,7 @@ class Block(Unit):
         user = Unishare.context_user()
         if hasattr(self,'closable'):        
             def close(*_):
-                delete_unit(user.screen.blocks, self.name)
-                return Redesign
+                delete_unit(user.screen.blocks, self.name)                
             self.close = close
 
         self.set_reactivity(user)
@@ -80,6 +80,11 @@ class Block(Unit):
                 self.scaler.changed(self.scaler, sval)        
         self.set_reactivity(Unishare.context_user())
 
+    def find(self, elem: Unit | str):
+        for e in flatten(self.value):
+            if e == elem or e.name == elem:
+                return e
+
 class ParamBlock(Block):
     def __init__(self, name, *args, row = 3, **params):
         """ does not need reactivity so Block init is not used"""
@@ -95,26 +100,26 @@ class ParamBlock(Block):
 
         for param, val in params.items():                    
             pretty_name = pretty4(param)            
-            t = type(val)
-            if t == str or t == int or t == float:
-                el = Edit(pretty_name, val)
-            elif t == bool:
-                el = Switch(pretty_name, val)
-            elif t == tuple or t == list:
-                if len(val) != 2:
-                    raise ValueError('Composite value has to contain the current value and options value!')
-                options = val[1]
-                if not isinstance(options, list | tuple | dict):
-                    raise ValueError('Options value (the second parameter) has to be a list or tuple!')
-                if len(options) == 3 and all(map(lambda e: isinstance(e, Number), options)):
-                    el = Range(pretty_name, val[0], options = options)
-                elif isinstance(options, list | tuple):
-                    el = Select(pretty_name, val[0], options = options, type = 'select')
-                else: 
-                    el = Tree(pretty_name, val[0], options = options)
-            else:
-                raise ValueError(f'The {param} value {val} is not supported. Look at ParamBlock documentation!')
-            
+            match val:
+                case True | False:
+                    el = Switch(pretty_name, val)
+                case str() | int() | float():
+                    el = Edit(pretty_name, val)                
+                case tuple() | list():
+                    if len(val) != 2:
+                        raise ValueError('Composite value has to contain the current value and options value!')
+                    options = val[1]
+                    if not isinstance(options, list | tuple | dict):
+                        raise ValueError('Options value (the second parameter) has to be a list or tuple!')
+                    if len(options) == 3 and all(map(lambda e: isinstance(e, Number), options)):
+                        el = Range(pretty_name, val[0], options = options)
+                    elif isinstance(options, list | tuple):
+                        el = Select(pretty_name, val[0], options = options, type = 'select')
+                    else: 
+                        el = Tree(pretty_name, val[0], options = options)
+                case _:
+                    raise ValueError(f'The {param} value {val} is not supported. Look at ParamBlock documentation!')
+                            
             self.name2elem[param] = el
             
             if cnt % row == 0:
@@ -136,9 +141,9 @@ class Dialog:
         self.icon = icon
         self.value = [[], *content] if content else []        
 
-class Screen:
-    def __init__(self, name, **kwargs):
-        self.name = name        
-        self.__dict__.update(kwargs) 
-        self.type = 'screen'
+class Screen(Unit):
+    def __init__(self, name):
+        self._mark_changed = None        
+        self.name = name                
+        self.type = 'screen'                                  
 

unisi/dbunits.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .common import Unishare
 from collections import defaultdict
 

unisi/graphs.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .units import *
 from .tables import Table
 from .containers import Block

unisi/kdb.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 import kuzu, shutil, os, re
 from datetime import date, datetime
 from cymple import QueryBuilder as qb

unisi/llmrag.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .common import Unishare
 from langchain_groq import ChatGroq
 from langchain_openai import ChatOpenAI

unisi/multimon.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 import multiprocessing, time, asyncio, logging, inspect
 from .utils import start_logging
 from config import froze_time, monitor_tick, profile, pool

unisi/proxy.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from websocket import create_connection
 from enum import IntFlag
 import json, requests, os

unisi/reloader.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .autotest import config
 
 empty_app = {

unisi/server.py

@@ -1,14 +1,75 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from aiohttp import web, WSMsgType
 from .users import *
 from pathlib import Path
 from .reloader import empty_app 
 from .autotest import recorder, run_tests
 from .common import  *
-from.llmrag import setup_llmrag
+from .llmrag import setup_llmrag
 from .dbunits import dbupdates
+from .kdb import Database
 from config import port, upload_dir
 import traceback, json
 
+def context_user():
+    return context_object(User)
+
+def context_screen():
+    user = context_user()
+    return user.screen if user else None
+
+def message_logger(str, type = 'error'):
+    user = context_user()
+    user.log(str, type)
+
+Unishare.context_user = context_user
+Unishare.message_logger = message_logger
+User.type = User    
+
+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)
+        if not user:
+            error = f'Session id "{requested_connect}" is unknown. Connection refused!'
+            with logging_lock:
+                logging.error(error)
+            return None, Error(error)
+        user = User.type(session, user)
+        ok = user.screens
+    elif config.mirror and User.count:
+        user = User.type(session, User.last_user)
+        ok = user.screens
+    elif not User.count:
+        user = User.last_user        
+        user.session = session
+        user.monitor(session)
+        ok = True
+    else:
+        user = User.type(session)
+        ok = user.load()  
+                
+    User.count += 1
+    Unishare.sessions[session] = user 
+    return user, ok
+
+def handle(elem, event):
+    def h(fn):
+        key = elem, event
+        handler_map = User.last_user.handlers        
+        func = handler_map.get(key, None)        
+        if func:
+            handler_map[key] =  compose_handlers(func, fn)  
+        else: 
+            handler_map[key] = fn
+        return fn
+    return h
+
+Unishare.handle = handle
+
 async def post_handler(request):
     reader = await request.multipart()
     field = await reader.next()   
@@ -21,7 +82,6 @@ async def post_handler(request):
                 break
             size += len(chunk)
             f.write(chunk)
-
     return web.Response(text=filename)
 
 async def static_serve(request):    
@@ -34,14 +94,12 @@ async def static_serve(request):
         file_path = None
         #unmask win path
         if rpath.startswith('/') and rpath[2] == ':':
-            rpath = rpath[1:]
-        dirs = getattr(config, public_dirs, []) 
-        for dir in dirs:              
+            rpath = rpath[1:]        
+        for dir in config.public_dirs:              
             if rpath.startswith(dir):                
                 if os.path.exists(rpath):
                     file_path  = Path(rpath)
-                break
-            
+                break            
     return web.FileResponse(file_path) if file_path else web.HTTPNotFound()
      
 async def websocket_handler(request):

unisi/tables.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .units import Unit
 from .common import *
 from .dbunits import Dblist, dbupdates

unisi/units.py

@@ -1,3 +1,4 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .common import *
 from .llmrag import get_property
 
@@ -22,13 +23,26 @@ class ChangedProxy:
         elif not callable(value) and not isinstance(value, atomics):
             return ChangedProxy(value, self)
         return value
+    
+    def __setattr__(self, name, value):                
+        if name in ('_obj', '_unit'):            
+            super().__setattr__(name, value)
+        else:
+            self._obj.__setattr__(name, value) 
+            self._unit._mark_changed()
 
     def __setitem__(self, key, value):
         self._obj[key] = value
         self._unit._mark_changed ()
        
     def __getitem__(self, key):
-        return self._obj[key]    
+        value = self._obj[key]    
+        if not callable(value) and not isinstance(value, atomics):
+            value = ChangedProxy(value, self._unit)
+        return value
+    
+    def __eq__(self, other):
+        return self._obj.__eq__(other._obj) if isinstance(other, ChangedProxy) else self._obj.__eq__(other)
 
     def __delitem__(self, key):
         del self._obj[key]
@@ -42,6 +56,16 @@ class ChangedProxy:
             return len(self._obj)
         except TypeError:        
             return 0  
+        
+    def __hash__(self):
+        return hash(self._obj)
+        
+    def __iadd__(self, other):  
+        if isinstance(self._obj, list):
+            self.extend(other)  
+            return self  # Important: __iadd__ must return self
+        
+        raise TypeError(f"Unsupported operand type for += with '{type(self._obj).__name__}'")
             
     def __getstate__(self):     
         return self._obj
@@ -49,6 +73,7 @@ class ChangedProxy:
 atomics = (int, float, complex, bool, str, bytes, ChangedProxy, type(None))
            
 class Unit:    
+    action_list = set(['complete', 'update', 'changed','delete','append', 'modify', 'complete'])
     def __init__(self, name, *args, **kwargs):                
         self._mark_changed =  None
         self.name = name
@@ -81,9 +106,7 @@ class Unit:
 
     def __setattr__(self, name, value):      
         #it is correct condition order 
-        if name != "_mark_changed" and self._mark_changed:
-            if name != "__dict__" and not isinstance(value, atomics) and not callable(value):
-              value = ChangedProxy(value, self)                                    
+        if name[0] != "_" and self._mark_changed:            
             self._mark_changed(name, value)
         super().__setattr__(name, value)
 
@@ -103,7 +126,13 @@ class Unit:
     def delattr(self, attr):
         if hasattr(self, attr): 
             delattr(self, attr)
-        
+
+    def __eq__(self, other):
+        return super().__eq__(other._obj) if isinstance(other, ChangedProxy) else super().__eq__(other)
+    
+    def __hash__(self):
+        return super().__hash__()
+    
     @property
     def compact_view(self) -> str:
         """reduce for external (llm) using if required"""
@@ -126,8 +155,8 @@ class Unit:
                 obj.value = value
         self.changed = compose_handlers(changed_handler, handler) 
     
-    def __getstate__(self):     
-        return {n: v for n, v in self.__dict__.items() if n[0] != '_'}
+    def __getstate__(self):         
+        return {n: (True if n in Unit.action_list else v) for n, v in self.__dict__.items() if n[0] != '_'}
 
     def __str__(self):
         return f'{type(self).__name__}({self.name})'
@@ -153,6 +182,7 @@ def smart_complete(lst, min_input_length = 0, max_output_length = 20):
 class Edit(Unit):
     def __init__(self, name, *args, **kwargs):
         super().__init__(name, *args, **kwargs)        
+        self.x = 0
         has_value = hasattr(self,'value')
         if 'type' not in kwargs:            
             if has_value:
@@ -263,6 +293,7 @@ class Tree(Unit):
 class TextArea(Unit):
     def __init__(self,name, *args, **kwargs):
         super().__init__(name, *args, **kwargs)
+        self.x = 0
         self.type = 'text' 
                      
         

unisi/users.py

@@ -1,10 +1,10 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 from .utils import *
 from .units import *
 from .common import *
 from .voicecom import VoiceCom
 from .containers import Dialog, Screen
 from .multimon import notify_monitor, logging_lock, run_external_process
-from .kdb import Database
 from .dbunits import dbshare, dbupdates
 import sys, asyncio, logging, importlib
 
@@ -23,7 +23,7 @@ class User:
         if share:            
             self.screens = share.screens            
             self.screen_module = share.screen_module if share.screens else []
-            self.__handlers__ =  share.__handlers__        
+            self.handlers =  share.handlers        
             
             if share.reflections:            
                 share.reflections.append(self)
@@ -34,7 +34,7 @@ class User:
             self.screens = []        
             self.reflections = []
             self.screen_module = None         
-            self.__handlers__ = {} 
+            self.handlers = {} 
 
         User.last_user = self
         self.monitor(session, share)     
@@ -79,7 +79,7 @@ class User:
         module.user = self  
                 
         spec.loader.exec_module(module)            
-        screen = Screen(getattr(module, 'name', ''))
+        screen = Screen(getattr(module, 'name', ''))        
         #set system vars
         for var, val in screen.defaults.items():                                            
             setattr(screen, var, getattr(module, var, val))         
@@ -89,22 +89,23 @@ class User:
             screen.toolbar += User.toolbar
         else: 
             screen.toolbar = User.toolbar  
-        module.screen = screen                                 
+        screen.set_reactivity(self)        
+        module.screen = screen#ChangedProxy(screen, screen)                                 
         return module
     
     async def delete(self):
         uss = Unishare.sessions
         if uss and uss.get(self.session):
-            del uss[self.session]
-        
+            del uss[self.session]        
         if self.reflections: #reflections is common array
             if len(self.reflections) == 2: 
                 self.reflections.clear() #1 element in user.reflections has no sense
             else:
                 self.reflections.remove(self)  
-
         if notify_monitor:
             await notify_monitor('-', self.session, self.last_message)   
+        if config.share:
+            self.log(f'User is disconnected, session: {self.session}', type = 'info')            
 
     def set_clean(self):
         #remove user modules from sys 
@@ -145,8 +146,8 @@ class User:
     def screen(self):        
         return  self.screen_module.screen 
 
-    def set_screen(self,name):
-        return asyncio.run(self.process(ArgObject(block = 'root', element = None, value = name)))
+    def set_screen(self,name): 
+        return self.screen_process(ArgObject(block = 'root', element = None, value = name))
     
     async def result4message(self, message):
         result = None        
@@ -217,10 +218,10 @@ class User:
                 return ['toolbar', e.name]
 
     def prepare_result(self, raw):
-        if raw is True or raw == Redesign:
-            out = self.screen      
-            out.reload = raw == Redesign                              
-            raw = out
+        reload_screen = self.screen in self.changed_units
+        if reload_screen or raw is True or raw == Redesign:            
+            self.screen.reload = reload_screen or raw == Redesign                              
+            raw = self.screen
         else:
             match raw:
                 case None: 
@@ -242,8 +243,8 @@ class User:
                     
         self.changed_units.clear()           
         return raw
-
-    async def process(self, message):        
+    
+    def screen_process(self, message):
         screen_change_message = message.screen and self.screen.name != message.screen
         if screen_change_message or message.screen_type:
             for s in self.screens:
@@ -261,17 +262,20 @@ class User:
                 error = f'Unknown screen name: {message.value}'   
                 self.log(error)
                 return Error(error)
-        elif message.voice_type:
-            created = False
+
+    async def process(self, message):        
+        if screen_result := self.screen_process(message):
+            return screen_result
+        elif message.voice_type:            
             if not self.voice:
-                self.voice = VoiceCom(self)
-                created = True
+                self.voice = VoiceCom(self)                
             if message.event == 'listen':                
-                return self.voice.start() if message.value else self.voice.stop()
+                if message.value:
+                    self.voice.start()  
+                else:
+                    self.voice.stop()
             else:
-                self.voice.input_word(message.value)
-            if created:
-                return Redesign
+                self.voice.process_word(message.value)            
         else:        
             elem = self.find_element(message)          
             if elem:                          
@@ -283,7 +287,7 @@ class User:
     async def process_element(self, elem, message):                
         event = message.event 
         query = event == 'complete' or event == 'append' or event == 'get'        
-        handler = self.__handlers__.get((elem, event), None)
+        handler = self.handlers.get((elem, event), None)
         if handler:
             return await self.eval_handler(handler, elem, message.value)
                                                                     
@@ -358,62 +362,3 @@ class User:
                                     sync_calls.append(user.send(update4user))
         dbupdates.clear()
         await asyncio.gather(*sync_calls)
-
-def context_user():
-    return context_object(User)
-
-def context_screen():
-    user = context_user()
-    return user.screen if user else None
-
-def message_logger(str, type = 'error'):
-    user = context_user()
-    user.log(str, type)
-
-Unishare.context_user = context_user
-Unishare.message_logger = message_logger
-User.type = User    
-
-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)
-        if not user:
-            error = f'Session id "{requested_connect}" is unknown. Connection refused!'
-            with logging_lock:
-                logging.error(error)
-            return None, Error(error)
-        user = User.type(session, user)
-        ok = user.screens
-    elif config.mirror and User.count:
-        user = User.type(session, User.last_user)
-        ok = user.screens
-    elif not User.count:
-        user = User.last_user        
-        user.session = session
-        user.monitor(session)
-        ok = True
-    else:
-        user = User.type(session)
-        ok = user.load()  
-                
-    User.count += 1
-    Unishare.sessions[session] = user 
-    return user, ok
-
-def handle(elem, event):
-    def h(fn):
-        key = elem, event
-        handler_map = User.last_user.__handlers__        
-        func = handler_map.get(key, None)        
-        if func:
-            handler_map[key] =  compose_handlers(func, fn)  
-        else: 
-            handler_map[key] = fn
-        return fn
-    return h
-
-Unishare.handle = handle

unisi/utils.py

@@ -1,10 +1,10 @@
+# Copyright © 2024 UNISI Tech. All rights reserved.
 import os, platform, requests, logging
 from .common import set_defaults
 from .containers import Screen
 
 blocks_dir = 'blocks'        
 screens_dir =  'screens'        
-public_dirs = 'public_dirs'
 testdir = 'autotest'
 
 divpath = '\\' if platform.system() == 'Windows' else '/'
@@ -18,7 +18,7 @@ except:
     f = open('config.py', 'w')  
     f.write("""port = 8000 
 upload_dir = 'web'
-hot_reload   = True
+hot_reload  = True
 logfile  = 'log'
 autotest = '*'
 appname = 'Unisi app'
@@ -41,7 +41,9 @@ set_defaults(config,  dict(
     froze_time= None,
     monitor_tick = 0.005,
     pool = None,
-    db_dir = None
+    db_dir = None,
+    lang = 'en-US',
+    public_dirs = []
 ))
 
 Screen.defaults = dict(
@@ -51,7 +53,8 @@ Screen.defaults = dict(
     header = config.appname,                        
     toolbar = [], 
     order = 0,
-    reload = config.hot_reload 
+    reload = config.hot_reload, 
+    lang = config.lang
 )
 
 if config.froze_time == 0: