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

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,11 +12,13 @@ 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
 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__)
 
@@ -121,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:
 
@@ -264,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)
@@ -282,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
@@ -298,5 +306,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/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/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.211.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.209.0
+Version: 2.211.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"