unisi 0.3.32__py3-none-any.whl → 0.4.0__py3-none-any.whl

unisi/containers.py

@@ -53,7 +53,12 @@ class Block(Unit):
             def close(*_):
                 user = self._user if self._user else  Unishare.context_user()
                 delete_unit(user.screen.blocks, self.name)                
-            self.close = close        
+            self.close = close      
+
+    def __setattr__(self, name, value):      
+        super().__setattr__(name, value)
+        if name == 'value' and getattr(self, '_user', None):
+            self.set_reactivity(self._user)  
 
     def set_reactivity(self, user, override = False):
         self._user = user

unisi/units.py

@@ -89,9 +89,9 @@ class Unit:
         return not property or not property.startswith('_')
         
     def set_reactivity(self, user, override = False):        
-        changed_call = None
+        changed_call = self._mark_changed
         
-        if not hasattr(self, 'id') and (override or not self._mark_changed): 
+        if not hasattr(self, 'id') and (override or not changed_call): 
             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)})                    
                     
@@ -108,7 +108,7 @@ class Unit:
         #it is correct condition order 
         if name[0] != "_" and self._mark_changed:            
             self._mark_changed(name, value)
-        super().__setattr__(name, value)
+        super().__setattr__(name, value)        
 
     def mutate(self, obj):
         if self is not obj:

unisi/users.py

@@ -41,6 +41,15 @@ class User:
         User.last_user = self
         self.monitor(session, share)     
 
+    @property
+    def sorted_changed_units(self):
+        """sort changed units by type, 'block' types have priority"""
+        if len(self.changed_units) > 1:
+            not_block = lambda u: u.type != 'block' 
+            if any(not not_block(x) for x in self.changed_units):
+                return sorted(self.changed_units, key=not_block)  
+        return self.changed_units       
+        
     async def run_process(self, long_running_task, *args, progress_callback = None, **kwargs):
         if progress_callback and notify_monitor and progress_callback != self.progress: #progress notifies the monitor
             async def new_callback(value):
@@ -111,7 +120,7 @@ class User:
             self.log(f'User is disconnected, session: {self.session}', type = 'info')            
 
     def set_clean(self):
-        #remove user modules from sys 
+        """remove user modules from sys """
         if os.path.exists(blocks_dir):
             for file in os.listdir(blocks_dir):
                 if file.endswith(".py") and file != '__init__.py':
@@ -232,21 +241,21 @@ class User:
             match raw:
                 case None: 
                     if self.changed_units:
-                        raw = Message(*self.changed_units, user = self)
+                        raw = Message(*self.sorted_changed_units, user = self)
                         if not raw.updates:
                             raw = None
                 case Message():
                     if self.changed_units:
                         message_units = [x['data'] for x in raw.updates]
                         self.changed_units.update(message_units)
-                        raw.set_updates(self.changed_units)
+                        raw.set_updates(self.sorted_changed_units)
                     raw.fill_paths4(self)                                    
                 case Unit():
                     self.changed_units.add(raw)
-                    raw = Message(*self.changed_units, user = self) 
+                    raw = Message(*self.sorted_changed_units, user = self) 
                 case list() | tuple(): #raw is *unit
                     self.changed_units.update(raw)
-                    raw = Message(*self.changed_units, user = self) 
+                    raw = Message(*self.sorted_changed_units, user = self) 
                 case _: ...
                     
         self.changed_units.clear()           
@@ -292,7 +301,8 @@ class User:
                 return await self.process_element(elem, message)              
             error = f'Element {message.block}/{message.element} does not exist!'
             self.log(error)
-            return Error(error)        
+            return Error(error)    
+            
     async def process_element(self, elem, message):                
         event = message.event         
         handler = self.handlers.get((elem, event), None)

{unisi-0.3.32.dist-info → unisi-0.4.0.dist-info}/METADATA

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

{unisi-0.3.32.dist-info → unisi-0.4.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-unisi-0.3.32.dist-info/METADATA,sha256=daR-9MpLQ1G1BUjI6N13Ejm5MlxZ7SrNAi6nE4OrKto,27266
-unisi-0.3.32.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-unisi-0.3.32.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.32.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.4.0.dist-info/METADATA,sha256=thJFLs8apFPeh7KUgqOaND6nFibDWKXmGq40Esm8wwE,27265
+unisi-0.4.0.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+unisi-0.4.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.4.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=prG4FwJzpNJRX1trto0x_4Bne3kkpEX1dUxcRnIxWVw,301
 unisi/autotest.py,sha256=rY44RnSMIxkwCexNwS1j5LmE7Gx76Pu_da5er_vNPL8,9002
 unisi/common.py,sha256=QHSS-pQDtLZxeZls0eDl8-EmYJZuaRmYO1M9izCly-Y,5791
-unisi/containers.py,sha256=dmRHogzjIVoc0qu713bOPOPBp2QrN-LEA4Wn3owF0Yg,7223
+unisi/containers.py,sha256=yl5CZrTK3HmNJJxpO7SmzIIsBMehwfCb_otaWG7GriM,7416
 unisi/dbunits.py,sha256=g1h9pjoSwJrJ0Hmph-xv5jE1yfrxJeXGfuSnyVTg3j8,7438
 unisi/graphs.py,sha256=DTyLUPzi9ErKY6ADXVMXf9-uJskNISZY_xDvsnhMs1Q,6959
 unisi/jsoncomparison/__init__.py,sha256=lsWkYEuL6v3Qol-lwSUvB6y63tm6AKcCMUd4DZDx3Cg,350
@@ -20,8 +20,8 @@ unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=t7z0NgaeJX52044ue_LxITa99WMuE5Jra9qkMEeGhTg,6941
 unisi/server.py,sha256=owUV_siimohV-PZwMkkIRTnynY0wxpia2la3Vjqy9g8,6658
 unisi/tables.py,sha256=1ZjR_eJ_vf0h26kdv2PjLV3t2cPMoqCV17MQjfilTX0,13810
-unisi/units.py,sha256=6Oo_09ppfw2Rre4NVGKFb5RS3SmBmtWATd1qWW_xMlY,11675
-unisi/users.py,sha256=ZKRTgsxATmnrGhTYk87XuLAWptgZbjfs9KAcoi3UxBQ,16456
+unisi/units.py,sha256=AGpb1Oad2HrNBaJNLR1Kl1OwjgbswAY7tQN195O7dn0,11691
+unisi/users.py,sha256=ec8SkpzJ877H2wJ0iiNGUYtZ6CowRoLWVfM2OcTwBlE,16894
 unisi/utils.py,sha256=I5UF97kH5Xsx3ZtU-7tJNhOAKtdf7TMO0KyhaH9I8gc,2657
 unisi/voicecom.py,sha256=QzS1gIrBeGLO5dEwiu7KIEdJIIVbPBZFGb5nY632Ws8,16707
 unisi/web/css/312.2bdc526c.css,sha256=E2kfiWrKmaXQaR79f3K7m4NHxEKhah_jn-fS7oDZ7Rk,3508
@@ -55,4 +55,4 @@ unisi/web/js/sigma.ce21336a.js,sha256=ngST-065XWOdnR_Xn7U6oGNHTL8fyiOEI9V8-BWRvl
 unisi/web/js/sigma.ce21336a.js.gz,sha256=zv6oToZZFCfmrZ4G4fw0sOncVe8-dyYNWh2v5QLKZp4,51965
 unisi/web/js/vendor.6a64dcc5.js,sha256=OSNK2nadU2DnSOEYQQcAmelybITOFZXMxnRyaDoT3yU,747104
 unisi/web/js/vendor.6a64dcc5.js.gz,sha256=nmtqRzQRWaToxgHxI9hfJd3UrUCg2-fd-0Fjc4H4wu8,245827
-unisi-0.3.32.dist-info/RECORD,,
+unisi-0.4.0.dist-info/RECORD,,