Add pydantic for better mypy tests + Fixes

Author: philogicae

pyproject.toml

@@ -155,6 +155,7 @@ dependencies = [
   "ruff==0.4.8",
   "isort==5.13.2",
   "pyproject-fmt==2.2.1",
+  "pydantic-settings>=2",
 ]
 [tool.hatch.envs.linting.scripts]
 typing = "mypy --config-file=pyproject.toml {args:} ./src/ ./tests/ ./examples/"

src/aleph/sdk/conf.py

@@ -7,8 +7,8 @@
 
 from aleph_message.models import Chain
 from aleph_message.models.execution.environment import HypervisorType
-from pydantic import BaseModel, ConfigDict, Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from aleph.sdk.types import ChainInfo
 
@@ -224,7 +224,7 @@ class Settings(BaseSettings):
     DNS_STATIC_DOMAIN: ClassVar[str] = "static.public.aleph.sh"
     DNS_RESOLVERS: ClassVar[List[str]] = ["9.9.9.9", "1.1.1.1"]
 
-    model_config = ConfigDict(
+    model_config = SettingsConfigDict(
         env_prefix="ALEPH_", case_sensitive=False, env_file=".env"
     )
 
@@ -237,7 +237,7 @@ class MainConfiguration(BaseModel):
     path: Path
     chain: Chain
 
-    model_config = ConfigDict(use_enum_values=True)
+    model_config = SettingsConfigDict(use_enum_values=True)
 
 
 # Settings singleton

src/aleph/sdk/domain.py

@@ -52,11 +52,11 @@ def raise_error(self, status: Dict[str, bool]):
 def hostname_from_url(url: Union[HttpUrl, str]) -> Hostname:
     """Extract FQDN from url"""
 
-    parsed = urlparse(url)
+    parsed = urlparse(str(url))
     if all([parsed.scheme, parsed.netloc]) is True:
         url = parsed.netloc
 
-    return Hostname(url)
+    return Hostname(str(url))
 
 
 async def get_target_type(fqdn: Hostname) -> Optional[TargetType]:

src/aleph/sdk/vm/cache.py

@@ -70,7 +70,7 @@ def __init__(
             )
 
         self.cache = {}
-        self.api_host = connector_url if connector_url else settings.API_HOST
+        self.api_host = str(connector_url) if connector_url else settings.API_HOST
 
     async def get(self, key: str) -> Optional[bytes]:
         sanitized_key = sanitize_cache_key(key)

tests/unit/aleph_vm_authentication.py

@@ -75,7 +75,7 @@ def payload_must_be_hex(cls, value: bytes) -> bytes:
         """Convert the payload from hexadecimal to bytes"""
         return bytes_from_hex(value.decode())
 
-    @model_validator(mode="after")
+    @model_validator(mode="after")  # type: ignore
     def check_expiry(cls, values: SignedPubKeyHeader) -> SignedPubKeyHeader:
         """Check that the token has not expired"""
         payload: bytes = values.payload
@@ -87,7 +87,7 @@ def check_expiry(cls, values: SignedPubKeyHeader) -> SignedPubKeyHeader:
 
         return values
 
-    @model_validator(mode="after")
+    @model_validator(mode="after")  # type: ignore
     def check_signature(cls, values: SignedPubKeyHeader) -> SignedPubKeyHeader:
         signature: bytes = values.signature
         payload: bytes = values.payload
@@ -262,7 +262,7 @@ async def authenticate_websocket_message(
     signed_operation = SignedOperation.model_validate(message["X-SignedOperation"])
     if signed_operation.content.domain != domain_name:
         logger.debug(
-            f"Invalid domain '{signed_pubkey.content.domain}' != '{domain_name}'"
+            f"Invalid domain '{signed_operation.content.domain}' != '{domain_name}'"
         )
         raise web.HTTPUnauthorized(reason="Invalid domain")
     return verify_signed_operation(signed_operation, signed_pubkey)

tests/unit/test_price.py

@@ -18,7 +18,7 @@ async def test_get_program_price_valid():
     mock_session = make_mock_get_session(expected_response)
     async with mock_session:
         response = await mock_session.get_program_price("cacacacacacaca")
-        assert response == PriceResponse(**expected_response)
+        assert response == PriceResponse(**expected_response)  # type: ignore
 
 
 @pytest.mark.asyncio