Remove api.Literal

Signed-off-by: Nicola Sella <[email protected]>

podman/api/__init__.py

@@ -15,8 +15,6 @@
 )
 from podman.api.tar_utils import create_tar, prepare_containerfile, prepare_containerignore
 
-from typing import Literal
-
 DEFAULT_CHUNK_SIZE = 2 * 1024 * 1024
 
 

podman/domain/images.py

@@ -1,12 +1,12 @@
 """Model and Manager for Image resources."""
 
 import logging
-from typing import Any, Optional, Union
+from typing import Any, Optional, Literal, Union
 from collections.abc import Iterator
 
 import urllib.parse
 
-from podman import api
+from podman.api import DEFAULT_CHUNK_SIZE
 from podman.domain.manager import PodmanResource
 from podman.errors import ImageNotFound, InvalidArgument
 
@@ -50,7 +50,7 @@ def history(self) -> list[dict[str, Any]]:
 
     def remove(
         self, **kwargs
-    ) -> list[dict[api.Literal["Deleted", "Untagged", "Errors", "ExitCode"], Union[str, int]]]:
+    ) -> list[dict[Literal["Deleted", "Untagged", "Errors", "ExitCode"], Union[str, int]]]:
         """Delete image from Podman service.
 
         Podman only
@@ -70,7 +70,7 @@ def remove(
 
     def save(
         self,
-        chunk_size: Optional[int] = api.DEFAULT_CHUNK_SIZE,
+        chunk_size: Optional[int] = DEFAULT_CHUNK_SIZE,
         named: Union[str, bool] = False,
     ) -> Iterator[bytes]:
         """Returns Image as tarball.

podman/domain/networks_manager.py

@@ -12,10 +12,9 @@
 import ipaddress
 import logging
 from contextlib import suppress
-from typing import Any, Optional
+from typing import Any, Optional, Literal
 
-from podman import api
-from podman.api import http_utils
+from podman.api import http_utils, prepare_filters
 from podman.domain.manager import Manager
 from podman.domain.networks import Network
 from podman.errors import APIError
@@ -152,7 +151,7 @@ def list(self, **kwargs) -> list[Network]:
         filters = kwargs.get("filters", {})
         filters["name"] = kwargs.get("names")
         filters["id"] = kwargs.get("ids")
-        filters = api.prepare_filters(filters)
+        filters = prepare_filters(filters)
 
         params = {"filters": filters}
         response = self.client.get("/networks/json", params=params)
@@ -162,7 +161,7 @@ def list(self, **kwargs) -> list[Network]:
 
     def prune(
         self, filters: Optional[dict[str, Any]] = None
-    ) -> dict[api.Literal["NetworksDeleted", "SpaceReclaimed"], Any]:
+    ) -> dict[Literal["NetworksDeleted", "SpaceReclaimed"], Any]:
         """Delete unused Networks.
 
         SpaceReclaimed always reported as 0
@@ -173,7 +172,7 @@ def prune(
         Raises:
             APIError: when service reports error
         """
-        params = {"filters": api.prepare_filters(filters)}
+        params = {"filters": prepare_filters(filters)}
         response = self.client.post("/networks/prune", params=params)
         response.raise_for_status()