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

unisi/__init__.py

@@ -6,4 +6,5 @@ from .tables import *
 from .containers import *
 from .proxy import *
 from .dbunits import *
+from .graphs import *
 from .kdb import Database, Dbtable

unisi/autotest.py

@@ -96,6 +96,8 @@ test_name = Edit('Name test file', '', focus = True)
 rewrite = Switch('Overwrite existing', False, type = 'check')
 
 def button_clicked(_,__):
+    if not os.path.exists(testdir):
+        os.makedirs(testdir)        
     test_name.value = User.last_user.screen.name
     test_name.complete = smart_complete(os.listdir(testdir))
     return Dialog('Create autotest..', ask_create_test, test_name, rewrite)
@@ -176,11 +178,7 @@ def check_module(module):
         errors.insert(0, f"\nErrors in screen {screen.name}, file name {module.__file__}:")
     return errors
     
-def run_tests():
-    if not os.path.exists(testdir):
-        os.makedirs(testdir)
-    user = User.type(testdir)
-    user.load()    
+def run_tests(user):
     errors = []
     for module in user.screens:
         errors += check_module(module)
@@ -200,8 +198,7 @@ def run_tests():
                 if not test(file,user):
                     ok = False
     if process and ok:
-        print('\n-----Autotests successfully passed.-----\n')
-    User.last_user = None
+        print('\n-----Autotests successfully passed.-----\n')    
     User.toolbar.append(button)
     
         

unisi/common.py

@@ -48,6 +48,12 @@ class ReceivedMessage(ArgObject):
         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
+    @property
+    def voice_type(self):
+        return self.block == 'voice' and self.element is None
 
 def toJson(obj):
     return jsonpickle.encode(obj,unpicklable = False)
@@ -147,6 +153,21 @@ def Answer(type, message, result):
     ms.message = message
     return ms
 
+def delete_unit(units, name):
+    """Deletes a unit with the given name from a nested list of units.
+        Returns True if the unit was found and deleted, False otherwise.
+    """
+    for i in range(len(units)):
+        if isinstance(units[i], list | tuple):
+            if delete_unit(units[i], name):
+                if not units[i]: # if the sublist became empty after deletion
+                    units.pop(i) # remove sublist also
+                return True
+        elif units[i].name == name:
+            units.pop(i) 
+            return True
+    return False
+
 
 
 

unisi/containers.py

@@ -1,186 +1,6 @@
 from .units import *
-from .tables import Table
-from .common import pretty4, flatten
+from .common import pretty4, flatten, delete_unit
 from numbers import Number
-from collections import defaultdict
-from collections.abc import Iterable
-
-class Node:
-    def __init__(self, name , color = '', size = 0, image = ''):
-        if name:
-            self.name = name
-        if image:
-            self.type = 'image'
-            self.image = image
-        else:
-            self.type = ''
-        if color:
-            self.color = color
-        if size:
-            self.size = size        
-
-class Edge:
-    def __init__(self, source, target, name = '', color = '', size = 0, property = None):
-        self.source = source
-        self.target = target
-        if name:
-            self.name = name
-        if color:
-            self.color = color
-        if size:
-            self.size = size
-        if property is not None:
-            self.property = property     
-    def __str__(self):
-        return f"Edge({self.source}->{self.target})"   
-    def __repr__(self):
-        return f"Edge({self.source}->{self.target})"   
-
-graph_default_value = {'nodes' : [], 'edges' : []}
-
-class Graph(Unit):
-    '''has to contain nodes, edges, see Readme'''
-    def __init__(self, name, *args, **kwargs):
-        super().__init__(name, *args, **kwargs)
-        set_defaults(self, dict(type ='graph', value = graph_default_value, nodes = [], edges = []))
-
-Topology = lambda: defaultdict(lambda: defaultdict(lambda: {}))
-
-def unit2image(unit):
-    match unit:
-        case Block():
-            return 'https://img.icons8.com/fluency/48/object.png'
-        case Button():
-            return 'https://img.icons8.com/ios-filled/50/doorbell.png'
-        case Edit() | Text():
-            return 'https://img.icons8.com/fluency-systems-filled/50/123.png' if unit.type == 'number'\
-                else 'https://img.icons8.com/sf-regular/48/abc.png'
-        case Switch():
-            return 'https://img.icons8.com/ios/50/toggle-on--v1.png'
-        case TextArea():
-            return 'https://img.icons8.com/color/48/align-cell-content-left.png'
-        case Table():
-            return 'https://img.icons8.com/color/48/day-view.png' if unit.type == 'table'\
-                else 'https://img.icons8.com/ultraviolet/40/combo-chart.png'
-        case Tree():
-            return 'https://img.icons8.com/external-flatart-icons-outline-flatarticons/64/external-tree-nature-flatart-icons-outline-flatarticons-3.png'
-        case Select():
-            return 'https://img.icons8.com/cotton/64/list--v2.png'
-        case Graph():
-            return 'https://img.icons8.com/external-vitaliy-gorbachev-blue-vitaly-gorbachev/50/external-nodes-cryptocurrency-vitaliy-gorbachev-blue-vitaly-gorbachev.png'
-        case Range():
-            return 'https://img.icons8.com/ios/50/slider-control.png'
-        case Unit():
-            return 'https://img.icons8.com/ios-filled/50/link--v1.png'
-        case _: 
-            return ''
-
-class Net(Graph):    
-    """Graph of Units"""
-    def __init__(self, name, topology = Topology(),  *args, **kwargs):        
-        super().__init__(name, *args, **kwargs)
-        self.type = 'graph' 
-        self.topology = topology       
-        changed_handler = getattr(self, 'changed', None)
-        
-        def changed_converter(_, value):            
-            mark_changed = self._mark_changed 
-            self._mark_changed = None #turn off for 'value' diff  reaction
-            self._value = value
-            narray = self._narray
-            value = dict(nodes = [self._narray[i] for i in value['nodes']], edges = 
-                [Edge(narray[self._edges[i].source], narray[self._edges[i].target]) for i in value['edges']])
-            if changed_handler:
-                result = changed_handler(_, value)
-            else:
-                result = None
-                self.value = value
-            self._mark_changed = mark_changed #turn on
-            return result
-        self.changed = changed_converter
-
-    def specific_changed_register(self, property = None, value = None):
-        """ mark serial info as invalid """
-        if property:
-            if property.startswith('_'):
-                return False
-            else:
-                self.delattr('_nodes')
-                self.delattr('_value')                            
-        return True
-
-    def elements(self, stubs=True):
-        if not hasattr(self, '_nodes'):
-            self.__getstate__()
-        return self.narray
-    
-    def __getstate__(self):
-        if not hasattr(self, '_nodes'):
-            nodes = []            
-            narray = []
-            earray = []
-            for sunit, links in self.topology.items():
-                sindex = index_of(narray,sunit)
-                if sindex == -1:
-                    sindex = len(narray)
-                    narray.append(sunit)
-                    nodes.append(Node(sunit.name, image = unit2image(sunit), 
-                            color = 'white', size = 15))
-                for dunit  in links:
-                    dindex = index_of(narray,dunit)
-                    if dindex == -1:
-                        dindex = len(narray)
-                        narray.append(dunit)
-                        nodes.append(Node(dunit.name, image = unit2image(dunit), 
-                            color = 'white', size = 15))
-                    earray.append(Edge(sindex, dindex))
-            self._nodes = nodes
-            self._edges = earray
-            self._narray = narray            
-
-        if not hasattr(self, '_value'):
-            self._value = dict(nodes = [index_of(self._narray,unit) for unit in self.value['nodes']], 
-            edges = [Edge(index_of(self._narray, e.source), index_of(self._narray, e.target)) for e in self.value['edges']])
-        return dict(name = self.name, type = self.type, nodes = self._nodes, edges = self._edges, value = self._value)
-
-    def make_topology(self, unit: Unit | Iterable):
-        topo = Topology()
-        def dive(unit):
-            match unit:
-                case Iterable():
-                    node = Unit('Union', type = 'union')            
-                    for obj in unit:
-                        if obj:
-                            topo[node][dive(obj)] = {}                
-                    return node
-                case Block():
-                    for obj in unit.value:
-                        if obj:
-                            topo[unit][dive(obj)] = {}                
-                case _: ...
-            return unit
-        dive(unit)
-        self.topology = topo
-        self.specific_changed_register()
-
-class ContentScaler(Range):
-    def __init__(self, *args, **kwargs):
-        name = args[0] if args else 'Scale content'        
-        super().__init__(name, *args, **kwargs)                
-        if 'options' not in kwargs:
-            self.options = [0.25, 3.0, 0.25]
-        self.changed = self.scaler
-        
-    def scaler(self, _, val):
-        prev = self.value
-        elements = self.elements() 
-        self.value = val
-        if elements:
-            prev /= val
-            for element in elements:
-                element.width /= prev
-                element.height /= prev            
-            return elements
         
 class Block(Unit):    
     def __init__(self, name, *elems, **options):    
@@ -213,7 +33,7 @@ class Block(Unit):
                 elif isinstance(elem.llm, dict):
                     if elem.type != 'table':                        
                         raise AttributeError(f'{elem.name} llm parameter is a dictionary only for tables, not for {elem.type}!')                                                                
-                    elem.__llm_dependencies__ = {fld: (deps if isinstance(deps, list | bool) else [deps]) for fld, deps in elem.llm.items()} 
+                    elem._llm_dependencies = {fld: (deps if isinstance(deps, list | bool) else [deps]) for fld, deps in elem.llm.items()} 
                     elem.llm = True
                     continue
                 else:
@@ -222,12 +42,19 @@ class Block(Unit):
                     elem.llm = exactly                
                     for dependency in dependencies:
                         dependency.add_changed_handler(elem.emit)    
-                    elem.__llm_dependencies__ = dependencies
+                    elem._llm_dependencies = dependencies
                 else:
                     elem.llm = None
                     print(f'Empty dependency list for llm calculation for {elem.name} {elem.type}!')
-        
-        self.set_reactivity(Unishare.context_user())
+
+        user = Unishare.context_user()
+        if hasattr(self,'closable'):        
+            def close(*_):
+                delete_unit(user.screen.blocks, self.name)
+                return Redesign
+            self.close = close
+
+        self.set_reactivity(user)
 
     def set_reactivity(self, user, override = False):
         if user:            

unisi/graphs.py

@@ -0,0 +1,168 @@
+from .units import *
+from .tables import Table
+from .containers import Block
+from collections import defaultdict
+from collections.abc import Iterable
+
+class Node:
+    def __init__(self, name , color = '', size = 0, image = ''):
+        if name:
+            self.name = name
+        if image:
+            self.type = 'image'
+            self.image = image
+        else:
+            self.type = ''
+        if color:
+            self.color = color
+        if size:
+            self.size = size        
+
+class Edge:
+    def __init__(self, source, target, name = '', color = '', size = 0, property = None):
+        self.source = source
+        self.target = target
+        if name:
+            self.name = name
+        if color:
+            self.color = color
+        if size:
+            self.size = size
+        if property is not None:
+            self.property = property     
+    def __str__(self):
+        return f"Edge({self.source}->{self.target})"   
+    def __repr__(self):
+        return f"Edge({self.source}->{self.target})"   
+
+graph_default_value = {'nodes' : [], 'edges' : []}
+
+class Graph(Unit):
+    '''has to contain nodes, edges, see Readme'''
+    def __init__(self, name, *args, **kwargs):
+        super().__init__(name, *args, **kwargs)
+        set_defaults(self, dict(type ='graph', value = graph_default_value, nodes = [], edges = []))
+
+Topology = lambda: defaultdict(lambda: defaultdict(lambda: None))
+
+def unit2image(unit):
+    match unit:
+        case Block():
+            return 'https://img.icons8.com/fluency/48/object.png'
+        case Button():
+            return 'https://img.icons8.com/ios-filled/50/doorbell.png'
+        case Edit() | Text():
+            return 'https://img.icons8.com/fluency-systems-filled/50/123.png' if unit.type == 'number'\
+                else 'https://img.icons8.com/sf-regular/48/abc.png'
+        case Switch():
+            return 'https://img.icons8.com/ios/50/toggle-on--v1.png'
+        case TextArea():
+            return 'https://img.icons8.com/color/48/align-cell-content-left.png'
+        case Table():
+            return 'https://img.icons8.com/color/48/day-view.png' if unit.type == 'table'\
+                else 'https://img.icons8.com/ultraviolet/40/combo-chart.png'
+        case Tree():
+            return 'https://img.icons8.com/external-flatart-icons-outline-flatarticons/64/external-tree-nature-flatart-icons-outline-flatarticons-3.png'
+        case Select():
+            return 'https://img.icons8.com/cotton/64/list--v2.png'
+        case Graph():
+            return 'https://img.icons8.com/external-vitaliy-gorbachev-blue-vitaly-gorbachev/50/external-nodes-cryptocurrency-vitaliy-gorbachev-blue-vitaly-gorbachev.png'
+        case Range():
+            return 'https://img.icons8.com/ios/50/slider-control.png'
+        case Unit():
+            return 'https://img.icons8.com/ios-filled/50/link--v1.png'
+        case _: 
+            return ''
+
+class Net(Graph):    
+    """Graph of Units"""
+    replace4state = dict(nodes = '_nodes', edges = '_edges', value = '_value')
+    def __init__(self, name, value = graph_default_value, topology = Topology(),  **kwargs):        
+        Unit.__init__(self, name, **kwargs)        
+        self.type = 'graph'         
+        self.value = value
+        self.topology = topology       
+        self._inside_converter = False
+        changed_handler = getattr(self, 'changed', None)
+        
+        def changed_converter(_, value):                        
+            self._inside_converter = True
+            self._value = value
+            narray = self._narray
+            value = dict(nodes = [self._narray[i] for i in value['nodes']], edges = 
+                [Edge(narray[self._edges[i].source], narray[self._edges[i].target]) for i in value['edges']])
+            if changed_handler:
+                result = changed_handler(_, value)
+            else:
+                result = None
+                self.value = value
+            self._inside_converter = False
+            return result
+        self.changed = changed_converter
+
+    def specific_changed_register(self, property = None, value = None):
+        """ mark serial info as invalid """
+        if property:
+            if property.startswith('_'):
+                return False
+            elif property == 'value' and self._inside_converter:
+                return False
+            else:
+                self.delattr('_nodes')
+                self.delattr('_value')                            
+        return True
+
+    def elements(self, stubs=True):
+        if not hasattr(self, '_nodes'):
+            self.__getstate__()
+        return self.narray
+    
+    def __getstate__(self):
+        if not hasattr(self, '_nodes'):
+            nodes = []            
+            narray = []
+            earray = []
+            for sunit, links in self.topology.items():
+                sindex = index_of(narray,sunit)
+                if sindex == -1:
+                    sindex = len(narray)
+                    narray.append(sunit)
+                    nodes.append(Node(sunit.name, image = unit2image(sunit), 
+                            color = 'white', size = 15))
+                for dunit  in links:
+                    dindex = index_of(narray,dunit)
+                    if dindex == -1:
+                        dindex = len(narray)
+                        narray.append(dunit)
+                        nodes.append(Node(dunit.name, image = unit2image(dunit), 
+                            color = 'white', size = 15))
+                    earray.append(Edge(sindex, dindex))
+            self._nodes = nodes
+            self._edges = earray
+            self._narray = narray            
+        
+        if not hasattr(self, '_value'):
+            self._value = dict(nodes = [index_of(self._narray,unit) for unit in self.value['nodes']], 
+            edges = [Edge(index_of(self._narray, e.source), index_of(self._narray, e.target)) for e in self.value['edges']])            
+        return {name: getattr(self,Net.replace4state.get(name, name)) for name in ['nodes', 'edges', *self.__dict__.keys()] 
+                                                                        if name != 'topology' and name[0] != '_'}    
+
+    def make_topology(self, unit: Unit | Iterable):
+        topo = Topology()
+        def dive(unit):
+            match unit:
+                case Iterable():
+                    node = Unit('Union', type = 'union')            
+                    for obj in unit:
+                        if obj:
+                            topo[node][dive(obj)] = {}                
+                    return node
+                case Block():
+                    for obj in unit.value:
+                        if obj:
+                            topo[unit][dive(obj)] = {}                
+                case _: ...
+            return unit
+        dive(unit)
+        self.topology = topo
+        self.specific_changed_register()

unisi/server.py

@@ -105,10 +105,8 @@ def start(appname = None, user_type = User, http_handlers = []):
     if appname:
         config.appname = appname
 
-    User.type = user_type    
-
-    if config.autotest:
-        run_tests()
+    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), 

unisi/tables.py

@@ -199,7 +199,7 @@ class Table(Unit):
             tasks = []
             for index in self.selected_list:
                 values = {field: value for field, value in zip(self.headers, self.rows[index]) if value}
-                for fld, deps in self.__llm_dependencies__.items():                    
+                for fld, deps in self._llm_dependencies.items():                    
                     if fld not in values:                        
                         if deps is True:
                             context = values

unisi/units.py

@@ -112,9 +112,9 @@ class Unit:
     async def emit(self, *_ ):        
         """calcute value by system llm, can be used as a handler"""
         if Unishare.llm_model and (exactly := getattr(self, 'llm', None)) is not None:        
-            elems = [e.compact_view for e in self.__llm_dependencies__ if e.value != '' and e.value is not None]
+            elems = [e.compact_view for e in self._llm_dependencies if e.value != '' and e.value is not None]
             #exactly is requirment that all elements have to have valid value
-            if not exactly or len(elems) == len(self.__llm_dependencies__):
+            if not exactly or len(elems) == len(self._llm_dependencies):
                 context = ','.join(elems)    
                 self.value = await get_property(self.name, context, self.type, options = getattr(self, 'options', None))
                 return self
@@ -125,6 +125,9 @@ class Unit:
             def changed_handler(obj, value):
                 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 __str__(self):
         return f'{type(self).__name__}({self.name})'
@@ -177,6 +180,25 @@ class Range(Unit):
         if 'options' not in kwargs:
             self.options = [self.value - 10, self.value + 10, 1]
 
+class ContentScaler(Range):
+    def __init__(self, *args, **kwargs):
+        name = args[0] if args else 'Scale content'        
+        super().__init__(name, *args, **kwargs)                
+        if 'options' not in kwargs:
+            self.options = [0.25, 3.0, 0.25]
+        self.changed = self.scaler
+        
+    def scaler(self, _, val):
+        prev = self.value
+        elements = self.elements() 
+        self.value = val
+        if elements:
+            prev /= val
+            for element in elements:
+                element.width /= prev
+                element.height /= prev            
+            return elements
+
 class Button(Unit):
     def __init__(self, name, handler = None, **kwargs):
         self._mark_changed =  None

unisi/users.py

@@ -1,6 +1,7 @@
 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
@@ -17,6 +18,7 @@ class User:
         self.active_dialog = None        
         self.last_message = None                               
         self.changed_units = set()
+        self.voice = None
 
         if share:            
             self.screens = share.screens            
@@ -53,7 +55,7 @@ class User:
                 if user is not self and screen is user.screen_module])        
         
     async def reflect(self, message, result):
-        if self.reflections and not is_screen_switch(message):                        
+        if self.reflections and not message.screen_type:                        
             if result:
                 await self.broadcast(result)        
             if message:                    
@@ -197,6 +199,8 @@ class User:
         else:
             for bl in flatten(self.blocks):
                 if bl.name == blname:
+                    if not elname:
+                        return bl
                     for c in flatten(bl.value):
                         if c.name == elname:
                             return c
@@ -214,8 +218,9 @@ class User:
 
     def prepare_result(self, raw):
         if raw is True or raw == Redesign:
-            raw = self.screen      
-            raw.reload = raw == Redesign                              
+            out = self.screen      
+            out.reload = raw == Redesign                              
+            raw = out
         else:
             match raw:
                 case None: 
@@ -240,12 +245,15 @@ class User:
 
     async def process(self, message):        
         screen_change_message = message.screen and self.screen.name != message.screen
-        if screen_change_message or is_screen_switch(message):
+        if screen_change_message or message.screen_type:
             for s in self.screens:
                 if s.name == message.value:
-                    self.screen_module = s                    
+                    self.screen_module = s   
                     if screen_change_message:
                         break                    
+                    if self.voice:
+                        self.voice.set_screen(s)       
+                        self.voice.start()                              
                     if getattr(s.screen,'prepare', None):
                         s.screen.prepare()
                     return True 
@@ -253,14 +261,24 @@ class User:
                 error = f'Unknown screen name: {message.value}'   
                 self.log(error)
                 return Error(error)
-        
-        elem = self.find_element(message)          
-        if elem:                          
-            return await self.process_element(elem, message)  
-        
-        error = f'Element {message.block}/{message.element} does not exist!'
-        self.log(error)
-        return Error(error)
+        elif message.voice_type:
+            created = False
+            if not self.voice:
+                self.voice = VoiceCom(self)
+                created = True
+            if message.event == 'listen':                
+                return self.voice.start() if message.value else self.voice.stop()
+            else:
+                self.voice.input_word(message.value)
+            if created:
+                return Redesign
+        else:        
+            elem = self.find_element(message)          
+            if elem:                          
+                return await self.process_element(elem, message)              
+            error = f'Element {message.block}/{message.element} does not exist!'
+            self.log(error)
+            return Error(error)
         
     async def process_element(self, elem, message):                
         event = message.event 
@@ -285,7 +303,7 @@ class User:
             self.log(error)                     
             return Error(error)
         
-    def monitor(self, session, share):
+    def monitor(self, session, share = None):
         if config.share and session != testdir:
             self.log(f'User is connected, session: {session}, share: {share.session if share else None}', type = 'info')            
 
@@ -306,6 +324,14 @@ class User:
                 logging.info(str)
                 func(level = logging.WARNING)
 
+    def init_user():
+        """make initial user for autotest and evaluating dbsharing"""
+        user = User.type(testdir)
+        user.load()    
+        #register shared db map once
+        user.calc_dbsharing()
+        return user
+
     def calc_dbsharing(self):
         """calc connections db and units"""
         dbshare.clear()
@@ -362,15 +388,18 @@ def make_user(request):
             return None, Error(error)
         user = User.type(session, user)
         ok = user.screens
-    elif config.mirror and User.last_user:
+    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()  
-        #register shared db map once
-        if not user.count:
-            user.calc_dbsharing()            
+                
     User.count += 1
     Unishare.sessions[session] = user 
     return user, ok