synapse 2.164.0__py311-none-any.whl → 2.166.0__py311-none-any.whl

synapse/lib/types.py

@@ -17,6 +17,7 @@ import synapse.lib.layer as s_layer
 import synapse.lib.config as s_config
 import synapse.lib.msgpack as s_msgpack
 import synapse.lib.grammar as s_grammar
+import synapse.lib.stormtypes as s_stormtypes
 
 logger = logging.getLogger(__name__)
 
@@ -367,6 +368,7 @@ class Bool(Type):
         self.setNormFunc(int, self._normPyInt)
         self.setNormFunc(bool, self._normPyInt)
         self.setNormFunc(decimal.Decimal, self._normPyInt)
+        self.setNormFunc(s_stormtypes.Number, self._normNumber)
 
     def _normPyStr(self, valu):
 
@@ -387,6 +389,9 @@ class Bool(Type):
     def _normPyInt(self, valu):
         return int(bool(valu)), {}
 
+    def _normNumber(self, valu):
+        return int(bool(valu.valu)), {}
+
     def repr(self, valu):
         return repr(bool(valu)).lower()
 
@@ -887,6 +892,7 @@ class IntBase(Type):
         })
 
         self.setNormFunc(decimal.Decimal, self._normPyDecimal)
+        self.setNormFunc(s_stormtypes.Number, self._normNumber)
 
     def _storLiftRange(self, cmpr, valu):
         minv, minfo = self.norm(valu[0])
@@ -924,6 +930,9 @@ class IntBase(Type):
     def _normPyDecimal(self, valu):
         return self._normPyInt(int(valu))
 
+    def _normNumber(self, valu):
+        return self._normPyInt(int(valu.valu))
+
 class Int(IntBase):
 
     _opt_defs = (
@@ -996,6 +1005,7 @@ class Int(IntBase):
         self.setNormFunc(str, self._normPyStr)
         self.setNormFunc(int, self._normPyInt)
         self.setNormFunc(bool, self._normPyBool)
+        self.setNormFunc(float, self._normPyFloat)
 
     def merge(self, oldv, newv):
 
@@ -1040,6 +1050,9 @@ class Int(IntBase):
 
         return valu, {}
 
+    def _normPyFloat(self, valu):
+        return self._normPyInt(int(valu))
+
     def repr(self, norm):
 
         text = self.enumrepr.get(norm)
@@ -1132,6 +1145,7 @@ class Float(Type):
         self.setNormFunc(int, self._normPyInt)
         self.setNormFunc(float, self._normPyFloat)
         self.setNormFunc(decimal.Decimal, self._normPyInt)
+        self.setNormFunc(s_stormtypes.Number, self._normNumber)
 
     def _normPyStr(self, valu):
 
@@ -1146,6 +1160,9 @@ class Float(Type):
         valu = float(valu)
         return self._normPyFloat(valu)
 
+    def _normNumber(self, valu):
+        return self._normPyFloat(float(valu.valu))
+
     def _normPyFloat(self, valu):
 
         if self.minval is not None and not self.mincmp(valu, self.minval):
@@ -1185,6 +1202,7 @@ class Ival(Type):
         self.setNormFunc(list, self._normPyIter)
         self.setNormFunc(tuple, self._normPyIter)
         self.setNormFunc(decimal.Decimal, self._normPyInt)
+        self.setNormFunc(s_stormtypes.Number, self._normNumber)
         self.storlifts.update({
             '@=': self._storLiftAt,
         })
@@ -1245,6 +1263,11 @@ class Ival(Type):
         maxv, info = self.timetype._normPyInt(minv + 1)
         return (minv, maxv), info
 
+    def _normNumber(self, valu):
+        minv, _ = self.timetype._normPyInt(valu.valu)
+        maxv, info = self.timetype._normPyInt(minv + 1)
+        return (minv, maxv), info
+
     def _normRelStr(self, valu, relto=None):
         valu = valu.strip().lower()
         # assumes the relative string starts with a - or +
@@ -1631,6 +1654,7 @@ class Str(Type):
         self.setNormFunc(bool, self._normPyBool)
         self.setNormFunc(float, self._normPyFloat)
         self.setNormFunc(decimal.Decimal, self._normPyInt)
+        self.setNormFunc(s_stormtypes.Number, self._normNumber)
 
         self.storlifts.update({
             '=': self._storLiftEq,
@@ -1696,6 +1720,9 @@ class Str(Type):
     def _normPyInt(self, valu):
         return self._normPyStr(str(valu))
 
+    def _normNumber(self, valu):
+        return self._normPyStr(str(valu.valu))
+
     def _normPyFloat(self, valu):
         deci = s_common.hugectx.create_decimal(str(valu))
         return format(deci, 'f'), {}
@@ -1823,7 +1850,7 @@ class Tag(Str):
             mesg = f'Tag does not match tagre: [{s_grammar.tagre.pattern}]'
             raise s_exc.BadTypeValu(valu=norm, name=self.name, mesg=mesg)
 
-        return norm, {'subs': subs}
+        return norm, {'subs': subs, 'toks': toks}
 
     def _normPyStr(self, text):
         toks = text.strip('#').split('.')
@@ -1901,7 +1928,7 @@ class Velocity(IntBase):
 
         unit = valu[offs:].strip()
         if not unit:
-            return base, {}
+            return int(base), {}
 
         if unit.find('/') != -1:
             dist, dura = unit.split('/', 1)

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, 164, 0)
+version = (2, 166, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '1c4ac22918ed63d1b33158245c75a30364a231e5'
+commit = '09f8a7b3ad1f2ed5949e7d1a9dc7d17161fab932'

synapse/lib/view.py

@@ -167,6 +167,18 @@ class View(s_nexus.Pusher):  # type: ignore
         if byts is not None:
             return s_msgpack.un(byts)
 
+    async def getMergingViews(self):
+        if self.info.get('quorum') is None:
+            mesg = f'View ({self.iden}) does not require quorum voting.'
+            raise s_exc.BadState(mesg=mesg)
+
+        idens = []
+        for view in list(self.core.views.values()):
+            await asyncio.sleep(0)
+            if view.parent == self and view.getMergeRequest() is not None:
+                idens.append(view.iden)
+        return idens
+
     async def setMergeRequest(self, mergeinfo):
         self.reqParentQuorum()
         mergeinfo['iden'] = s_common.guid()
@@ -193,6 +205,27 @@ class View(s_nexus.Pusher):  # type: ignore
         await self.core.feedBeholder('view:merge:request:set', {'view': self.iden, 'merge': mergeinfo})
         return mergeinfo
 
+    async def setMergeComment(self, comment):
+        return await self._push('merge:set:comment', s_common.now(), comment)
+
+    @s_nexus.Pusher.onPush('merge:set:comment')
+    async def _setMergeRequestComment(self, updated, comment):
+        self.reqParentQuorum()
+        merge = self.getMergeRequest()
+        if merge is None:
+            mesg = 'Cannot set the comment of a merge request that does not exist.'
+            raise s_exc.BadState(mesg=mesg)
+
+        merge['updated'] = updated
+        merge['comment'] = comment
+        s_schemas.reqValidMerge(merge)
+        lkey = self.bidn + b'merge:req'
+        self.core.slab.put(lkey, s_msgpack.en(merge), db='view:meta')
+
+        await self.core.feedBeholder('view:merge:set', {'view': self.iden, 'merge': merge})
+
+        return merge
+
     async def delMergeRequest(self):
         return await self._push('merge:del')
 
@@ -300,6 +333,30 @@ class View(s_nexus.Pusher):  # type: ignore
 
         return vote
 
+    async def setMergeVoteComment(self, useriden, comment):
+        return await self._push('merge:vote:set:comment', s_common.now(), useriden, comment)
+
+    @s_nexus.Pusher.onPush('merge:vote:set:comment')
+    async def _setMergeVoteComment(self, tick, useriden, comment):
+        self.reqParentQuorum()
+
+        uidn = s_common.uhex(useriden)
+
+        lkey = self.bidn + b'merge:vote' + uidn
+        byts = self.core.slab.pop(lkey, db='view:meta')
+
+        if byts is None:
+            mesg = 'Cannot set the comment for a vote that does not exist.'
+            raise s_exc.BadState(mesg=mesg)
+
+        vote = s_msgpack.un(byts)
+        vote['updated'] = tick
+        vote['comment'] = comment
+        self.core.slab.put(lkey, s_msgpack.en(vote), db='view:meta')
+        await self.core.feedBeholder('view:merge:vote:set', {'view': self.iden, 'vote': vote})
+
+        return vote
+
     async def delMergeVote(self, useriden):
         return await self._push('merge:vote:del', useriden, s_common.now())
 
@@ -1327,87 +1384,57 @@ class View(s_nexus.Pusher):  # type: ignore
                 self._confirm(user, perm)
                 await asyncio.sleep(0)
 
-    async def runTagAdd(self, node, tag, valu, view=None):
+    async def runTagAdd(self, node, tag, valu):
 
-        # Run the non-glob callbacks, then the glob callbacks
-        funcs = itertools.chain(self.core.ontagadds.get(tag, ()), (x[1] for x in self.core.ontagaddglobs.get(tag)))
-        for func in funcs:
-            try:
-                await s_coro.ornot(func, node, tag, valu)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
-            except Exception:
-                logger.exception('onTagAdd Error')
-
-        if view is None:
-            view = self.iden
+        if self.core.migration:
+            return
 
         # Run any trigger handlers
-        await self.triggers.runTagAdd(node, tag, view=view)
+        await self.triggers.runTagAdd(node, tag)
 
-    async def runTagDel(self, node, tag, valu, view=None):
+    async def runTagDel(self, node, tag, valu):
 
-        funcs = itertools.chain(self.core.ontagdels.get(tag, ()), (x[1] for x in self.core.ontagdelglobs.get(tag)))
-        for func in funcs:
-            try:
-                await s_coro.ornot(func, node, tag, valu)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
-            except Exception:
-                logger.exception('onTagDel Error')
+        if self.core.migration:
+            return
 
-        if view is None:
-            view = self.iden
+        await self.triggers.runTagDel(node, tag)
 
-        await self.triggers.runTagDel(node, tag, view=view)
+    async def runNodeAdd(self, node):
 
-    async def runNodeAdd(self, node, view=None):
-        if not node.snap.trigson:
+        if self.core.migration:
             return
 
-        if view is None:
-            view = self.iden
+        await self.triggers.runNodeAdd(node)
 
-        await self.triggers.runNodeAdd(node, view=view)
+    async def runNodeDel(self, node):
 
-    async def runNodeDel(self, node, view=None):
-        if not node.snap.trigson:
+        if self.core.migration:
             return
 
-        if view is None:
-            view = self.iden
+        await self.triggers.runNodeDel(node)
 
-        await self.triggers.runNodeDel(node, view=view)
-
-    async def runPropSet(self, node, prop, oldv, view=None):
+    async def runPropSet(self, node, prop, oldv):
         '''
         Handle when a prop set trigger event fired
         '''
-        if not node.snap.trigson:
+        if self.core.migration:
             return
 
-        if view is None:
-            view = self.iden
+        await self.triggers.runPropSet(node, prop, oldv)
 
-        await self.triggers.runPropSet(node, prop, oldv, view=view)
+    async def runEdgeAdd(self, n1, edge, n2):
 
-    async def runEdgeAdd(self, n1, edge, n2, view=None):
-        if not n1.snap.trigson:
+        if self.core.migration:
             return
 
-        if view is None:
-            view = self.iden
+        await self.triggers.runEdgeAdd(n1, edge, n2)
 
-        await self.triggers.runEdgeAdd(n1, edge, n2, view=view)
+    async def runEdgeDel(self, n1, edge, n2):
 
-    async def runEdgeDel(self, n1, edge, n2, view=None):
-        if not n1.snap.trigson:
+        if self.core.migration:
             return
 
-        if view is None:
-            view = self.iden
-
-        await self.triggers.runEdgeDel(n1, edge, n2, view=view)
+        await self.triggers.runEdgeDel(n1, edge, n2)
 
     async def addTrigger(self, tdef):
         '''

synapse/models/economic.py

@@ -11,7 +11,7 @@ class EconModule(s_module.CoreModule):
                     'doc': 'A Card Verification Value (CVV).'}),
 
                 ('econ:pay:pin', ('str', {'regex': '^[0-9]{3,6}$'}), {
-                    'doc': 'A Personal Identification Number.'}),
+                    'doc': 'A Personal Identification Number (PIN).'}),
 
                 ('econ:pay:mii', ('int', {'min': 0, 'max': 9}), {
                     'doc': 'A Major Industry Identifier (MII).'}),
@@ -41,6 +41,12 @@ class EconModule(s_module.CoreModule):
                 ('econ:acct:balance', ('guid', {}), {
                     'doc': 'A snapshot of the balance of an account at a point in time.'}),
 
+                ('econ:acct:receipt', ('guid', {}), {
+                    'doc': 'A receipt issued as proof of payment.'}),
+
+                ('econ:acct:invoice', ('guid', {}), {
+                    'doc': 'An invoice issued requesting payment.'}),
+
                 ('econ:price', ('hugenum', {'norm': False}), {
                     'doc': 'The amount of money expected, required, or given in payment for something',
                     'ex': '2.20'}),
@@ -61,15 +67,34 @@ class EconModule(s_module.CoreModule):
                 ('econ:fin:tick', ('guid', {}), {
                     'doc': 'A sample of the price of a security at a single moment in time'}),
 
-                # econ:acct:bill
-                # econ:bank:us:aba:rtn ( ABA Routing Number )
-                # econ:bank:us:account = (econ:bank:us:aba:rtn, acct)
-                # econ:bank:swift:...
+                ('econ:bank:account:type:taxonomy', ('taxonomy', {}), {
+                    'doc': 'A bank account type taxonomy.'}),
+
+                ('econ:bank:account', ('guid', {}), {
+                    'doc': 'A bank account.'}),
+
+                ('econ:bank:balance', ('guid', {}), {
+                    'doc': 'A balance contained by a bank account at a point in time.'}),
+
+                ('econ:bank:statement', ('guid', {}), {
+                    'doc': 'A statement of bank account payment activity over a period of time.'}),
+
+                ('econ:bank:aba:rtn', ('str', {'regex': '[0-9]{9}'}), {
+                    'doc': 'An American Bank Association (ABA) routing transit number (RTN).'}),
+
+                ('econ:bank:iban', ('str', {'regex': '[A-Z]{2}[0-9]{2}[a-zA-Z0-9]{1,30}'}), {
+                    'doc': 'An International Bank Account Number.'}),
+
+                ('econ:bank:swift:bic', ('str', {'regex': '[A-Z]{6}[A-Z0-9]{5}'}), {
+                    'doc': 'A Society for Worldwide Interbank Financial Telecommunication (SWIFT) Business Identifier Code (BIC).'}),
             ),
 
             'edges': (
                 (('econ:purchase', 'acquired', None), {
                     'doc': 'The purchase was used to acquire the target node.'}),
+
+                (('econ:bank:statement', 'has', 'econ:acct:payment'), {
+                    'doc': 'The bank statement includes the payment.'}),
             ),
 
             'forms': (
@@ -105,6 +130,12 @@ class EconModule(s_module.CoreModule):
 
                     ('pin', ('econ:pay:pin', {}), {
                         'doc': 'The Personal Identification Number on the card.'}),
+
+                    ('account', ('econ:bank:account', {}), {
+                        'doc': 'A bank account associated with the payment card.'}),
+
+                    ('contact', ('ps:contact', {}), {
+                        'doc': 'The contact information associated with the payment card.'}),
                 )),
 
                 ('econ:purchase', {}, (
@@ -171,6 +202,9 @@ class EconModule(s_module.CoreModule):
                     ('fee', ('econ:price', {}), {
                         'doc': 'The transaction fee paid by the recipient to the payment processor.'}),
 
+                    ('from:account', ('econ:bank:account', {}), {
+                        'doc': 'The bank account which made the payment.'}),
+
                     ('from:pay:card', ('econ:pay:card', {}), {
                         'doc': 'The payment card making the payment.'}),
 
@@ -183,6 +217,9 @@ class EconModule(s_module.CoreModule):
                     ('from:contact', ('ps:contact', {}), {
                         'doc': 'Contact information for the entity making the payment.'}),
 
+                    ('to:account', ('econ:bank:account', {}), {
+                        'doc': 'The bank account which received the payment.'}),
+
                     ('to:coinaddr', ('crypto:currency:address', {}), {
                         'doc': 'The crypto currency address receiving the payment.'}),
 
@@ -210,6 +247,12 @@ class EconModule(s_module.CoreModule):
                     ('crypto:transaction', ('crypto:currency:transaction', {}), {
                         'doc': 'A crypto currency transaction that initiated the payment.'}),
 
+                    ('invoice', ('econ:acct:invoice', {}), {
+                        'doc': 'The invoice that the payment applies to.'}),
+
+                    ('receipt', ('econ:acct:receipt', {}), {
+                        'doc': 'The receipt that was issued for the payment.'}),
+
                 )),
 
                 ('econ:acct:balance', {}, (
@@ -296,5 +339,131 @@ class EconModule(s_module.CoreModule):
                     ('price:high', ('econ:price', {}), {
                         'doc': 'The high price of the security'}),
                 )),
+
+                ('econ:acct:invoice', {}, (
+
+                    ('issued', ('time', {}), {
+                        'doc': 'The time that the invoice was issued to the recipient.'}),
+
+                    ('issuer', ('ps:contact', {}), {
+                        'doc': 'The contact information for the entity who issued the invoice.'}),
+
+                    ('purchase', ('econ:purchase', {}), {
+                        'doc': 'The purchase that the invoice is requesting payment for.'}),
+
+                    ('recipient', ('ps:contact', {}), {
+                        'doc': 'The contact information for the intended recipient of the invoice.'}),
+
+                    ('due', ('time', {}), {
+                        'doc': 'The time by which the payment is due.'}),
+
+                    ('paid', ('bool', {}), {
+                        'doc': 'Set to true if the invoice has been paid in full.'}),
+
+                    ('amount', ('econ:price', {}), {
+                        'doc': 'The balance due.'}),
+
+                    ('currency', ('econ:currency', {}), {
+                        'doc': 'The currency that the invoice specifies for payment.'}),
+                )),
+
+                ('econ:acct:receipt', {}, (
+
+                    ('issued', ('time', {}), {
+                        'doc': 'The time the receipt was issued.'}),
+
+                    ('purchase', ('econ:purchase', {}), {
+                        'doc': 'The purchase that the receipt confirms payment for.'}),
+
+                    ('issuer', ('ps:contact', {}), {
+                        'doc': 'The contact information for the entity who issued the receipt.'}),
+
+                    ('recipient', ('ps:contact', {}), {
+                        'doc': 'The contact information for the entity who received the receipt.'}),
+
+                    ('currency', ('econ:currency', {}), {
+                        'doc': 'The currency that the receipt uses to specify the price.'}),
+
+                    ('amount', ('econ:price', {}), {
+                        'doc': 'The price that the receipt confirms was paid.'}),
+                )),
+
+                ('econ:bank:aba:rtn', {}, (
+
+                    ('bank', ('ou:org', {}), {
+                        'doc': 'The bank which was issued the ABA RTN.'}),
+
+                    ('bank:name', ('ou:name', {}), {
+                        'doc': 'The name which is registered for this ABA RTN.'}),
+
+                )),
+
+                ('econ:bank:iban', {}, ()),
+
+                ('econ:bank:swift:bic', {}, (
+
+                    ('business', ('ou:org', {}), {
+                        'doc': 'The business which is the registered owner of the SWIFT BIC.'}),
+
+                    ('office', ('ps:contact', {}), {
+                        'doc': 'The branch or office which is specified in the last 3 digits of the SWIFT BIC.'}),
+                )),
+
+                ('econ:bank:account:type:taxonomy', {}, ()),
+                ('econ:bank:account', {}, (
+
+                    ('type', ('econ:bank:account:type:taxonomy', {}), {
+                        'doc': 'The type of bank account.'}),
+
+                    ('aba:rtn', ('econ:bank:aba:rtn', {}), {
+                        'doc': 'The ABA routing transit number for the bank which issued the account.'}),
+
+                    ('number', ('str', {'regex': '[0-9]+'}), {
+                        'doc': 'The account number.'}),
+
+                    ('iban', ('econ:bank:iban', {}), {
+                        'doc': 'The IBAN for the account.'}),
+
+                    ('contact', ('ps:contact', {}), {
+                        'doc': 'The contact information associated with the bank account.'}),
+
+                    ('issuer', ('ou:org', {}), {
+                        'doc': 'The bank which issued the account.'}),
+
+                    ('issuer:name', ('ou:name', {}), {
+                        'doc': 'The name of the bank which issued the account.'}),
+
+                    ('currency', ('econ:currency', {}), {
+                        'doc': 'The currency of the account balance.'}),
+
+                    ('balance', ('econ:bank:balance', {}), {
+                        'doc': 'The most recently known bank balance information.'}),
+                )),
+
+                ('econ:bank:balance', {}, (
+
+                    ('time', ('time', {}), {
+                        'doc': 'The time that the account balance was observed.'}),
+
+                    ('amount', ('econ:price', {}), {
+                        'doc': 'The amount of currency available at the time.'}),
+
+                    ('account', ('econ:bank:account', {}), {
+                        'doc': 'The bank account which contained the balance amount.'}),
+                )),
+                ('econ:bank:statement', {}, (
+
+                    ('account', ('econ:bank:account', {}), {
+                        'doc': 'The bank account used to compute the statement.'}),
+
+                    ('period', ('ival', {}), {
+                        'doc': 'The period that the statement includes.'}),
+
+                    ('starting:balance', ('econ:price', {}), {
+                        'doc': 'The account balance at the beginning of the statement period.'}),
+
+                    ('ending:balance', ('econ:price', {}), {
+                        'doc': 'The account balance at the end of the statement period.'}),
+                )),
             ),
         }),)

synapse/models/files.py

@@ -256,6 +256,8 @@ class FileModule(s_module.CoreModule):
                             'doc': 'MIME specific lat/long information extracted from metadata.'}),
                         ('altitude', ('geo:altitude', {}), {
                             'doc': 'MIME specific altitude information extracted from metadata.'}),
+                        ('text', ('str', {'lower': True, 'onespace': True}), {
+                            'doc': 'The text contained within the image.'}),
                     ),
                     'doc': 'Properties common to image file formats.',
                     'interfaces': ('file:mime:meta',),