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

unisi/server.py

@@ -50,15 +50,14 @@ def make_user(request):
         ok = True
     else:
         user = User.type(session)
-        ok = user.load()  
-                
+        ok = user.load()                  
     User.count += 1
     Unishare.sessions[session] = user 
     return user, ok
 
-def handle(elem, event):
+def handle(unit, event):
     def h(fn):
-        key = elem, event
+        key = unit, event
         handler_map = User.last_user.handlers        
         func = handler_map.get(key, None)        
         if func:
@@ -89,7 +88,6 @@ async def static_serve(request):
     file_path  = Path(f"{webpath}{rpath}" )
     if request.path == '/':
         file_path /= 'index.html'
-
     if not file_path.exists():
         file_path = None
         #unmask win path
@@ -113,7 +111,6 @@ async def websocket_handler(request):
             if type(res) != str:
                 res = toJson(user.prepare_result(res))        
             await ws.send_str(res)        
-
         user.send = send         
         await send(True if status else empty_app) 
         try:
@@ -146,7 +143,6 @@ async def websocket_handler(request):
         except BaseException as e:
             if not isinstance(e, ConnectionResetError):
                 user.log(traceback.format_exc())
-
         await user.delete()   
     return ws     
 

unisi/voicecom.py

@@ -17,11 +17,15 @@ def find_most_similar_sequence(input_string, string_list):
             best_match = string
     return best_match, highest_ratio
 
-def word_to_number(sn):
+def word_to_number(word: str):
+    sn = word.replace(',', '')
     try: 
-        return w2n.word_to_num(sn) 
+        return float(sn) 
     except:
-        return None
+        try: 
+            return w2n.word_to_num(sn) 
+        except:
+            return None
     
 command_synonyms = dict( #-> words    
     value = ['is', 'equals'],
@@ -47,9 +51,7 @@ modes = dict( #-> actions
 word2command = {}
 for command, syns in command_synonyms.items():
     for syn in syns:
-        word2command[syn] = command  
-        if command in root_commands:
-            root_commands.append(syn)
+        word2command[syn] = command          
 
 word2command.update({command: command for command in root_commands})
 for mode, commands in modes.items():
@@ -137,15 +139,13 @@ class VoiceCom:
         
     def commands4mode(self, mode):
         if commands :=self.cached_commands.get(mode, None):
-            return commands
+            self.commands = commands            
         syn_commands = []
-        commands = modes.get(mode, []) 
+        commands = modes.get(mode, []) + root_commands
         for command in commands:
             if command in command_synonyms:
-                syn_commands.extend(command_synonyms[command])
-        if syn_commands:
-            commands.extend(syn_commands)
-        commands.extend(root_commands)
+                syn_commands.extend(command_synonyms[command])        
+        commands.extend(syn_commands)        
         commands.sort()
         self.cached_commands[mode] = commands
         self.commands = commands
@@ -188,17 +188,13 @@ class VoiceCom:
             match self.mode:
                 case 'number'|'text':
                 #double repeat command word cause execution
-                    if self.mode == 'number' and not command:
+                    if self.mode == 'number':
                         num = word_to_number(word)
-                        if num is not None:
-                            self.previous_unit_value_x = self.unit.value, self.unit.x
-                            if self.unit.x == -1:
-                                self.unit.value = num
-                            elif num >= 0 and num <= 9:            
-                                snum = str(num)                                                
-                                svalue = str(self.unit.value)
-                                self.unit.value = float(svalue[:self.unit.x] + snum + svalue[self.unit.x:])
-                                self.unit.x += 1
+                        if command:
+                            self.run_command(command)
+                        elif num is not None:
+                            self.previous_unit_value_x = self.unit.value, self.unit.x                            
+                            self.unit.value = num                                                    
                         else:
                             self.message.value = 'Not a number'
                     elif self.mode == 'text':
@@ -222,6 +218,8 @@ class VoiceCom:
                 case 'select': 
                     if command == 'ok' and self.context:
                         self.activate_unit(self.name2unit[self.context])
+                    elif command:
+                        self.run_command(command)
                     else:
                         unit_name, similarity = self.buffer_suits_name(word)                    
                         if similarity >= 0.8:
@@ -254,10 +252,7 @@ class VoiceCom:
         self.message.value = ''                            
         match command:
             case 'select':            
-                self.mode = 'select'
-                self.buffer = []
-                self.commands = root_commands                    
-                self.message.value = VoiceCom.standart_message
+                self.reset()                
             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]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unisi
-Version: 0.3.1
+Version: 0.3.2
 Summary: Unified System Interface, GUI and Remote API
 Author-Email: UNISI Tech <g.dernovoy@gmail.com>
 License: Apache-2.0
@@ -43,6 +43,7 @@ UNISI technology provides a unified system interface and advanced program functi
  - Monitoring and profiling
  - Database interactions
  - LLM-RAG interactions
+ - Voice interaction
 
 ### Installing ###
 ```
@@ -57,7 +58,7 @@ This document serves as a comprehensive guide on utilizing Unisi with Python, al
 ### High level - Screen ###
 The program directory has to contain a screens folder which contains all screens which Unisi has to show.
 
-Screen example tests/screens/main.py
+Screen example tests/blocks/main.py
 ```
 name = "Main"
 blocks = [block] 
@@ -85,7 +86,7 @@ block = Block('X Block',
 | toolbar | Optional | list | Unit elements to show in the screen toolbar |
 | order | Optional | int | order in the program menu |
 | icon  | Optional | str | MD icon of screen to show in the screen menu |
-| prepare | Optional | def prepare() | Syncronizes GUI elements one to another and with the program/system data. It is called before screen appearing if defined. |
+| prepare | Optional | def prepare() | Syncronizes Unit/GUI elements one to another and with the program/system data. It is called before screen appearing if defined. |
 
 
 ### Server start ###
@@ -171,7 +172,7 @@ Examples of such block tests/blocks/tblock.py:
 from unisi import *
 ..
 concept_block = Block('Concept block',
-   [   #some gui elements       
+   [   #some Units
        Button('Run',run_proccess),
        Edit('Working folder','run_folder')
    ], result_table)
@@ -194,7 +195,7 @@ blocks = [ [b1,b2], [b3, [b4, b5]]]
 ![image](https://github.com/user-attachments/assets/16ab9909-08b3-429e-9205-9b388b10aba7)
 
 ### ParamBlock ###
-ParamBlock(name, *gui_elements, row = 3, **parameters)
+ParamBlock(name, *units, row = 3, **parameters)
 
 ParamBlock creates blocks with Unit elements formed from parameters. Parameters can be string, bool, number and optional types. Example:
 ```
@@ -263,7 +264,7 @@ Text('Some field')
 complete handler is optional function which accepts the current edit value and returns a string list for autocomplete.
 
 ```
-def get_complete_list(gui_element, current_value):
+def get_complete_list(unit, current_value):
     return [s for s in vocab if current_value in s]    
 
 Edit('Edit me', 'value', complete = get_complete_list) #value has to be string or number
@@ -402,7 +403,7 @@ Info(info_message, *UnitforUpdades)
 Warning(warning_message, *UnitforUpdades)
 Error(error_message, *UnitforUpdades)
 ```
-They are returned by handlers and cause appearing on the top screen colored rectangle window for 3 second. UnitforUpdades is optional Unit enumeration for updating on GUI client side.
+They are returned by handlers and cause appearing on the top screen colored rectangle window for 3 second. UnitforUpdades is optional Unit enumeration for updating on client side (GUI).
 
 For long time processes it is possible to create Progress window. It is just call user.progress in any async handler.
 Open window 
@@ -513,6 +514,24 @@ Table options multimode = True and value define relation type 1 -> 1 if equals N
 UNISI is compatible with any database that implements the Database and Dbtable methods. Internally UNISI operates using the Kuzu graph database.
 For using the functionality db_dir  in config.py has to be defined as a path to the database directory.
 
+### Voice interaction. ###
+This functionality allows users to interact with a user interface using voice commands instead of fingers or a mouse. It facilitates voice interaction with a graphical user interface composed of various Units. It recognizes spoken words, interprets them as commands or element selections, and performs corresponding actions. The system supports various modes of interaction, including text input, number input, element selection, screen navigation, and command execution. The user speaks commands or element names. The module recognizes words and updates the Mate block, which exposes the state of the module and what it expects to listen.
+
+#### Modes. ####
+Select Mode (Default): The user can select an interactive element or switch to another mode (e.g., "screen" to change a current screen).
+Text Mode: Activated when a text input element is selected. The user can dictate text, and use commands like "left," "right," "backspace," "delete," "space," "undo," and "clean."
+
+
+Number Mode: Activated when a number input element is selected. The user can dictate numbers or use number-related commands. 
+
+Screen Mode: Allows the user to switch the current screen.
+
+Command Mode: Activated when a command element is selected (e.g., a button). The user can execute the command using words like "push," "execute," or "run." Synonyms like "ok" and "okay" are also recognized.
+
+Graph Mode: Supports graph element manipulation (nodes and edges). Currently documented but no specifics are provided on how to use it.
+
+Table Mode: Supports table navigation and editing with commands like "page", "row", "column", "left", "right", "up", "down", "backspace", and "delete." Currently documented but no specifics are provided on how to use it.
+
 
 Examples are in tests folder.
 

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

@@ -1,7 +1,7 @@
-unisi-0.3.1.dist-info/METADATA,sha256=FJmY_iY8-U6nYVJ42Uiiz4F0FdefXXmGhSWAV8GAJBQ,24306
-unisi-0.3.1.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
-unisi-0.3.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+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/__init__.py,sha256=JVioDSebhtmoYTldT6ChEayuRTHOgYsAflcxcBYWBTY,279
 unisi/autotest.py,sha256=qYKwSPEPUEio6koUSu1tc71pDkX-doCQJlyRppaXCtY,8709
 unisi/common.py,sha256=gaMz7PpFqz-JpiQnc9sx3HgS4UWnVzv_Xf8XAKve8q8,5386
@@ -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=W_vuWRV42metdh8u0Kf6BglnwGdm-Sgm2FktQDlbo5Y,6144
+unisi/server.py,sha256=c62F_XYnj9afhxyeNkSAqVt2zsroz6GlZRtQrbZdEHA,6140
 unisi/tables.py,sha256=yF6Y2dczZoSD3fo7K14pyo3vP6A0U8dt-u4xY0SS8HU,13848
 unisi/units.py,sha256=rhZJtbZhje5C0Kc4sS1juMehcg5orOmQYpEe8KOVpzY,11004
 unisi/users.py,sha256=l7KazUJiby_jTKekS2tqT0TZNzZc6cOazGDzD-W3yHA,16040
 unisi/utils.py,sha256=NHoRMItaMleHg2UEp96_zzvrtGaZHcLNUZqmKkEwiHQ,2474
-unisi/voicecom.py,sha256=_F4V4HZkridNNyQN-mov3W9wIZu278Pxd0bD3oRvRFI,14189
+unisi/voicecom.py,sha256=5LGuHyaAlXY8f3KHqtLtOloJ3Dtkp-rIvW0FgPacHvs,13857
 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.1.dist-info/RECORD,,
+unisi-0.3.2.dist-info/RECORD,,