Address reviewer feedback

Author: douglasjacobsen

lib/ramble/ramble/appkit.py

@@ -16,13 +16,10 @@
 from llnl.util.filesystem import *
 
 import ramble.language.application_language
-from ramble.repository import ObjectTypes, get_obj_class
+from ramble.repository import get_base_class
 
-ExecutableApplication = get_obj_class(
-    "executable-application", object_type=ObjectTypes.base_classes
-)
-
-ApplicationBase = get_obj_class("application-base", object_type=ObjectTypes.base_classes)
+ExecutableApplication = get_base_class("executable-application")
+ApplicationBase = get_base_class("application-base")
 
 from ramble.language.application_language import *
 from ramble.language.shared_language import *

lib/ramble/ramble/modkit.py

@@ -30,9 +30,5 @@
 from ramble.util.logger import logger as tty
 from ramble.util.output_capture import OUTPUT_CAPTURE
 
-base_class_type = ramble.repository.ObjectTypes.base_classes
-ModifierBase = ramble.repository.get_obj_class("modifier-base", object_type=base_class_type)
-BasicModifier = ramble.repository.get_obj_class("basic-modifier", object_type=base_class_type)
-DisabledModifier = ramble.repository.get_obj_class(
-    "disabled-modifier", object_type=base_class_type
-)
+ModifierBase = ramble.repository.get_base_class("modifier-base")
+BasicModifier = ramble.repository.get_base_class("basic-modifier")

lib/ramble/ramble/pkgmankit.py

@@ -33,7 +33,4 @@
 from ramble.util.logger import logger as tty
 from ramble.util.output_capture import OUTPUT_CAPTURE
 
-base_class_type = ramble.repository.ObjectTypes.base_classes
-PackageManagerBase = ramble.repository.get_obj_class(
-    "package-manager-base", object_type=base_class_type
-)
+PackageManagerBase = ramble.repository.get_base_class("package-manager-base")

lib/ramble/ramble/repository.py

@@ -287,6 +287,11 @@ def get(spec, object_type=default_type):
     return paths[object_type].get(spec)
 
 
+def get_base_class(spec):
+    """Convenience wrapper around ``ramble.repository.get_obj_class()`` for base classes."""
+    return paths[ObjectTypes.base_classes].get_obj_class(spec)
+
+
 def get_obj_class(spec, object_type=default_type):
     """Convenience wrapper around ``ramble.repository.get_obj_class()``."""
     return paths[object_type].get_obj_class(spec)

lib/ramble/ramble/software_environments.py

@@ -153,7 +153,7 @@ def __init__(
         Args:
             name (str): Name of package
             pkg_info (dict): Package info containing specs for supported package managers
-            package_manager (ramble.base_cls.builtin.PackageManagerBase):
+            package_manager (ramble.repository.get_base_class("package-manager-base")):
                 package manager tied to this package
             spec (str): Package spec (used to install / load package)
             compiler (optional str): Name of package definition to use as compiler
@@ -372,7 +372,7 @@ def __init__(self, name: str):
 
         Args:
             name (str): Name of the environment
-            package_manager (ramble.base_cls.builtin.PackageManagerBase):
+            package_manager (ramble.repository.get_base_class("package-manager-base")):
                 Package manager associated with the environment
         """
 
@@ -596,7 +596,7 @@ def render_environment(
         Args:
             expander (ramble.expander.Expander): Expander object to use when rendering
             all_packages (dict): All package definitions
-            package_manager (ramble.base_cls.builtin.PackageManagerBase):
+            package_manager (ramble.repository.get_base_class("package-manager-base")):
                 Package manager the environment is rendered with
 
         Returns:
@@ -719,7 +719,7 @@ def use_environment(self, package_manager, env_name):
         information about used packages and environments.
 
         Args:
-            package_manager (ramble.base_cls.builtin.PackageManagerBase):
+            package_manager (ramble.repository.get_base_class("package-manager-base")):
                 Reference to a package manager object
             env_name (str): Name of the rendered environment to mark as used
         """
@@ -926,7 +926,7 @@ def render_environment(
         Args:
             env_name (str): Name of environment needed by the experiment
             expander (ramble.expander.Expander): Expander object from the experiment
-            package_manager (ramble.base_cls.builtin.PackageManagerBase):
+            package_manager (ramble.repository.get_base_class("package-manager-base")):
                 Package manager the environment is rendered with
 
         Returns:

lib/ramble/ramble/wmkit.py

@@ -15,7 +15,4 @@
 from ramble.util.command_runner import CommandRunner, RunnerError
 from ramble.util.logger import logger
 
-base_class_type = ramble.repository.ObjectTypes.base_classes
-WorkflowManagerBase = ramble.repository.get_obj_class(
-    "workflow-manager-base", object_type=base_class_type
-)
+WorkflowManagerBase = ramble.repository.get_base_class("workflow-manager-base")