remove all errors

kcidb/__init__.py

@@ -4,9 +4,11 @@
 import email
 import logging
 from kcidb.misc import LIGHT_ASSERTS
+from kcidb.db import DRIVER_TYPES
 
 # Silence flake8 "imported but unused" warning
-from kcidb import io, db, mq, orm, oo, monitor, tests, unittest, misc, argparse # noqa
+from kcidb import io, db, orm, oo, monitor, tests, unittest, misc, argparse # noqa
+from kcidb.mq import IOPublisher
 
 
 # Module's logger
@@ -57,7 +59,7 @@ def __init__(self, database=None, project_id=None, topic_name=None):
             if not self.db_client.is_initialized():
                 raise DatabaseNotInitialized()
         self.mq_publisher = \
-            mq.IOPublisher(project_id, topic_name) \
+            IOPublisher(project_id, topic_name) \
             if project_id and topic_name else None
 
     def submit(self, data):
@@ -331,8 +333,9 @@ def ingest_main():
     sys.excepthook = misc.log_and_print_excepthook
     description = 'kcidb-ingest - Load data into a (new) database and ' \
         'generate notifications for new and modified objects'
-    parser = db.ArgumentParser(database="sqlite::memory:",
-                               description=description)
+    parser = db.argparse.ArgumentParser(driver_types=DRIVER_TYPES,
+                                        database="sqlite::memory:",
+                                        description=description)
     args = parser.parse_args()
 
     db_client = db.Client(args.database)

kcidb/argparse.py

@@ -1,18 +1,9 @@
+"""Kernel CI argparse"""
+
 import math
 import re
 import argparse
 import logging
-# from textwrap import indent
-# import os
-# import atexit
-# import tempfile
-# import sys
-# import traceback
-# import itertools
-# import json
-# import dateutil.parser
-# from google.cloud import secretmanager
-# import jq
 
 try:  # Python 3.9
     from importlib import metadata

kcidb/db/__init__.py

@@ -7,9 +7,9 @@
 import kcidb.orm
 import kcidb.misc
 from kcidb.misc import LIGHT_ASSERTS
-from .argparse import QueryArgumentParser
 from kcidb.db import abstract, schematic, mux, argparse, \
-    bigquery, postgresql, sqlite, json, null, misc  # noqa: F401
+     bigquery, postgresql, sqlite, json, null, misc  # noqa: F401
+from .argparse import QueryArgumentParser
 
 # Module's logger
 LOGGER = logging.getLogger(__name__)
@@ -409,7 +409,8 @@ def load_main():
     sys.excepthook = kcidb.misc.log_and_print_excepthook
     description = \
         'kcidb-db-load - Load reports into Kernel CI report database'
-    parser = argparse.ArgumentParser(DRIVER_TYPES, description=description)
+    parser = argparse.ArgumentParser(driver_types=DRIVER_TYPES,
+                                     description=description)
     args = parser.parse_args()
     client = Client(args.database)
     if not client.is_initialized():

kcidb/db/argparse.py

@@ -1,14 +1,8 @@
+"""KICDB argparse"""
+
 import argparse
 import kcidb.misc
 import kcidb.argparse
-from kcidb.db import abstract, schematic, mux, \
-    bigquery, postgresql, sqlite, json, null, misc  # noqa: F401
-# import kcidb.orm
-# import sys
-# import logging
-# import datetime
-# import kcidb.io as io
-# from kcidb.misc import LIGHT_ASSERTS
 
 
 class DBHelpAction(argparse.Action):
@@ -49,7 +43,7 @@ def __call__(self, parser, namespace, values, option_string=None):
               "\n"
               "Available drivers and format of their parameter strings "
               "follow.\n")
-        for name, driver in parser.DRIVER_TYPES.items():
+        for name, driver in parser.driver_types.items():
             print(f"\n{name!r} driver\n" +
                   "-" * (len(name) + 9) + "\n" +
                   driver.get_doc())
@@ -96,9 +90,7 @@ def __init__(self, driver_types, *args, database=None, **kwargs):
                         make database specification required.
             kwargs:     Keyword arguments to initialize ArgumentParser with.
         """
-        self.DRIVER_TYPES = driver_types
-        print("args:", args)
-        print("kwargs:", kwargs)
+        self.driver_types = driver_types
         super().__init__(*args, **kwargs)
         add_args(self, database=database)
 

kcidb/monitor/output.py

@@ -7,7 +7,7 @@
 import html
 import logging
 from email.message import EmailMessage
-import kcidb.oo
+from kcidb.oo import Object
 from kcidb.monitor.misc import is_valid_firestore_id
 from kcidb.templates import ENV as TEMPLATE_ENV
 
@@ -152,7 +152,7 @@ def __init__(self, obj, subscription, message):
             message:        Notification message. An instance of
                             NotificationMessage.
         """
-        assert isinstance(obj, kcidb.oo.Object)
+        assert isinstance(obj, Object)
         assert isinstance(subscription, str)
         assert SUBSCRIPTION_RE.fullmatch(subscription)
         assert len(subscription.encode()) <= 64

kcidb/mq/__init__.py

@@ -16,9 +16,9 @@
 import kcidb.orm
 from kcidb.argparse import output_add_args
 from kcidb.orm.argparse import PatternHelpAction
-from .argparse import SubscriberArgumentParser, PublisherArgumentParser
-from kcidb import misc
 from kcidb.misc import LIGHT_ASSERTS
+from kcidb import misc
+from .argparse import SubscriberArgumentParser, PublisherArgumentParser
 
 
 # Module's logger
@@ -606,8 +606,8 @@ def io_publisher_main():
     description = \
         'kcidb-mq-io-publisher - ' \
         'Kernel CI I/O data publisher management tool'
-    parser = argparse.PublisherArgumentParser("I/O data",  # noqa: F821
-                                              description=description)
+    parser = PublisherArgumentParser("I/O data",
+                                     description=description)
     args = parser.parse_args()
     publisher = IOPublisher(args.project, args.topic)
     if args.command == "init":

kcidb/mq/argparse.py

@@ -1,21 +1,8 @@
+"""KICDB argparse"""
 
 import math
-# import datetime
-# import json
-# import logging
-# import threading
-# import sys
 import argparse
-# import email
-# import email.message
-# import email.policy
-# from abc import ABC, abstractmethod
-# from google.cloud import pubsub
-# from google.api_core.exceptions import DeadlineExceeded
-# import kcidb.io as io
-# import kcidb.orm
-import kcidb
-# from kcidb.misc import LIGHT_ASSERTS
+import kcidb.argparse
 
 
 def add_args(parser):

kcidb/oo/__init__.py

@@ -6,10 +6,11 @@
 from abc import ABC, abstractmethod
 from functools import reduce
 from cached_property import cached_property
-import kcidb.db
-from kcidb.misc import LIGHT_ASSERTS
 from kcidb.orm import Type, SCHEMA, Pattern, Source
-import argparse
+from kcidb.misc import LIGHT_ASSERTS
+import kcidb.misc
+import kcidb.orm
+from . import argparse
 
 
 class Object:

kcidb/oo/argparse.py

@@ -1,11 +1,6 @@
-# import sys
-# from abc import abstractmethod
-# from functools import reduce
-# from cached_property import cached_property
-import kcidb.db
-import kcidb
-# from kcidb.misc import LIGHT_ASSERTS
-# from kcidb.orm import Type, SCHEMA, Pattern, Source
+"""KICDB argparse"""
+
+import kcidb.orm.argparse
 
 
 class ArgumentParser(kcidb.argparse.ArgumentParser):
@@ -25,8 +20,8 @@ def __init__(self, *args, database=None, **kwargs):
             kwargs:     Keyword arguments to initialize ArgumentParser with.
         """
         super().__init__(*args, **kwargs)
-        kcidb.db.add_args(self, database=database)
-        kcidb.orm.add_args(self)
+        kcidb.db.argparse.add_args(self, database=database)
+        kcidb.orm.argparse.add_args(self)
 
 
 class OutputArgumentParser(kcidb.argparse.OutputArgumentParser):
@@ -47,5 +42,5 @@ def __init__(self, *args, database=None, **kwargs):
             kwargs:     Keyword arguments to initialize ArgumentParser with.
         """
         super().__init__(*args, **kwargs)
-        kcidb.db.add_args(self, database=database)
-        kcidb.orm.add_args(self)
+        kcidb.db.argparse.add_args(self, database=database)
+        kcidb.orm.argparse.add_args(self)

kcidb/orm/argparse.py

@@ -1,15 +1,7 @@
-# import re
-# import textwrap
-# import logging
+"""KICDB argparse"""
+
 import argparse
-# from . import Pattern
-# import jsonschema
-# import kcidb.io as io
 import kcidb.misc
-import kcidb
-# from kcidb.misc import LIGHT_ASSERTS
-
-# We'll get to it, pylint: disable=too-many-lines
 
 
 class PatternHelpAction(argparse.Action):

kcidb/tests/__init__.py

@@ -3,7 +3,7 @@
 import sys
 import yaml
 import requests
-import kcidb
+import kcidb.argparse
 from kcidb import misc
 
 from kcidb.tests import schema