fix and rebase

Author: Tranquility2

core/testcontainers/compose/compose.py

@@ -10,7 +10,9 @@
 from subprocess import CalledProcessError, CompletedProcess
 from subprocess import run as subprocess_run
 from types import TracebackType
-from typing import Any, Callable, Literal, Optional, Self, TypeVar, Union, cast
+from typing import Any, Callable, Literal, Optional, TypeVar, Union, cast
+
+from typing_extensions import Self
 
 from testcontainers.core.docker_client import DockerClient, get_docker_host_hostname, is_podman
 from testcontainers.core.exceptions import ContainerIsNotRunning, NoSuchPortExposed
@@ -47,7 +49,7 @@ class PublishedPortModel:
     PublishedPort: Optional[int] = None
     Protocol: Optional[str] = None
 
-    def normalize(self) -> Self:
+    def normalize(self) -> "PublishedPortModel":
         url = self.URL
 
         # For SSH-based DOCKER_HOST, local addresses (0.0.0.0, 127.0.0.1, localhost, ::, ::1)

core/testcontainers/core/container.py

@@ -7,14 +7,14 @@
 from os import PathLike
 from socket import socket
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Optional, Self, TypedDict, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, TypedDict, Union, cast
 
 import docker.errors
 from docker import version
 from docker.models.containers import ExecResult
 from docker.types import EndpointConfig
 from dotenv import dotenv_values
-from typing_extensions import assert_never
+from typing_extensions import Self, assert_never
 
 from testcontainers.core.config import ConnectionMode
 from testcontainers.core.config import testcontainers_config as c
@@ -403,14 +403,14 @@ class Reaper:
     :meta private:
     """
 
-    _instance: Optional[Self] = None
+    _instance: "Optional[Reaper]" = None
     _container: Optional[DockerContainer] = None
     _socket: Optional[socket] = None
 
     @classmethod
-    def get_instance(cls) -> Self:
-        if not Reaper._instance:
-            Reaper._create_instance()
+    def get_instance(cls) -> "Reaper":
+        if Reaper._instance is None:
+            Reaper._instance = Reaper._create_instance()
 
         return Reaper._instance
 
@@ -429,7 +429,7 @@ def delete_instance(cls) -> None:
             Reaper._instance = None
 
     @classmethod
-    def _create_instance(cls) -> Self:
+    def _create_instance(cls) -> "Reaper":
         logger.debug(f"Creating new Reaper for session: {SESSION_ID}")
 
         Reaper._container = (

core/testcontainers/core/generic.py

@@ -10,9 +10,11 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from typing import Any, Optional, Self
+from typing import Any, Optional
 from urllib.parse import quote
 
+from typing_extensions import Self
+
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.exceptions import ContainerStartException
 from testcontainers.core.utils import raise_for_deprecated_parameter

core/testcontainers/core/image.py

@@ -1,6 +1,8 @@
 from os import PathLike
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Optional, Self, Union
+from typing import TYPE_CHECKING, Any, Optional, Union
+
+from typing_extensions import Self
 
 from testcontainers.core.docker_client import DockerClient
 from testcontainers.core.utils import setup_logger

core/testcontainers/core/inspect.py

@@ -14,7 +14,9 @@
 """Docker Engine API data structures for container inspect responses."""
 
 from dataclasses import dataclass, fields, is_dataclass
-from typing import Any, Optional, Self, TypeVar
+from typing import Any, Optional, TypeVar
+
+from typing_extensions import Self
 
 _IPT = TypeVar("_IPT")
 

core/testcontainers/core/network.py

@@ -12,7 +12,9 @@
 #    under the License.
 import uuid
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Optional, Self
+from typing import TYPE_CHECKING, Any, Optional
+
+from typing_extensions import Self
 
 from testcontainers.core.docker_client import DockerClient
 

core/testcontainers/core/wait_strategies.py

@@ -35,10 +35,12 @@
 import time
 from datetime import timedelta
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional, Self, Union, cast
+from typing import TYPE_CHECKING, Any, Callable, Optional, Union, cast
 from urllib.error import HTTPError, URLError
 from urllib.request import Request, urlopen
 
+from typing_extensions import Self
+
 from testcontainers.compose import DockerCompose
 from testcontainers.core.utils import setup_logger
 

core/testcontainers/socat/socat.py

@@ -13,7 +13,9 @@
 import random
 import socket
 import string
-from typing import Any, Optional, Self
+from typing import Any, Optional
+
+from typing_extensions import Self
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_container_is_ready

modules/azurite/testcontainers/azurite/__init__.py

@@ -12,7 +12,9 @@
 #    under the License.
 import enum
 import os
-from typing import Optional, Self
+from typing import Optional
+
+from typing_extensions import Self
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.utils import raise_for_deprecated_parameter

modules/chroma/testcontainers/chroma/__init__.py

@@ -1,6 +1,7 @@
-from typing import TYPE_CHECKING, Self
+from typing import TYPE_CHECKING
 
 from requests import ConnectionError, get
+from typing_extensions import Self
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.utils import raise_for_deprecated_parameter