synapse 2.170.0__py311-none-any.whl → 2.172.0__py311-none-any.whl

synapse/lib/types.py

@@ -507,7 +507,7 @@ class Comp(Type):
         fields = self.opts.get('fields')
         if len(fields) != len(valu):
             raise s_exc.BadTypeValu(name=self.name, fields=fields, numitems=len(valu),
-                                    mesg=f'invalid number of fields given for norming: {repr(valu)[:256]}')
+                                    mesg=f'invalid number of fields given for norming: {s_common.trimText(repr(valu))}')
 
         subs = {}
         adds = []
@@ -1589,7 +1589,7 @@ class Data(Type):
             if self.validator is not None:
                 self.validator(valu)
         except (s_exc.MustBeJsonSafe, s_exc.SchemaViolation) as e:
-            raise s_exc.BadTypeValu(name=self.name, mesg=f'{e}: {repr(valu)[:256]}') from None
+            raise s_exc.BadTypeValu(name=self.name, mesg=f'{e}: {s_common.trimText(repr(valu))}') from None
         byts = s_msgpack.en(valu)
         return s_msgpack.un(byts), {}
 
@@ -1608,7 +1608,7 @@ class NodeProp(Type):
 
     def _normPyTuple(self, valu):
         if len(valu) != 2:
-            mesg = f'Must be a 2-tuple: {repr(valu)[:256]}'
+            mesg = f'Must be a 2-tuple: {s_common.trimText(repr(valu))}'
             raise s_exc.BadTypeValu(name=self.name, numitems=len(valu), mesg=mesg) from None
 
         propname, propvalu = valu
@@ -1650,7 +1650,7 @@ class Range(Type):
 
     def _normPyTuple(self, valu):
         if len(valu) != 2:
-            mesg = f'Must be a 2-tuple of type {self.subtype.name}: {repr(valu)[:256]}'
+            mesg = f'Must be a 2-tuple of type {self.subtype.name}: {s_common.trimText(repr(valu))}'
             raise s_exc.BadTypeValu(numitems=len(valu), name=self.name, mesg=mesg)
 
         minv = self.subtype.norm(valu[0])[0]
@@ -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):
 
@@ -2262,11 +2262,11 @@ class Time(IntBase):
         '''
 
         if not isinstance(vals, (list, tuple)):
-            mesg = f'Must be a 2-tuple: {repr(vals)[:256]}'
+            mesg = f'Must be a 2-tuple: {s_common.trimText(repr(vals))}'
             raise s_exc.BadCmprValu(itemtype=type(vals), cmpr='range=', mesg=mesg)
 
         if len(vals) != 2:
-            mesg = f'Must be a 2-tuple: {repr(vals)[:256]}'
+            mesg = f'Must be a 2-tuple: {s_common.trimText(repr(vals))}'
             raise s_exc.BadCmprValu(itemtype=type(vals), cmpr='range=', mesg=mesg)
 
         tick, tock = self.getTickTock(vals)

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, 172, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '0e74d28df290e631963a8e06c8e605531a96aeab'
+commit = '3e33d8a8cbdfd0f4f6f9a31d664578d817d9ccb8'

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():
@@ -1438,11 +1444,7 @@ class View(s_nexus.Pusher):  # type: ignore
         if user is None or user.isAdmin() or user.isAdmin(gateiden=parentlayr.iden):
             return
 
-        async with await self.parent.snap(user=user) as snap:
-            async for nodeedit in fromlayr.iterLayerNodeEdits():
-                for offs, perm in s_layer.getNodeEditPerms([nodeedit]):
-                    self.parent._confirm(user, perm)
-                    await asyncio.sleep(0)
+        await fromlayr.confirmLayerEditPerms(user, parentlayr.iden)
 
     async def wipeAllowed(self, user=None):
         '''
@@ -1451,10 +1453,8 @@ class View(s_nexus.Pusher):  # type: ignore
         if user is None or user.isAdmin():
             return
 
-        async for nodeedit in self.layers[0].iterWipeNodeEdits():
-            for offs, perm in s_layer.getNodeEditPerms([nodeedit]):
-                self._confirm(user, perm)
-                await asyncio.sleep(0)
+        layer = self.layers[0]
+        await layer.confirmLayerEditPerms(user, layer.iden, delete=True)
 
     async def runTagAdd(self, node, tag, valu):
 
@@ -1558,14 +1558,14 @@ class View(s_nexus.Pusher):  # type: ignore
     async def getTrigger(self, iden):
         trig = self.triggers.get(iden)
         if trig is None:
-            raise s_exc.NoSuchIden("Trigger not found")
+            raise s_exc.NoSuchIden(mesg=f"Trigger not found {iden=}", iden=iden)
 
         return trig
 
     async def delTrigger(self, iden):
         trig = self.triggers.get(iden)
         if trig is None:
-            raise s_exc.NoSuchIden("Trigger not found")
+            raise s_exc.NoSuchIden(mesg=f"Trigger not found {iden=}", iden=iden)
 
         return await self._push('trigger:del', iden)
 
@@ -1586,7 +1586,7 @@ class View(s_nexus.Pusher):  # type: ignore
     async def setTriggerInfo(self, iden, name, valu):
         trig = self.triggers.get(iden)
         if trig is None:
-            raise s_exc.NoSuchIden("Trigger not found")
+            raise s_exc.NoSuchIden(mesg=f"Trigger not found {iden=}", iden=iden)
         await trig.set(name, valu)
 
         await self.core.feedBeholder('trigger:set', {'iden': trig.iden, 'view': trig.view.iden, 'name': name, 'valu': valu}, gates=[trig.iden])

synapse/models/base.py

@@ -195,8 +195,12 @@ class BaseModule(s_module.CoreModule):
 
                     ('created', ('time', {}), {
                         'doc': 'The time the note was created.'}),
+
                     ('updated', ('time', {}), {
                         'doc': 'The time the note was updated.'}),
+
+                    ('replyto', ('meta:note', {}), {
+                        'doc': 'The note is a reply to the specified note.'}),
                 )),
 
                 ('meta:timeline', {}, (
@@ -213,17 +217,26 @@ class BaseModule(s_module.CoreModule):
                 ('meta:timeline:taxonomy', {}, ()),
 
                 ('meta:event', {}, (
+
                     ('timeline', ('meta:timeline', {}), {
                         'doc': 'The timeline containing the event.'}),
+
                     ('title', ('str', {}), {
                         'doc': 'A title for the event.'}),
+
                     ('summary', ('str', {}), {
                         'disp': {'hint': 'text'},
                         'doc': 'A prose summary of the event.'}),
+
                     ('time', ('time', {}), {
                         'doc': 'The time that the event occurred.'}),
+
+                    ('index', ('int', {}), {
+                        'doc': 'The index of this event in a timeline without exact times.'}),
+
                     ('duration', ('duration', {}), {
                         'doc': 'The duration of the event.'}),
+
                     ('type', ('meta:event:taxonomy', {}), {
                         'doc': 'Type of event.'}),
                 )),

synapse/models/biz.py

@@ -175,22 +175,36 @@ class BizModule(s_module.CoreModule):
                     }),
                 )),
                 ('biz:listing', {}, (
+
                     ('seller', ('ps:contact', {}), {
                         'doc': 'The contact information for the seller.'}),
+
                     ('product', ('biz:product', {}), {
                         'doc': 'The product being offered.'}),
+
                     ('service', ('biz:service', {}), {
                         'doc': 'The service being offered.'}),
+
                     ('current', ('bool', {}), {
                         'doc': 'Set to true if the offer is still current.'}),
+
                     ('time', ('time', {}), {
                         'doc': 'The first known offering of this product/service by the organization for the asking price.'}),
+
                     ('expires', ('time', {}), {
                         'doc': 'Set if the offer has a known expiration date.'}),
+
                     ('price', ('econ:price', {}), {
                         'doc': 'The asking price of the product or service.'}),
+
                     ('currency', ('econ:currency', {}), {
                         'doc': 'The currency of the asking price.'}),
+
+                    ('count:total', ('int', {'min': 0}), {
+                        'doc': 'The number of instances for sale.'}),
+
+                    ('count:remaining', ('int', {'min': 0}), {
+                        'doc': 'The current remaining number of instances for sale.'}),
                 )),
                 ('biz:service', {}, (
                     ('provider', ('ps:contact', {}), {

synapse/models/economic.py

@@ -169,6 +169,9 @@ class EconModule(s_module.CoreModule):
 
                     ('currency', ('econ:currency', {}), {
                         'doc': 'The econ:price of the purchase'}),
+
+                    ('listing', ('biz:listing', {}), {
+                        'doc': 'The purchase was made based on the given listing.'}),
                 )),
 
                 ('econ:receipt:item', {}, (