Allow manually coded error handling in CLI

src/glvd/cli/client/cve.py

@@ -28,7 +28,7 @@ class ClientCve:
             ),
         ]
     )
-    def run(cve: str, server: str, debug: bool) -> None:
+    def run(*, argparser: None, cve: str, server: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         ClientCve(server)(cve)
 

src/glvd/cli/data/combine_all.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 
-import asyncio
 from sqlalchemy import (
     select,
     text,
@@ -26,7 +26,7 @@
 class CombineAll:
     @staticmethod
     @cli.register('combine-all')
-    def run(database: str, debug: bool) -> None:
+    def run(*, argparser: None, database: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         engine = create_async_engine(database, echo=debug)
         asyncio.run(CombineAll()(engine))

src/glvd/cli/data/combine_deb.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 from typing import (
     Any,
     AsyncGenerator,
 )
 
-import asyncio
 from sqlalchemy import (
     bindparam,
     select,
@@ -33,7 +33,7 @@
 class CombineDeb:
     @staticmethod
     @cli.register('combine-deb')
-    def run(database: str, debug: bool) -> None:
+    def run(*, argparser: None, database: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         engine = create_async_engine(database, echo=debug)
         asyncio.run(CombineDeb()(engine))

src/glvd/cli/data/ingest_debsec.py

@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 from pathlib import Path
 
-import asyncio
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import (
     AsyncEngine,
@@ -42,7 +42,7 @@ class IngestDebsec:
             ),
         ]
     )
-    def run(cpe_product: str, dir: Path, database: str, debug: bool) -> None:
+    def run(*, argparser: None, cpe_product: str, dir: Path, database: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         engine = create_async_engine(database, echo=debug)
         asyncio.run(IngestDebsec(cpe_product, dir)(engine))

src/glvd/cli/data/ingest_debsrc.py

@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 from pathlib import Path
 
-import asyncio
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import (
     AsyncEngine,
@@ -47,7 +47,7 @@ class IngestDebsrc:
             ),
         ]
     )
-    def run(cpe_product: str, deb_codename: str, file: Path, database: str, debug: bool) -> None:
+    def run(*, argparser: None, cpe_product: str, deb_codename: str, file: Path, database: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         engine = create_async_engine(database, echo=debug)
         asyncio.run(IngestDebsrc(cpe_product, deb_codename, file)(engine))

src/glvd/cli/data/ingest_nvd.py

@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 from typing import Any
 
-import asyncio
 from sqlalchemy import func, select
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.ext.asyncio import (
@@ -28,7 +28,7 @@ class IngestNvd:
 
     @staticmethod
     @cli.register('ingest-nvd')
-    def run(database: str, debug: bool) -> None:
+    def run(*, argparser: None, database: str, debug: bool) -> None:
         logging.basicConfig(level=debug and logging.DEBUG or logging.INFO)
         engine = create_async_engine(database, echo=debug)
         asyncio.run(IngestNvd()(engine))

src/glvd/cli/registry.py

@@ -69,7 +69,7 @@ def wrap(func: Callable) -> Callable:
 
             def run() -> None:
                 args = parser_main.parse_args()
-                func(**vars(args))
+                func(argparser=self.parser, **vars(args))
 
             return run
 
@@ -80,6 +80,6 @@ def main(self) -> None:
         v = vars(args)
         func = v.pop('func', None)
         if func:
-            func(**v)
+            func(argparser=self.parser, **v)
         else:
             self.parser.print_help()