synapse 2.177.0__py311-none-any.whl → 2.179.0__py311-none-any.whl

synapse/lib/ast.py

@@ -1953,7 +1953,7 @@ class PivotOut(PivotOper):
                 typename = prop.type.opts.get('type')
                 if runt.model.forms.get(typename) is not None:
                     for item in valu:
-                        async for pivo in runt.snap.nodesByPropValu(typename, '=', item):
+                        async for pivo in runt.snap.nodesByPropValu(typename, '=', item, norm=False):
                             yield pivo, path.fork(pivo)
 
             form = runt.model.forms.get(prop.type.name)
@@ -2090,11 +2090,13 @@ class PivotIn(PivotOper):
         name, valu = node.ndef
 
         for prop in runt.model.getPropsByType(name):
-            async for pivo in runt.snap.nodesByPropValu(prop.full, '=', valu):
+            norm = node.form.typehash is not prop.typehash
+            async for pivo in runt.snap.nodesByPropValu(prop.full, '=', valu, norm=norm):
                 yield pivo, path.fork(pivo)
 
         for prop in runt.model.getArrayPropsByType(name):
-            async for pivo in runt.snap.nodesByPropArray(prop.full, '=', valu):
+            norm = node.form.typehash is not prop.arraytypehash
+            async for pivo in runt.snap.nodesByPropArray(prop.full, '=', valu, norm=norm):
                 yield pivo, path.fork(pivo)
 
         async for refsbuid in runt.snap.getNdefRefs(node.buid):
@@ -2141,7 +2143,7 @@ class PivotInFrom(PivotOper):
                 if self.isjoin:
                     yield node, path
 
-                async for pivo in runt.snap.nodesByPropValu(full, '=', node.ndef):
+                async for pivo in runt.snap.nodesByPropValu(full, '=', node.ndef, norm=False):
                     yield pivo, path.fork(pivo)
 
             return
@@ -2179,7 +2181,7 @@ class FormPivot(PivotOper):
         if isinstance(prop.type, s_types.Ndef):
 
             async def pgenr(node, strict=True):
-                async for pivo in runt.snap.nodesByPropValu(prop.full, '=', node.ndef):
+                async for pivo in runt.snap.nodesByPropValu(prop.full, '=', node.ndef, norm=False):
                     yield pivo
 
         elif not prop.isform:
@@ -2190,13 +2192,14 @@ class FormPivot(PivotOper):
             async def pgenr(node, strict=True):
                 if isarray:
                     if isinstance(prop.type.arraytype, s_types.Ndef):
-                        ngenr = runt.snap.nodesByPropArray(prop.full, '=', node.ndef)
+                        ngenr = runt.snap.nodesByPropArray(prop.full, '=', node.ndef, norm=False)
                     else:
-                        ngenr = runt.snap.nodesByPropArray(prop.full, '=', node.ndef[1])
+                        norm = prop.arraytypehash is not node.form.typehash
+                        ngenr = runt.snap.nodesByPropArray(prop.full, '=', node.ndef[1], norm=norm)
                 else:
-                    ngenr = runt.snap.nodesByPropValu(prop.full, '=', node.ndef[1])
+                    norm = prop.typehash is not node.form.typehash
+                    ngenr = runt.snap.nodesByPropValu(prop.full, '=', node.ndef[1], norm=norm)
 
-                # TODO cache/bypass normalization in loop!
                 async for pivo in ngenr:
                     yield pivo
 
@@ -2206,7 +2209,7 @@ class FormPivot(PivotOper):
             full = prop.name + ':n1'
 
             async def pgenr(node, strict=True):
-                async for pivo in runt.snap.nodesByPropValu(full, '=', node.ndef):
+                async for pivo in runt.snap.nodesByPropValu(full, '=', node.ndef, norm=False):
                     yield pivo
 
         else:
@@ -2251,7 +2254,7 @@ class FormPivot(PivotOper):
 
                     refsvalu = node.get(refsname)
                     if refsvalu is not None:
-                        async for pivo in runt.snap.nodesByPropValu(refsform, '=', refsvalu):
+                        async for pivo in runt.snap.nodesByPropValu(refsform, '=', refsvalu, norm=False):
                             yield pivo
 
                 for refsname, refsform in refs.get('array'):
@@ -2264,7 +2267,7 @@ class FormPivot(PivotOper):
                     refsvalu = node.get(refsname)
                     if refsvalu is not None:
                         for refselem in refsvalu:
-                            async for pivo in runt.snap.nodesByPropValu(destform.name, '=', refselem):
+                            async for pivo in runt.snap.nodesByPropValu(destform.name, '=', refselem, norm=False):
                                 yield pivo
 
                 for refsname in refs.get('ndef'):
@@ -2300,7 +2303,7 @@ class FormPivot(PivotOper):
                     found = True
 
                     refsprop = destform.props.get(refsname)
-                    async for pivo in runt.snap.nodesByPropValu(refsprop.full, '=', node.ndef[1]):
+                    async for pivo in runt.snap.nodesByPropValu(refsprop.full, '=', node.ndef[1], norm=False):
                         yield pivo
 
                 # "reverse" array references...
@@ -2312,7 +2315,7 @@ class FormPivot(PivotOper):
                     found = True
 
                     destprop = destform.props.get(refsname)
-                    async for pivo in runt.snap.nodesByPropArray(destprop.full, '=', node.ndef[1]):
+                    async for pivo in runt.snap.nodesByPropArray(destprop.full, '=', node.ndef[1], norm=False):
                         yield pivo
 
                 # "reverse" ndef references...
@@ -2321,7 +2324,7 @@ class FormPivot(PivotOper):
                     found = True
 
                     refsprop = destform.props.get(refsname)
-                    async for pivo in runt.snap.nodesByPropValu(refsprop.full, '=', node.ndef):
+                    async for pivo in runt.snap.nodesByPropValu(refsprop.full, '=', node.ndef, norm=False):
                         yield pivo
 
                 for refsname in refs.get('ndefarray'):
@@ -2329,7 +2332,7 @@ class FormPivot(PivotOper):
                     found = True
 
                     refsprop = destform.props.get(refsname)
-                    async for pivo in runt.snap.nodesByPropArray(refsprop.full, '=', node.ndef):
+                    async for pivo in runt.snap.nodesByPropArray(refsprop.full, '=', node.ndef, norm=False):
                         yield pivo
 
                 if strict and not found:
@@ -2433,7 +2436,7 @@ class PropPivotOut(PivotOper):
                     continue
 
                 for item in valu:
-                    async for pivo in runt.snap.nodesByPropValu(fname, '=', item):
+                    async for pivo in runt.snap.nodesByPropValu(fname, '=', item, norm=False):
                         yield pivo, path.fork(pivo)
 
                 continue
@@ -2474,8 +2477,6 @@ class PropPivot(PivotOper):
 
         async def pgenr(node, srcprop, valu, strict=True):
 
-            # TODO cache/bypass normalization in loop!
-
             # pivoting from an array prop to a non-array prop needs an extra loop
             if srcprop.type.isarray and not prop.type.isarray:
                 if isinstance(srcprop.type.arraytype, s_types.Ndef) and prop.isform:
@@ -2487,8 +2488,9 @@ class PropPivot(PivotOper):
                             yield pivo
                     return
 
+                norm = srcprop.arraytypehash is not prop.typehash
                 for arrayval in valu:
-                    async for pivo in runt.snap.nodesByPropValu(prop.full, '=', arrayval):
+                    async for pivo in runt.snap.nodesByPropValu(prop.full, '=', arrayval, norm=norm):
                         yield pivo
 
                 return
@@ -2506,9 +2508,11 @@ class PropPivot(PivotOper):
                 return
 
             if prop.type.isarray and not srcprop.type.isarray:
-                genr = runt.snap.nodesByPropArray(prop.full, '=', valu)
+                norm = prop.arraytypehash is not srcprop.typehash
+                genr = runt.snap.nodesByPropArray(prop.full, '=', valu, norm=norm)
             else:
-                genr = runt.snap.nodesByPropValu(prop.full, '=', valu)
+                norm = prop.typehash is not srcprop.typehash
+                genr = runt.snap.nodesByPropValu(prop.full, '=', valu, norm=norm)
 
             async for pivo in genr:
                 yield pivo

synapse/lib/base.py

@@ -178,7 +178,24 @@ class Base:
     def onfini(self, func):
         '''
         Add a function/coroutine/Base to be called on fini().
+
+        The rules around how to register function/coroutine/Base to be called:
+            - Call this method with an instance of Base (this class) if holding
+              a reference to a bound method of the instance (such as a fini()
+              method) would cause the object to be leaked. This is appropriate
+              for ephemeral objects that may be constructed/destroyed multiple
+              times over the lifetime of a process.
+
+            - Call this method with an instance method if you want the object to
+              have a lifetime as long as the thing being fini'd.
         '''
+        if self.isfini:
+            if isinstance(func, Base):
+                s_coro.create_task(func.fini())
+            else:
+                s_coro.create_task(s_coro.ornot(func))
+            return
+
         if isinstance(func, Base):
             self.tofini.add(func)
             return
@@ -408,8 +425,6 @@ class Base:
         for fini in self._fini_funcs:
             try:
                 await s_coro.ornot(fini)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
             except Exception:
                 logger.exception(f'{self} - fini function failed: {fini}')
 
@@ -493,9 +508,8 @@ class Base:
         def taskDone(task):
             self._active_tasks.remove(task)
             try:
-                if not task.done():
-                    task.result()
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
+                task.result()
+            except asyncio.CancelledError:
                 pass
             except Exception:
                 logger.exception('Task %s scheduled through Base.schedCoro raised exception', task)
@@ -579,7 +593,7 @@ class Base:
         loop.add_signal_handler(signal.SIGINT, sigint)
         loop.add_signal_handler(signal.SIGTERM, sigterm)
 
-    async def main(self):
+    async def main(self): # pragma: no cover
         '''
         Helper function to setup signal handlers for this base as the main object.
         ( use base.waitfini() to block )
@@ -590,7 +604,7 @@ class Base:
         await self.addSignalHandlers()
         return await self.waitfini()
 
-    def waiter(self, count, *names):
+    def waiter(self, count, *names, timeout=None):
         '''
         Construct and return a new Waiter for events on this base.
 
@@ -615,16 +629,17 @@ class Base:
             race conditions with this mechanism ;)
 
         '''
-        return Waiter(self, count, *names)
+        return Waiter(self, count, *names, timeout=timeout)
 
 class Waiter:
     '''
     A helper to wait for a given number of events on a Base.
     '''
-    def __init__(self, base, count, *names):
+    def __init__(self, base, count, *names, timeout=None):
         self.base = base
         self.names = names
         self.count = count
+        self.timeout = timeout
         self.event = asyncio.Event()
 
         self.events = []
@@ -656,6 +671,9 @@ class Waiter:
                 doStuff(evnt)
 
         '''
+        if timeout is None:
+            timeout = self.timeout
+
         try:
 
             retn = await s_coro.event_wait(self.event, timeout)
@@ -676,6 +694,18 @@ class Waiter:
             self.base.unlink(self._onWaitEvent)
         del self.event
 
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc, cls, tb):
+        if exc is None:
+            if await self.wait() is None: # pragma: no cover
+                # these lines are 100% covered by the tests but
+                # the coverage plugin cannot seem to see them...
+                events = ','.join(self.names)
+                mesg = f'timeout waiting for {self.count} event(s): {events}'
+                raise s_exc.TimeOut(mesg=mesg)
+
 class BaseRef(Base):
     '''
     An object for managing multiple Base instances by name.
@@ -777,9 +807,6 @@ async def schedGenr(genr, maxsize=100):
 
             await q.put((False, None))
 
-        except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-            raise
-
         except Exception:
             if not base.isfini:
                 await q.put((False, None))