Enh/code revamp 2 (#23)

* Create and use Country common entity

* Enforce kwargs usage with all mixins

Author: ebram96

src/abstract_api/core/common_entities/__init__.py

@@ -0,0 +1,7 @@
+from typing import Final
+
+from .country import Country
+
+__all__: Final[list[str]] = [
+    "Country"
+]

src/abstract_api/core/common_entities/country.py

@@ -0,0 +1,17 @@
+class Country:
+    """Country entity."""
+
+    def __init__(self, code: str, name: str) -> None:
+        """Initializes a new Country."""
+        self._code = code
+        self._name = name
+
+    @property
+    def code(self) -> str | None:
+        """The country's two-letter ISO 3166-1 alpha-2 code."""
+        return self._code
+
+    @property
+    def name(self) -> str | None:
+        """The name of the country."""
+        return self._name

src/abstract_api/image_processing/strategies/_mixins/crop_mode_mixin.py

@@ -35,12 +35,12 @@ class CropModeMixin(_Base):
 
     def __init__(
         self,
+        *,
         crop_mode: CropMode | str | None = None,
-        *args,
         **kwargs
     ) -> None:
         """Initializes a new instance."""
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
         if crop_mode is not None:
             if isinstance(crop_mode, str):

src/abstract_api/image_processing/strategies/_mixins/height_mixin.py

@@ -10,9 +10,9 @@
 
 class HeightMixin(_Base):
     """Height mixin."""
-    def __init__(self, height: int, *args, **kwargs) -> None:
+    def __init__(self, *, height: int, **kwargs) -> None:
         """Initializes a new instance."""
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self._height = height
 
     def json(self) -> dict[str, int | str]:

src/abstract_api/image_processing/strategies/_mixins/width_mixin.py

@@ -10,9 +10,9 @@
 
 class WidthMixin(_Base):
     """Width mixin."""
-    def __init__(self, width: int, *args, **kwargs) -> None:
+    def __init__(self, *, width: int, **kwargs) -> None:
         """Initializes a new instance."""
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self._width = width
 
     def json(self) -> dict[str, int | str]:

src/abstract_api/image_processing/strategies/crop/crop.py

@@ -38,11 +38,10 @@ def __init__(
         scale: int | None = None,
         x: int | None = None,
         y: int | None = None,
-        *args,
         **kwargs
     ) -> None:
         """Initializes a new Crop instance."""
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self._scale = scale
         self._x = x
         self._y = y

src/abstract_api/image_processing/strategies/fill.py

@@ -10,14 +10,9 @@ class Fill(HeightMixin, WidthMixin, BaseStrategy):
     The default background color is black.
     """
 
-    def __init__(
-        self,
-        background: str | None = None,
-        *args,
-        **kwargs
-    ) -> None:
+    def __init__(self, background: str | None = None, **kwargs) -> None:
         """Initialize a new Square instance."""
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self._background = background
 
     def json(self) -> dict[str, int | str]:

src/abstract_api/image_processing/strategies/square.py

@@ -9,6 +9,7 @@ class Square(BaseStrategy):
 
     def __init__(self, size: int) -> None:
         """Initialize a new Square instance."""
+        super().__init__()
         self._size = size
 
     def json(self) -> dict[str, int | str]:

src/abstract_api/phone_validation/phone_validation_response.py

@@ -1,6 +1,7 @@
 import requests
 
 from ..core.bases import JSONResponse
+from ..core.common_entities import Country as CommonCountry
 from ..core.mixins import NestedEntitiesMixin
 from .response_fields import RESPONSE_FIELDS
 
@@ -32,25 +33,14 @@ def local(self) -> str:
         return self._local
 
 
-class Country:
+class Country(CommonCountry):
     """Country entity in phone validation response."""
 
-    def __init__(self, code: str, name: str, prefix: str) -> None:
+    def __init__(self, prefix: str, **kwargs) -> None:
         """Initializes a new Country."""
-        self._code = code
-        self._name = name
+        super().__init__(**kwargs)
         self._prefix = prefix
 
-    @property
-    def code(self) -> str | None:
-        """The country's two-letter ISO 3166-1 alpha-2 code."""
-        return self._code
-
-    @property
-    def name(self) -> str | None:
-        """The name of the country in which the phone number is registered."""
-        return self._name
-
     @property
     def prefix(self) -> str | None:
         """The country's calling code prefix."""

src/abstract_api/vat/vat_calculation_response.py

@@ -1,32 +1,11 @@
 import requests
 
 from ..core.bases import JSONResponse
+from ..core.common_entities import Country
 from ..core.mixins import NestedEntitiesMixin
 from .response_fields.calculation import CALCULATION_RESPONSE_FIELDS
 
 
-class Country:
-    """Country entity in VAT calculation response."""
-
-    def __init__(self, code: str, name: str) -> None:
-        """Initializes a new Country."""
-        self._code = code
-        self._name = name
-
-    @property
-    def code(self) -> str | None:
-        """The two-letter ISO 3166-1 alpha-2 code of the country.
-
-        It is the code of the country in which the transaction takes place.
-        """
-        return self._code
-
-    @property
-    def name(self) -> str | None:
-        """The name of the country the VAT is being calculated from."""
-        return self._name
-
-
 class VATCalculationResponse(NestedEntitiesMixin, JSONResponse):
     """VAT calculation service response."""