synapse 2.215.0__py311-none-any.whl → 2.217.0__py311-none-any.whl

synapse/tools/genpkg.py

@@ -1,10 +1,7 @@
 import io
 import os
-import sys
 import base64
-import asyncio
 import logging
-import argparse
 
 import regex
 
@@ -12,7 +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.cmd as s_cmd
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
@@ -238,12 +235,11 @@ def loadPkgProto(path, opticdir=None, no_docs=False, readonly=False):
     return pkgdef
 
 
-prog = 'synapse.tools.genpkg'
 desc = 'A tool for generating/pushing storm packages from YAML prototypes.'
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser()
+    pars = s_cmd.Parser(prog='synapse.tools.genpkg', outp=outp, description=desc)
     pars.add_argument('--push', metavar='<url>', help='A telepath URL of a Cortex or PkgRepo.')
     pars.add_argument('--push-verify', default=False, action='store_true',
                       help='Tell the Cortex to verify the package signature.')
@@ -306,10 +302,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/guid.py

@@ -1,12 +1,10 @@
+import sys
+
 import synapse.common as s_common
 import synapse.lib.output as s_output
 
-def main(argv, outp=None):
-    if outp is None:  # pragma: no cover
-        outp = s_output.OutPut()
-
+def main(argv, outp=s_output.stdout):
     outp.printf(s_common.guid())
 
 if __name__ == '__main__':  # pragma: no cover
-    import sys
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))

synapse/tools/healthcheck.py

@@ -1,4 +1,3 @@
-import sys
 import socket
 import asyncio
 
@@ -7,7 +6,6 @@ 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
@@ -30,7 +28,7 @@ def format_component(e, mesg: str) -> dict:
     return d
 
 async def main(argv, outp=s_output.stdout):
-    pars = makeargparser()
+    pars = getArgParser(outp)
     try:
         opts = pars.parse_args(argv)
     except s_exc.ParserExit as e:  # pragma: no cover
@@ -96,21 +94,16 @@ async def main(argv, outp=s_output.stdout):
     outp.printf(serialize(ret))
     return retval
 
-def makeargparser():
+def getArgParser(outp):
     desc = '''
     synapse healthcheck tool
     '''
-    pars = s_cmd.Parser('healthcheck', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.healthcheck', outp=outp, description=desc)
     pars.add_argument('--cell', '-c', required=True, type=str,
                       help='Telepath path to the cell to check.')
     pars.add_argument('--timeout', '-t', default=10, type=float,
                       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:])))
+    s_cmd.exitmain(main)

synapse/tools/json2mpk.py

@@ -12,11 +12,7 @@ def getArgParser():
     pars.add_argument('paths', nargs='+', help='json files or directories full of json files')
     return pars
 
-def main(argv, outp=None):
-
-    if outp is None:  # pragma: no cover
-        outp = s_output.OutPut()
-
+def main(argv, outp=s_output.stdout):
     pars = getArgParser()
     opts = pars.parse_args(argv)
 

synapse/tools/livebackup.py

@@ -1,10 +1,6 @@
-import sys
-import asyncio
-import argparse
-
 import synapse.telepath as s_telepath
 
-import synapse.lib.coro as s_coro
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 
 descr = '''
@@ -19,8 +15,7 @@ Examples:
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.livebackup', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.livebackup', outp=outp, description=descr)
 
     pars.add_argument('--url', default='cell:///vertex/storage', help='The telepath URL of the Synapse service.')
     pars.add_argument('--name', default=None, help='Specify a name for the backup.  Defaults to an automatically generated timestamp.')
@@ -35,10 +30,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/modrole.py

@@ -1,11 +1,7 @@
-import sys
-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.cmd as s_cmd
 import synapse.lib.output as s_output
 
 descr = '''
@@ -30,7 +26,7 @@ def printrole(role, outp):
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='modrole', description=descr)
+    pars = s_cmd.Parser(prog='synapse.tools.modrole', outp=outp, description=descr)
     pars.add_argument('--svcurl', default='cell:///vertex/storage', help='The telepath URL of the Synapse service.')
     pars.add_argument('--add', default=False, action='store_true', help='Add the role if they do not already exist.')
     pars.add_argument('--del', dest='delete', default=False, action='store_true', help='Delete the role if it exists.')
@@ -116,10 +112,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/moduser.py

@@ -1,11 +1,7 @@
-import sys
-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.cmd as s_cmd
 import synapse.lib.output as s_output
 
 descr = '''
@@ -41,7 +37,7 @@ def printuser(user, outp):
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='moduser', description=descr)
+    pars = s_cmd.Parser(prog='synapse.tools.moduser', outp=outp, description=descr)
     pars.add_argument('--svcurl', default='cell:///vertex/storage', help='The telepath URL of the Synapse service.')
     pars.add_argument('--add', default=False, action='store_true', help='Add the user if they do not already exist.')
     pars.add_argument('--del', dest='delete', default=False, action='store_true', help='Delete the user if they exist.')
@@ -187,10 +183,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/pkgs/gendocs.py

@@ -28,7 +28,7 @@ def hasPandoc():
         return True
     return False
 
-async def buildPkgDocs(outp: s_output.OutPut, pkgpath: str, rst_only: bool =False):
+async def buildPkgDocs(outp, pkgpath: str, rst_only: bool =False):
 
     logger.info(f'Building pkg for {pkgpath}')
     pkgdef = s_common.yamlload(pkgpath)

synapse/tools/promote.py

@@ -1,12 +1,8 @@
-import sys
-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.cmd as s_cmd
 import synapse.lib.output as s_output
 import synapse.lib.urlhelp as s_urlhelp
 
@@ -19,8 +15,7 @@ Example (being run from a Cortex mirror docker container):
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.promote', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.promote', outp=outp, description=descr)
 
     pars.add_argument('--svcurl', default='cell:///vertex/storage',
                       help='The telepath URL of the Synapse service.')
@@ -49,10 +44,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/pullfile.py

@@ -1,23 +1,16 @@
-import sys
-import asyncio
 import pathlib
-import argparse
 
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
-import synapse.lib.coro as s_coro
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 
 
-async def main(argv, outp=None):
-
-    pars = setup()
+async def main(argv, outp=s_output.stdout):
+    pars = getArgParser(outp)
     opts = pars.parse_args(argv)
 
-    if outp is None:  # pragma: no cover
-        outp = s_output.OutPut()
-
     if opts.output is None:
         opts.output = '.'
 
@@ -55,9 +48,9 @@ async def main(argv, outp=None):
     return 0
 
 
-def setup():
+def getArgParser(outp):
     desc = 'Fetches file from the given axon'
-    pars = argparse.ArgumentParser('synapse.tools.pullfile', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.pullfile', outp=outp, description=desc)
     pars.add_argument('-a', '--axon', type=str, dest='axon', required=True,
                       help='URL to the axon blob store')
     pars.add_argument('-o', '--output', type=str, dest='output',
@@ -67,10 +60,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/pushfile.py

@@ -1,27 +1,20 @@
 import os
-import sys
 import glob
-import asyncio
 import logging
-import argparse
 
 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.cmd as s_cmd
 import synapse.lib.output as s_output
 import synapse.lib.hashset as s_hashset
 
 logger = logging.getLogger(__name__)
 
 
-async def main(argv, outp=None):
-
-    if outp is None:  # pragma: no cover
-        outp = s_output.OutPut()
-
-    pars = makeargparser()
+async def main(argv, outp=s_output.stdout):
+    pars = getArgParser(outp)
     opts = pars.parse_args(argv)
 
     async with s_telepath.withTeleEnv():
@@ -111,10 +104,10 @@ async def main(argv, outp=None):
 
     return 0
 
-def makeargparser():
+def getArgParser(outp):
     desc = 'Command line tool for uploading files to an Axon and making ' \
            'file:bytes in a Cortex.'
-    pars = argparse.ArgumentParser('synapse.tools.pushfile', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.pushfile', outp=outp, description=desc)
     pars.add_argument('-a', '--axon', required=True, type=str, dest='axon',
                    help='URL for a target Axon to store files at.')
     pars.add_argument('-c', '--cortex', default=None, type=str, dest='cortex',
@@ -125,10 +118,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/reload.py

@@ -1,10 +1,6 @@
-import sys
-import asyncio
-import argparse
-
 import synapse.telepath as s_telepath
 
-import synapse.lib.coro as s_coro
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 import synapse.lib.urlhelp as s_urlhelp
 
@@ -14,7 +10,7 @@ List or execute reload subsystems on a Synapse service.
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = getArgParser()
+    pars = getArgParser(outp)
     opts = pars.parse_args(argv)
 
     async with s_telepath.withTeleEnv():
@@ -55,8 +51,8 @@ async def main(argv, outp=s_output.stdout):
                         outp.printf(f'{name.ljust(40)}{result.ljust(10)}{mesg}')
     return 0
 
-def getArgParser():
-    pars = argparse.ArgumentParser(prog='reload', description=descr)
+def getArgParser(outp):
+    pars = s_cmd.Parser(prog='synapse.tools.reload', outp=outp, description=descr)
     pars.add_argument('--svcurl', default='cell:///vertex/storage', help='The telepath URL of the Synapse service.')
 
     subpars = pars.add_subparsers(required=True,
@@ -68,10 +64,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/rstorm.py

@@ -1,11 +1,8 @@
-import sys
-import asyncio
 import logging
-import argparse
 
 import synapse.common as s_common
 
-import synapse.lib.coro as s_coro
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 import synapse.lib.rstorm as s_rstorm
 
@@ -16,7 +13,7 @@ descr = 'An RST pre-processor that allows you to embed storm directives.'
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog=prog, description=descr)
+    pars = s_cmd.Parser(prog=prog, outp=outp, description=descr)
     pars.add_argument('rstfile', help='Input RST file with storm directives.')
     pars.add_argument('--save', help='Output file to save (default: stdout)')
 
@@ -33,11 +30,6 @@ async def main(argv, outp=s_output.stdout):
         for line in lines:
             outp.printf(line, addnl=False)
 
-async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+if __name__ == '__main__':  # pragma: no cover
     s_common.setlogging(logger)
-    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:])))
+    s_cmd.exitmain(main)

synapse/tools/shutdown.py

@@ -1,5 +1,4 @@
 import synapse.exc as s_exc
-import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
@@ -22,7 +21,7 @@ NOTE: This will also demote the service if run on a leader with mirrors.
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = s_cmd.Parser('synapse.tools.shutdown', outp=outp, description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.shutdown', outp=outp, description=desc)
 
     pars.add_argument('--url', default='cell:///vertex/storage',
                         help='The telepath URL to connect to the service.')

synapse/tools/snapshot.py

@@ -1,12 +1,8 @@
-import sys
-import asyncio
 import logging
-import argparse
-
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
-import synapse.lib.coro as s_coro
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 
 logger = logging.getLogger(__name__)
@@ -29,9 +25,7 @@ The tool will set the process exit code to 0 on success.
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser('synapse.tools.snapshot',
-                        description=desc,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.snapshot', outp=outp, description=desc)
 
     subs = pars.add_subparsers(required=True, title='commands', dest='cmd')
 
@@ -66,10 +60,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/storm.py

@@ -1,9 +1,7 @@
 import os
-import sys
 import copy
 import asyncio
 import logging
-import argparse
 
 import regex
 import prompt_toolkit
@@ -14,7 +12,6 @@ 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
@@ -613,8 +610,8 @@ class StormCli(s_cli.Cli):
 
         return ret
 
-def getArgParser():
-    pars = argparse.ArgumentParser(prog='synapse.tools.storm')
+def getArgParser(outp):
+    pars = s_cmd.Parser(prog='synapse.tools.storm', outp=outp)
     pars.add_argument('cortex', help='A telepath URL for the Cortex.')
     pars.add_argument('onecmd', nargs='?', help='A single storm command to run and exit.')
     pars.add_argument('--view', default=None, help='The view iden to work in.')
@@ -623,7 +620,7 @@ def getArgParser():
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = getArgParser()
+    pars = getArgParser(outp=outp)
     opts = pars.parse_args(argv)
 
     async with s_telepath.withTeleEnv():
@@ -649,10 +646,5 @@ 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:])))
+    s_cmd.exitmain(main)

{synapse-2.215.0.dist-info → synapse-2.217.0.dist-info}/METADATA

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