unisi 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

unisi/common.py

@@ -10,6 +10,12 @@ def flatten(*arr):
         else:
             yield a
 
+def index_of(lst, target):  
+  try:
+    return lst.index(target)
+  except ValueError:
+    return -1
+
 def compose_handlers(*handlers):
     async def compose(obj, value):
         objs = set()        

unisi/containers.py

@@ -1,6 +1,167 @@
 from .units import *
+from .tables import Table
 from .common import pretty4, flatten
 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):

unisi/units.py

@@ -1,8 +1,6 @@
 from .common import *
 from .llmrag import get_property
 
-atomics = (int, float, complex, bool, str, bytes, type(None))
-
 class ChangedProxy:
     MODIFYING_METHODS = {
         'append', 'extend', 'insert', 'remove', 'pop', 'clear', 'sort', 'reverse',
@@ -47,6 +45,8 @@ class ChangedProxy:
             
     def __getstate__(self):     
         return self._obj
+    
+atomics = (int, float, complex, bool, str, bytes, ChangedProxy, type(None))
            
 class Unit:    
     def __init__(self, name, *args, **kwargs):                
@@ -59,6 +59,10 @@ class Unit:
             self.changed = args[1]                    
         self.add(kwargs)
 
+    def specific_changed_register(self, property, value) -> bool:
+        """ addtional actions when changed, return False if not changed"""
+        return not property or not property.startswith('_')
+        
     def set_reactivity(self, user, override = False):        
         changed_call = None
         if user:
@@ -67,17 +71,13 @@ class Unit:
                     if not isinstance(value, atomics) and not callable(value)})                    
                         
                 def changed_call(property = None, value = None):
-                    user.register_changed_unit(self, property, value)            
+                    if self.specific_changed_register(property, value):
+                        user.register_changed_unit(self, property, value)            
         super().__setattr__('_mark_changed', changed_call)                    
 
     def add(self, kwargs):              
         for key, value in kwargs.items():
-            setattr(self, key, value)
-
-    def mutate(self, obj):
-        self.__dict__ = obj.__dict__ 
-        if self._mark_changed:
-            self._mark_changed()
+            setattr(self, key, value)   
 
     def __setattr__(self, name, value):      
         #it is correct condition order 
@@ -100,6 +100,10 @@ class Unit:
         else:
             self.value = value
 
+    def delattr(self, attr):
+        if hasattr(self, attr): 
+            delattr(self, attr)
+        
     @property
     def compact_view(self) -> str:
         """reduce for external (llm) using if required"""
@@ -122,6 +126,12 @@ class Unit:
                 obj.value = value
         self.changed = compose_handlers(changed_handler, handler) 
 
+    def __str__(self):
+        return f'{type(self).__name__}({self.name})'
+    
+    def __repr__(self):
+        return f'{type(self).__name__}({self.name})'
+
 Line = Unit("__Line__", type = 'line')
 
 def smart_complete(lst, min_input_length = 0, max_output_length = 20):
@@ -209,39 +219,7 @@ class Video(Unit):
     def __init__(self,name, *args, **kwargs):
         super().__init__(name, *args, **kwargs)
         self.type = 'video'        
-        set_defaults(self, {'url': self.name, 'ratio' : None})            
-
-class Node:
-    def __init__(self, name = '',id = '', color = '', size = 0):
-        if name:
-            self.name = name
-        if color:
-            self.color = color
-        if size:
-            self.size = size
-        if id:
-            self.id = id        
-
-class Edge:
-    def __init__(self, source, target, name = '', id = '', color = '', size = 0):
-        self.source = source
-        self.target = target
-        if name:
-            self.name = name
-        if color:
-            self.color = color
-        if size:
-            self.size = size
-        if id:
-            self.id = id        
-
-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 = []))
+        set_defaults(self, {'url': self.name, 'ratio' : None})                    
         
 class Switch(Unit):
     def __init__(self,name, *args, **kwargs):

unisi/users.py

@@ -6,7 +6,6 @@ from .multimon import notify_monitor, logging_lock, run_external_process
 from .kdb import Database
 from .dbunits import dbshare, dbupdates
 import sys, asyncio, logging, importlib
-from collections.abc import Iterable
 
 class User:          
     last_user = None
@@ -124,9 +123,9 @@ class User:
         if self.screens:                        
             self.screens.sort(key=lambda s: s.screen.order)            
             main = self.screens[0]
-            if hasattr(main, 'prepare'):  
-                main.prepare()
             self.screen_module = main
+            if hasattr(main, 'prepare'):  
+                main.prepare()            
             self.update_menu()
             self.set_clean()                               
             return True                 
@@ -202,7 +201,7 @@ class User:
                         if c.name == elname:
                             return c
         
-    def find_path(self, elem):        
+    def find_path(self, elem) -> list:        
         for bl in flatten(self.blocks):        
             if bl == elem:
                 return [bl.name]

unisi/web/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><base href=/ ><title>UNISI</title><meta charset=utf-8><meta name=description content="UNISI on Quasar"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=/js/vendor.eab68489.js></script><script defer src=/js/app.cb79330d.js></script><link href=/css/vendor.9ed7638d.css rel=stylesheet><link href=/css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>
+<!DOCTYPE html><html><head><base href=/ ><title>UNISI</title><meta charset=utf-8><meta name=description content="UNISI on Quasar"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=/js/vendor.2875b6c7.js></script><script defer src=/js/app.2b81b997.js></script><link href=/css/vendor.9ed7638d.css rel=stylesheet><link href=/css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>