synapse 2.214.0__py311-none-any.whl → 2.216.0__py311-none-any.whl

synapse/tools/aha/easycert.py

@@ -1,22 +1,15 @@
-import sys
-import asyncio
-import logging
-import argparse
-
 import cryptography.x509 as c_x509
 
 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.certdir as s_certdir
 
 
-logger = logging.getLogger(__name__)
-
 async def main(argv, outp=s_output.stdout):
-    pars = getArgParser()
+    pars = getArgParser(outp)
     opts = pars.parse_args(argv)
 
     if opts.network:
@@ -56,9 +49,9 @@ async def main(argv, outp=s_output.stdout):
                 cdir.delUserCsr(name, outp=outp)
                 return 0
 
-def getArgParser():
+def getArgParser(outp):
     desc = 'CLI tool to generate simple x509 certificates from an Aha server.'
-    pars = argparse.ArgumentParser(prog='synapse.tools.aha.easycert', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.aha.easycert', outp=outp, description=desc)
 
     pars.add_argument('-a', '--aha', required=True,  # type=str,
                       help='Aha server to connect too.')
@@ -77,11 +70,5 @@ def getArgParser():
 
     return pars
 
-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:])))
+    s_cmd.exitmain(main)

synapse/tools/aha/enroll.py

@@ -1,12 +1,9 @@
 import os
-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
 import synapse.lib.certdir as s_certdir
 import synapse.lib.msgpack as s_msgpack
@@ -22,9 +19,7 @@ Examples:
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.aha.enroll', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
-
+    pars = s_cmd.Parser(prog='synapse.tools.aha.enroll', outp=outp, description=descr)
     pars.add_argument('onceurl', help='The one-time use AHA user enrollment URL.')
     opts = pars.parse_args(argv)
 
@@ -103,10 +98,6 @@ 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/aha/list.py

@@ -1,17 +1,10 @@
-import sys
-import asyncio
-import logging
-
 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.version as s_version
 
-logger = logging.getLogger(__name__)
-
 reqver = '>=2.11.0,<3.0.0'
 
 async def main(argv, outp=s_output.stdout):
@@ -74,11 +67,5 @@ async def main(argv, outp=s_output.stdout):
                 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:])))
+    s_cmd.exitmain(main)

synapse/tools/aha/mirror.py

@@ -1,14 +1,9 @@
-import sys
-import asyncio
-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.version as s_version
 
 descr = '''
 Query the Aha server for the service cluster status of mirrors.
@@ -87,8 +82,7 @@ def timeout_type(valu):
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.aha.mirror', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.aha.mirror', outp=outp, description=descr)
 
     pars.add_argument('--url', default='cell:///vertex/storage', help='The telepath URL to connect to the AHA service.')
     pars.add_argument('--timeout', type=timeout_type, default=10, help='The timeout in seconds for individual service API calls')
@@ -192,10 +186,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/aha/provision/service.py

@@ -1,12 +1,8 @@
-import sys
-import asyncio
-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
 
 descr = '''
@@ -24,8 +20,7 @@ Examples:
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.aha.provision.service', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.aha.provision.service', outp=outp, description=descr)
 
     pars.add_argument('--url', default='cell:///vertex/storage', help='The telepath URL to connect to the AHA service.')
     pars.add_argument('--user', help='Provision the new service with the username.')
@@ -79,10 +74,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/aha/provision/user.py

@@ -1,11 +1,7 @@
-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
 
 descr = '''
@@ -23,8 +19,7 @@ Examples:
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='synapse.tools.aha.provision.user', description=descr,
-                        formatter_class=argparse.RawDescriptionHelpFormatter)
+    pars = s_cmd.Parser(prog='synapse.tools.aha.provision.user', outp=outp, description=descr)
 
     pars.add_argument('--url', default='cell:///vertex/storage', help='The telepath URL to connect to the AHA service.')
     pars.add_argument('--again', default=False, action='store_true', help='Generate a new enroll URL for an existing user.')
@@ -50,10 +45,6 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/apikey.py

@@ -1,11 +1,7 @@
-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.time as s_time
 import synapse.lib.output as s_output
 
@@ -33,7 +29,7 @@ def printkey(outp, info, apikey=None):
 
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='apikey', description=descr)
+    pars = s_cmd.Parser(prog='synapse.tools.apikey', outp=outp, description=descr)
     pars.add_argument('--svcurl', default='cell:///vertex/storage', help='The telepath URL of the Synapse service.')
 
     subpars = pars.add_subparsers(dest='action', required=True)
@@ -90,11 +86,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/autodoc.py

@@ -1,8 +1,5 @@
-import sys
 import copy
-import asyncio
 import logging
-import argparse
 import collections
 
 from typing import List, Tuple, Dict, Union
@@ -12,7 +9,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.cmd as s_cmd
 import synapse.lib.json as s_json
 import synapse.lib.storm as s_storm
 import synapse.lib.config as s_config
@@ -962,12 +959,8 @@ async def docStormTypes():
 
     return libspage, typespage
 
-async def main(argv, outp=None):
-    if outp is None:
-        outp = s_output.OutPut()
-
-    pars = makeargparser()
-
+async def main(argv, outp=s_output.stdout):
+    pars = getArgParser(outp)
     opts = pars.parse_args(argv)
 
     if opts.doc_model:
@@ -1018,9 +1011,9 @@ async def main(argv, outp=None):
 
     return 0
 
-def makeargparser():
+def getArgParser(outp):
     desc = 'Command line tool to generate various synapse documentation.'
-    pars = argparse.ArgumentParser('synapse.tools.autodoc', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.autodoc', outp=outp, description=desc)
 
     pars.add_argument('--cortex', '-c', default=None,
                       help='Cortex URL for model inspection')
@@ -1042,11 +1035,6 @@ def makeargparser():
 
     return pars
 
-async def _main(argv, outp=None):  # pragma: no cover
-    s_common.setlogging(logger, 'DEBUG')
-    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:]))
+    s_common.setlogging(logger, 'DEBUG')
+    s_cmd.exitmain(main)

synapse/tools/axon2axon.py

@@ -1,5 +1,3 @@
-import sys
-import asyncio
 import logging
 
 import synapse.common as s_common
@@ -8,7 +6,6 @@ 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__)
@@ -43,10 +40,5 @@ 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:])))
+    s_cmd.exitmain(main)

synapse/tools/cellauth.py

@@ -1,4 +1,3 @@
-import sys
 import asyncio
 import logging
 import functools
@@ -9,7 +8,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.output as s_output
 import synapse.lib.version as s_version
 
@@ -18,7 +16,7 @@ logger = logging.getLogger(__name__)
 desc = '''
 Manage permissions of users, roles, and objects in a remote cell.
 '''
-outp = None
+outp = None  # type: s_output.OutPut
 
 min_authgate_vers = (0, 1, 33)
 reqver = '>=0.2.0,<3.0.0'
@@ -266,9 +264,7 @@ async def handleList(opts):
     else:
         return 0
 
-async def main(argv, outprint=None):
-    if outprint is None:   # pragma: no cover
-        outprint = s_output.OutPut()
+async def main(argv, outprint=s_output.stdout):
     global outp
     outp = outprint
 
@@ -289,7 +285,7 @@ async def main(argv, outprint=None):
 
 def makeargparser():
     global outp
-    pars = s_cmd.Parser('synapse.tools.cellauth', outp=outp, description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.cellauth', outp=outp, description=desc)
 
     pars.add_argument('--debug', action='store_true', help='Show debug traceback on error.')
     pars.add_argument('cellurl', help='The telepath URL to connect to a cell.')
@@ -337,11 +333,6 @@ def makeargparser():
     pars_mod.set_defaults(func=handleModify)
     return pars
 
-async def _main(argv, outp=s_output.stdout):  # pragma: no cover
-    s_common.setlogging(logger, 'DEBUG')
-    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(asyncio.run(_main(sys.argv[1:])))
+    s_common.setlogging(logger, 'DEBUG')
+    s_cmd.exitmain(main)

synapse/tools/changelog.py

@@ -1,11 +1,8 @@
 import os
 import re
-import sys
 import copy
 import gzip
 import pprint
-import asyncio
-import argparse
 import datetime
 import tempfile
 import textwrap
@@ -19,6 +16,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.cortex as s_cortex
 
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 import synapse.lib.autodoc as s_autodoc
 import synapse.lib.schemas as s_schemas
@@ -458,7 +456,7 @@ def _getModelFile(fp: str) -> dict | None:
         ref_modl = s_common.yamlloads(large_bytz)
     return ref_modl
 
-async def gen(opts: argparse.Namespace,
+async def gen(opts: s_cmd.argparse.Namespace,
               outp: s_output.OutPut):
 
     name = opts.name
@@ -806,7 +804,7 @@ def _gen_model_rst(version, model_ref, changes, current_model, outp: s_output.Ou
     return rst
 
 
-async def format(opts: argparse.Namespace,
+async def format(opts: s_cmd.argparse.Namespace,
            outp: s_output.OutPut):
 
     if not regex.match(version_regex, opts.version):
@@ -976,7 +974,7 @@ async def format(opts: argparse.Namespace,
 
     return 0
 
-async def model(opts: argparse.Namespace,
+async def model(opts: s_cmd.argparse.Namespace,
            outp: s_output.OutPut):
 
     if opts.save:
@@ -1017,11 +1015,8 @@ async def model(opts: argparse.Namespace,
             outp.printf(line)
         return 0
 
-async def main(argv, outp=None):
-    if outp is None:
-        outp = s_output.OutPut()
-
-    pars = makeargparser()
+async def main(argv, outp=s_output.stdout):
+    pars = getArgParser(outp)
 
     opts = pars.parse_args(argv)
     if opts.git_dir_check:
@@ -1038,11 +1033,11 @@ async def main(argv, outp=None):
         outp.printf(f'Error running {opts.func}: {traceback.format_exc()}')
     return 1
 
-def makeargparser():
+def getArgParser(outp: s_output.OutPut):
     desc = '''Command line tool to manage changelog entries.
     This tool and any data formats associated with it may change at any time.
     '''
-    pars = argparse.ArgumentParser('synapse.tools.changelog', description=desc)
+    pars = s_cmd.Parser(prog='synapse.tools.changelog', outp=outp, description=desc)
 
     subpars = pars.add_subparsers(required=True,
                                   title='subcommands',
@@ -1059,7 +1054,7 @@ def makeargparser():
                           help='Add the newly created file to the current git staging area.')
     # Hidden name override. Mainly for testing.
     gen_pars.add_argument('-n', '--name', default=None, type=str,
-                          help=argparse.SUPPRESS)
+                          help=s_cmd.argparse.SUPPRESS)
 
     format_pars = subpars.add_parser('format', help='Format existing files into a RST block.')
     format_pars.set_defaults(func=format)
@@ -1101,10 +1096,11 @@ def makeargparser():
                        help='Enable verbose output')
         p.add_argument('--cdir', default='./changes', action='store',
                        help='Directory of changelog files.')
+        # Hidden name override. Mainly for testing.
         p.add_argument('--disable-git-dir-check', dest='git_dir_check', default=True, action='store_false',
-                       help=argparse.SUPPRESS)
+                       help=s_cmd.argparse.SUPPRESS)
 
     return pars
 
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:], s_output.stdout)))
+    s_cmd.exitmain(main)

synapse/tools/cmdr.py

@@ -1,15 +1,12 @@
-import sys
-import asyncio
 import logging
 import warnings
-import contextlib
 
 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
 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__)
@@ -52,9 +49,8 @@ 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
     warnings.filterwarnings("default", category=PendingDeprecationWarning)
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    s_cmd.exitmain(main)

synapse/tools/cryo/cat.py

@@ -1,44 +1,35 @@
 import sys
 import pprint
-import asyncio
 import argparse
-import logging
 
 import synapse.telepath as s_telepath
 
+import synapse.lib.cmd as s_cmd
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.msgpack as s_msgpack
 
-logger = logging.getLogger(__name__)
-
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='cryo.cat', description='display data items from a cryo cell')
+    pars = s_cmd.Parser(prog='synapse.tools.cryo.cat', outp=outp, description='display data items from a cryo cell')
     pars.add_argument('cryotank', help='The telepath URL for the remote cryotank.')
     pars.add_argument('--offset', default=0, type=int, help='Begin at offset index')
     pars.add_argument('--size', default=10, type=int, help='How many items to display')
     pars.add_argument('--omit-offset', default=False, action='store_true', help='Output raw items with no offsets.')
-    # TODO: synapse.tools.cryo.list <cryocell>
-    # pars.add_argument('--list', default=False, action='store_true', help='List tanks in the remote cell and return')
     group = pars.add_mutually_exclusive_group()
     group.add_argument('--jsonl', action='store_true', help='Input/Output items in jsonl format')
     group.add_argument('--msgpack', action='store_true', help='Input/Output items in msgpack format')
-    pars.add_argument('--verbose', '-v', default=False, action='store_true', help='Verbose output')
+    pars.add_argument('--verbose', '-v', default=False, action='store_true',
+                      help='Verbose output. This argument is deprecated and no longer has any effect.')
     pars.add_argument('--ingest', '-i', default=False, action='store_true',
                       help='Reverses direction: feeds cryotank from stdin in msgpack or jsonl format')
 
     opts = pars.parse_args(argv)
 
-    if opts.verbose:
-        logger.setLevel(logging.INFO)
-
     if opts.ingest and not opts.jsonl and not opts.msgpack:
         outp.printf('Must specify exactly one of --jsonl or --msgpack if --ingest is specified')
         return 1
 
-    logger.info(f'connecting to: {opts.cryotank}')
-
     async with s_telepath.withTeleEnv():
 
         async with await s_telepath.openurl(opts.cryotank) as tank:
@@ -67,5 +58,4 @@ async def main(argv, outp=s_output.stdout):
     return 0
 
 if __name__ == '__main__':  # pragma: no cover
-    logging.basicConfig()
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    s_cmd.exitmain(main)

synapse/tools/cryo/list.py

@@ -1,17 +1,11 @@
-import sys
-import logging
-import asyncio
-import argparse
-
 import synapse.telepath as s_telepath
 
+import synapse.lib.cmd as s_cmd
 import synapse.lib.output as s_output
 
-logger = logging.getLogger(__name__)
-
 async def main(argv, outp=s_output.stdout):
 
-    pars = argparse.ArgumentParser(prog='cryo.list', description='List tanks within a cryo cell.')
+    pars = s_cmd.Parser(prog='synapse.tools.cryo.list', outp=outp, description='List tanks within a cryo cell.')
     pars.add_argument('cryocell', nargs='+', help='Telepath URLs to cryo cells.')
 
     opts = pars.parse_args(argv)
@@ -30,5 +24,4 @@ async def main(argv, outp=s_output.stdout):
     return 0
 
 if __name__ == '__main__':  # pragma: no cover
-    logging.basicConfig()
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    s_cmd.exitmain(main)