unisi 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

unisi/containers.py

@@ -8,7 +8,8 @@ class Block(Unit):
         self._mark_changed = None        
         self.name = name        
         self.type = 'block'
-        self.value = list(elems)        
+        self.value = list(elems)       
+        self._user = None 
         self.add(options)  
         if getattr(self,'scaler', False):
             scaler = ContentScaler(elements = lambda: self.scroll_list)
@@ -47,16 +48,15 @@ class Block(Unit):
                 else:
                     elem.llm = None
                     print(f'Empty dependency list for llm calculation for {elem.name} {elem.type}!')
-
-        user = Unishare.context_user()
+        
         if hasattr(self,'closable'):        
             def close(*_):
+                user = Unishare.context_user()
                 delete_unit(user.screen.blocks, self.name)                
-            self.close = close
-
-        self.set_reactivity(user)
+            self.close = close        
 
     def set_reactivity(self, user, override = False):
+        self._user = user
         if user:            
             super().set_reactivity(user, override)
             for elem in flatten(self.value):
@@ -72,13 +72,14 @@ class Block(Unit):
     
     @scroll_list.setter
     def scroll_list(self, lst):
-        self.value = [self.value[0] if self.value else [], lst]
+        self.value = ChangedProxy([self.value[0] if self.value else [], lst], self)
         if hasattr(self,'scaler'):
             sval = self.scaler.value
             if sval != 1:
                 self.scaler.value = 1
-                self.scaler.changed(self.scaler, sval)        
-        self.set_reactivity(Unishare.context_user())
+                self.scaler.changed(self.scaler, sval)                  
+        for image in lst:
+            image.set_reactivity(self._user)      
 
     def find(self, elem: Unit | str):
         for e in flatten(self.value):
@@ -123,8 +124,6 @@ class ParamBlock(Block):
                 self.value.append(block)
             cnt += 1
             block.append(el)
-            
-        self.set_reactivity(Unishare.context_user())
         
     @property
     def params(self):
@@ -160,3 +159,8 @@ class Screen(Unit):
         self.name = name                
         self.type = 'screen'                                  
 
+    def set_reactivity(self, user, override = False):
+        super().set_reactivity(user, override)
+        for block in flatten(self.blocks):
+            block.set_reactivity(user, override)
+

unisi/units.py

@@ -25,7 +25,7 @@ class ChangedProxy:
         return value
     
     def __setattr__(self, name, value):                
-        if name in ('_obj', '_unit'):            
+        if name.startswith('_'):
             super().__setattr__(name, value)
         else:
             self._obj.__setattr__(name, value) 
@@ -90,14 +90,14 @@ class Unit:
         
     def set_reactivity(self, user, override = False):        
         changed_call = None
-        if user:
-            if not hasattr(self, 'id') and (override or not self._mark_changed): 
-                self.__dict__.update({property : ChangedProxy(value, self)  for property, value in self.__dict__.items() 
-                    if not isinstance(value, atomics) and not callable(value)})                    
-                        
-                def changed_call(property = None, value = None):
-                    if self.specific_changed_register(property, value):
-                        user.register_changed_unit(self, property, value)            
+        
+        if not hasattr(self, 'id') and (override or not self._mark_changed): 
+            self.__dict__.update({property : ChangedProxy(value, self)  for property, value in self.__dict__.items() 
+                if property[0] != '_' and not isinstance(value, atomics) and not callable(value)})                    
+                    
+            def changed_call(property = None, value = None):
+                if self.specific_changed_register(property, value):
+                    user.register_changed_unit(self, property, value)            
         super().__setattr__('_mark_changed', changed_call)                    
 
     def add(self, kwargs):              

unisi/users.py

@@ -217,7 +217,7 @@ class User:
                 return ['toolbar', e.name]
 
     def prepare_result(self, raw):
-        reload_screen = self.screen in self.changed_units
+        reload_screen = any(u.type == 'screen' for u 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
@@ -248,15 +248,17 @@ class User:
         if screen_change_message or message.screen_type:
             for s in self.screens:
                 if s.name == message.value:
-                    self.screen_module = s   
-                    if screen_change_message:
-                        break                    
-                    if self.voice:
-                        self.voice.set_screen(s.screen)       
-                        self.voice.start()                              
-                    if getattr(s.screen,'prepare', None):
-                        s.screen.prepare()
-                    return True 
+                    if self.screen_module != s:
+                        self.changed_units.add(s.screen)
+                        self.screen_module = s   
+                        if screen_change_message:
+                            break                    
+                        if self.voice:
+                            self.voice.set_screen(s.screen)       
+                            self.voice.start()                              
+                        if getattr(s.screen,'prepare', None):
+                            s.screen.prepare()
+                        return True 
             else:        
                 error = f'Unknown screen name: {message.value}'   
                 self.log(error)

unisi/voicecom.py

@@ -28,7 +28,7 @@ def word_to_number(word: str):
     
 command_synonyms = dict( #-> words    
     value = ['is', 'equals'],
-    select = ['choose','set'],
+    root = ['select', 'choose','set'],
     backspace = ['back'],    
     enter = ['push', 'execute','run'],
     clean = ['empty','erase'],
@@ -38,7 +38,7 @@ command_synonyms = dict( #-> words
     ok = ['okay']
 )
 
-root_commands = ['select', 'screen', 'stop', 'reset', 'ok']   
+root_commands = ['root', 'screen', 'stop', 'reset', 'ok']   
 ext_root_commands = root_commands[:]
 
 modes = dict( #-> actions    
@@ -62,7 +62,7 @@ for mode, commands in modes.items():
 
 class VoiceCom:
     def __init__(self, user):
-        self.block = self.assist_block()    
+        self.block = self.assist_block(user)    
         self.user = user    
         self.previous_unit_value_x = None
         self.unit = None
@@ -72,19 +72,22 @@ class VoiceCom:
     async def keyboard_input(self, _, value):
         return await self.process_string(value)
 
-    def assist_block(self) -> Block:
+    def assist_block(self, user) -> Block:
         self.input = Edit('Recognized words', '', update = self.keyboard_input)
         self.message = Edit('System message', '', edit = False)
         self.context_list = Select('Elements', None, self.select_elem, type = 'list', width = 250)
         self.command_list = Select('Commands', None, self.select_command, type = 'list', width = 250)
         
-        return Block("Mate:", 
+        block = Block("Mate:", 
             self.message,
             self.input,            
             self.context_list,
             self.command_list,
             closable = True, icon = 'mic'                                
-        )        
+        )      
+        block.set_reactivity(user)  
+        return block
+    
     def set_screen(self, screen):        
         self.calc_interactive_units()
         self.screen = screen
@@ -94,7 +97,7 @@ class VoiceCom:
         elem.value = value
         if value:
             if self.mode == 'screen':
-                return self.user.set_screen(value)
+                self.user.set_screen(value)
             self.activate_unit(self.name2unit.get(value, None))    
 
     async def select_command(self, _, value):
@@ -285,11 +288,11 @@ class VoiceCom:
                             self.input.value = ' '.join(self.buffer)                      
                 case 'screen':
                     if command == 'ok' and self.context:
-                        return self.user.set_screen(self.context)
+                        self.user.set_screen(self.context)
                     else:
                         screen_name, similarity = self.buffer_suits_name(word)
                         if similarity > 0.9:
-                            return self.user.set_screen(screen_name)
+                            self.user.set_screen(screen_name)
                         else:
                             self.context = screen_name
                             self.message.value = '"Ok" to confirm'             

{unisi-0.3.6.dist-info → unisi-0.3.7.dist-info}/METADATA

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

{unisi-0.3.6.dist-info → unisi-0.3.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
-unisi-0.3.6.dist-info/METADATA,sha256=kC-BQUL80ALV3IhLI4c7AYobZS7AjUwLhNofmGSwWjI,27449
-unisi-0.3.6.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
-unisi-0.3.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.7.dist-info/METADATA,sha256=tH5Nkp5SF1MCz7LLmbc19Qsz-9z6N55cJaHI7A_EIQA,27449
+unisi-0.3.7.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+unisi-0.3.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=JVioDSebhtmoYTldT6ChEayuRTHOgYsAflcxcBYWBTY,279
 unisi/autotest.py,sha256=qYKwSPEPUEio6koUSu1tc71pDkX-doCQJlyRppaXCtY,8709
 unisi/common.py,sha256=f8UEj1R4V5KxpKnetcuxsBbeONNaRrL0LpL07HsFPuM,5511
-unisi/containers.py,sha256=CUogDcpGCIiWGlj1Cdfi4C8DjTUwwRL94Wh_6VqnR5k,7026
+unisi/containers.py,sha256=KfWowgU2ab94BHL_gvZNpQ1X5PfZHJlV7YlpvWwJKhE,7249
 unisi/dbunits.py,sha256=G__LLHS-WqdYB4KOOfIYGfcK_SgRWD6LbMj6wqVCyxw,7423
 unisi/graphs.py,sha256=DTyLUPzi9ErKY6ADXVMXf9-uJskNISZY_xDvsnhMs1Q,6959
 unisi/jsoncomparison/__init__.py,sha256=lsWkYEuL6v3Qol-lwSUvB6y63tm6AKcCMUd4DZDx3Cg,350
@@ -20,10 +20,10 @@ unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=WKY2TrmxLbQTknvZuY1IHInnwSgWXFbUoOtrdbh6yNo,6869
 unisi/server.py,sha256=URTreRlTlqpa6XnzcXk4L1LGDE9rWTca-C-85JcEtLg,6078
 unisi/tables.py,sha256=yF6Y2dczZoSD3fo7K14pyo3vP6A0U8dt-u4xY0SS8HU,13848
-unisi/units.py,sha256=ylegaC_Ollnw6MdrIOUjDhy1-GBHTBp1XxKHy1ntAiQ,10992
-unisi/users.py,sha256=2n2pSyNiCUJIVf5sTWq1J2I-2cdoVsqY9Gcoz0rWwdE,15950
+unisi/units.py,sha256=dz32RPejz0SlCpysgwaEuxYS0crqsyzhGITe8Tu8wzg,10962
+unisi/users.py,sha256=W9QO1773xdSdk3w7bfctJSsPakAMD1_HY7sKVdHRUgY,16109
 unisi/utils.py,sha256=NHoRMItaMleHg2UEp96_zzvrtGaZHcLNUZqmKkEwiHQ,2474
-unisi/voicecom.py,sha256=KJOKNui9H2HXPJUBys5kIl03nhMvsaIUC4bWBKBtc_U,16650
+unisi/voicecom.py,sha256=QzS1gIrBeGLO5dEwiu7KIEdJIIVbPBZFGb5nY632Ws8,16707
 unisi/web/css/715.b9adf6e0.css,sha256=qCrEgBq7Nh72Eud21l81kYXEmdx0n75yU41ksuiBosQ,3264
 unisi/web/css/app.31d6cfe0.css,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unisi/web/css/vendor.f7e3cefe.css,sha256=0cbvPPBV-_jv7jBIC9glq8c1QgCowWt_TxoBalHGdAs,220668
@@ -46,4 +46,4 @@ unisi/web/js/715.85ab2263.js,sha256=bFrNpz9nqi4gTv983uwGl-UReWI6r4I_IF9P1-iyQlc,
 unisi/web/js/935.cc0c012c.js,sha256=FzVIRBr4vyQgW38ROCoh929gtzuXqM73Cf77vejfDWk,6561
 unisi/web/js/app.5ba3308e.js,sha256=ddyKZ0-oImCxOSfWqS5WTXsToI9rq8FBhab-DDQA8Dw,6150
 unisi/web/js/vendor.1bb14e9d.js,sha256=7q80jaZcms7UhWSqHAk2pXSx67cYQJGlsp-6DBXBZuU,1253597
-unisi-0.3.6.dist-info/RECORD,,
+unisi-0.3.7.dist-info/RECORD,,

{unisi-0.3.6.dist-info → unisi-0.3.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.2)
+Generator: pdm-backend (2.4.3)
 Root-Is-Purelib: true
 Tag: py3-none-any