continue renaming

src/dabmodel/__init__.py

@@ -16,8 +16,8 @@ from .__metadata__ import __version__, __Summuary__, __Name__
 from .LAMFields.LAMField import LAMField
 from .LAMFields.LAMFieldInfo import LAMFieldInfo
 from .LAMFields.FrozenLAMField import FrozenLAMField
-from .appliance import BaseAppliance
-from .feature import BaseFeature
+from .appliance import Appliance
+from .feature import Feature
 
 
 from .exception import (

src/dabmodel/appliance.py

@@ -1,8 +1,8 @@
-from .element import BaseElement
-from .meta.appliance import BaseMetaAppliance
+from .element import Element
+from .meta.appliance import _MetaAppliance
 
 
-class BaseAppliance(BaseElement, metaclass=BaseMetaAppliance):
+class Appliance(Element, metaclass=_MetaAppliance):
     """BaseFeature class
     Base class for Appliance.
     An appliance is a server configuration / image that is built using appliance's code and Fields.

src/dabmodel/element.py

@@ -1,7 +1,7 @@
-from .meta.base import BaseMeta
+from .meta.base import _MetaElement
 
 
-class BaseElement(metaclass=BaseMeta):
-    """BaseElement class
+class Element(metaclass=_MetaElement):
+    """Element class
     Base class to apply metaclass and set common Fields.
     """

src/dabmodel/feature.py

@@ -1,9 +1,9 @@
-from .element import BaseElement
-from .meta.feature import BaseMetaFeature
+from .element import Element
+from .meta.feature import _MetaFeature
 
 
-class BaseFeature(BaseElement, metaclass=BaseMetaFeature):
-    """BaseFeature class
+class Feature(Element, metaclass=_MetaFeature):
+    """Feature class
     Base class for Appliance's Features.
     Features are optional traits of an appliance.
     """

src/dabmodel/meta/appliance.py

@@ -6,8 +6,8 @@ from typeguard import check_type, CollectionCheckStrategy, TypeCheckError
 from ..tools import LAMdeepfreeze
 from ..LAMFields.LAMField import LAMField
 from ..LAMFields.FrozenLAMField import FrozenLAMField
-from .base import BaseMeta
-from ..feature import BaseFeature
+from .base import _MetaElement
+from ..feature import Feature
 from ..exception import (
     InvalidFieldValue,
     InvalidFeatureInheritance,
@@ -15,8 +15,8 @@ from ..exception import (
 )
 
 
-class BaseMetaAppliance(BaseMeta):
-    """BaseMetaAppliance class
+class _MetaAppliance(_MetaElement):
+    """_MetaAppliance class
     Appliance specific metaclass code
     """
 
@@ -84,7 +84,7 @@ class BaseMetaAppliance(BaseMeta):
                     f"Feature {_fname} is not an instance of {bases[0]}.{_fname}"
                 )
             extensions["modified_features"][_fname] = _fvalue
-        elif isinstance(_fvalue, type) and issubclass(_fvalue, BaseFeature):
+        elif isinstance(_fvalue, type) and issubclass(_fvalue, Feature):
             extensions["new_features"][_fname] = _fvalue
         else:
             super().process_new_field(name, bases, namespace, _fname, _fvalue, extensions)  # type: ignore[misc]
@@ -124,7 +124,7 @@ class BaseMetaAppliance(BaseMeta):
         """
         for fname, fdef in obj.__DABSchema__.get("features", {}).items():
             # Case 1: plain class or subclass
-            if isinstance(fdef, type) and issubclass(fdef, BaseFeature):
+            if isinstance(fdef, type) and issubclass(fdef, Feature):
                 inst = fdef()
                 object.__setattr__(obj, fname, inst)
 
@@ -221,7 +221,7 @@ class BaseMetaAppliance(BaseMeta):
 
         # --- new features not declared at class level ---
         for k, v in list(kwargs.items()):
-            if isinstance(v, type) and issubclass(v, BaseFeature):
+            if isinstance(v, type) and issubclass(v, Feature):
                 bound = getattr(v, "_BoundAppliance", None)
                 if bound is None or not issubclass(cls, bound):
                     raise FeatureNotBound(

src/dabmodel/meta/base.py

@@ -327,11 +327,11 @@ class ModelSpecView:
         return dict(self._vals)
 
 
-T_Meta = TypeVar("T_Meta", bound="BaseMeta")
+T_Meta = TypeVar("T_Meta", bound="_MetaElement")
 T_BE = TypeVar("T_BE", bound="BaseElement")
 
 
-class BaseMeta(type):
+class _MetaElement(type):
     """metaclass to use to build BaseElement"""
 
     modified_fields: Dict[str, Any] = {}
@@ -341,7 +341,7 @@ class BaseMeta(type):
 
     @classmethod
     def check_class(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         name: str,
         bases: tuple[type[Any], ...],
         namespace: dict[str, Any],  # pylint: disable=unused-argument
@@ -382,7 +382,7 @@ class BaseMeta(type):
 
     @classmethod
     def process_class_fields(  # pylint: disable=too-complex,too-many-branches
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         name: str,
         bases: tuple[type[Any], ...],
         namespace: dict[str, Any],
@@ -443,7 +443,7 @@ class BaseMeta(type):
 
     @classmethod
     def process_modified_field(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         name: str,
         bases: tuple[type[Any], ...],
         namespace: dict[str, Any],
@@ -475,7 +475,7 @@ class BaseMeta(type):
 
     @classmethod
     def process_new_field(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         name: str,
         bases: tuple[type[Any], ...],
         namespace: dict[str, Any],
@@ -550,7 +550,7 @@ class BaseMeta(type):
 
     @classmethod
     def apply_initializer(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         cls,
         name: str,
         bases: tuple[type[Any], ...],
@@ -604,7 +604,7 @@ class BaseMeta(type):
                 cls.__DABSchema__[_fname].update_value(_fvalue)
 
     def __new__(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         name: str,
         bases: tuple[type[Any], ...],
         namespace: dict[str, Any],
@@ -624,7 +624,7 @@ class BaseMeta(type):
 
     @classmethod
     def commit_fields(
-        mcs: type["BaseMeta"],
+        mcs: type["_MetaElement"],
         cls,
         name: str,
         bases: tuple[type[Any], ...],
@@ -699,7 +699,7 @@ class BaseMeta(type):
         Hook for runtime overrides at instance creation.
 
         Invoked after the schema has been frozen but before finalize_instance.
-        Subclasses of BaseMeta can override this to support things like:
+        Subclasses of _MetaElement can override this to support things like:
 
           - Field overrides: MyApp(field=value)
           - Feature overrides: MyApp(FeatureName=CustomFeature)

src/dabmodel/meta/feature.py

@@ -1,10 +1,10 @@
 from typing import Type, Any
-from .base import BaseMeta
+from .base import _MetaElement
 from ..exception import FeatureNotBound
 
 
-class BaseMetaFeature(BaseMeta):
-    """BaseMetaFeature class
+class _MetaFeature(_MetaElement):
+    """_MetaFeature class
     Feature specific metaclass code
     """