localstack-core 4.7.1.dev22__py3-none-any.whl → 4.7.1.dev24__py3-none-any.whl

localstack/utils/bootstrap.py

@@ -9,8 +9,9 @@ import shlex
 import signal
 import threading
 import time
+from collections.abc import Iterable
 from functools import wraps
-from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Union
+from typing import Any, Callable, Optional, Union
 
 from localstack import config, constants
 from localstack.config import (
@@ -156,7 +157,7 @@ def log_duration(name=None, min_ms=500):
     return wrapper
 
 
-def get_docker_image_details(image_name: str = None) -> Dict[str, str]:
+def get_docker_image_details(image_name: str = None) -> dict[str, str]:
     image_name = image_name or get_docker_image_to_start()
     try:
         result = DOCKER_CLIENT.inspect_image(image_name)
@@ -249,7 +250,7 @@ def setup_logging():
 # --------------
 
 
-def resolve_apis(services: Iterable[str]) -> Set[str]:
+def resolve_apis(services: Iterable[str]) -> set[str]:
     """
     Resolves recursively for the given collection of services (e.g., ["serverless", "cognito"]) the list of actual
     API services that need to be included (e.g., {'dynamodb', 'cloudformation', 'logs', 'kinesis', 'sts',
@@ -289,8 +290,8 @@ def resolve_apis(services: Iterable[str]) -> Set[str]:
     return result
 
 
-@functools.lru_cache()
-def get_enabled_apis() -> Set[str]:
+@functools.lru_cache
+def get_enabled_apis() -> set[str]:
     """
     Returns the list of APIs that are enabled through the combination of the SERVICES variable and
     STRICT_SERVICE_LOADING variable. If the SERVICES variable is empty, then it will return all available services.
@@ -324,8 +325,8 @@ def is_api_enabled(api: str) -> bool:
     return api in get_enabled_apis()
 
 
-@functools.lru_cache()
-def get_preloaded_services() -> Set[str]:
+@functools.lru_cache
+def get_preloaded_services() -> set[str]:
     """
     Returns the list of APIs that are marked to be eager loaded through the combination of SERVICES variable and
     EAGER_SERVICE_LOADING. If the SERVICES variable is empty, then it will return all available services.
@@ -431,10 +432,8 @@ def validate_localstack_config(name: str):
 
     if not port_exposed(edge_port):
         warns.append(
-            (
-                f"Edge port {edge_port} is not exposed. You may have to add the entry "
-                'to the "ports" section of the docker-compose file.'
-            )
+            f"Edge port {edge_port} is not exposed. You may have to add the entry "
+            'to the "ports" section of the docker-compose file.'
         )
 
     # print warning/info messages
@@ -638,7 +637,7 @@ class ContainerConfigurators:
         return _cfg
 
     @staticmethod
-    def custom_command(cmd: List[str]):
+    def custom_command(cmd: list[str]):
         """
         Overwrites the container command and unsets the default entrypoint.
 
@@ -653,7 +652,7 @@ class ContainerConfigurators:
         return _cfg
 
     @staticmethod
-    def env_vars(env_vars: Dict[str, str]):
+    def env_vars(env_vars: dict[str, str]):
         def _cfg(cfg: ContainerConfiguration):
             cfg.env_vars.update(env_vars)
 
@@ -674,7 +673,7 @@ class ContainerConfigurators:
         return _cfg
 
     @staticmethod
-    def cli_params(params: Dict[str, Any]):
+    def cli_params(params: dict[str, Any]):
         """
         Parse docker CLI parameters and add them to the config. The currently known CLI params are::
 
@@ -808,7 +807,7 @@ def get_gateway_port(container: Container) -> int:
     :param container: the localstack container
     :return: the gateway port reachable from the host
     """
-    candidates: List[int]
+    candidates: list[int]
 
     gateway_listen = container.config.env_vars.get("GATEWAY_LISTEN")
     if gateway_listen:
@@ -1001,7 +1000,7 @@ class RunningContainer:
                     return
                 raise
 
-    def inspect(self) -> Dict[str, Union[Dict, str]]:
+    def inspect(self) -> dict[str, Union[dict, str]]:
         return self.container_client.inspect_container(container_name_or_id=self.id)
 
     def attach(self):
@@ -1033,7 +1032,7 @@ class ContainerLogPrinter:
 
     def _can_start_streaming(self):
         if self._closed.is_set():
-            raise IOError("Already stopped")
+            raise OSError("Already stopped")
         if not self.container.running_container:
             return False
         return self.container.running_container.is_running()
@@ -1041,7 +1040,7 @@ class ContainerLogPrinter:
     def run(self):
         try:
             poll_condition(self._can_start_streaming)
-        except IOError:
+        except OSError:
             return
         self._stream = self.container.running_container.stream_logs()
         for line in self._stream:
@@ -1227,7 +1226,7 @@ def prepare_host(console):
     hooks.prepare_host.run()
 
 
-def start_infra_in_docker(console, cli_params: Dict[str, Any] = None):
+def start_infra_in_docker(console, cli_params: dict[str, Any] = None):
     prepare_docker_start()
 
     # create and prepare container
@@ -1302,7 +1301,7 @@ def ensure_container_image(console, container: Container):
         console.log("download complete")
 
 
-def start_infra_in_docker_detached(console, cli_params: Dict[str, Any] = None):
+def start_infra_in_docker_detached(console, cli_params: dict[str, Any] = None):
     """
     An alternative to start_infra_in_docker where the terminal is not blocked by the follow on the logfile.
     """

localstack/utils/collections.py

@@ -5,18 +5,11 @@ and manipulate python collection (dicts, list, sets).
 
 import logging
 import re
-from collections.abc import Mapping
+from collections.abc import Iterable, Iterator, Mapping, Sized
 from typing import (
     Any,
     Callable,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
     Optional,
-    Sized,
-    Tuple,
-    Type,
     TypedDict,
     TypeVar,
     Union,
@@ -40,7 +33,7 @@ class AccessTrackingDict(dict):
           simply duplicates the entries of "wrapped" in the constructor, for simplicity.
     """
 
-    def __init__(self, wrapped, callback: Callable[[Dict, str, List, Dict], Any] = None):
+    def __init__(self, wrapped, callback: Callable[[dict, str, list, dict], Any] = None):
         super().__init__(wrapped)
         self.callback = callback
 
@@ -112,7 +105,7 @@ class HashableJsonDict(ImmutableDict):
 _ListType = TypeVar("_ListType")
 
 
-class PaginatedList(List[_ListType]):
+class PaginatedList(list[_ListType]):
     """List which can be paginated and filtered. For usage in AWS APIs with paginated responses"""
 
     DEFAULT_PAGE_SIZE = 50
@@ -123,7 +116,7 @@ class PaginatedList(List[_ListType]):
         next_token: str = None,
         page_size: int = None,
         filter_function: Callable[[_ListType], bool] = None,
-    ) -> Tuple[List[_ListType], Optional[str]]:
+    ) -> tuple[list[_ListType], Optional[str]]:
         if filter_function is not None:
             result_list = list(filter(filter_function, self))
         else:
@@ -280,13 +273,13 @@ def pick_attributes(dictionary, paths):
     return new_dictionary
 
 
-def select_attributes(obj: Dict, attributes: List[str]) -> Dict:
+def select_attributes(obj: dict, attributes: list[str]) -> dict:
     """Select a subset of attributes from the given dict (returns a copy)"""
     attributes = attributes if is_list_or_tuple(attributes) else [attributes]
     return {k: v for k, v in obj.items() if k in attributes}
 
 
-def remove_attributes(obj: Dict, attributes: List[str], recursive: bool = False) -> Dict:
+def remove_attributes(obj: dict, attributes: list[str], recursive: bool = False) -> dict:
     """Remove a set of attributes from the given dict (in-place)"""
     from localstack.utils.objects import recurse_object
 
@@ -306,8 +299,8 @@ def remove_attributes(obj: Dict, attributes: List[str], recursive: bool = False)
 
 
 def rename_attributes(
-    obj: Dict, old_to_new_attributes: Dict[str, str], in_place: bool = False
-) -> Dict:
+    obj: dict, old_to_new_attributes: dict[str, str], in_place: bool = False
+) -> dict:
     """Rename a set of attributes in the given dict object. Second parameter is a dict that maps old to
     new attribute names. Default is to return a copy, but can also pass in_place=True."""
     if not in_place:
@@ -322,7 +315,7 @@ def is_list_or_tuple(obj) -> bool:
     return isinstance(obj, (list, tuple))
 
 
-def ensure_list(obj: Any, wrap_none=False) -> Optional[List]:
+def ensure_list(obj: Any, wrap_none=False) -> Optional[list]:
     """Wrap the given object in a list, or return the object itself if it already is a list."""
     if obj is None and not wrap_none:
         return obj
@@ -385,7 +378,7 @@ def merge_dicts(*dicts, **kwargs):
     return result
 
 
-def remove_none_values_from_dict(dict: Dict) -> Dict:
+def remove_none_values_from_dict(dict: dict) -> dict:
     return {k: v for (k, v) in dict.items() if v is not None}
 
 
@@ -399,7 +392,7 @@ def last_index_of(array, value):
     return result
 
 
-def is_sub_dict(child_dict: Dict, parent_dict: Dict) -> bool:
+def is_sub_dict(child_dict: dict, parent_dict: dict) -> bool:
     """Returns whether the first dict is a sub-dict (subset) of the second dict."""
     return all(parent_dict.get(key) == val for key, val in child_dict.items())
 
@@ -429,7 +422,7 @@ def is_none_or_empty(obj: Union[Optional[str], Optional[list]]) -> bool:
     )
 
 
-def select_from_typed_dict(typed_dict: Type[TypedDict], obj: Dict, filter: bool = False) -> Dict:
+def select_from_typed_dict(typed_dict: type[TypedDict], obj: dict, filter: bool = False) -> dict:
     """
     Select a subset of attributes from a dictionary based on the keys of a given `TypedDict`.
     :param typed_dict: the `TypedDict` blueprint
@@ -445,10 +438,10 @@ def select_from_typed_dict(typed_dict: Type[TypedDict], obj: Dict, filter: bool
     return selection
 
 
-T = TypeVar("T", bound=Dict)
+T = TypeVar("T", bound=dict)
 
 
-def convert_to_typed_dict(typed_dict: Type[T], obj: Dict, strict: bool = False) -> T:
+def convert_to_typed_dict(typed_dict: type[T], obj: dict, strict: bool = False) -> T:
     """
     Converts the given object to the given typed dict (by calling the type constructors).
     Limitations:
@@ -482,7 +475,7 @@ def convert_to_typed_dict(typed_dict: Type[T], obj: Dict, strict: bool = False)
     return result
 
 
-def dict_multi_values(elements: Union[List, Dict]) -> Dict[str, List[Any]]:
+def dict_multi_values(elements: Union[list, dict]) -> dict[str, list[Any]]:
     """
     Return a dictionary with the original keys from the list of dictionary and the
     values are the list of values of the original dictionary.
@@ -511,7 +504,7 @@ ItemType = TypeVar("ItemType")
 
 def split_list_by(
     lst: Iterable[ItemType], predicate: Callable[[ItemType], bool]
-) -> Tuple[List[ItemType], List[ItemType]]:
+) -> tuple[list[ItemType], list[ItemType]]:
     truthy, falsy = [], []
 
     for item in lst:

localstack/utils/config_listener.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import re
-from typing import Callable, List
+from typing import Callable
 
 from requests.models import Response
 
@@ -9,7 +9,7 @@ from localstack import config
 
 LOG = logging.getLogger(__name__)
 
-CONFIG_LISTENERS: List[Callable[[str, str], None]] = []
+CONFIG_LISTENERS: list[Callable[[str, str], None]] = []
 
 
 def trigger_config_listeners(variable, new_value):

localstack/utils/container_networking.py

@@ -12,7 +12,7 @@ from localstack.utils.net import get_docker_host_from_container
 LOG = logging.getLogger(__name__)
 
 
-@lru_cache()
+@lru_cache
 def get_main_container_network() -> Optional[str]:
     """
     Gets the main network of the LocalStack container (if we run in one, bridge otherwise)
@@ -49,7 +49,7 @@ def get_main_container_network() -> Optional[str]:
     return main_container_network
 
 
-@lru_cache()
+@lru_cache
 def get_endpoint_for_network(network: Optional[str] = None) -> str:
     """
     Get the LocalStack endpoint (= IP address) on the given network.
@@ -126,7 +126,7 @@ def get_main_container_id():
         return None
 
 
-@lru_cache()
+@lru_cache
 def get_main_container_name():
     """
     Returns the container name of the LocalStack container