From ed137aa665b353830be356d4d586731d1817f672 Mon Sep 17 00:00:00 2001
From: Avram Lubkin <aviso@rockhopper.net>
Date: Thu, 6 Jul 2023 10:27:39 -0400
Subject: [PATCH] Rename configuration models

---
 comma/cli/__init__.py | 10 +++++-----
 comma/config.py       |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/comma/cli/__init__.py b/comma/cli/__init__.py
index 7746c11..daad20a 100644
--- a/comma/cli/__init__.py
+++ b/comma/cli/__init__.py
@@ -13,7 +13,7 @@ from ruamel.yaml import YAML as R_YAML
 from ruamel.yaml import YAMLError
 
 from comma.cli.parser import parse_args
-from comma.config import BaseConfig, Config
+from comma.config import BasicConfig, FullConfig
 from comma.database.driver import DatabaseDriver
 from comma.database.model import Distros, MonitoringSubjects
 from comma.downstream import Downstream
@@ -33,7 +33,7 @@ class Session:
     """
 
     def __init__(self, config, database) -> None:
-        self.config: Config = config
+        self.config: FullConfig = config
         self.database: DatabaseDriver = database
 
     def _get_repo(
@@ -161,16 +161,16 @@ def main(args: Optional[Sequence[str]] = None):
 
     # If a full configuration is required, CLI parser would ensure this is set
     if options.config:
-        options_values = {field: getattr(options, field, None) for field in BaseConfig.__fields__}
+        options_values = {field: getattr(options, field, None) for field in BasicConfig.__fields__}
         try:
-            config = Config(**YAML.load(options.config) | options_values)
+            config = FullConfig(**YAML.load(options.config) | options_values)
         except (ValidationError, YAMLError) as e:
             print(f"Unable to validate config file: {options.config}")
             sys.exit(e)
 
     # Fallback to basic configuration
     else:
-        config: BaseConfig = BaseConfig(**vars(options))
+        config: BasicConfig = BasicConfig(**vars(options))
 
     # Get database object
     database = DatabaseDriver(dry_run=options.dry_run, echo=options.verbose > 2)
diff --git a/comma/config.py b/comma/config.py
index 5408c89..a6b66ef 100644
--- a/comma/config.py
+++ b/comma/config.py
@@ -31,7 +31,7 @@ class Upstream(BaseModel):
     sections: Tuple[str, ...]
 
 
-class BaseConfig(BaseModel):
+class BasicConfig(BaseModel):
     """
     Minimal configuration model
     """
@@ -51,9 +51,11 @@ class BaseConfig(BaseModel):
         validate_assignment = True
 
 
-class Config(BaseConfig):
+class FullConfig(BasicConfig):
     """
-    Main configuration model
+    Full configuration model
+    Requires:
+        upstream to be defined
     """
 
     repos: Dict[str, AnyUrl]