synapse 2.170.0__tar.gz → 2.171.0__tar.gz

{synapse-2.170.0/synapse.egg-info → synapse-2.171.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.170.0
+Version: 2.171.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0

{synapse-2.170.0 → synapse-2.171.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.170.0'
+version = '2.171.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]

{synapse-2.170.0 → synapse-2.171.0}/synapse/cortex.py

@@ -4548,7 +4548,11 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 continue
 
             view.layers = [lyr for lyr in view.layers if lyr.iden != layriden]
-            await view.info.set('layers', [lyr.iden for lyr in view.layers])
+            layridens = [lyr.iden for lyr in view.layers]
+            await view.info.set('layers', layridens)
+
+            mesg = {'iden': view.iden, 'layers': layridens}
+            await self.feedBeholder('view:setlayers', mesg, gates=[view.iden, layridens[0]])
 
             if view.parent.iden == viewiden:
                 if newparent is None:
@@ -4558,6 +4562,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                     view.parent = newview
                     await view.info.set('parent', newparent)
 
+                mesg = {'iden': view.iden, 'name': 'parent', 'valu': newparent}
+                await self.feedBeholder('view:set', mesg, gates=[view.iden, layridens[0]])
+
         if not layrinuse and (layr := self.layers.get(layriden)) is not None:
             del self.layers[layriden]
 
@@ -6922,7 +6929,10 @@ async def getTempCortex(mods=None):
     '''
     with s_common.getTempDir() as dirn:
         logger.debug(f'Creating temporary cortex as {dirn}')
-        async with await Cortex.anit(dirn) as core:
+        conf = {
+            'health:sysctl:checks': False,
+        }
+        async with await Cortex.anit(dirn, conf=conf) as core:
             if mods:
                 for mod in mods:
                     await core.loadCoreModule(mod)

{synapse-2.170.0 → synapse-2.171.0}/synapse/lib/cell.py

@@ -55,7 +55,6 @@ import synapse.lib.lmdbslab as s_lmdbslab
 import synapse.lib.thisplat as s_thisplat
 
 import synapse.lib.crypto.passwd as s_passwd
-import synapse.lib.platforms.linux as s_linux
 
 import synapse.tools.backup as s_t_backup
 
@@ -1465,7 +1464,7 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
     async def _runSysctlLoop(self):
         while not self.isfini:
             fixvals = []
-            sysctls = s_linux.getSysctls()
+            sysctls = s_thisplat.getSysctls()
 
             for name, valu in self.SYSCTL_VALS.items():
                 if (sysval := sysctls.get(name)) != valu:
@@ -1484,7 +1483,7 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
             extra = await self.getLogExtra(sysctls=fixvals)
             logger.warning(mesg, extra=extra)
 
-            await asyncio.sleep(self.SYSCTL_CHECK_FREQ)
+            await self.waitfini(self.SYSCTL_CHECK_FREQ)
 
     def _getAhaAdmin(self):
         name = self.conf.get('aha:admin')

{synapse-2.170.0 → synapse-2.171.0}/synapse/lib/lmdbslab.py

@@ -1367,6 +1367,10 @@ class Slab(s_base.Base):
                 if not scan.set_range(nextbyts):
                     return
 
+                if scan.atitem[0] == nextbyts:
+                    if not scan.next_key():
+                        return
+
             except OverflowError:
                 if not scan.first():
                     return
@@ -1810,6 +1814,19 @@ class ScanBack(Scan):
         self.atitem = next(self.genr)
         return True
 
+    def next_key(self):
+
+        if not self.curs.prev_nodup():
+            return False
+
+        if self.dupsort:
+            self.curs.last_dup()
+
+        self.genr = self.iterfunc()
+        self.atitem = next(self.genr)
+
+        return True
+
     def set_range(self, lkey):
 
         if not self.curs.set_range(lkey):

{synapse-2.170.0 → synapse-2.171.0}/synapse/lib/types.py

@@ -1762,7 +1762,7 @@ class Str(Type):
 
     def _normPyFloat(self, valu):
         deci = s_common.hugectx.create_decimal(str(valu))
-        return format(deci, 'f'), {}
+        return self._normPyStr(format(deci, 'f'))
 
     def _normPyStr(self, valu):
 

{synapse-2.170.0 → synapse-2.171.0}/synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 170, 0)
+version = (2, 171, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '0e74d28df290e631963a8e06c8e605531a96aeab'
+commit = 'c89839928860a36f70377a8cefd09aaa4b12595a'

{synapse-2.170.0 → synapse-2.171.0}/synapse/lib/view.py

@@ -708,7 +708,10 @@ class View(s_nexus.Pusher):  # type: ignore
         layers.extend(view.layers)
 
         self.layers = layers
-        await self.info.set('layers', [layr.iden for layr in layers])
+        layridens = [layr.iden for layr in layers]
+        await self.info.set('layers', layridens)
+
+        await self.core.feedBeholder('view:setlayers', {'iden': self.iden, 'layers': layridens}, gates=[self.iden, layridens[0]])
 
     async def pack(self):
         d = {'iden': self.iden}
@@ -1300,6 +1303,9 @@ class View(s_nexus.Pusher):  # type: ignore
         self.parent = self.core.reqView(forkiden)
         await self.info.set('parent', forkiden)
 
+        mesg = {'iden': self.iden, 'name': 'parent', 'valu': forkiden}
+        await self.core.feedBeholder('view:set', mesg, gates=[self.iden, self.layers[0].iden])
+
         await self._calcForkLayers()
 
         for view in self.core.views.values():

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_cortex.py

@@ -6350,8 +6350,17 @@ class CortexBasicTest(s_t_utils.SynTest):
 
             coros = len(core.activecoros)
 
+            layridens = [lyr.iden for lyr in view4.layers if lyr.iden != view3.layers[0].iden]
+            events = [
+                {'event': 'view:setlayers', 'info': {'iden': view4.iden, 'layers': layridens}},
+                {'event': 'view:set', 'info': {'iden': view4.iden, 'name': 'parent', 'valu': None}}
+            ]
+            task = core.schedCoro(s_t_utils.waitForBehold(core, events))
+
             await core.delViewWithLayer(view3_iden)
 
+            await asyncio.wait_for(task, timeout=1)
+
             # push/pull activecoros have been deleted
             self.len(coros - 2, core.activecoros)
 

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_lib_cell.py

@@ -2624,7 +2624,7 @@ class CellTest(s_t_utils.SynTest):
         # Detect and report incorrect values
         with self.getStructuredAsyncLoggerStream('synapse.lib.cell') as stream:
             with mock.patch.object(s_cell.Cell, 'SYSCTL_VALS', sysvals):
-                async with self.getTestCore():
+                async with self.getTestCore(conf={'health:sysctl:checks': True}):
                     pass
 
         stream.seek(0)

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_lib_lmdbslab.py

@@ -649,6 +649,42 @@ class LmdbSlabTest(s_t_utils.SynTest):
                 self.eq((b'1', b'1'), next(it))
                 self.raises(StopIteration, next, it)
 
+    async def test_lmdbslab_scanback(self):
+
+        with self.getTestDir() as dirn:
+
+            path = os.path.join(dirn, 'test.lmdb')
+
+            async with await s_lmdbslab.Slab.anit(path, map_size=100000, growsize=10000) as slab:
+
+                foodup = slab.initdb('foodup', dupsort=True)
+                foonodup = slab.initdb('foonodup', dupsort=False)
+
+                for db in (foodup, foonodup):
+                    slab.put(b'\x01', b'foo', db=db)
+                    slab.put(b'\x01\x01', b'bar', db=db)
+                    slab.put(b'\x01\x03', b'baz', db=db)
+                    slab.put(b'\x02', b'faz', db=db)
+
+                items = list(slab.scanByPrefBack(b'\x01', db=foonodup))
+                self.eq(items, (
+                    (b'\x01\x03', b'baz'),
+                    (b'\x01\x01', b'bar'),
+                    (b'\x01', b'foo')
+                ))
+
+                self.eq((), list(slab.scanByPrefBack(b'\x00', db=foonodup)))
+
+                slab.put(b'\x01\x03', b'waz', db=foodup)
+
+                items = list(slab.scanByPrefBack(b'\x01', db=foodup))
+                self.eq(items, (
+                    (b'\x01\x03', b'waz'),
+                    (b'\x01\x03', b'baz'),
+                    (b'\x01\x01', b'bar'),
+                    (b'\x01', b'foo')
+                ))
+
     async def test_lmdbslab_count_empty(self):
 
         with self.getTestDir() as dirn:

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_lib_stormtypes.py

@@ -6758,10 +6758,12 @@ words\tword\twrd'''
             self.eq([], await core.callStorm(merging))
 
             # merge a view with a fork
-            fork00 = await core.getView().fork()
+            mainview = core.getView()
+            fork00 = await mainview.fork()
             midfork = core.getView(fork00['iden'])
 
             fork01 = await midfork.fork()
+            fork01_iden = fork01['iden']
             self.true(midfork.hasKids())
 
             opts = {'view': midfork.iden}
@@ -6769,11 +6771,20 @@ words\tword\twrd'''
 
             self.eq([midfork.iden], await core.callStorm(merging))
 
+            layridens = [lyr['iden'] for lyr in fork01['layers'] if lyr['iden'] != midfork.layers[0].iden]
+            events = [
+                {'event': 'view:setlayers', 'info': {'iden': fork01_iden, 'layers': layridens}},
+                {'event': 'view:set', 'info': {'iden': fork01_iden, 'name': 'parent', 'valu': mainview.iden}}
+            ]
+            task = core.schedCoro(s_test.waitForBehold(core, events))
+
             opts = {'view': midfork.iden, 'user': visi.iden}
             await core.callStorm('return($lib.view.get().setMergeVote())', opts=opts)
 
             self.true(await midfork.waitfini(timeout=12))
 
+            await asyncio.wait_for(task, timeout=5)
+
             self.eq([], await core.callStorm(merging))
 
             leaffork = core.getView(fork01['iden'])

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_lib_types.py

@@ -1087,6 +1087,7 @@ class TypesTest(s_t_utils.SynTest):
         self.eq('hehe', enums.norm('hehe')[0])
         self.eq('haha', enums.norm('haha')[0])
         self.eq('zork', enums.norm('zork')[0])
+        self.raises(s_exc.BadTypeValu, enums.norm, 1.23)
         self.raises(s_exc.BadTypeValu, enums.norm, 'zing')
 
         strsubs = model.type('str').clone({'regex': r'(?P<first>[ab]+)(?P<last>[zx]+)'})

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/test_model_files.py

@@ -26,6 +26,7 @@ class FileTest(s_t_utils.SynTest):
             self.raises(s_exc.BadTypeValu, fbyts.norm, 'guid:0101')
             self.raises(s_exc.BadTypeValu, fbyts.norm, 'helo:moto')
             self.raises(s_exc.BadTypeValu, fbyts.norm, f'sha256:{s_common.guid()}')
+            self.raises(s_exc.BadTypeValu, fbyts.norm, 1.23)
 
             nodes = await core.nodes('''
                 [ file:bytes=$byts

{synapse-2.170.0 → synapse-2.171.0}/synapse/tests/utils.py

@@ -96,6 +96,18 @@ def norm(z):
 def deguidify(x):
     return regex.sub('[0-9a-f]{32}', '*' * 32, x)
 
+async def waitForBehold(core, events):
+    async for mesg in core.behold():
+        for event in list(events):
+            for key, valu in event.items():
+                if mesg.get(key) != valu:
+                    break
+            else:
+                events.remove(event)
+
+        if len(events) == 0:
+            break
+
 @contextlib.asynccontextmanager
 async def matchContexts(testself):
     origenter = s_base.Base.__aenter__
@@ -1286,10 +1298,9 @@ class SynTest(unittest.TestCase):
             s_cortex.Cortex: A Cortex object.
         '''
         if conf is None:
-            conf = {'layer:lmdb:map_async': True,
-                    'nexslog:en': True,
-                    'layers:logedits': True,
-                    }
+            conf = {
+                'health:sysctl:checks': False,
+            }
 
         conf = copy.deepcopy(conf)
 
@@ -1332,7 +1343,9 @@ class SynTest(unittest.TestCase):
     async def getTestJsonStor(self, dirn=None, conf=None):
 
         if conf is None:
-            conf = {}
+            conf = {
+                'health:sysctl:checks': False,
+            }
         conf = copy.deepcopy(conf)
 
         with self.withNexusReplay():
@@ -1355,7 +1368,9 @@ class SynTest(unittest.TestCase):
             s_cryotank.CryoCell: Test cryocell.
         '''
         if conf is None:
-            conf = {}
+            conf = {
+                'health:sysctl:checks': False,
+            }
         conf = copy.deepcopy(conf)
 
         with self.withNexusReplay():
@@ -1399,7 +1414,9 @@ class SynTest(unittest.TestCase):
         Get a test Cell.
         '''
         if conf is None:
-            conf = {}
+            conf = {
+                'health:sysctl:checks': False,
+            }
 
         conf = copy.deepcopy(conf)
 
@@ -1438,7 +1455,9 @@ class SynTest(unittest.TestCase):
     async def getTestAha(self, conf=None, dirn=None):
 
         if conf is None:
-            conf = {}
+            conf = {
+                'health:sysctl:checks': False,
+            }
         conf = copy.deepcopy(conf)
 
         with self.withNexusReplay():
@@ -1512,7 +1531,9 @@ class SynTest(unittest.TestCase):
         onetime = await aha.addAhaSvcProv(svcname, provinfo=provinfo)
 
         if conf is None:
-            conf = {}
+            conf = {
+                'health:sysctl:checks': False,
+            }
 
         conf['aha:provision'] = onetime
 

{synapse-2.170.0 → synapse-2.171.0/synapse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.170.0
+Version: 2.171.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0