Refactor configuration & CLI

pyproject.toml

@@ -30,13 +30,14 @@ classifiers = [
 dependencies = [
     "datumaro",
     "omegaconf",
-    "hydra-core",
     "rich",
     "jsonargparse==4.27.1",
     "psutil", # Mem cache needs system checks
     "ftfy",
     "regex",
-    "importlib_resources"
+    "importlib_resources",
+    "docstring_parser", # CLI help-formatter
+    "rich_argparse", # CLI help-formatter
 ]
 
 [project.optional-dependencies]
@@ -245,21 +246,12 @@ exclude = [
     "tests/assets",
 
     # it will be cleaned up later
-    "src/otx/core/engine/utils/*",
     "src/otx/algo/classification/backbones/*",
     "for_developers/helpers.py",
 
     # Ruff complains it but don't know how to fix since it literally showed no useful logs.
     # https://github.com/openvinotoolkit/training_extensions/actions/runs/7176557723/job/19541622452?pr=2718#step:5:170
     "tests/regression/*.py",
-
-    # Temporarily disable it. This will be fixed in the next PR.
-    # [TODO] harimkang
-    "src/otx/core/utils/instantiators.py",
-    "src/otx/core/utils/logging_utils.py",
-    "src/otx/core/utils/pylogger.py",
-    "src/otx/core/utils/rich_utils.py",
-    "src/otx/core/utils/utils.py",
 ]
 
 # Same as Black.

src/otx/algo/classification/otx_dino_v2.py

@@ -5,9 +5,10 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import torch
+from omegaconf import DictConfig
 from torch import nn
 
 from otx.core.data.entity.base import OTXBatchLossEntity
@@ -17,9 +18,6 @@
 )
 from otx.core.model.entity.classification import OTXMulticlassClsModel
 
-if TYPE_CHECKING:
-    from omegaconf import DictConfig
-
 
 class DINOv2(nn.Module):
     """DINO-v2 Model."""
@@ -65,8 +63,8 @@ def forward(self, imgs: torch.Tensor, labels: torch.Tensor = None) -> torch.Tens
 class DINOv2RegisterClassifier(OTXMulticlassClsModel):
     """DINO-v2 Classification Model with register."""
 
-    def __init__(self, num_classes: int, config: DictConfig) -> None:
-        self.config = config
+    def __init__(self, num_classes: int, config: DictConfig | dict) -> None:
+        self.config = DictConfig(config)
         super().__init__(num_classes=num_classes)  # create the model
 
     def _create_model(self) -> nn.Module:

src/otx/algo/detection/atss.py

@@ -12,7 +12,7 @@
 class ATSS(MMDetCompatibleModel):
     """ATSS Model."""
 
-    def __init__(self, num_classes: int, variant: Literal["mobilenetv2", "f50_fpn", "resnext101"]) -> None:
+    def __init__(self, num_classes: int, variant: Literal["mobilenetv2", "r50_fpn", "resnext101"]) -> None:
         model_name = f"atss_{variant}"
         config = read_mmconfig(model_name=model_name)
         super().__init__(num_classes=num_classes, config=config)

src/otx/algo/segmentation/litehrnet.py

@@ -12,7 +12,7 @@
 class LiteHRNet(MMSegCompatibleModel):
     """LiteHRNet Model."""
 
-    def __init__(self, num_classes: int, variant: Literal["18", "s", "x"]) -> None:
+    def __init__(self, num_classes: int, variant: Literal["18", 18, "s", "x"]) -> None:
         model_name = f"litehrnet_{variant}"
         config = read_mmconfig(model_name=model_name)
         super().__init__(num_classes=num_classes, config=config)

src/otx/cli/__init__.py

@@ -3,75 +3,7 @@
 
 """CLI entrypoints."""
 
-from __future__ import annotations
-
-from jsonargparse import ArgumentParser
-
-from otx import __version__
-
-
-class OTXCLI:
-    """OTX CLI entrypoint."""
-
-    def __init__(self) -> None:
-        """Initialize OTX CLI."""
-        self.parser = self.init_parser()
-        self.setup_subcommands()
-        self.config = self.parser.parse_args()
-
-        self.run()
-
-    def init_parser(self, **kwargs) -> ArgumentParser:
-        """Initialize the argument parser for the OTX CLI.
-
-        Args:
-            **kwargs: Additional keyword arguments to pass to the ArgumentParser constructor.
-
-        Returns:
-            ArgumentParser: The initialized argument parser.
-        """
-        parser = ArgumentParser(description="OpenVINO Training-Extension command line tool", env_prefix="otx")
-        parser.add_argument(
-            "-V",
-            "--version",
-            action="version",
-            version=f"%(prog)s {__version__}",
-            help="Display OTX version number.",
-        )
-        return parser
-
-    def setup_subcommands(self) -> None:
-        """Setup subcommands for the OTX CLI."""
-        parser_subcommands = self.parser.add_subcommands()
-        from otx.cli.install import add_install_parser
-
-        add_install_parser(parser_subcommands)
-
-        # otx train parser
-        train_parser = ArgumentParser()
-        train_parser.add_argument("overrides", help="overrides values", default=[], nargs="+")
-        parser_subcommands.add_subcommand("train", train_parser, help="Training subcommand for OTX")
-
-        # otx test parser
-        test_parser = ArgumentParser()
-        test_parser.add_argument("overrides", help="overrides values", default=[], nargs="+")
-        parser_subcommands.add_subcommand("test", test_parser, help="Testing subcommand for OTX")
-
-    def run(self) -> None:
-        """Run the OTX CLI."""
-        subcommand = self.config["subcommand"]
-        if subcommand == "install":
-            from otx.cli.install import otx_install
-
-            otx_install(**self.config["install"])
-        elif subcommand == "train":
-            from otx.cli.train import otx_train
-
-            otx_train(**self.config["train"])
-        elif subcommand == "test":
-            from otx.cli.test import otx_test
-
-            otx_test(**self.config["test"])
+from .cli import OTXCLI
 
 
 def main() -> None: