Commands Cleanup

Author: DEKHTIARJonathan

README.md

@@ -9,7 +9,7 @@
     <img src="https://img.shields.io/github/license/wheelnext/variantlib?style=for-the-badge">
   </a>
   <a href="https://discord.com/channels/803025117553754132/1279204588196597811">
-      <img src="https://img.shields.io/badge/Discord_PyPA-WheelNext-blueviolet?style=for-the-badge" /> 
+      <img src="https://img.shields.io/badge/Discord_PyPA-WheelNext-blueviolet?style=for-the-badge" />
   </a>
   <a href="https://wheelnext.dev">
       <img src="https://img.shields.io/badge/WheelNext.dev-lightblue?style=for-the-badge" />
@@ -18,6 +18,6 @@
 
 <p align="center">
   <a href="https://deepwiki.com/wheelnext/variantlib">
-      <img src="https://img.shields.io/badge/Deep_Wiki-VariantLib-lightblue?style=for-the-badge" /> 
+      <img src="https://img.shields.io/badge/Deep_Wiki-VariantLib-lightblue?style=for-the-badge" />
   </a>
-</p>
+</p>

variantlib/commands/analyze_platform.py

@@ -2,11 +2,11 @@
 
 import argparse
 import logging
+import sys
 
 from variantlib.loader import PluginLoader
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def analyze_platform(args: list[str]) -> None:
@@ -16,13 +16,13 @@ def analyze_platform(args: list[str]) -> None:
     )
     _ = parser.parse_args(args)
 
-    logger.info("Analyzing the platform ... \n")
+    logger.info("Analyzing the platform ...\n")
     variant_cfgs = PluginLoader.get_supported_configs().values()
 
-    for variant_cfg in variant_cfgs:
-        logger.info(variant_cfg.pretty_print())
-        print()  # visual spacing  # noqa: T201
+    # We have to flush the logger handlers to ensure that all logs are printed
+    for handler in logger.handlers:
+        handler.flush()
 
-    logger.info(
-        f"Total Variant Hashes: {2 ** sum(len(variant_cfg.configs) for variant_cfg in variant_cfgs):,}"  # noqa: G004, E501
-    )
+    for variant_cfg in variant_cfgs:
+        for line in variant_cfg.pretty_print().splitlines():
+            sys.stdout.write(f"{line}\n")

variantlib/commands/analyze_wheel.py

@@ -16,7 +16,6 @@
 from variantlib.models.variant import VariantProperty
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def pretty_print(vdesc: VariantDescription, providers: list[ProviderPackage]) -> str:
@@ -101,5 +100,9 @@ def analyze_wheel(args: list[str]) -> None:
             )
         ]
 
+        # We have to flush the logger handlers to ensure that all logs are printed
+        for handler in logger.handlers:
+            handler.flush()
+
         for line in pretty_print(vdesc=vdesc, providers=providers).splitlines():
             sys.stdout.write(f"{line}\n")

variantlib/commands/config/list_paths.py

@@ -16,7 +16,6 @@ def get_localzone() -> None:
 
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def list_paths(args: list[str]) -> None:

variantlib/commands/config/setup.py

@@ -17,7 +17,6 @@
 from variantlib.models.variant import VariantProperty
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 INSTRUCTIONS = """
 ----------------------------------------------------------------------------#

variantlib/commands/generate_index_json.py

@@ -21,7 +21,6 @@
 from variantlib.models.variant import VariantProperty
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def generate_index_json(args: list[str]) -> None:
@@ -66,10 +65,6 @@ def generate_index_json(args: list[str]) -> None:
             )
             continue
 
-        # if vhash == "0" * VARIANT_HASH_LEN:
-        #     known_variants[vhash] = VariantDescription()
-        #     continue
-
         with zipfile.ZipFile(wheel, "r") as zip_file:
             # Find the METADATA file
             for name in zip_file.namelist():

variantlib/commands/make_variant.py

@@ -18,7 +18,6 @@
 from variantlib.errors import ValidationError
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 METADATA_POLICY = email.policy.EmailPolicy(
     utf8=True,
@@ -72,6 +71,12 @@ def make_variant(args: list[str]) -> None:
         help="make the variant a `null variant` - no variant property.",
     )
 
+    parser.add_argument(
+        "--skip-plugin-validation",
+        action="store_true",
+        help="allow to register invalid or unknown variant properties",
+    )
+
     parsed_args = parser.parse_args(args)
 
     input_filepath: pathlib.Path = parsed_args.input_filepath
@@ -82,6 +87,7 @@ def make_variant(args: list[str]) -> None:
         output_directory,
         is_null_variant=parsed_args.null_variant,
         properties=parsed_args.properties,
+        validate_properties=not parsed_args.skip_plugin_validation,
     )
 
 
@@ -90,6 +96,7 @@ def _make_variant(
     output_directory: pathlib.Path,
     is_null_variant: bool,
     properties: list[VariantProperty],
+    validate_properties: bool = True,
 ) -> None:
     # Input Validation
     if not input_filepath.is_file():
@@ -109,20 +116,21 @@ def _make_variant(
         # Transform properties into a VariantDescription
         vdesc = VariantDescription(properties=properties)
 
-        # Verify whether the variant properties are valid
-        vdesc_valid = validate_variant(vdesc)
-        if vdesc_valid.invalid_properties:
-            raise ValidationError(
-                "The following variant properties are invalid according to the "
-                "plugins: "
-                f"{', '.join(x.to_str() for x in vdesc_valid.invalid_properties)}"
-            )
-        if vdesc_valid.unknown_properties:
-            raise ValidationError(
-                "The following variant properties use namespaces that are not provided "
-                "by any installed plugin: "
-                f"{', '.join(x.to_str() for x in vdesc_valid.unknown_properties)}"
-            )
+        if validate_properties:
+            # Verify whether the variant properties are valid
+            vdesc_valid = validate_variant(vdesc)
+            if vdesc_valid.invalid_properties:
+                raise ValidationError(
+                    "The following variant properties are invalid according to the "
+                    "plugins: "
+                    f"{', '.join(x.to_str() for x in vdesc_valid.invalid_properties)}"
+                )
+            if vdesc_valid.unknown_properties:
+                raise ValidationError(
+                    "The following variant properties use namespaces that are not "
+                    "provided by any installed plugin: "
+                    f"{', '.join(x.to_str() for x in vdesc_valid.unknown_properties)}"
+                )
     else:
         # Create a null variant
         vdesc = VariantDescription()

variantlib/commands/plugins/_display_configs.py

@@ -10,7 +10,6 @@
     from variantlib.models.provider import ProviderConfig
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def display_configs(

variantlib/commands/plugins/get_all_configs.py

@@ -7,7 +7,6 @@
 from variantlib.loader import PluginLoader
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def get_all_configs(args: list[str]) -> None:

variantlib/commands/plugins/get_supported_configs.py

@@ -7,7 +7,6 @@
 from variantlib.loader import PluginLoader
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def get_supported_configs(args: list[str]) -> None:

variantlib/commands/plugins/list_plugins.py

@@ -7,7 +7,6 @@
 from variantlib.loader import PluginLoader
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def list_plugins(args: list[str]) -> None:

variantlib/commands/unmake_variant.py

@@ -16,7 +16,6 @@
 from variantlib.constants import VALIDATION_WHEEL_NAME_REGEX
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 METADATA_POLICY = email.policy.EmailPolicy(
     utf8=True,

variantlib/models/provider.py

@@ -87,13 +87,16 @@ class ProviderConfig(BaseModel):
     )
 
     def pretty_print(self) -> str:
-        result_str = f"{'#' * 20} Provider Config: `{self.namespace}` {'#' * 20}"
+        result_str = f"\n{'#' * 20} Provider Config: `{self.namespace}` {'#' * 20}"
+        header_length = len(result_str) - 1
+
         for kid, vconfig in enumerate(self.configs):
             result_str += (
                 f"\n\t- Variant Config [{kid + 1:03d}]: "
                 f"{vconfig.name} :: {vconfig.values}"
             )
-        result_str += f"\n{'#' * 80}\n"
+
+        result_str += f"\n{'#' * header_length}\n"
         return result_str
 
     def to_list_of_properties(self) -> Generator[VariantProperty]: