fix: rename BoundModelBase to BaseBoundModel

hcloud/actions/client.py

@@ -4,14 +4,14 @@
 import warnings
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import Action, ActionFailedException, ActionTimeoutException
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundAction(BoundModelBase, Action):
+class BoundAction(BaseBoundModel, Action):
     _client: ActionsClient
 
     model = Action

hcloud/certificates/client.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import (
     Certificate,
     CreateManagedCertificateResponse,
@@ -15,7 +15,7 @@
     from .._client import Client
 
 
-class BoundCertificate(BoundModelBase, Certificate):
+class BoundCertificate(BaseBoundModel, Certificate):
     _client: CertificatesClient
 
     model = Certificate

hcloud/core/__init__.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-from .client import BaseResourceClient, BoundModelBase, ClientEntityBase
+from .client import BaseBoundModel, BaseResourceClient, BoundModelBase, ClientEntityBase
 from .domain import BaseDomain, DomainIdentityMixin, Meta, Pagination
 
 __all__ = [
+    "BaseBoundModel",
     "BaseDomain",
     "BaseResourceClient",
     "BoundModelBase",

hcloud/core/client.py

@@ -5,6 +5,7 @@
 
 if TYPE_CHECKING:
     from .._client import Client
+    from .domain import BaseDomain
 
 
 class BaseResourceClient:
@@ -69,10 +70,10 @@ def __init__(self, client: Client):
         super().__init__(client)
 
 
-class BoundModelBase:
-    """Bound Model Base"""
+class BaseBoundModel:
+    """Base Bound Model"""
 
-    model: Any
+    model: type[BaseDomain]
 
     def __init__(
         self,
@@ -121,3 +122,26 @@ def __eq__(self, other: Any) -> bool:
         if not isinstance(other, self.__class__):
             return NotImplemented
         return self.data_model == other.data_model
+
+
+class BoundModelBase(BaseBoundModel):
+    """
+    Kept for backward compatibility.
+
+    .. deprecated:: 2.6.0
+        Use :class:``hcloud.core.client.BaseBoundModel`` instead.
+    """
+
+    def __init__(
+        self,
+        client: BaseResourceClient,
+        data: dict,
+        complete: bool = True,
+    ):
+        warnings.warn(
+            "The 'hcloud.core.client.BoundModelBase' class is deprecated, please use the "
+            "'hcloud.core.client.BaseBoundModel' class instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        super().__init__(client, data, complete)

hcloud/datacenters/client.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from ..locations import BoundLocation
 from ..server_types import BoundServerType
 from .domain import Datacenter, DatacenterServerTypes
@@ -11,7 +11,7 @@
     from .._client import Client
 
 
-class BoundDatacenter(BoundModelBase, Datacenter):
+class BoundDatacenter(BaseBoundModel, Datacenter):
     _client: DatacentersClient
 
     model = Datacenter

hcloud/firewalls/client.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import (
     CreateFirewallResponse,
     Firewall,
@@ -17,7 +17,7 @@
     from .._client import Client
 
 
-class BoundFirewall(BoundModelBase, Firewall):
+class BoundFirewall(BaseBoundModel, Firewall):
     _client: FirewallsClient
 
     model = Firewall

hcloud/floating_ips/client.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from ..locations import BoundLocation
 from .domain import CreateFloatingIPResponse, FloatingIP
 
@@ -13,7 +13,7 @@
     from ..servers import BoundServer, Server
 
 
-class BoundFloatingIP(BoundModelBase, FloatingIP):
+class BoundFloatingIP(BaseBoundModel, FloatingIP):
     _client: FloatingIPsClient
 
     model = FloatingIP

hcloud/images/client.py

@@ -4,14 +4,14 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import Image
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundImage(BoundModelBase, Image):
+class BoundImage(BaseBoundModel, Image):
     _client: ImagesClient
 
     model = Image

hcloud/isos/client.py

@@ -2,14 +2,14 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import Iso
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundIso(BoundModelBase, Iso):
+class BoundIso(BaseBoundModel, Iso):
     _client: IsosClient
 
     model = Iso

hcloud/load_balancer_types/client.py

@@ -2,14 +2,14 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import LoadBalancerType
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundLoadBalancerType(BoundModelBase, LoadBalancerType):
+class BoundLoadBalancerType(BaseBoundModel, LoadBalancerType):
     _client: LoadBalancerTypesClient
 
     model = LoadBalancerType

hcloud/load_balancers/client.py

@@ -7,7 +7,7 @@
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
 from ..certificates import BoundCertificate
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from ..load_balancer_types import BoundLoadBalancerType
 from ..locations import BoundLocation
 from ..metrics import Metrics
@@ -40,7 +40,7 @@
     from ..networks import Network
 
 
-class BoundLoadBalancer(BoundModelBase, LoadBalancer):
+class BoundLoadBalancer(BaseBoundModel, LoadBalancer):
     _client: LoadBalancersClient
 
     model = LoadBalancer

hcloud/locations/client.py

@@ -2,14 +2,14 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import Location
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundLocation(BoundModelBase, Location):
+class BoundLocation(BaseBoundModel, Location):
     _client: LocationsClient
 
     model = Location

hcloud/networks/client.py

@@ -3,14 +3,14 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import Network, NetworkRoute, NetworkSubnet
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundNetwork(BoundModelBase, Network):
+class BoundNetwork(BaseBoundModel, Network):
     _client: NetworksClient
 
     model = Network

hcloud/placement_groups/client.py

@@ -3,14 +3,14 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import BoundAction
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import CreatePlacementGroupResponse, PlacementGroup
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundPlacementGroup(BoundModelBase, PlacementGroup):
+class BoundPlacementGroup(BaseBoundModel, PlacementGroup):
     _client: PlacementGroupsClient
 
     model = PlacementGroup

hcloud/primary_ips/client.py

@@ -3,15 +3,15 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import CreatePrimaryIPResponse, PrimaryIP
 
 if TYPE_CHECKING:
     from .._client import Client
     from ..datacenters import BoundDatacenter, Datacenter
 
 
-class BoundPrimaryIP(BoundModelBase, PrimaryIP):
+class BoundPrimaryIP(BaseBoundModel, PrimaryIP):
     _client: PrimaryIPsClient
 
     model = PrimaryIP

hcloud/server_types/client.py

@@ -2,14 +2,14 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import ServerType
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundServerType(BoundModelBase, ServerType):
+class BoundServerType(BaseBoundModel, ServerType):
     _client: ServerTypesClient
 
     model = ServerType

hcloud/servers/client.py

@@ -6,7 +6,7 @@
 from dateutil.parser import isoparse
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from ..datacenters import BoundDatacenter
 from ..firewalls import BoundFirewall
 from ..floating_ips import BoundFloatingIP
@@ -48,7 +48,7 @@
     from .domain import ServerCreatePublicNetwork
 
 
-class BoundServer(BoundModelBase, Server):
+class BoundServer(BaseBoundModel, Server):
     _client: ServersClient
 
     model = Server

hcloud/ssh_keys/client.py

@@ -2,14 +2,14 @@
 
 from typing import TYPE_CHECKING, Any, NamedTuple
 
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from .domain import SSHKey
 
 if TYPE_CHECKING:
     from .._client import Client
 
 
-class BoundSSHKey(BoundModelBase, SSHKey):
+class BoundSSHKey(BaseBoundModel, SSHKey):
     _client: SSHKeysClient
 
     model = SSHKey

hcloud/volumes/client.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from ..actions import ActionsPageResult, BoundAction, ResourceActionsClient
-from ..core import BaseResourceClient, BoundModelBase, Meta
+from ..core import BaseBoundModel, BaseResourceClient, Meta
 from ..locations import BoundLocation
 from .domain import CreateVolumeResponse, Volume
 
@@ -13,7 +13,7 @@
     from ..servers import BoundServer, Server
 
 
-class BoundVolume(BoundModelBase, Volume):
+class BoundVolume(BaseBoundModel, Volume):
     _client: VolumesClient
 
     model = Volume

tests/unit/core/test_client.py

@@ -6,10 +6,10 @@
 import pytest
 
 from hcloud.actions import ActionsPageResult
-from hcloud.core import BaseDomain, BaseResourceClient, BoundModelBase, Meta
+from hcloud.core import BaseBoundModel, BaseDomain, BaseResourceClient, Meta
 
 
-class TestBoundModelBase:
+class TestBaseBoundModel:
     @pytest.fixture()
     def bound_model_class(self):
         class Model(BaseDomain):
@@ -21,7 +21,7 @@ def __init__(self, id, name="", description=""):
                 self.name = name
                 self.description = description
 
-        class BoundModel(BoundModelBase, Model):
+        class BoundModel(BaseBoundModel, Model):
             model = Model
 
         return BoundModel