synapse 2.195.0__py311-none-any.whl → 2.195.1__py311-none-any.whl

synapse/lib/nexus.py

@@ -341,13 +341,17 @@ class NexsRoot(s_base.Base):
         if meta is None:
             meta = {}
 
-        if (nexus := self._nexskids.get(nexsiden)) is None:
-            raise s_exc.NoSuchIden(mesg=f'No Nexus Pusher with iden {nexsiden}.', iden=nexsiden)
+        async with self.cell.nexslock:
+            if (nexus := self._nexskids.get(nexsiden)) is None:
+                mesg = f'No Nexus Pusher with iden {nexsiden} {event=} args={s_common.trimText(repr(args))} ' \
+                       f'kwargs={s_common.trimText(repr(kwargs))}'
+                raise s_exc.NoSuchIden(mesg=mesg, iden=nexsiden, event=event)
 
-        if event not in nexus._nexshands:
-            raise s_exc.NoSuchName(mesg=f'No Nexus handler for event {event}.', name=event)
+            if event not in nexus._nexshands:
+                mesg = f'No event handler for event {event} args={s_common.trimText(repr(args))} ' \
+                       f'kwargs={s_common.trimText(repr(kwargs))}'
+                raise s_exc.NoSuchName(mesg=mesg, iden=nexsiden, event=event)
 
-        async with self.cell.nexslock:
             self.reqNotReadOnly()
             # Keep a reference to the shielded task to ensure it isn't GC'd
             self.applytask = asyncio.create_task(self._eat((nexsiden, event, args, kwargs, meta)))

synapse/lib/stormtypes.py

@@ -5446,7 +5446,7 @@ class Number(Prim):
         try:
             valu = s_common.hugenum(valu)
         except (TypeError, decimal.DecimalException) as e:
-            mesg = f'Failed to make number from {valu!r}'
+            mesg = f'Failed to make number from {s_common.trimText(repr(valu))}'
             raise s_exc.BadCast(mesg=mesg) from e
 
         Prim.__init__(self, valu, path=path)
@@ -9813,7 +9813,7 @@ async def tostr(valu, noneok=False):
 
         return str(valu)
     except Exception as e:
-        mesg = f'Failed to make a string from {valu!r}.'
+        mesg = f'Failed to make a string from {s_common.trimText(repr(valu))}.'
         raise s_exc.BadCast(mesg=mesg) from e
 
 async def tobool(valu, noneok=False):
@@ -9827,7 +9827,7 @@ async def tobool(valu, noneok=False):
     try:
         return bool(valu)
     except Exception:
-        mesg = f'Failed to make a boolean from {valu!r}.'
+        mesg = f'Failed to make a boolean from {s_common.trimText(repr(valu))}.'
         raise s_exc.BadCast(mesg=mesg)
 
 async def tonumber(valu, noneok=False):
@@ -9852,13 +9852,13 @@ async def toint(valu, noneok=False):
         try:
             return int(valu, 0)
         except ValueError as e:
-            mesg = f'Failed to make an integer from {valu!r}.'
+            mesg = f'Failed to make an integer from {s_common.trimText(repr(valu))}.'
             raise s_exc.BadCast(mesg=mesg) from e
 
     try:
         return int(valu)
     except Exception as e:
-        mesg = f'Failed to make an integer from {valu!r}.'
+        mesg = f'Failed to make an integer from {s_common.trimText(repr(valu))}.'
         raise s_exc.BadCast(mesg=mesg) from e
 
 async def toiter(valu, noneok=False):
@@ -9877,7 +9877,7 @@ async def toiter(valu, noneok=False):
             async for item in agen:
                 yield item
     except TypeError as e:
-        mesg = f'Value is not iterable: {valu!r}'
+        mesg = f'Value is not iterable: {s_common.trimText(repr(valu))}'
         raise s_exc.StormRuntimeError(mesg=mesg) from e
 
 async def torepr(valu, usestr=False):

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, 195, 0)
+version = (2, 195, 1)
 verstring = '.'.join([str(x) for x in version])
-commit = 'dc93864afdb2150e6d83ac4ed426c8e99bb3a448'
+commit = '83cc00aa05086cbc4dfec2f820db8f392c76a012'

synapse/tests/test_lib_nexus.py

@@ -318,7 +318,7 @@ class NexusTest(s_t_utils.SynTest):
                     cell01.nexsiden = 'newp'
                     with self.raises(s_exc.NoSuchIden) as cm:
                         await cell01.sync()
-                    self.eq(cm.exception.get('mesg'), 'No Nexus Pusher with iden newp.')
+                    self.eq(cm.exception.get('mesg'), "No Nexus Pusher with iden newp event='sync' args=() kwargs={}")
 
                     self.none(await cell00.nexsroot.nexslog.last())
                     self.none(await cell01.nexsroot.nexslog.last())
@@ -331,7 +331,7 @@ class NexusTest(s_t_utils.SynTest):
 
                     with self.raises(s_exc.NoSuchName) as cm:
                         await cell01._push('newp')
-                    self.eq(cm.exception.get('mesg'), 'No Nexus handler for event newp.')
+                    self.eq(cm.exception.get('mesg'), 'No event handler for event newp args=() kwargs={}')
 
                     self.eq(0, (await cell00.nexsroot.nexslog.last())[0])
                     self.eq(0, (await cell01.nexsroot.nexslog.last())[0])
@@ -379,3 +379,25 @@ class NexusTest(s_t_utils.SynTest):
                     self.isin(mesg, data)
 
                 self.true(restarted)
+
+    async def test_pusher_race(self):
+
+        evnt = asyncio.Event()
+
+        async with self.getTestCore() as core:
+            orig = core._nexshands['view:delwithlayer'][0]
+
+            async def holdlock(self, viewiden, layriden, nexsitem, newparent=None):
+                evnt.set()
+                await asyncio.sleep(1)
+                await orig(self, viewiden, layriden, nexsitem, newparent=newparent)
+
+            core._nexshands['view:delwithlayer'] = (holdlock, True)
+
+            forkiden = await core.callStorm('return($lib.view.get().fork().iden)')
+
+            core.schedCoro(core.delViewWithLayer(forkiden))
+            await asyncio.wait_for(evnt.wait(), timeout=10)
+
+            with self.raises(s_exc.NoSuchIden):
+                await core.nodes('[ it:dev:str=foo ]', opts={'view': forkiden})

{synapse-2.195.0.dist-info → synapse-2.195.1.dist-info}/METADATA

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

{synapse-2.195.0.dist-info → synapse-2.195.1.dist-info}/RECORD

@@ -123,7 +123,7 @@ synapse/lib/module.py,sha256=0XLFLzuZVmEqulKmdT0uah0oi1t8_f_ghakhqvoKtKI,4686
 synapse/lib/modules.py,sha256=xHNrGBWLOSTSqn7GMMnm6iiw3Df-Q11h5gOUw84Ax7E,1282
 synapse/lib/msgpack.py,sha256=IEYF1sv0UoYq1BpqfZUzf30bAlWveC6ZArXBeY68vuI,7895
 synapse/lib/multislabseqn.py,sha256=WxJQm6XNINyGBTUnmSkY4iifxLlR_FZe3geOcT8BxR4,15211
-synapse/lib/nexus.py,sha256=sSbQdopWRa6Q7k_H0GWQlmol6wDk2dRsWVi04PP7UZ0,23077
+synapse/lib/nexus.py,sha256=boP4T9Al_61EpW63OdMsAmn-P7T5YpN_rYiaCwz7n3Q,23399
 synapse/lib/node.py,sha256=F3cDgnOdlaimjQrtNb2zGZeG8X2xg9FUQ0tAAp0bUsg,31049
 synapse/lib/oauth.py,sha256=Nmd7dnxq7aRdBR5HILYYQm-TpCjfrTOIZwkHPeLQApA,15094
 synapse/lib/output.py,sha256=MARscREHja4h8PQN7GZxHGvF36RoOkUyw3vfhmFzMTk,890
@@ -146,7 +146,7 @@ synapse/lib/storm_format.py,sha256=kXWFY0PC8z4IBDDXYBiN4xkWuz4rEG_RNl3U6p_ylpU,4
 synapse/lib/stormctrl.py,sha256=3UC2LOHClC17JwYNuo8NeyntuAvIXphjenXEzVP33mY,2523
 synapse/lib/stormhttp.py,sha256=GwSmdKbY3yFe8tgNazkUAPhmEwP2U2PJTbByPkHAXmk,28846
 synapse/lib/stormsvc.py,sha256=dKREBhzYAncOXBbI-FYLRy9VusGIbRyF0TaDDz7mMXw,7581
-synapse/lib/stormtypes.py,sha256=qn9J7PfPrZWoJOoqOG1q9R6XtyAp-6mBtr286OOjEew,394891
+synapse/lib/stormtypes.py,sha256=zAiVhAow2PWQNZYId2GqAMyDANJETG73OoGlWfARd2s,395029
 synapse/lib/stormwhois.py,sha256=w7N2oCyMljNvi_sRt_bZb5BJwWwYkVGcRd7H_0oHY8Q,2554
 synapse/lib/structlog.py,sha256=qiuD7TTdwCyYEDF2f-88G2iX54SuB-lJ1pqlYokL1r8,1303
 synapse/lib/task.py,sha256=krDjQvNh0EpAs1PILK8CJJa9DMeM0depI0K8Eimp010,5733
@@ -157,7 +157,7 @@ synapse/lib/time.py,sha256=FKTYwpdvpuAj8p8sSodRjOxoA7Vu67CIbbXz55gtghk,9231
 synapse/lib/trigger.py,sha256=mnfkoBHB88JfqPoxb5oflvAaBKZpNvYdxP247YS53fE,20697
 synapse/lib/types.py,sha256=u89ukW38oDziRzeA6IWrPwwPD0Ds75u-gwJSXsQ4loY,69708
 synapse/lib/urlhelp.py,sha256=j-DvWGi-xH0TcO0NbCuwG7guUuiV8wxIxfMyJOzDygo,2523
-synapse/lib/version.py,sha256=Rtmj4k4N2cqpMkUhcSEGfnvBh173gFo0Va8Ni8C9Hc0,7162
+synapse/lib/version.py,sha256=Hug5WQOkn3bFD5KqMyQjSJF-NcWgJesHNFEXEjpd6mI,7162
 synapse/lib/view.py,sha256=IxBTOrNumrjSXQhZrLqh2NTPpS2zOc8YFwC5VdoHURw,61843
 synapse/lib/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/lib/crypto/coin.py,sha256=_dhlkzIrHT8BvHdJOWK7PDThz3sK3dDRnWAUqjRpZJc,4910
@@ -316,7 +316,7 @@ synapse/tests/test_lib_modelrev.py,sha256=DlHbhzrTKKjVEZaf6MynI4umeDFwXlmVpLKMLH
 synapse/tests/test_lib_module.py,sha256=h2OyCW4HW-ZFiJBNQtZ-sPLjsnrlLdTFHQPaXpA8cds,3923
 synapse/tests/test_lib_msgpack.py,sha256=_cS-Kzap6InQstBH0nCgFj9HoVO_tB2dj7D2zCa2miU,10056
 synapse/tests/test_lib_multislabseqn.py,sha256=ujIp3VkFRhPURx3Js9nklXJ4aYup8UTrcLg7X96lrDs,17425
-synapse/tests/test_lib_nexus.py,sha256=3Lvg4qNJ8T6RFgyMajb-TOEN1PJc7I8GwF131lzx4bg,15407
+synapse/tests/test_lib_nexus.py,sha256=qU8kPGuDb5cGHnJqcS-YYFjkX2yiWmwde0RqTmAQi44,16270
 synapse/tests/test_lib_node.py,sha256=C4OPFTq5qhG9oZx9SPJZAlhb7zorKGywVyCro7fx0Yg,24709
 synapse/tests/test_lib_output.py,sha256=iYt3DSEVvJiolIUkGKhATYqHbSk-N92swIr4p6lmzl0,603
 synapse/tests/test_lib_platforms_linux.py,sha256=MgafTw5hq1ld9sKLREqf3LnmINk4Kdhz589jvE5NC0M,2556
@@ -608,8 +608,8 @@ synapse/vendor/xrpl/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 synapse/vendor/xrpl/tests/test_codec.py,sha256=Zwq6A5uZUK_FWDL3BA932c5b-rL3hnC6efobWHSLC4o,6651
 synapse/vendor/xrpl/tests/test_main.py,sha256=kZQwWk7I6HrP-PMvLdsUUN4POvWD9I-iXDHOwdeF090,4299
 synapse/vendor/xrpl/tests/test_main_test_cases.py,sha256=vTlUM4hJD2Hd2wCIdd9rfsvcMZZZQmNHWdCTTFeGz2Y,4221
-synapse-2.195.0.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
-synapse-2.195.0.dist-info/METADATA,sha256=KwK3DxD_-7ClE0fJ7g5sqgUAEPEYKwFkvtpLj1z8p20,4620
-synapse-2.195.0.dist-info/WHEEL,sha256=5pBL_y1xgYbRv8URJNE-BCn6IBkqK0TW5FP9QHWct1c,93
-synapse-2.195.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
-synapse-2.195.0.dist-info/RECORD,,
+synapse-2.195.1.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
+synapse-2.195.1.dist-info/METADATA,sha256=WWaiuO-cJnS9jHZhGlJ61OC7ThsfbOuKp9rVBfhKf5c,4620
+synapse-2.195.1.dist-info/WHEEL,sha256=5pBL_y1xgYbRv8URJNE-BCn6IBkqK0TW5FP9QHWct1c,93
+synapse-2.195.1.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
+synapse-2.195.1.dist-info/RECORD,,