unisi 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

unisi/__init__.py

@@ -4,4 +4,3 @@ from .users import User, handle
 from .server import start
 from .tables import *
 from .containers import *
-from .proxy import *

unisi/users.py

@@ -194,7 +194,7 @@ class User:
         if elem:                          
             return self.process_element(elem, message)  
         
-        error = f'Element {message.block}>>{message.element} does not exists!'
+        error = f'Element {message.block}>>{message.element} does not exist!'
         self.log(error)
         return Error(error)
         

{unisi-0.1.7.dist-info → unisi-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unisi
-Version: 0.1.7
+Version: 0.1.8
 Summary: UNified System Interface, GUI and proxy
 Author-Email: UNISI Tech <g.dernovoy@gmail.com>
 License: Apache-2.0
@@ -30,8 +30,6 @@ UNISI technology provides a unified system interface and advanced program functi
  - Integral autotesting
  - Protocol schema auto validation
  - Shared sessions
- - Voice interaction (not released yet)
- - Remote GUI interaction and pipelining (not released yet)
 
 ### Installing ###
 ```
@@ -39,7 +37,7 @@ pip install unisi
 ```
 
 ### Programming ###
-This repo explains how to work with Unisi using Python and the tiny but optimal framework for that. Unisi web version is included in this library.  Supports Python 3.8 and up.
+This repo explains how to work with Unisi using Python and the tiny but optimal framework for that. Unisi web version is included in this library.  Supports Python 3.10 and up.
 
 
 ### High level - Screen ###
@@ -336,12 +334,12 @@ Graph supports an interactive graph.
 ```
 graph = Graph('X graph', graph_value, graph_selection, 
     nodes = [
-     { 'id' : 'node1', 'label': "Node 1" },
-     { 'id' : 'node2', 'label': "Node 2" },
-     { 'id' : 'node3', 'label': "Node 3" }    
+     { 'id' : 'node1', 'name': "Node 1" },
+     { 'id' : 'node2', 'name': "Node 2" },
+     { 'id' : 'node3', 'name': "Node 3" }    
   ], edges = [
-     { 'id' : 'edge1', 'source': "node1", 'target': "node2", 'label' : 'extending' },
-     { 'id' :'edge2' , 'source': "node2", 'target': "node3" , 'label' : 'extending'}     
+     { 'id' : 'edge1', 'source': "node1", 'target': "node2", 'name' : 'extending' },
+     { 'id' :'edge2' , 'source': "node2", 'target': "node3" , 'name' : 'extending'}     
   ])
 ```
 where graph_value is a dictionary like {'nodes' : ["node1"], 'edges' : ['edge3']}, where enumerations are selected nodes and edges.

{unisi-0.1.7.dist-info → unisi-0.1.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-unisi-0.1.7.dist-info/METADATA,sha256=Daai6No7h9RdMN_B8Kp0hcFvpdJTpZfBbze_f2bnxVE,17788
-unisi-0.1.7.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-unisi-0.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-unisi/__init__.py,sha256=bQ7yTDcgybkbIGTjxkajTbBJXtgyryrCvt3nXg8QxlQ,175
+unisi-0.1.8.dist-info/METADATA,sha256=rBUW89zbtC9urbRQ1mzUAcdU786z5oJyYT1QCHMx860,17684
+unisi-0.1.8.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+unisi-0.1.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi/__init__.py,sha256=z7fP6b-R1l4VZmc0tFXz4-Uay5y1kSzMm3xbWl5Zh-g,154
 unisi/autotest.py,sha256=mkvfUuxO7co9QcninjBSS9u-zJSva9H_51k3m6sd3rw,9485
 unisi/common.py,sha256=jsZpOkZIQdfPZjrTIoO1OLiZfQ_spEpMCX3td269RR0,635
 unisi/containers.py,sha256=Me28aZkhchWJA5OExtXoFzl2u5bc6p0m2Cww7CfKIbA,4200
@@ -11,11 +11,10 @@ unisi/jsoncomparison/compare.py,sha256=qPDaxd9n0GgiNd2SgrcRWvRDoXGg7NStViP9PHk2t
 unisi/jsoncomparison/config.py,sha256=LbdLJE1KIebFq_tX7zcERhPvopKhnzcTqMCnS3jN124,381
 unisi/jsoncomparison/errors.py,sha256=wqphE1Xn7K6n16uvUhDC45m2BxbsMUhIF2olPbhqf4o,1192
 unisi/jsoncomparison/ignore.py,sha256=xfF0a_BBEyGdZBoq-ovpCpawgcX8SRwwp7IrGnu1c2w,2634
-unisi/proxy.py,sha256=sMnGEs480wiic91AGH9hrDAisc0gDUEKKHX_nC3v3_E,7559
 unisi/reloader.py,sha256=B0f9GU452epFvdih8sH7_NiIJrXnC5i27uw2imGQxMg,6585
 unisi/server.py,sha256=5oax_OGWGPNm1smQM_8EpCb1jKia2s7IBnIfjIr1Z2w,4583
 unisi/tables.py,sha256=v7Fio5iIN7u1t7cE4Yvl4ewn7jTmmNPyWigoKW1Mj8U,4239
-unisi/users.py,sha256=B3Ouj-Ygx9BYU64JtE_HM4yApIZ7ikVeH2v86Lr1rSA,9819
+unisi/users.py,sha256=JD4AD0WyuJQK31juWURqHwbeHF-016nifGQBZutHSPI,9818
 unisi/utils.py,sha256=6iDXECQE_44v8m6fvte_PXM0Ku6ZV-8LkAqMcNSMYdk,2975
 unisi/web/css/847.64dbc68c.css,sha256=ckeNz4l2QkIp60LdV_-cEXf9orp0ZVklEbrQfjkAG5M,2691
 unisi/web/css/app.31d6cfe0.css,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,4 +38,4 @@ unisi/web/js/430.591e9a73.js,sha256=7S1CJTwGdE2EKXzeFRcaYuTrn0QteoVI03Hykz8qh3s,
 unisi/web/js/847.c4ea8fe3.js,sha256=el_JqiK9zS97V_UDUjlkbwIM8NQ4Y0Yt2WMMRoNm3UM,56531
 unisi/web/js/app.8224dd96.js,sha256=aKvusY5mySDAmto_L53gUEV2njTSU6JZKWGe_TXtlK8,5923
 unisi/web/js/vendor.d6797c01.js,sha256=2aKM3Lfxc0pHSirrcUReL1LcvDYWnfeBj2c67XsSELk,1279477
-unisi-0.1.7.dist-info/RECORD,,
+unisi-0.1.8.dist-info/RECORD,,

unisi/proxy.py

@@ -1,202 +0,0 @@
-from websocket import create_connection
-from enum import IntFlag
-import json, requests, os
-from .common import *
-
-class Event(IntFlag):
-    none = 0
-    update = 1
-    invalid = 2
-    message = 4
-    update_message = 6
-    progress = 12
-    update_progress = 13
-    unknown = 16
-    unknown_update = 17
-    dialog = 32
-    screen = 65
-    complete = 128
-    append = 256    
-
-ws_header = 'ws://'
-wss_header = 'wss://'
-ws_path = 'ws'
-
-message_types = ['error','warning','info']
-
-class Proxy:
-    """UNISI proxy"""
-    def __init__(self, host_port, timeout = 7, ssl = False):
-        addr_port = f'{wss_header if ssl else ws_header}{host_port}'
-        addr_port = f'{addr_port}{"" if addr_port.endswith("/") else "/"}{ws_path}'
-        self.host_port = f'{"https" if ssl else "http"}://{host_port}'
-        self.conn = create_connection(addr_port, timeout = timeout)
-        self.screen = None       
-        self.screens = {}
-        self.dialog = None
-        self.event = None
-        self.request(None)
-
-    def close(self):
-        self.conn.close()
-    
-    @property
-    def screen_menu(self):
-        return [name_icon[0] for name_icon in self.screen['menu']] if self.screen else []
-    
-    @property
-    def commands(self):
-        """return command objects"""
-        return self.elements(types=['command'])        
-            
-    def element(self, name, block_name = None):
-        """return the element only if 1 element has such name"""
-        result = None
-        name2block = self.screen['name2block']
-        for block in [name2block[block_name]] if block_name else name2block.values(): 
-            for el in flatten(block['value']):
-                if el['name'] == name:
-                    if not result:
-                        result = el
-                    else:
-                        return None
-        return result
-    
-    def elements(self, block = None, types = None):
-        """get elements with filtering types and blocks"""
-        if block:
-            return [el for el in flatten(block['value']) if not types or el['type'] in types]
-        answer = []
-        for block in self.screen['name2block'].values(): 
-            answer.extend([el for el in flatten(block['value']) if not types or el['type'] in types])
-        return answer
-    
-    def block_name(self, element):
-        is_name = isinstance(element, str)
-        for block in self.screen['name2block'].values():
-            for el in flatten(block['value']):
-                if el['name'] == element if is_name else el == element:
-                    return block['name']
-                
-    def upload(self, fpath):
-        """upload file to the server and get its server path"""
-        file = open(fpath, "rb")        
-        response = requests.post(self.host_port, files = {os.path.basename(fpath): file})
-        return getattr(response, 'text', '')
-    
-    def command(self, command, value = None):
-        return self.interact(self.make_message(command, value))        
-        
-    def command_upload(self, command, fpath):
-        """upload file to the server and call command"""        
-        spath = self.upload(fpath)
-        return self.command(command, spath) if spath else Event.invalid                    
-    
-    def make_message(self, element, value = None, event = 'changed'):
-        if isinstance(element, str):
-            element = self.element(element)            
-        if event != 'changed' and event not in element:
-            return None        
-        return ArgObject(block = self.block_name(element), element = element['name'], 
-            event = event, value = value)
-    
-    def interact(self, message, progress_callback = None):
-        """progress_callback is def (proxy:Proxy)"""        
-        while self.request(message) & Event.progress:
-            if progress_callback:
-                progress_callback(self)
-            message = None
-        return self.event
-    
-    def request(self, message):
-        """send message or message list, get responce, return the responce type"""
-        if message:
-            self.conn.send(toJson(message))
-        responce = self.conn.recv()
-        message = json.loads(responce) 
-        return self.process(message) 
-    
-    def set_value(self, element, new_value):
-        if isinstance(element, str):
-            element = self.element(element)            
-        element['value'] = new_value
-        ms = self.make_message(element, new_value)
-        return self.interact(ms) if ms else Event.invalid
-    
-    def set_screen(self, name):
-        screen = self.screens.get(name)
-        if not screen:
-            if name in self.screen_menu:
-                mtype = self.request(ArgObject(block = 'root', element = None, value = name))
-                return mtype == Event.screen 
-            else:
-                return False
-        return True 
-    
-    @property
-    def dialog_commands(self):
-        return self.dialog['commands'] if self.dialog else []
-    
-    def dialog_responce(self, command: str | None):
-        if not self.dialog:
-            self.event = Event.invalid
-            return  self.event
-        return self.interact(ArgObject(block = self.dialog['name'], value = command))
-       
-    def process(self, message):        
-        self.message = message   
-        if not message:
-            self.event = Event.none 
-            self.mtype = None
-        else:    
-            mtype = message.get('type')        
-            self.mtype = mtype
-            if mtype == 'screen':
-                self.screen = message
-                self.screens[self.screen['name']] = message
-                name2block = {block['name']: block for block in flatten(message['blocks'])}            
-                name2block['toolbar'] = {'name': 'toolbar', 'value': message['toolbar']}
-                message['name2block'] = name2block
-                self.event = Event.screen
-            elif mtype == 'dialog':
-                self.dialog = message
-                self.event = Event.dialog
-            elif mtype == 'complete':
-                return Event.complete
-            elif mtype == 'append':
-                self.event = Event.append
-            elif mtype == 'update':
-                self.update(message)
-                self.event = Event.update
-            else:
-                updates = message.get('updates')
-                if updates:
-                    self.update(message)                                        
-                if type in message_types:
-                    self.event = Event.update_message if updates else Event.message 
-                if type == 'progress':
-                    self.event = Event.update_progress if updates else Event.progress
-                else:
-                    self.event = Event.unknown_update if updates else Event.unknown
-        return self.event
-        
-    def update(self, message):
-        """update screen from the message"""
-        result = Event.update
-        updates = message.updates
-        for update in updates:
-            path = update['path']
-            name2block = self.screen['name2block']
-            if len(path) == 1: #block
-                name2block[block] = update['data']
-            else:
-                block, element = path
-                for el in flatten(name2block[block]['value']):
-                    if el['name'] == element:
-                       el.__dict__ =  update['data'].__dict__ 
-                       break
-                else:
-                    result = Event.unknown_update
-        return result
-
-