revert unecessary formatting changes

Author: faviansamatha

aws_advanced_python_wrapper/blue_green_plugin.py

@@ -1156,9 +1156,9 @@ def _update_ip_address_flags(self):
                 {host_info.host for host_info in self._start_topology}
             current_topology_copy = self._current_topology
             self._all_topology_changed = (
-                current_topology_copy and
-                start_topology_hosts and
-                all(host_info.host not in start_topology_hosts for host_info in current_topology_copy))
+                    current_topology_copy and
+                    start_topology_hosts and
+                    all(host_info.host not in start_topology_hosts for host_info in current_topology_copy))
 
     def _has_all_start_topology_ip_changed(self) -> bool:
         if not self._start_topology:
@@ -1429,7 +1429,7 @@ def _update_corresponding_hosts(self):
                     (green_host for green_host in green_hosts
                      if self._rds_utils.is_rds_custom_cluster_dns(green_host)
                      and custom_cluster_name == self._rds_utils.remove_green_instance_prefix(
-                         self._rds_utils.get_cluster_id(green_host))),
+                        self._rds_utils.get_cluster_id(green_host))),
                     None
                 )
 

aws_advanced_python_wrapper/driver_dialect_manager.py

@@ -52,8 +52,7 @@ class DriverDialectManager(DriverDialectProvider):
     }
 
     pool_connection_driver_dialect: Dict[str, str] = {
-        "SqlAlchemyPooledConnectionProvider": "aws_advanced_python_wrapper.sqlalchemy_driver_dialect.SqlAlchemyDriverDialect",
-        "SqlAlchemyTortoisePooledConnectionProvider": "aws_advanced_python_wrapper.sqlalchemy_driver_dialect.SqlAlchemyDriverDialect",
+        "SqlAlchemyPooledConnectionProvider": "aws_advanced_python_wrapper.sqlalchemy_driver_dialect.SqlAlchemyDriverDialect"
     }
 
     @staticmethod

aws_advanced_python_wrapper/host_monitoring_plugin.py

@@ -207,7 +207,6 @@ class MonitoringContext:
     This contains each connection's criteria for whether a server should be considered unhealthy.
     The context is shared between the main thread and the monitor thread.
     """
-
     def __init__(
             self,
             monitor: Monitor,

aws_advanced_python_wrapper/host_monitoring_v2_plugin.py

@@ -415,7 +415,7 @@ def _update_host_health_status(
 
             invalid_host_duration_ns = status_check_end_ns - self._invalid_host_start_time_ns
             max_invalid_host_duration_ns = (
-                self._failure_detection_interval_ns * max(0, self._failure_detection_count - 1))
+                    self._failure_detection_interval_ns * max(0, self._failure_detection_count - 1))
 
             if invalid_host_duration_ns >= max_invalid_host_duration_ns:
                 logger.debug("HostMonitorV2.HostDead", self._host_info.host)

aws_advanced_python_wrapper/mysql_driver_dialect.py

@@ -11,6 +11,7 @@
 #  WITHOUT 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 __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Set

aws_advanced_python_wrapper/pg_driver_dialect.py

@@ -14,7 +14,6 @@
 
 from __future__ import annotations
 
-from inspect import signature
 from typing import TYPE_CHECKING, Any, Callable, Set
 
 import psycopg
@@ -23,6 +22,8 @@
     from aws_advanced_python_wrapper.hostinfo import HostInfo
     from aws_advanced_python_wrapper.pep249 import Connection
 
+from inspect import signature
+
 from aws_advanced_python_wrapper.driver_dialect import DriverDialect
 from aws_advanced_python_wrapper.driver_dialect_codes import DriverDialectCodes
 from aws_advanced_python_wrapper.errors import UnsupportedOperationError

aws_advanced_python_wrapper/sqlalchemy_driver_dialect.py

@@ -16,22 +16,21 @@
 
 from typing import TYPE_CHECKING, Any
 
+from aws_advanced_python_wrapper.driver_dialect import DriverDialect
+from aws_advanced_python_wrapper.errors import AwsWrapperError
+from aws_advanced_python_wrapper.utils.messages import Messages
+
 if TYPE_CHECKING:
     from aws_advanced_python_wrapper.hostinfo import HostInfo
     from aws_advanced_python_wrapper.pep249 import Connection
     from aws_advanced_python_wrapper.utils.properties import Properties
 
 from sqlalchemy import PoolProxiedConnection
 
-from aws_advanced_python_wrapper.driver_dialect import DriverDialect
-from aws_advanced_python_wrapper.errors import AwsWrapperError
-from aws_advanced_python_wrapper.utils.messages import Messages
-
 
 class SqlAlchemyDriverDialect(DriverDialect):
     _driver_name: str = "SQLAlchemy"
     TARGET_DRIVER_CODE: str = "sqlalchemy"
-    _underlying_driver_dialect = None
 
     def __init__(self, underlying_driver: DriverDialect, props: Properties):
         super().__init__(props)

tests/integration/container/utils/connection_utils.py

@@ -109,7 +109,9 @@ def get_aws_tortoise_url(
             dbname: Optional[str] = None,
             **kwargs) -> str:
         """Build AWS MySQL connection URL for Tortoise ORM with query parameters."""
-        host = self.writer_cluster_host if host is None else host
+
+        env_host = self.writer_cluster_host if self.writer_cluster_host else self.writer_host
+        host = env_host if host is None else host
         port = self.port if port is None else port
         user = self.user if user is None else user
         password = self.password if password is None else password

tests/integration/container/utils/test_environment.py

@@ -240,7 +240,7 @@ def is_test_driver_allowed(self, test_driver: TestDriver) -> bool:
             disabled_by_feature = TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS in features
         elif test_driver == TestDriver.PG:
             driver_compatible_to_database_engine = (
-                database_engine == DatabaseEngine.PG)
+                    database_engine == DatabaseEngine.PG)
             disabled_by_feature = TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS in features
         else:
             raise UnsupportedOperationError(test_driver.value)

tests/integration/container/utils/test_environment_request.py

@@ -40,7 +40,7 @@ def __init__(self, request: Dict[str, Any]) -> None:
         self._instances = getattr(DatabaseInstances, typing.cast('str', request.get("instances")))
         self._deployment = getattr(DatabaseEngineDeployment, typing.cast('str', request.get("deployment")))
         self._target_python_version = getattr(TargetPythonVersion, typing.cast('str', request.get("targetPythonVersion")))
-        self._num_of_instances = request.get("numOfInstances", 1)
+        self._num_of_instances = typing.cast('int', request.get("numOfInstances"))
         self._features = set()
         features: Iterable[str] = typing.cast('Iterable[str]', request.get("features"))
         if features is not None: