synapse 2.210.0__tar.gz → 2.211.0__tar.gz

{synapse-2.210.0/synapse.egg-info → synapse-2.211.0}/PKG-INFO

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

{synapse-2.210.0 → synapse-2.211.0}/pyproject.toml

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

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/base.py

@@ -1,5 +1,6 @@
 import gc
 import os
+import sys
 import atexit
 import signal
 import asyncio
@@ -82,7 +83,7 @@ class Base:
     '''
     def __init__(self):
         self.anitted = False
-        assert inspect.stack()[1].function == 'anit', 'Objects from Base must be constructed solely via "anit"'
+        assert sys._getframe(1).f_code.co_name == 'anit', 'Objects from Base must be constructed solely via "anit"'
 
     @classmethod
     async def anit(cls, *args, **kwargs):
@@ -129,7 +130,6 @@ class Base:
         self.isfini = False
         self.anitted = True  # For assertion purposes
         self.finievt = asyncio.Event()
-        self.entered = False
 
         # hold a weak ref to other bases we should fini if they
         # are still around when we go down...
@@ -205,7 +205,6 @@ class Base:
 
     async def __aenter__(self):
         assert asyncio.get_running_loop() == self.loop
-        self.entered = True
         return self
 
     async def __aexit__(self, exc, cls, tb):

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/node.py

@@ -181,7 +181,7 @@ class Node:
 
             if prop.modl.form(prop.type.name) is not None:
                 buid = s_common.buid((prop.type.name, valu))
-            elif prop.type.name == 'ndef':
+            elif prop.type.name == 'ndef' or 'ndef' in prop.type.info.get('bases'):
                 buid = s_common.buid(valu)
             else:
                 return None

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/schemas.py

@@ -668,9 +668,18 @@ _reqValidPkgdefSchema = {
             'pattern': s_version.semverstr,
         },
         'build': {
-            'type' 'object'
+            'type': 'object',
             'properties': {
                 'time': {'type': 'number'},
+                'synapse:version': {
+                    'type': 'string',
+                    'pattern': s_version.semverstr
+                },
+                'synapse:commit': {
+                    'type': 'string',
+                    # Note: This pattern allows empty string for dev environments
+                    'pattern': '^[0-9a-fA-F]*$'
+                },
             },
             'required': ['time'],
         },

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/share.py

@@ -16,9 +16,6 @@ class Share(s_base.Base):
 
         self.iden = s_common.guid()
 
-        self.exited = False
-        self.entered = False
-
         sess = link.get('sess')
 
         async def fini():

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/snap.py

@@ -303,6 +303,9 @@ class ProtoNode:
             self.tags[tagnode.valu] = valu
             return tagnode
 
+        elif valu == (None, None):
+            return tagnode
+
         valu = s_time.ival(*valu, *curv)
         self.tags[tagnode.valu] = valu
 

{synapse-2.210.0 → synapse-2.211.0}/synapse/lib/stormtypes.py

@@ -6210,9 +6210,9 @@ class NodeData(Prim):
                       {'name': 'valu', 'type': 'prim', 'desc': 'The data to store.', },
                   ),
                   'returns': {'type': 'null', }}},
-        {'name': 'list', 'desc': 'Get a list of the Node data names on the Node.',
+        {'name': 'list', 'desc': 'Get a list of the Node data on the Node as (name, value) tuples.',
          'type': {'type': 'function', '_funcname': '_listNodeData',
-                  'returns': {'type': 'list', 'desc': 'List of the names of values stored on the node.', }}},
+                  'returns': {'type': 'list', 'desc': 'List of (name, value) tuples stored on the node.', }}},
         {'name': 'load',
          'desc': 'Load the Node data onto the Node so that the Node data is packed and returned by the runtime.',
          'type': {'type': 'function', '_funcname': '_loadNodeData',

{synapse-2.210.0 → synapse-2.211.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, 210, 0)
+version = (2, 211, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'e43efa9d9c2257ff05fe47988a323e16896fdf50'
+commit = '99beab651131ab996a967c6d0345c80b89de4a74'

{synapse-2.210.0 → synapse-2.211.0}/synapse/models/inet.py

@@ -1535,6 +1535,11 @@ class InetModule(s_module.CoreModule):
                     ('inet:service:platform', ('guid', {}), {
                         'doc': 'A network platform which provides services.'}),
 
+                    ('inet:service:app', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'template': {'service:base': 'application'},
+                        'doc': 'A platform specific application.'}),
+
                     ('inet:service:instance', ('guid', {}), {
                         'doc': 'An instance of the platform such as Slack or Discord instances.'}),
 
@@ -1626,6 +1631,10 @@ class InetModule(s_module.CoreModule):
                         'template': {'service:base': 'emote'},
                         'doc': 'An emote or reaction by an account.'}),
 
+                    ('inet:service:access:action:taxonomy', ('taxonomy', {}), {
+                        'interfaces': ('meta:taxonomy',),
+                        'doc': 'A hierarchical taxonomy of service actions.'}),
+
                     ('inet:service:access', ('guid', {}), {
                         'interfaces': ('inet:service:action',),
                         'doc': 'Represents a user access request to a service resource.'}),
@@ -1774,6 +1783,9 @@ class InetModule(s_module.CoreModule):
                         'interfaces': ('inet:service:base',),
                         'props': (
 
+                            ('app', ('inet:service:app', {}), {
+                                'doc': 'The app which handled the action.'}),
+
                             ('time', ('time', {}), {
                                 'doc': 'The time that the account initiated the action.'}),
 
@@ -1807,6 +1819,9 @@ class InetModule(s_module.CoreModule):
                             ('client:host', ('it:host', {}), {
                                 'doc': 'The client host which initiated the action.'}),
 
+                            ('client:app', ('inet:service:app', {}), {
+                                'doc': 'The client service app which initiated the action.'}),
+
                             ('server', ('inet:server', {}), {
                                 'doc': 'The network address of the server which handled the action.'}),
 
@@ -3608,12 +3623,22 @@ class InetModule(s_module.CoreModule):
 
                         ('url', ('inet:url', {}), {
                             'ex': 'https://twitter.com',
+                            'alts': ('urls',),
                             'doc': 'The primary URL of the platform.'}),
 
+                        ('urls', ('array', {'type': 'inet:url', 'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate URLs for the platform.'}),
+
                         ('name', ('str', {'onespace': True, 'lower': True}), {
                             'ex': 'twitter',
+                            'alts': ('names',),
                             'doc': 'A friendly name for the platform.'}),
 
+                        ('names', ('array', {'type': 'str',
+                                             'typeopts': {'onespace': True, 'lower': True},
+                                             'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate names for the platform.'}),
+
                         ('desc', ('str', {}), {
                             'disp': {'hint': 'text'},
                             'doc': 'A description of the service platform.'}),
@@ -3662,6 +3687,22 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The tenant which contains the instance.'}),
                     )),
 
+                    ('inet:service:app', {}, (
+
+                        ('name', ('str', {'lower': True, 'onespace': True}), {
+                            'alts': ('names',),
+                            'doc': 'The name of the platform specific application.'}),
+
+                        ('names', ('array', {'type': 'str',
+                                             'typeopts': {'onespace': True, 'lower': True},
+                                             'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate names for the application.'}),
+
+                        ('desc', ('str', {}), {
+                            'disp': {'hint': 'text'},
+                            'doc': 'A description of the platform specific application.'}),
+                    )),
+
                     ('inet:service:account', {}, (
 
                         ('user', ('inet:user', {}), {
@@ -3937,6 +3978,9 @@ class InetModule(s_module.CoreModule):
 
                     ('inet:service:access', {}, (
 
+                        ('action', ('inet:service:access:action:taxonomy', {}), {
+                            'doc': 'The platform specific action which this access records.'}),
+
                         ('resource', ('inet:service:resource', {}), {
                             'doc': 'The resource which the account attempted to access.'}),
 

{synapse-2.210.0 → synapse-2.211.0}/synapse/models/orgs.py

@@ -1241,7 +1241,6 @@ class OuModule(s_module.CoreModule):
                  )),
                 ('ou:conference:event', {}, (
                     ('conference', ('ou:conference', {}), {
-                        'ro': True,
                         'doc': 'The conference to which the event is associated.',
                     }),
                     ('organizer', ('ps:contact', {}), {

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_lib_base.py

@@ -86,6 +86,11 @@ class BaseTest(s_t_utils.SynTest):
             await Hehe.anit(-1)
         self.eq(cm.exception.get('mesg'), 'boom')
 
+        if __debug__:
+            with self.raises(AssertionError) as cm:
+                Hehe()
+            self.eq(str(cm.exception), 'Objects from Base must be constructed solely via "anit"')
+
     async def test_coro_fini(self):
 
         event = asyncio.Event()

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_lib_storm.py

@@ -2384,6 +2384,26 @@ class StormTest(s_t_utils.SynTest):
             self.eq('barvuln', embeds['vuln']['name'])
             self.eq('foohw', embeds['node']['name'])
 
+            # embed through `econ:pay:instrument` type that extends from `ndef`
+            await core.nodes('''
+                [ econ:acct:payment=* :from:instrument={ [ econ:pay:card=(testcard,) :name=infime ] } ]
+            ''')
+
+            opts = {
+                'embeds': {
+                    'econ:acct:payment': {
+                        'from:instrument': ['name'],
+                    }
+                }
+            }
+            msgs = await core.stormlist('econ:acct:payment', opts=opts)
+            node = [m[1] for m in msgs if m[0] == 'node'][0]
+            self.eq('econ:acct:payment', node[0][0])
+
+            embeds = node[1]['embeds']
+            self.eq('86caf7a47348d56b2f6bec3e767a9fc7eaaaf5a80d7bbaa235fab763c7dcc560', embeds['from:instrument']['*'])
+            self.eq('infime', embeds['from:instrument']['name'])
+
     async def test_storm_wget(self):
 
         async def _getRespFromSha(core, mesgs):

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_lib_stormtypes.py

@@ -1291,35 +1291,33 @@ class StormTypesTest(s_test.SynTest):
             self.len(1, nodes)
             self.eq('visi@vertex.link', nodes[0].ndef[1])
 
-            nodes = await core.nodes('$s = woot [ test:int=$s.startswith(w) ]')
-            self.eq(1, nodes[0].ndef[1])
+            self.true(await core.callStorm('$s = woot return($s.startswith(w))'))
 
-            nodes = await core.nodes('$s = woot [ test:int=$s.endswith(visi) ]')
-            self.eq(0, nodes[0].ndef[1])
+            self.false(await core.callStorm('$s = woot return($s.endswith(visi))'))
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.rjust(10) ]')
-            self.eq('      woot', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.rjust(10))')
+            self.eq('      woot', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.rjust(10, x) ]')
-            self.eq('xxxxxxwoot', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.rjust(10, x))')
+            self.eq('xxxxxxwoot', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.ljust(10) ]')
-            self.eq('woot      ', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.ljust(10))')
+            self.eq('woot      ', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.ljust(10, x) ]')
-            self.eq('wootxxxxxx', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.ljust(10, x))')
+            self.eq('wootxxxxxx', valu)
 
             sobj = s_stormtypes.Str('beepbeep')
             self.len(8, sobj)
 
-            nodes = await core.nodes("$s = (foo, bar, baz) [ test:str=('.').join($s) ]")
-            self.eq('foo.bar.baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = (foo, bar, baz) return((".").join($s))')
+            self.eq('foo.bar.baz', valu)
 
-            nodes = await core.nodes('$s = foo-bar-baz [ test:str=$s.replace("-", ".") ]')
-            self.eq('foo.bar.baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = foo-bar-baz return($s.replace("-", "."))')
+            self.eq('foo.bar.baz', valu)
 
-            nodes = await core.nodes('$s = foo-bar-baz [ test:str=$s.replace("-", ".", 1) ]')
-            self.eq('foo.bar-baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = foo-bar-baz return($s.replace("-", ".", 1))')
+            self.eq('foo.bar-baz', valu)
 
             q = '$foo=" foo " return ( $foo.strip() )'
             self.eq('foo', await core.callStorm(q))

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_lib_view.py

@@ -332,6 +332,20 @@ class ViewTest(s_t_utils.SynTest):
             self.len(100, nodeedit[0][2])
             self.len(2, nodeedit[1][2])
 
+            await core.nodes('[ test:str=lowertag +#a.b=2020]')
+
+            vdef2 = await core.view.fork()
+            opts = {'view': vdef2['iden']}
+            await core.nodes('test:str=lowertag [ +#a.b.c ]', opts=opts)
+
+            retn = await core.callStorm('test:str=lowertag return($node.getStorNodes())', opts=opts)
+
+            # Only leaf tag is added in our top layer
+            self.isin('a.b.c', retn[0].get('tags'))
+            self.notin('a.b', retn[0].get('tags'))
+
+            self.isin('a.b', retn[1].get('tags'))
+
     async def test_view_merge_ival(self):
 
         async with self.getTestCore() as core:

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_model_inet.py

@@ -2971,7 +2971,9 @@ class InetModelTest(s_t_utils.SynTest):
             q = '''
             [ inet:service:platform=(slack,)
                 :url="https://slack.com"
+                :urls=(https://slacker.com,)
                 :name=Slack
+                :names=("slack chat",)
                 :provider={ ou:org:name=$provname }
                 :provider:name=$provname
             ]
@@ -2980,11 +2982,19 @@ class InetModelTest(s_t_utils.SynTest):
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('inet:service:platform', s_common.guid(('slack',))))
             self.eq(nodes[0].get('url'), 'https://slack.com')
+            self.eq(nodes[0].get('urls'), ('https://slacker.com',))
             self.eq(nodes[0].get('name'), 'slack')
+            self.eq(nodes[0].get('names'), ('slack chat',))
             self.eq(nodes[0].get('provider'), provider.ndef[1])
             self.eq(nodes[0].get('provider:name'), provname.lower())
             platform = nodes[0]
 
+            nodes = await core.nodes('[ inet:service:platform=({"name": "slack chat"}) ]')
+            self.eq(nodes[0].ndef, platform.ndef)
+
+            nodes = await core.nodes('[ inet:service:platform=({"url": "https://slacker.com"}) ]')
+            self.eq(nodes[0].ndef, platform.ndef)
+
             q = '''
             [ inet:service:instance=(vertex, slack)
                 :id='T2XK1223Y'
@@ -3383,12 +3393,15 @@ class InetModelTest(s_t_utils.SynTest):
 
             q = '''
             [ inet:service:access=(api, blackout, 1715856900000, vertex, slack)
+                :action=foo.bar
                 :account=$blckiden
                 :instance=$instiden
                 :platform=$platiden
                 :resource=$rsrciden
                 :success=$lib.true
                 :time=(1715856900000)
+                :app={[ inet:service:app=({"name": "slack web"}) ]}
+                :client:app={[ inet:service:app=({"name": "slack web"}) :desc="The slack web application"]}
             ]
             '''
             opts = {'vars': {
@@ -3400,12 +3413,14 @@ class InetModelTest(s_t_utils.SynTest):
             }}
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
+            self.eq(nodes[0].get('action'), 'foo.bar.')
             self.eq(nodes[0].get('account'), blckacct.ndef[1])
             self.eq(nodes[0].get('instance'), platinst.ndef[1])
             self.eq(nodes[0].get('platform'), platform.ndef[1])
             self.eq(nodes[0].get('resource'), resource.ndef[1])
             self.true(nodes[0].get('success'))
             self.eq(nodes[0].get('time'), 1715856900000)
+            self.eq(nodes[0].get('app'), nodes[0].get('client:app'))
 
             q = '''
             [ inet:service:message=(visi, says, relax)

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_model_orgs.py

@@ -455,8 +455,24 @@ class OuModelTest(s_t_utils.SynTest):
                 'place': place0,
                 'url': 'http://arrowcon.org/2018/dinner',
             }
-            q = '''[(ou:conference:event=$valu :name=$p.name :desc=$p.desc :start=$p.start :end=$p.end
-                    :conference=$p.conference :contact=$p.contact :place=$p.place :url=$p.url)]'''
+            q = '''
+            [ ou:conference:event=$valu
+                :name=$p.name
+                :desc=$p.desc
+                :start=$p.start
+                :end=$p.end
+                :conference=$p.conference
+                :contact=$p.contact
+                :place=$p.place
+                :url=$p.url
+            ]
+
+            // :conference should not be RO
+            [ -:conference ]
+
+            // Put the value back
+            [ :conference=$p.conference ]
+            '''
             nodes = await core.nodes(q, opts={'vars': {'valu': c0, 'p': props}})
             self.len(1, nodes)
             node = nodes[0]

{synapse-2.210.0 → synapse-2.211.0}/synapse/tests/test_tools_genpkg.py

@@ -3,6 +3,9 @@ import stat
 
 import synapse.exc as s_exc
 import synapse.common as s_common
+
+import synapse.lib.version as s_version
+
 import synapse.tests.utils as s_test
 import synapse.tests.files as s_files
 
@@ -159,6 +162,12 @@ class GenPkgTest(s_test.SynTest):
             wflow = pdef['optic']['workflows']['testpkg-baz']
             self.eq(wflow, {'name': 'real-baz', 'desc': 'this is the real baz desc'})
 
+            build = pdef.get('build')
+            self.nn(build)
+            self.nn(build.get('time'))
+            self.eq(build.get('synapse:version'), s_version.verstring)
+            self.eq(build.get('synapse:commit'), s_version.commit)
+
             # nodocs
             nodocspath = s_common.genpath(core.dirn, 'testpkg_nodocs.json')
             argv = ('--no-docs', '--save', nodocspath, ymlpath)

{synapse-2.210.0 → synapse-2.211.0}/synapse/tools/autodoc.py

@@ -12,6 +12,7 @@ import synapse.common as s_common
 import synapse.cortex as s_cortex
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.storm as s_storm
 import synapse.lib.config as s_config
@@ -1041,6 +1042,11 @@ def makeargparser():
 
     return pars
 
-if __name__ == '__main__':  # pragma: no cover
+async def _main(argv, outp=None):  # pragma: no cover
     s_common.setlogging(logger, 'DEBUG')
-    asyncio.run(main(sys.argv[1:]))
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
+if __name__ == '__main__':  # pragma: no cover
+    asyncio.run(_main(sys.argv[1:]))

{synapse-2.210.0 → synapse-2.211.0}/synapse/tools/genpkg.py

@@ -18,6 +18,7 @@ import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
 import synapse.lib.dyndeps as s_dyndeps
 import synapse.lib.schemas as s_schemas
+import synapse.lib.version as s_version
 
 logger = logging.getLogger(__name__)
 
@@ -122,6 +123,12 @@ def loadPkgProto(path, opticdir=None, no_docs=False, readonly=False):
 
     genopts = pkgdef.pop('genopts', {})
 
+    # Stamp build info into the pkgdef if it doesn't already exist
+    pkgdef.setdefault('build', {})
+    pkgdef['build'].setdefault('time', s_common.now())
+    pkgdef['build'].setdefault('synapse:version', s_version.verstring)
+    pkgdef['build'].setdefault('synapse:commit', s_version.commit)
+
     logodef = pkgdef.get('logo')
     if logodef is not None:
 
@@ -265,8 +272,6 @@ async def main(argv, outp=s_output.stdout):
     else:
         pkgdef = loadPkgProto(opts.pkgfile, opticdir=opts.optic, no_docs=opts.no_docs)
 
-    pkgdef['build'] = {'time': s_common.now()}
-
     if opts.signas is not None:
 
         s_certdir.addCertPath(opts.certdir)
@@ -283,6 +288,8 @@ async def main(argv, outp=s_output.stdout):
             'sign': sign,
         }
 
+    s_schemas.reqValidPkgdef(pkgdef)
+
     if not opts.save and not opts.push:
         outp.printf('Neither --push nor --save provided.  Nothing to do.')
         return 1

{synapse-2.210.0 → synapse-2.211.0}/synapse/tools/rstorm.py

@@ -5,6 +5,7 @@ import argparse
 
 import synapse.common as s_common
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.rstorm as s_rstorm
 
@@ -32,6 +33,11 @@ async def main(argv, outp=s_output.stdout):
         for line in lines:
             outp.printf(line, addnl=False)
 
-if __name__ == '__main__':
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
     s_common.setlogging(logger)
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
+if __name__ == '__main__':
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

{synapse-2.210.0 → synapse-2.211.0/synapse.egg-info}/PKG-INFO

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