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

synapse/lib/stormlib/aha.py

@@ -1,43 +1,169 @@
-import synapse.common as s_common
+import synapse.exc as s_exc
 import synapse.lib.stormtypes as s_stormtypes
 
+@s_stormtypes.registry.registerLib
+class AhaLib(s_stormtypes.Lib):
+    '''
+    A Storm Library for interacting with AHA.
+    '''
+
+    _storm_locals = (
+        {'name': 'del', 'desc': '''Delete a service from AHA.
+
+        Examples:
+            Deleting a service with its relative name::
+
+                $lib.aha.del(00.mysvc...)
+
+            Deleting a service with its full name::
+
+                $lib.aha.del(00.mysvc.loop.vertex.link)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methAhaDel',
+                  'args': (
+                      {'name': 'svcname', 'type': 'str',
+                       'desc': 'The name of the service to delete. It is easiest to use the relative name of a service, ending with "...".', },
+                  ),
+                  'returns': {'type': 'null'}}},
+        {'name': 'get', 'desc': '''Get information about an AHA service.
+
+        Examples:
+            Getting service information with a relative name::
+
+                $lib.aha.get(00.cortex...)
+
+            Getting service information with its full name::
+
+                $lib.aha.get(00.cortex.loop.vertex.link)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methAhaGet',
+                  'args': (
+                      {'name': 'svcname', 'type': 'str',
+                       'desc': 'The name of the AHA service to look up. It is easiest to use the relative name of a service, ending with "...".', },
+                      {'name': 'filters', 'type': 'dict', 'default': None,
+                       'desc': 'An optional dictionary of filters to use when resolving the AHA service.'}
+                  ),
+                  'returns': {'type': ('null', 'dict'),
+                              'desc': 'The AHA service information dictionary, or $lib.null.', }}},
+        {'name': 'list', 'desc': 'Enumerate all of the AHA services.',
+         'type': {'type': 'function', '_funcname': '_methAhaList', 'args': (),
+                  'returns': {'name': 'Yields', 'type': 'list',
+                              'desc': 'The AHA service dictionaries.', }}},
+    )
+    _storm_lib_path = ('aha',)
+    def getObjLocals(self):
+        return {
+            'del': self._methAhaDel,
+            'get': self._methAhaGet,
+            'list': self._methAhaList,
+        }
+
+    @s_stormtypes.stormfunc(readonly=True)
+    async def _methAhaList(self):
+        self.runt.reqAdmin()
+        proxy = await self.runt.snap.core.reqAhaProxy()
+        async for info in proxy.getAhaSvcs():
+            yield info
+
+    async def _methAhaDel(self, svcname):
+        self.runt.reqAdmin()
+        svcname = await s_stormtypes.tostr(svcname)
+        proxy = await self.runt.snap.core.reqAhaProxy()
+        svc = await proxy.getAhaSvc(svcname)
+        if svc is None:
+            raise s_exc.NoSuchName(mesg=f'No AHA service for {svcname=}')
+        if svc.get('services'):  # It is an AHA Pool!
+            mesg = f'Cannot use $lib.aha.del() to remove an AHA Pool. Use $lib.aha.pool.del(); {svcname=}'
+            raise s_exc.BadArg(mesg=mesg)
+        return await proxy.delAhaSvc(svc.get('svcname'), network=svc.get('svcnetw'))
+
+    @s_stormtypes.stormfunc(readonly=True)
+    async def _methAhaGet(self, svcname, filters=None):
+        self.runt.reqAdmin()
+        svcname = await s_stormtypes.tostr(svcname)
+        filters = await s_stormtypes.toprim(filters)
+        proxy = await self.runt.snap.core.reqAhaProxy()
+        return await proxy.getAhaSvc(svcname, filters=filters)
+
 @s_stormtypes.registry.registerLib
 class AhaPoolLib(s_stormtypes.Lib):
     '''
     A Storm Library for interacting with AHA service pools.
     '''
+
+    _storm_locals = (
+        {'name': 'add', 'desc': '''Add a new AHA service pool.
+
+        Examples:
+            Add a pool via its relative name::
+
+                $lib.aha.pool.add(pool00.cortex...)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methPoolAdd',
+                  'args': (
+                      {'name': 'name', 'type': 'str',
+                       'desc': 'The name of the pool to add. It is easiest to use the relative name of a pool, ending with "...".', },
+                  ),
+                  'returns': {'type': 'aha:pool'}}},
+        {'name': 'del', 'desc': '''Delete an existing AHA service pool.
+
+        Examples:
+            Delete a pool via its relative name::
+
+                $lib.aha.pool.del(pool00.cortex...)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methPoolDel',
+                  'args': (
+                      {'name': 'name', 'type': 'str',
+                       'desc': 'The name of the pool to delete. It is easiest to use the relative name of a pool, ending with "...".', },
+                  ),
+                  'returns': {'type': 'dict', 'desc': 'The AHA pool definition that was deleted.'}}},
+        {'name': 'get', 'desc': 'Get an existing AHA service pool.',
+         'type': {'type': 'function', '_funcname': '_methPoolGet',
+                  'args': (
+                      {'name': 'name', 'type': 'str',
+                       'desc': 'The name of the pool to get. It is easiest to use the relative name of a pool, ending with "...".', },
+                  ),
+                  'returns': {'type': ['null', 'aha:pool'], 'desc': 'The pool if it exists, or $lib.null.'}}},
+        {'name': 'list', 'desc': 'Enumerate all of the AHA service pools.',
+         'type': {'type': 'function', '_funcname': '_methPoolList',
+                  'returns': {'name': 'yields', 'type': 'aha:pool'}}},
+    )
     _storm_lib_path = ('aha', 'pool')
 
     def getObjLocals(self):
         return {
-            'add': self.add,
-            'del': self._del,
-            'get': self.get,
-            'list': self.list,
+            'add': self._methPoolAdd,
+            'del': self._methPoolDel,
+            'get': self._methPoolGet,
+            'list': self._methPoolList,
         }
 
-    async def add(self, name):
+    async def _methPoolAdd(self, name):
         self.runt.reqAdmin()
+        name = await s_stormtypes.tostr(name)
         proxy = await self.runt.snap.core.reqAhaProxy()
         poolinfo = {'creator': self.runt.user.iden}
         poolinfo = await proxy.addAhaPool(name, poolinfo)
         return AhaPool(self.runt, poolinfo)
 
-    async def _del(self, name):
+    async def _methPoolDel(self, name):
         self.runt.reqAdmin()
+        name = await s_stormtypes.tostr(name)
         proxy = await self.runt.snap.core.reqAhaProxy()
         return await proxy.delAhaPool(name)
 
-    async def get(self, name):
+    @s_stormtypes.stormfunc(readonly=True)
+    async def _methPoolGet(self, name):
         self.runt.reqAdmin()
+        name = await s_stormtypes.tostr(name)
         proxy = await self.runt.snap.core.reqAhaProxy()
         poolinfo = await proxy.getAhaPool(name)
         if poolinfo is not None:
             return AhaPool(self.runt, poolinfo)
 
     @s_stormtypes.stormfunc(readonly=True)
-    async def list(self):
-
+    async def _methPoolList(self):
         self.runt.reqAdmin()
         proxy = await self.runt.snap.core.reqAhaProxy()
 
@@ -49,6 +175,36 @@ class AhaPool(s_stormtypes.StormType):
     '''
     Implements the Storm API for an AHA pool.
     '''
+    _storm_locals = (
+        {'name': 'add', 'desc': '''Add a service to the AHA pool
+
+        Examples:
+            Add a service to a pool with its relative name::
+
+                $pool = $lib.aha.pool.get(pool00.cortex...)
+                $pool.add(00.cortex...)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methPoolSvcAdd',
+                  'args': (
+                      {'name': 'svcname', 'type': 'str',
+                       'desc': 'The name of the AHA service to add. It is easiest to use the relative name of a service, ending with "...".', },
+                  ),
+                  'returns': {'type': 'null', }}},
+        {'name': 'add', 'desc': '''Remove a service from the AHA pool.
+
+        Examples:
+            Remove a service from a pool with its relative name::
+
+                $pool = $lib.aha.pool.get(pool00.cortex...)
+                $pool.del(00.cortex...)
+        ''',
+         'type': {'type': 'function', '_funcname': '_methPoolSvcDel',
+                  'args': (
+                      {'name': 'svcname', 'type': 'str',
+                       'desc': 'The name of the AHA service to remove. It is easiest to use the relative name of a service, ending with "...".', },
+                  ),
+                  'returns': {'type': 'null', }}},
+    )
     _storm_typename = 'aha:pool'
 
     def __init__(self, runt, poolinfo):
@@ -57,8 +213,8 @@ class AhaPool(s_stormtypes.StormType):
         self.poolinfo = poolinfo
 
         self.locls.update({
-            'add': self.add,
-            'del': self._del,
+            'add': self._methPoolSvcAdd,
+            'del': self._methPoolSvcDel,
         })
 
     async def stormrepr(self):
@@ -67,7 +223,7 @@ class AhaPool(s_stormtypes.StormType):
     async def _derefGet(self, name):
         return self.poolinfo.get(name)
 
-    async def add(self, svcname):
+    async def _methPoolSvcAdd(self, svcname):
         self.runt.reqAdmin()
         svcname = await s_stormtypes.tostr(svcname)
 
@@ -80,7 +236,7 @@ class AhaPool(s_stormtypes.StormType):
 
         self.poolinfo.update(poolinfo)
 
-    async def _del(self, svcname):
+    async def _methPoolSvcDel(self, svcname):
         self.runt.reqAdmin()
         svcname = await s_stormtypes.tostr(svcname)
 
@@ -146,7 +302,7 @@ stormcmds = (
         ),
         'storm': '''
             $pool = $lib.aha.pool.get($cmdopts.poolname)
-            if (not $pool) { $lib.exit(`No AHA serivce pool named: {$cmdopts.poolname}`) }
+            if (not $pool) { $lib.exit(`No AHA service pool named: {$cmdopts.poolname}`) }
 
             $pool.add($cmdopts.svcname)
             $lib.print(`AHA service ({$cmdopts.svcname}) added to service pool ({$pool.name})`)
@@ -161,10 +317,204 @@ stormcmds = (
         ),
         'storm': '''
             $pool = $lib.aha.pool.get($cmdopts.poolname)
-            if (not $pool) { $lib.exit(`No AHA serivce pool named: {$cmdopts.poolname}`) }
+            if (not $pool) { $lib.exit(`No AHA service pool named: {$cmdopts.poolname}`) }
 
             $pool.del($cmdopts.svcname)
             $lib.print(`AHA service ({$cmdopts.svcname}) removed from service pool ({$pool.name})`)
         ''',
     },
+    {
+        'name': 'aha.svc.stat',
+        'descr': '''Show all information for a specific AHA service.
+
+If the --nexus argument is given, the Cortex will attempt to connect the service and report the Nexus offset of the service.
+
+The ready value indicates that a service has entered into the realtime change window for synchronizing changes from its leader.
+        ''',
+        'cmdargs': (
+            ('svc', {'help': 'The service to inspect.'}),
+            ('--nexus', {'help': 'Try to connect to online services and report their nexus offset.',
+                         'default': False, 'action': 'store_true'}),
+        ),
+        'storm': '''
+        function _getNexus(svcname) {
+            $_url = `aha://{$svcname}/`
+            try {
+                $_prox = $lib.telepath.open($_url)
+                $_info = $_prox.getCellInfo()
+                return ( $_info.cell.nexsindx )
+            } catch * as _err {
+                $_emsg = $_err.mesg
+                if ($_emsg = null ) {
+                    $_emsg = `{$_err}`
+                }
+                return ( $_emsg )
+            }
+        }
+
+        $svc = $lib.aha.get($cmdopts.svc)
+        if ($svc = null) {
+            $lib.print(`No service found for: "{$cmdopts.svc}"`)
+        } else {
+            $services = $svc.services
+            if $services {
+                $lib.print(`Resolved {$cmdopts.svc} to an AHA Pool.\n`)
+                $lib.print(`The pool currently has {$lib.len($services)} members.`)
+
+                $lib.print(`AHA Pool:   {$svc.name}`)
+                for ($_svcname, $_svcinfo) in $services {
+                    $lib.print(`Member:     {$_svcname}`)
+                }
+            } else {
+                $lib.print(`Resolved {$cmdopts.svc} to an AHA Service.\n`)
+                $svcinfo = $svc.svcinfo
+                $leader = $svcinfo.leader
+                if ($leader = null) {
+                    $leader = 'Service did not register itself with a leader name.'
+                }
+                $online = false
+                if $svcinfo.online {
+                    $online = true
+                }
+                $ready = 'null'
+                if $lib.dict.has($svcinfo, ready) {
+                    $ready = `{$svcinfo.ready}`
+                }
+                $lib.print(`Name:       {$svc.name}`)
+                $lib.print(`Online:     {$online}`)
+                $lib.print(`Ready:      {$ready}`)
+                $lib.print(`Run iden:   {$svcinfo.run}`)
+                $lib.print(`Cell iden:  {$svcinfo.iden}`)
+                $lib.print(`Leader:     {$leader}`)
+
+                if $cmdopts.nexus {
+                    if $svcinfo.online {
+                        $nexusOffset = $_getNexus($svc.name)
+                    } else {
+                        $nexusOffset = 'Service is not online. Will not attempt to retrieve its nexus offset.'
+                    }
+                    $lib.print(`Nexus:      {$nexusOffset}`)
+                }
+
+                $lib.print('Connection information:')
+                $urlinfo = $svcinfo.urlinfo
+                $keys = $lib.dict.keys($urlinfo)
+                $keys.sort()
+                for $k in $keys {
+                    $dk = `{$k}:`
+                    $dk = $dk.ljust(12)
+                    $lib.print(`    {$dk}{$urlinfo.$k}`)
+                }
+            }
+        }
+        '''
+    },
+    {
+        'name': 'aha.svc.list',
+        'descr': '''List AHA services.
+
+If the --nexus argument is given, the Cortex will attempt to connect to each service and report the Nexus offset of the service.
+
+The ready column indicates that a service has entered into the realtime change window for synchronizing changes from its leader.''',
+        'cmdargs': (
+            ('--nexus', {'help': 'Try to connect to online services and report their nexus offset.',
+                         'default': False, 'action': 'store_true'}),
+        ),
+        'storm': '''
+        function _getNexus(svcname) {
+            $_url = `aha://{$svcname}/`
+            try {
+                $_prox = $lib.telepath.open($_url)
+                $_info = $_prox.getCellInfo()
+                return ( $_info.cell.nexsindx )
+            } catch * as _err {
+                $_emsg = $_err.mesg
+                if ($_emsg = null ) {
+                    $_emsg = `{$_err}`
+                }
+                return ( $_emsg )
+            }
+        }
+
+        $svcs = ()
+        for $svc in $lib.aha.list() {
+            $svcs.append($svc)
+        }
+
+        if ($lib.len($svcs) = 0) {
+            $lib.print('No AHA services registered.')
+        }
+        else {
+            $columns = 'Name                                          Leader Online Ready Host            Port '
+            if $cmdopts.nexus {
+                $columns = `{$columns} Nexus`
+            }
+
+            $leaders = $lib.set()
+            for $info in $svcs {
+                $svcinfo = $info.svcinfo
+                if $svcinfo {
+                    if ($info.svcname = $svcinfo.leader) {
+                        $leaders.add($svcinfo.run)
+                    }
+                }
+            }
+
+            $lib.print($columns)
+
+            for $info in $svcs {
+                $name = $info.name
+                $nexusOffset = (null)
+                $svcinfo = $info.svcinfo
+
+                if $cmdopts.nexus {
+                    if $svcinfo.online {
+                        $nexusOffset = $_getNexus($name)
+                    } else {
+                        $nexusOffset = 'Service is not online. Will not attempt to retrieve its nexus offset.'
+                    }
+                }
+                $name=$name.ljust(45)
+
+                $online = false
+                if $svcinfo.online {
+                    $online = true
+                }
+                $online = $online.ljust(6)
+
+                $urlinfo = $svcinfo.urlinfo
+
+                $host = $urlinfo.host
+                $host = $host.ljust(15)
+
+                $port = $lib.cast(str, $urlinfo.port)  // Cast to str
+                $port = $port.ljust(5)
+
+                $ready = 'null'
+                if $lib.dict.has($svcinfo, ready) {
+                    $ready = `{$svcinfo.ready}`
+                }
+                $ready = $ready.ljust(5)
+
+                $leader = null
+                if ( $svcinfo.leader != null ) {
+                    if $leaders.has($svcinfo.run) {
+                        $leader = true
+                    } else {
+                        $leader = false
+                    }
+                }
+                $leader = $leader.ljust(6)
+
+                if $info {
+                    $s = `{$name} {$leader} {$online} {$ready} {$host} {$port}`
+                    if ($nexusOffset != null) {
+                        $s = `{$s} {$nexusOffset}`
+                    }
+                    $lib.print($s)
+                }
+            }
+        }
+        '''
+    }
 )

synapse/lib/stormlib/macro.py

@@ -34,7 +34,7 @@ stormcmds = [
         'name': 'macro.del',
         'descr': macro_del_descr,
         'cmdargs': (
-            ('name', {'help': 'The name of the macro to delete.'}),
+            ('name', {'type': 'str', 'help': 'The name of the macro to delete.'}),
         ),
         'storm': '''
             $lib.macro.del($cmdopts.name)
@@ -45,7 +45,7 @@ stormcmds = [
         'name': 'macro.set',
         'descr': macro_set_descr,
         'cmdargs': (
-            ('name', {'help': 'The name of the macro to set.'}),
+            ('name', {'type': 'str', 'help': 'The name of the macro to set.'}),
             ('storm', {'help': 'The storm command string or embedded query to set.'}),
         ),
         'storm': '''
@@ -57,7 +57,7 @@ stormcmds = [
         'name': 'macro.get',
         'descr': macro_get_descr,
         'cmdargs': (
-            ('name', {'help': 'The name of the macro to display.'}),
+            ('name', {'type': 'str', 'help': 'The name of the macro to display.'}),
         ),
         'storm': '''
             $mdef = $lib.macro.get($cmdopts.name)
@@ -74,8 +74,14 @@ stormcmds = [
         'storm': '''
             $count = $(0)
             for ($name, $mdef) in $lib.macro.list() {
-                $user = $lib.auth.users.get($mdef.user)
-                $lib.print('{name} (owner: {user})', name=$name.ljust(20), user=$user.name)
+                $user = $lib.auth.users.get($mdef.creator)
+                $username = $lib.null
+                if (not $user) {
+                    $username = `User not found ({$mdef.creator})`
+                } else {
+                    $username = $user.name
+                }
+                $lib.print('{name} (owner: {user})', name=$name.ljust(20), user=$username)
                 $count = $($count + 1)
             }
             $lib.print('{count} macros found', count=$count)
@@ -185,27 +191,17 @@ class LibMacro(s_stormtypes.Lib):
     async def _funcMacroGet(self, name):
         name = await s_stormtypes.tostr(name)
 
-        if len(name) > 491:
-            raise s_exc.BadArg(mesg='Macro names may only be up to 491 chars.')
-
         return self.runt.snap.core.getStormMacro(name, user=self.runt.user)
 
     async def _funcMacroDel(self, name):
-
         name = await s_stormtypes.tostr(name)
 
-        if len(name) > 491:
-            raise s_exc.BadArg(mesg='Macro names may only be up to 491 chars.')
-
         return await self.runt.snap.core.delStormMacro(name, user=self.runt.user)
 
     async def _funcMacroSet(self, name, storm):
         name = await s_stormtypes.tostr(name)
         storm = await s_stormtypes.tostr(storm)
 
-        if len(name) > 491:
-            raise s_exc.BadArg(mesg='Macro names may only be up to 491 chars.')
-
         await self.runt.getStormQuery(storm)
 
         if self.runt.snap.core.getStormMacro(name) is None:
@@ -220,9 +216,6 @@ class LibMacro(s_stormtypes.Lib):
         name = await s_stormtypes.tostr(name)
         info = await s_stormtypes.toprim(info)
 
-        if len(name) > 491:
-            raise s_exc.BadArg(mesg='Macro names may only be up to 491 chars.')
-
         if not isinstance(info, dict):
             raise s_exc.BadArg(mesg='Macro info must be a dictionary object.')
 

synapse/lib/stormlib/stix.py

@@ -585,7 +585,7 @@ def validateStix(bundle, version='2.1'):
         'result': {},
     }
     bundle = json.loads(json.dumps(bundle))
-    opts = stix2validator.ValidationOptions(strict=True, version=version, no_cache=True)
+    opts = stix2validator.ValidationOptions(strict=True, version=version)
     try:
         results = stix2validator.validate_parsed_json(bundle, options=opts)
     except stix2validator.ValidationError as e:

synapse/lib/stormtypes.py

@@ -3936,7 +3936,13 @@ class LibTelepath(Lib):
         scheme = url.split('://')[0]
         if not self.runt.allowed(('lib', 'telepath', 'open', scheme)):
             self.runt.confirm(('storm', 'lib', 'telepath', 'open', scheme))
-        return Proxy(self.runt, await self.runt.getTeleProxy(url))
+        try:
+            return Proxy(self.runt, await self.runt.getTeleProxy(url))
+        except s_exc.SynErr:
+            raise
+        except Exception as e:
+            mesg = f'Failed to connect to Telepath service: "{s_urlhelp.sanitizeUrl(url)}" error: {str(e)}'
+            raise s_exc.StormRuntimeError(mesg=mesg) from e
 
 @registry.registerType
 class Proxy(StormType):
@@ -7382,7 +7388,11 @@ class View(Prim):
                     The parent View iden.
 
                 nomerge (bool)
-                    Setting to $lib.true will prevent the layer from being merged.
+                    Deprecated - use protected. Updates to this option will be redirected to
+                    the protected option (below) until this option is removed.
+
+                protected (bool)
+                    Setting to $lib.true will prevent the layer from being merged or deleted.
 
                 layers (list(str))
                     Set the list of layer idens for a non-forked view. Layers are specified
@@ -7781,6 +7791,8 @@ class View(Prim):
 
     @stormfunc(readonly=True)
     async def _methViewGet(self, name, defv=None):
+        if name == 'nomerge':
+            name = 'protected'
         return self.valu.get(name, defv)
 
     def _reqView(self):
@@ -7807,6 +7819,10 @@ class View(Prim):
             valu = await toprim(valu)
 
         elif name == 'nomerge':
+            name = 'protected'
+            valu = await tobool(valu)
+
+        elif name == 'protected':
             valu = await tobool(valu)
 
         elif name == 'layers':

synapse/lib/types.py

@@ -1447,6 +1447,8 @@ class Edge(Type):
 
     def postTypeInit(self):
 
+        self.deprecated = True
+
         self.fieldoffs = {'n1': 0, 'n2': 1}
 
         self.ndeftype = self.modl.types.get('ndef')  # type: Ndef

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

synapse/lib/view.py

@@ -1098,7 +1098,8 @@ class View(s_nexus.Pusher):  # type: ignore
         '''
         Set a mutable view property.
         '''
-        if name not in ('name', 'desc', 'parent', 'nomerge', 'quorum'):
+        if name not in ('name', 'desc', 'parent', 'nomerge', 'protected', 'quorum'):
+            # TODO: Remove nomerge after Synapse 3.x.x
             mesg = f'{name} is not a valid view info key'
             raise s_exc.BadOptValu(mesg=mesg)
 
@@ -1346,8 +1347,8 @@ class View(s_nexus.Pusher):  # type: ignore
         if self.parent is None:
             raise s_exc.CantMergeView(mesg=f'Cannot merge view ({self.iden}) that has not been forked.')
 
-        if self.info.get('nomerge'):
-            raise s_exc.CantMergeView(mesg=f'Cannot merge view ({self.iden}) that has nomerge set.')
+        if self.info.get('protected'):
+            raise s_exc.CantMergeView(mesg=f'Cannot merge view ({self.iden}) that has protected set.')
 
         if self.parent.info.get('quorum') is not None:
             raise s_exc.CantMergeView(mesg=f'Cannot merge view({self.iden}). Parent view requires quorum voting.')

synapse/models/base.py

@@ -63,28 +63,36 @@ class BaseModule(s_module.CoreModule):
                     'doc': 'A generic rule linked to matches with -(matches)> edges.'}),
 
                 ('graph:cluster', ('guid', {}), {
+                    'deprecated': True,
                     'doc': 'A generic node, used in conjunction with Edge types, to cluster arbitrary nodes to a '
                            'single node in the model.'}),
 
                 ('graph:node', ('guid', {}), {
+                    'deprecated': True,
                     'doc': 'A generic node used to represent objects outside the model.'}),
 
                 ('graph:event', ('guid', {}), {
+                    'deprecated': True,
                     'doc': 'A generic event node to represent events outside the model.'}),
 
                 ('edge:refs', ('edge', {}), {
+                    'deprecated': True,
                     'doc': 'A digraph edge which records that N1 refers to or contains N2.'}),
 
                 ('edge:has', ('edge', {}), {
+                    'deprecated': True,
                     'doc': 'A digraph edge which records that N1 has N2.'}),
 
                 ('edge:wentto', ('timeedge', {}), {
+                    'deprecated': True,
                     'doc': 'A digraph edge which records that N1 went to N2 at a specific time.'}),
 
                 ('graph:edge', ('edge', {}), {
+                    'deprecated': True,
                     'doc': 'A generic digraph edge to show relationships outside the model.'}),
 
                 ('graph:timeedge', ('timeedge', {}), {
+                    'deprecated': True,
                     'doc': 'A generic digraph time edge to show relationships outside the model.'}),
 
                 ('meta:priority', ('int', {'enums': prioenums, 'enums:strict': False}), {