synapse 2.209.0__py311-none-any.whl → 2.210.0__py311-none-any.whl

synapse/tools/aha/list.py

@@ -1,12 +1,12 @@
 import sys
 import asyncio
 import logging
-import contextlib
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -14,76 +14,71 @@ logger = logging.getLogger(__name__)
 
 reqver = '>=2.11.0,<3.0.0'
 
-async def _main(argv, outp):
-
-    async with await s_telepath.openurl(argv[0]) as prox:
-        try:
-            s_version.reqVersion(prox._getSynVers(), reqver)
-        except s_exc.BadVersion as e:  # pragma: no cover
-            valu = s_version.fmtVersion(*e.get('valu'))
-            outp.printf(f'Proxy version {valu} is outside of the aha supported range ({reqver}).')
-            return 1
-        classes = prox._getClasses()
-        if 'synapse.lib.aha.AhaApi' not in classes:
-            outp.printf(f'Service at {argv[0]} is not an Aha server')
-            return 1
-
-        try:
-            network = argv[1]
-        except IndexError:
-            network = None
-
-        mesg = f"{'Service':<20s} {'network':<30s} {'leader':<6} {'online':<6} {'scheme':<6} {'host':<20} {'port':<5}  connection opts"
-        outp.printf(mesg)
-
-        svcs = []
-        ldrs = set()
-        async for svc in prox.getAhaSvcs(network):
-            svcinfo = svc.get('svcinfo')
-            if svcinfo and svc.get('svcname') == svcinfo.get('leader'):
-                ldrs.add(svcinfo.get('run'))
-            svcs.append(svc)
-
-        for svc in svcs:
-            svcname = svc.pop('svcname')
-            svcnetw = svc.pop('svcnetw')
-
-            svcinfo = svc.pop('svcinfo')
-            urlinfo = svcinfo.pop('urlinfo')
-            online = str(bool(svcinfo.pop('online', False)))
-            host = urlinfo.pop('host')
-            port = str(urlinfo.pop('port'))
-            scheme = urlinfo.pop('scheme')
-
-            leader = 'None'
-            if svcinfo.get('leader') is not None:
-                if svcinfo.get('run') in ldrs:
-                    leader = 'True'
-                else:
-                    leader = 'False'
-
-            mesg = f'{svcname:<20s} {svcnetw:<30s} {leader:<6} {online:<6} {scheme:<6} {host:<20} {port:<5}'
-            if svc:
-                mesg = f'{mesg}  {svc}'
-
-            outp.printf(mesg)
-        return 0
-
-async def main(argv, outp=None):  # pragma: no cover
-
-    if outp is None:
-        outp = s_output.stdout
+async def main(argv, outp=s_output.stdout):
 
     if len(argv) not in (1, 2):
         outp.printf('usage: python -m synapse.tools.aha.list <url> [network name]')
         return 1
 
-    s_common.setlogging(logger, 'WARNING')
-
     async with s_telepath.withTeleEnv():
-        await _main(argv, outp)
+        async with await s_telepath.openurl(argv[0]) as prox:
+            try:
+                s_version.reqVersion(prox._getSynVers(), reqver)
+            except s_exc.BadVersion as e:  # pragma: no cover
+                valu = s_version.fmtVersion(*e.get('valu'))
+                outp.printf(f'Proxy version {valu} is outside of the aha supported range ({reqver}).')
+                return 1
+            classes = prox._getClasses()
+            if 'synapse.lib.aha.AhaApi' not in classes:
+                outp.printf(f'Service at {argv[0]} is not an Aha server')
+                return 1
+
+            try:
+                network = argv[1]
+            except IndexError:
+                network = None
+
+            mesg = f"{'Service':<20s} {'network':<30s} {'leader':<6} {'online':<6} {'scheme':<6} {'host':<20} {'port':<5}  connection opts"
+            outp.printf(mesg)
 
-    return 0
+            svcs = []
+            ldrs = set()
+            async for svc in prox.getAhaSvcs(network):
+                svcinfo = svc.get('svcinfo')
+                if svcinfo and svc.get('svcname') == svcinfo.get('leader'):
+                    ldrs.add(svcinfo.get('run'))
+                svcs.append(svc)
+
+            for svc in svcs:
+                svcname = svc.pop('svcname')
+                svcnetw = svc.pop('svcnetw')
+
+                svcinfo = svc.pop('svcinfo')
+                urlinfo = svcinfo.pop('urlinfo')
+                online = str(bool(svcinfo.pop('online', False)))
+                host = urlinfo.pop('host')
+                port = str(urlinfo.pop('port'))
+                scheme = urlinfo.pop('scheme')
+
+                leader = 'None'
+                if svcinfo.get('leader') is not None:
+                    if svcinfo.get('run') in ldrs:
+                        leader = 'True'
+                    else:
+                        leader = 'False'
+
+                mesg = f'{svcname:<20s} {svcnetw:<30s} {leader:<6} {online:<6} {scheme:<6} {host:<20} {port:<5}'
+                if svc:
+                    mesg = f'{mesg}  {svc}'
+
+                outp.printf(mesg)
+            return 0
+
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    s_common.setlogging(logger, 'WARNING')
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/mirror.py

@@ -6,6 +6,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -191,5 +192,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/provision/service.py

@@ -6,6 +6,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -78,5 +79,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/provision/user.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -49,5 +50,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/apikey.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.time as s_time
 import synapse.lib.output as s_output
 
@@ -89,5 +90,11 @@ async def main(argv, outp=s_output.stdout):
 
     return 0
 
+
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/axon2axon.py

@@ -8,6 +8,7 @@ import synapse.telepath as s_telepath
 import synapse.exc as s_exc
 import synapse.lib.cmd as s_cmd
 import synapse.lib.base as s_base
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 logger = logging.getLogger(__name__)
@@ -42,5 +43,10 @@ async def main(argv, outp=s_output.stdout):
                     await fd.save()
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/cellauth.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import asyncio
 import logging
@@ -7,10 +6,10 @@ import traceback
 import synapse.exc as s_exc
 import synapse.common as s_common
 
-import synapse.glob as s_glob
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -338,9 +337,11 @@ def makeargparser():
     pars_mod.set_defaults(func=handleModify)
     return pars
 
-async def _main():  # pragma: no cover
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
     s_common.setlogging(logger, 'DEBUG')
-    return await main(sys.argv[1:])
+    ret = await main(argv, outprint=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
 
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(s_glob.sync(_main()))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/cmdr.py

@@ -9,6 +9,7 @@ import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.coro as s_coro
 import synapse.lib.version as s_version
 
 logger = logging.getLogger(__name__)
@@ -51,7 +52,7 @@ async def main(argv):  # pragma: no cover
 
     async with s_telepath.withTeleEnv():
         await _main(argv)
-
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
     return 0
 
 if __name__ == '__main__':  # pragma: no cover

synapse/tools/csvtool.py

@@ -9,8 +9,8 @@ import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
-import synapse.lib.base as s_base
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
@@ -235,5 +235,10 @@ def makeargparser(outp):
     pars.add_argument('csvfiles', nargs='+', help='CSV files to load.')
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(s_base.main(main(sys.argv[1:]))))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/feed.py

@@ -11,6 +11,7 @@ import synapse.cortex as s_cortex
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.msgpack as s_msgpack
@@ -149,6 +150,11 @@ def makeargparser():
 
     return pars
 
-if __name__ == '__main__':  # pragma: no cover
+async def _main(argv, outp=s_output.stdout):  # 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
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/genpkg.py

@@ -12,6 +12,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
@@ -298,5 +299,10 @@ async def main(argv, outp=s_output.stdout):
 
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/healthcheck.py

@@ -7,6 +7,7 @@ import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.health as s_health
@@ -106,5 +107,10 @@ def makeargparser():
                       help='Connection and call timeout')
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/livebackup.py

@@ -1,11 +1,10 @@
 import sys
-import yaml
 import asyncio
 import argparse
 
-import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -36,5 +35,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'...backup created: {name}')
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/modrole.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -115,5 +116,10 @@ async def main(argv, outp=s_output.stdout):
                     await cell.addRoleRule(roleiden, (False, perm), indx=0, gateiden=opts.gate)
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/moduser.py

@@ -1,11 +1,11 @@
 import sys
-import yaml
 import asyncio
 import argparse
 
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -187,5 +187,10 @@ async def main(argv, outp=s_output.stdout):
                     await cell.addUserRule(useriden, (False, perm), indx=0, gateiden=opts.gate)
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/promote.py

@@ -6,6 +6,7 @@ import synapse.exc as s_exc
 
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.urlhelp as s_urlhelp
 
@@ -27,8 +28,6 @@ async def main(argv, outp=s_output.stdout):
     pars.add_argument('--failure', default=False, action='store_true',
                       help='Promotion is due to leader being offline. Graceful handoff is not possible.')
 
-    # TODO pars.add_argument('--timeout', type=float, default=30.0, help='The maximum timeout to wait for the mirror to catch up.')
-
     opts = pars.parse_args(argv)
 
     async with s_telepath.withTeleEnv():
@@ -50,5 +49,10 @@ async def main(argv, outp=s_output.stdout):
 
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/pullfile.py

@@ -6,6 +6,7 @@ import argparse
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 
@@ -66,6 +67,10 @@ def setup():
 
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/pushfile.py

@@ -9,6 +9,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.hashset as s_hashset
 
@@ -124,5 +125,10 @@ def makeargparser():
     pars.add_argument('-t', '--tags', help='comma separated list of tags to add to the nodes')
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/reload.py

@@ -1,12 +1,10 @@
 import sys
-import yaml
 import asyncio
 import argparse
 
-import synapse.common as s_common
 import synapse.telepath as s_telepath
 
-
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.urlhelp as s_urlhelp
 
@@ -70,5 +68,10 @@ def getArgParser():
 
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/snapshot.py

@@ -6,6 +6,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 logger = logging.getLogger(__name__)
@@ -65,5 +66,10 @@ async def main(argv, outp=s_output.stdout):
         outp.printf(f'ERROR {e.__class__.__name__}: {mesg}')
         return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/storm.py

@@ -14,6 +14,7 @@ import synapse.telepath as s_telepath
 
 import synapse.lib.cli as s_cli
 import synapse.lib.cmd as s_cmd
+import synapse.lib.coro as s_coro
 import synapse.lib.node as s_node
 import synapse.lib.output as s_output
 import synapse.lib.parser as s_parser
@@ -648,5 +649,10 @@ async def main(argv, outp=s_output.stdout):
                     await cli.addSignalHandlers()
                     await cli.runCmdLoop()
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    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
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

{synapse-2.209.0.dist-info → synapse-2.210.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.209.0
+Version: 2.210.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0
@@ -49,7 +49,7 @@ Requires-Dist: idna<3.11,>=3.6
 Requires-Dist: python-dateutil<3.0,>=2.8
 Requires-Dist: pytz<2025.3,>=2023.3
 Requires-Dist: beautifulsoup4[html5lib]<5.0,>=4.11.1
-Requires-Dist: orjson<4.0,>=3.10.15
+Requires-Dist: vtx-yyjson<5.0.0,>=4.3.0
 Provides-Extra: dev
 Requires-Dist: pytest<8.0.0,>=7.2.0; extra == "dev"
 Requires-Dist: autopep8<3.0.0,>=2.0.4; extra == "dev"