unisi 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

unisi/containers.py

@@ -86,18 +86,15 @@ class Block(Unit):
                 return e
 
 class ParamBlock(Block):
-    def __init__(self, name, *args, row = 3, **params):
-        """ does not need reactivity so Block init is not used"""
+    def __init__(self, name, *args, row = 3, **params):        
         self._mark_changed = None
         if not args:
-            args = [[]]
-        self._mark_changed = None        
+            args = [[]]        
         self.name = name        
         self.type = 'block'
         self.value = list(args)
         self.name2elem = {}
         cnt = 0        
-
         for param, val in params.items():                    
             pretty_name = pretty4(param)            
             match val:
@@ -120,13 +117,15 @@ class ParamBlock(Block):
                 case _:
                     raise ValueError(f'The {param} value {val} is not supported. Look at ParamBlock documentation!')
                             
-            self.name2elem[param] = el
-            
+            self.name2elem[param] = el            
             if cnt % row == 0:
                 block = []
                 self.value.append(block)
             cnt += 1
             block.append(el)
+            
+        self.set_reactivity(Unishare.context_user())
+        
     @property
     def params(self):
         return {name: el.value for name, el in self.name2elem.items()}

unisi/server.py

@@ -56,9 +56,9 @@ def make_user(request):
     return user, ok
 
 def handle(unit, event):
+    handler_map = User.last_user.handlers        
     def h(fn):
-        key = unit, event
-        handler_map = User.last_user.handlers        
+        key = unit, event        
         func = handler_map.get(key, None)        
         if func:
             handler_map[key] =  compose_handlers(func, fn)  

unisi/users.py

@@ -275,7 +275,7 @@ class User:
                 else:
                     self.voice.stop()
             else:
-                self.voice.process_word(message.value)            
+                return self.voice.process_word(message.value)            
         else:        
             elem = self.find_element(message)          
             if elem:                          

unisi/voicecom.py

@@ -40,6 +40,7 @@ command_synonyms = dict( #-> words
 )
 
 root_commands = ['select', 'screen', 'stop', 'reset', 'ok']   
+ext_root_commands = root_commands[:]
 
 modes = dict( #-> actions    
     text = ['text', 'left', 'right', 'up', 'down','backspace','delete', 'space', 'tab', 'enter', 'undo','clean'],
@@ -52,10 +53,13 @@ word2command = {}
 for command, syns in command_synonyms.items():
     for syn in syns:
         word2command[syn] = command          
+    if command in root_commands:
+        ext_root_commands.extend(syns)
 
 word2command.update({command: command for command in root_commands})
 for mode, commands in modes.items():
     word2command.update({c:c for c in commands})
+    
 
 class VoiceCom:
     standart_message = "Element or command?"
@@ -78,7 +82,7 @@ class VoiceCom:
             self.input,            
             self.context_list,
             self.command_list,
-            closable = True, width = 390, icon = 'mic'                                    
+            closable = True, icon = 'mic'                                    
         )        
     def set_screen(self, screen):        
         self.calc_interactive_units()
@@ -92,12 +96,8 @@ class VoiceCom:
                 return self.user.set_screen(value)
             self.activate_unit(self.name2unit.get(value, None))    
 
-    def select_command(self, elem, value):
-        if command := word2command.get(value, None):
-            self.run_command(command)
-        self.input.value = value
-        self.message.value = command if command else ''
-        self.command_list.value = None
+    def select_command(self, _, value):        
+        self.process_word(value)        
 
     @property
     def  context_options(self):
@@ -137,17 +137,19 @@ class VoiceCom:
         self.unit_names = interactive_names
         self.name2unit = name2unit
         
-    def commands4mode(self, mode):
-        if commands :=self.cached_commands.get(mode, None):
-            self.commands = commands            
-        syn_commands = []
-        commands = modes.get(mode, []) + root_commands
-        for command in commands:
-            if command in command_synonyms:
-                syn_commands.extend(command_synonyms[command])        
-        commands.extend(syn_commands)        
-        commands.sort()
-        self.cached_commands[mode] = commands
+    def set_mode(self, mode):
+        self.context = None
+        self.mode = mode
+        self.buffer = []
+        if not (commands := self.cached_commands.get(mode, None)):            
+            syn_commands = []
+            commands = modes.get(mode, []) + root_commands
+            for command in commands:
+                if command in command_synonyms:
+                    syn_commands.extend(command_synonyms[command])        
+            commands.extend(syn_commands)        
+            commands.sort()
+            self.cached_commands[mode] = commands
         self.commands = commands
     
     def activate_unit(self, unit: Unit | None):
@@ -159,19 +161,18 @@ class VoiceCom:
         if unit:
             match unit.type:
                 case 'string':
-                    self.mode = 'text'
+                    mode = 'text'
                 case 'range':
-                    self.mode = 'number'
+                    mode = 'number'
                 case _: 
-                    self.mode = unit.type        
+                    mode = unit.type        
             unit.active = True
-            unit.focus = True
-            self.buffer = []            
-            self.commands4mode(self.mode)
+            unit.focus = True            
+            self.set_mode(mode)
             if unit.type == 'text' or unit.type == 'number':
                 self.previous_unit_value_x = unit.value, unit.x
         else:
-             self.commands = root_commands                    
+             self.commands = ext_root_commands                    
 
     def start(self):
         if self.screen.blocks[-1] != self.block:
@@ -256,10 +257,7 @@ class VoiceCom:
             case 'screen':
                 self.context_options = [getattr(s, 'name')for s in self.user.screens 
                     if hasattr(s, 'name') and s.name != self.user.screen.name]
-                self.commands4mode('screen')
-                self.context = None
-                self.mode = command
-                self.buffer = []
+                self.set_mode('screen')                
                 self.message.value = 'Select a screen'
             case 'reset':
                 self.reset()
@@ -280,7 +278,7 @@ class VoiceCom:
         self.input.value = VoiceCom.standart_message
         self.message.value = 'Select an element'
         self.context_list.value = None        
-        self.commands = root_commands
+        self.commands = ext_root_commands
         self.context = None
         self.context_options = self.unit_names
 

{unisi-0.3.2.dist-info → unisi-0.3.3.dist-info}/METADATA

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

{unisi-0.3.2.dist-info → unisi-0.3.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-unisi-0.3.2.dist-info/METADATA,sha256=i8IJvdK52wrM7IBA1-ge8Zp397Z9PZo0WJhYey_vLbE,26062
-unisi-0.3.2.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
-unisi-0.3.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.3.dist-info/METADATA,sha256=tir_jhPK-78JKakvC9caHB0HHXYZBhoYg1ANps10N4I,26062
+unisi-0.3.3.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
+unisi-0.3.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=JVioDSebhtmoYTldT6ChEayuRTHOgYsAflcxcBYWBTY,279
 unisi/autotest.py,sha256=qYKwSPEPUEio6koUSu1tc71pDkX-doCQJlyRppaXCtY,8709
 unisi/common.py,sha256=gaMz7PpFqz-JpiQnc9sx3HgS4UWnVzv_Xf8XAKve8q8,5386
-unisi/containers.py,sha256=d9oit77_DVjd-irT5NiV104_nKhQJyw2pZHM1r2oYW0,6434
+unisi/containers.py,sha256=-cCWHoMulCk7MM1H-NSfo0jB1pp1E2MJMnY6rgR-Pt0,6415
 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
@@ -18,12 +18,12 @@ unisi/llmrag.py,sha256=Wh9pQ8kBMlersKxbEDlZ3XeY2grH0_Rfg8I3E2W87hI,3481
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=5zWglaaU1zcXXNrSeyJMZW47fiHnjxbJ-CbDGREPyNk,6638
-unisi/server.py,sha256=c62F_XYnj9afhxyeNkSAqVt2zsroz6GlZRtQrbZdEHA,6140
+unisi/server.py,sha256=kiXTMiny5Ta3Z4mVVJ9iV-P5q64fhc1SZAVo3qrw5t8,6144
 unisi/tables.py,sha256=yF6Y2dczZoSD3fo7K14pyo3vP6A0U8dt-u4xY0SS8HU,13848
 unisi/units.py,sha256=rhZJtbZhje5C0Kc4sS1juMehcg5orOmQYpEe8KOVpzY,11004
-unisi/users.py,sha256=l7KazUJiby_jTKekS2tqT0TZNzZc6cOazGDzD-W3yHA,16040
+unisi/users.py,sha256=g0JMR4dxQEQizQlzIXhf974L-MY965SnwkPYP_Dmzn0,16047
 unisi/utils.py,sha256=NHoRMItaMleHg2UEp96_zzvrtGaZHcLNUZqmKkEwiHQ,2474
-unisi/voicecom.py,sha256=5LGuHyaAlXY8f3KHqtLtOloJ3Dtkp-rIvW0FgPacHvs,13857
+unisi/voicecom.py,sha256=mlGwk01VhkoRyZLhp_C1DAG2DyydqcSeX2IYB69sKwQ,13720
 unisi/web/css/364.9c989936.css,sha256=nvhfMM7I0j4Xyec9QWuXjiwY_rw8IZzxC1M0bzBwEak,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/609.35dc13d3.js,sha256=v3eqMeVE666_qkm_FGKzKkZWvg8WlVjRVYJCjTqTUFE,
 unisi/web/js/935.cc0c012c.js,sha256=FzVIRBr4vyQgW38ROCoh929gtzuXqM73Cf77vejfDWk,6561
 unisi/web/js/app.99853ae7.js,sha256=DUtNxnatRpjh2Utx8Y-d81mVQYQFOcLnX6M3GdQbg8o,6150
 unisi/web/js/vendor.1bb14e9d.js,sha256=7q80jaZcms7UhWSqHAk2pXSx67cYQJGlsp-6DBXBZuU,1253597
-unisi-0.3.2.dist-info/RECORD,,
+unisi-0.3.3.dist-info/RECORD,,