misc: improve type checking

Author: dklimpel

podman/api/client.py

@@ -32,6 +32,9 @@
 ]
 """Type alias for request data parameter."""
 
+_Params = Union[None, bytes, Mapping[str, Any]]
+"""Type alias for request query parameter."""
+
 _Timeout = Union[None, float, tuple[float, float], tuple[float, None]]
 """Type alias for request timeout parameter."""
 
@@ -207,7 +210,7 @@ def delete(
         self,
         path: Union[str, bytes],
         *,
-        params: Union[None, bytes, Mapping[str, str]] = None,
+        params: _Params = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
         stream: Optional[bool] = False,
@@ -242,7 +245,7 @@ def get(
         self,
         path: Union[str, bytes],
         *,
-        params: Union[None, bytes, Mapping[str, list[str]]] = None,
+        params: _Params = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
         stream: Optional[bool] = False,
@@ -277,7 +280,7 @@ def head(
         self,
         path: Union[str, bytes],
         *,
-        params: Union[None, bytes, Mapping[str, str]] = None,
+        params: _Params = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
         stream: Optional[bool] = False,
@@ -312,7 +315,7 @@ def post(
         self,
         path: Union[str, bytes],
         *,
-        params: Union[None, bytes, Mapping[str, str]] = None,
+        params: _Params = None,
         data: _Data = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
@@ -351,7 +354,7 @@ def put(
         self,
         path: Union[str, bytes],
         *,
-        params: Union[None, bytes, Mapping[str, str]] = None,
+        params: _Params = None,
         data: _Data = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
@@ -391,7 +394,7 @@ def _request(
         path: Union[str, bytes],
         *,
         data: _Data = None,
-        params: Union[None, bytes, Mapping[str, str]] = None,
+        params: _Params = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
         stream: Optional[bool] = None,

podman/domain/images_build.py

@@ -121,7 +121,7 @@ def build(self, **kwargs) -> tuple[Image, Iterator[bytes]]:
         if kwargs.get("timeout"):
             post_kwargs["timeout"] = float(kwargs.get("timeout"))
 
-        response = self.client.post(
+        response = self.client.post(  # type: ignore[attr-defined]
             "/build",
             params=params,
             data=body,
@@ -154,7 +154,7 @@ def build(self, **kwargs) -> tuple[Image, Iterator[bytes]]:
             unknown = line
 
         if image_id:
-            return self.get(image_id), report_stream
+            return self.get(image_id), report_stream  # type: ignore[attr-defined]
 
         raise BuildError(unknown or "Unknown", report_stream)
 

podman/domain/networks.py

@@ -11,12 +11,15 @@
 import json
 import logging
 from contextlib import suppress
-from typing import Optional, Union
+from typing import Optional, Union, TYPE_CHECKING
 
 from podman.domain.containers import Container
 from podman.domain.containers_manager import ContainersManager
 from podman.domain.manager import PodmanResource
 
+if TYPE_CHECKING:
+    from podman.domain.networks_manager import NetworksManager
+
 logger = logging.getLogger("podman.networks")
 
 
@@ -27,6 +30,8 @@ class Network(PodmanResource):
         attrs (dict[str, Any]): Attributes of Network reported from Podman service
     """
 
+    manager: "NetworksManager"
+
     @property
     def id(self):  # pylint: disable=invalid-name
         """str: Returns the identifier of the network."""
@@ -105,7 +110,7 @@ def connect(self, container: Union[str, Container], *_, **kwargs) -> None:
         }
 
         data = {"Container": container, "EndpointConfig": endpoint_config}
-        data = {k: v for (k, v) in data.items() if not (v is None or len(v) == 0)}
+        data = {k: v for (k, v) in data.items() if not (v is None or len(v) == 0)}  # type: ignore[arg-type]
 
         response = self.client.post(
             f"/networks/{self.name}/connect",

podman/domain/secrets.py

@@ -11,6 +11,8 @@
 class Secret(PodmanResource):
     """Details and configuration for a secret registered with the Podman service."""
 
+    manager: "SecretsManager"
+
     def __repr__(self):
         return f"<{self.__class__.__name__}: {self.name}>"
 

podman/domain/volumes.py

@@ -16,6 +16,8 @@
 class Volume(PodmanResource):
     """Details and configuration for an image managed by the Podman service."""
 
+    manager: "VolumesManager"
+
     @property
     def id(self):
         return self.name

pyproject.toml

@@ -146,13 +146,8 @@ module = [
     "podman.domain.images_manager",
     "podman.domain.manager",
     "podman.domain.manifests",
-    "podman.domain.networks",
-    "podman.domain.networks_manager",
-    "podman.domain.pods",
     "podman.domain.pods_manager",
     "podman.domain.registry_data",
-    "podman.domain.secrets",
-    "podman.domain.volumes",
     "podman.errors.exceptions"
 ]
 ignore_errors = true