v3.0.8 (#37)

Co-authored-by: ddc <ddc@users.noreply.github.com>

Author: ddc

ddcDatabases/__init__.py

@@ -1,29 +1,39 @@
-from ddcDatabases.core.operations import DBUtils, DBUtilsAsync
-from ddcDatabases.core.persistent import PersistentConnectionConfig, close_all_persistent_connections
-from ddcDatabases.sqlite import (
-    Sqlite,
-    SqliteConnRetryConfig,
-    SqliteOpRetryConfig,
-    SqliteSessionConfig,
-)
-from importlib.metadata import version
 import logging
-from typing import Literal, NamedTuple
+from .core.operations import DBUtils, DBUtilsAsync
+from .core.persistent import PersistentConnectionConfig, close_all_persistent_connections
+from importlib.metadata import version
 
 __all__ = [
     "DBUtils",
     "DBUtilsAsync",
     "PersistentConnectionConfig",
-    "Sqlite",
-    "SqliteConnRetryConfig",
-    "SqliteOpRetryConfig",
-    "SqliteSessionConfig",
     "close_all_persistent_connections",
 ]
 
 # Conditional imports based on available dependencies
+try:
+    from .core.settings import clear_sqlite_settings_cache, get_sqlite_settings
+    from .sqlite import (
+        Sqlite,
+        SqliteConnRetryConfig,
+        SqliteOpRetryConfig,
+        SqliteSessionConfig,
+    )
+
+    __all__ += [
+        "Sqlite",
+        "SqliteConnRetryConfig",
+        "SqliteOpRetryConfig",
+        "SqliteSessionConfig",
+        "clear_sqlite_settings_cache",
+        "get_sqlite_settings",
+    ]
+except ImportError:
+    pass
+
 try:
     from .core.persistent import MongoDBPersistent
+    from .core.settings import clear_mongodb_settings_cache, get_mongodb_settings
     from .mongodb import (
         MongoDB,
         MongoDBConnectionConfig,
@@ -41,12 +51,15 @@
         "MongoDBPersistent",
         "MongoDBQueryConfig",
         "MongoDBTLSConfig",
+        "clear_mongodb_settings_cache",
+        "get_mongodb_settings",
     ]
 except ImportError:
     pass
 
 try:
     from .core.persistent import MSSQLPersistent
+    from .core.settings import clear_mssql_settings_cache, get_mssql_settings
     from .mssql import (
         MSSQL,
         MSSQLConnectionConfig,
@@ -66,12 +79,15 @@
         "MSSQLPoolConfig",
         "MSSQLSessionConfig",
         "MSSQLSSLConfig",
+        "clear_mssql_settings_cache",
+        "get_mssql_settings",
     ]
 except ImportError:
     pass
 
 try:
     from .core.persistent import MySQLPersistent
+    from .core.settings import clear_mysql_settings_cache, get_mysql_settings
     from .mysql import (
         MySQL,
         MySQLConnectionConfig,
@@ -91,6 +107,8 @@
     MariaDBPoolConfig = MySQLPoolConfig
     MariaDBSessionConfig = MySQLSessionConfig
     MariaDBSSLConfig = MySQLSSLConfig
+    clear_mariadb_settings_cache = clear_mysql_settings_cache
+    get_mariadb_settings = get_mysql_settings
 
     __all__ += [
         "MySQL",
@@ -101,6 +119,8 @@
         "MySQLPoolConfig",
         "MySQLSessionConfig",
         "MySQLSSLConfig",
+        "clear_mysql_settings_cache",
+        "get_mysql_settings",
         # MariaDB aliases
         "MariaDB",
         "MariaDBConnectionConfig",
@@ -110,12 +130,15 @@
         "MariaDBPoolConfig",
         "MariaDBSessionConfig",
         "MariaDBSSLConfig",
+        "clear_mariadb_settings_cache",
+        "get_mariadb_settings",
     ]
 except ImportError:
     pass
 
 try:
     from .core.persistent import OraclePersistent
+    from .core.settings import clear_oracle_settings_cache, get_oracle_settings
     from .oracle import (
         Oracle,
         OracleConnectionConfig,
@@ -135,12 +158,15 @@
         "OraclePoolConfig",
         "OracleSessionConfig",
         "OracleSSLConfig",
+        "clear_oracle_settings_cache",
+        "get_oracle_settings",
     ]
 except ImportError:
     pass
 
 try:
     from .core.persistent import PostgreSQLPersistent
+    from .core.settings import clear_postgresql_settings_cache, get_postgresql_settings
     from .postgresql import (
         PostgreSQL,
         PostgreSQLConnectionConfig,
@@ -160,6 +186,8 @@
         "PostgreSQLPoolConfig",
         "PostgreSQLSessionConfig",
         "PostgreSQLSSLConfig",
+        "clear_postgresql_settings_cache",
+        "get_postgresql_settings",
     ]
 except ImportError:
     pass
@@ -170,47 +198,6 @@
 __email__ = "danieldcsta@gmail.com>"
 __license__ = "MIT"
 __copyright__ = "Copyright 2024-present DDC Softwares"
-_req_python_version = (3, 12, 0)
-
-
-try:
-    _version = tuple(int(x) for x in version(__title__).split("."))
-except ModuleNotFoundError:
-    _version = (0, 0, 0)
-
-
-class VersionInfo(NamedTuple):
-    major: int
-    minor: int
-    micro: int
-    releaselevel: Literal["alpha", "beta", "candidate", "final"]
-    serial: int
-
-
-__version__ = _version
-__version_info__: VersionInfo = VersionInfo(
-    major=__version__[0],
-    minor=__version__[1],
-    micro=__version__[2],
-    releaselevel="final",
-    serial=0,
-)
-__req_python_version__: VersionInfo = VersionInfo(
-    major=_req_python_version[0],
-    minor=_req_python_version[1],
-    micro=_req_python_version[2],
-    releaselevel="final",
-    serial=0,
-)
+__version__ = version(__title__)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
-
-del (
-    logging,
-    NamedTuple,
-    Literal,
-    VersionInfo,
-    version,
-    _version,
-    _req_python_version,
-)

ddcDatabases/core/base.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+import logging
+import sqlalchemy as sa
 from .configs import BaseOperationRetryConfig, BaseRetryConfig
 from .retry import retry_operation, retry_operation_async
 from abc import ABC, abstractmethod
 from contextlib import AbstractAsyncContextManager, AbstractContextManager
 from datetime import datetime
-import logging
-import sqlalchemy as sa
 from sqlalchemy.engine import URL, Engine
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker
 from sqlalchemy.orm import Session, sessionmaker

ddcDatabases/core/exceptions.py

@@ -1,5 +1,5 @@
-from datetime import datetime, timezone
 import logging
+from datetime import datetime, timezone
 from typing import Any
 
 _logger = logging.getLogger(__name__)

ddcDatabases/core/operations.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import logging
+import sqlalchemy as sa
 from .configs import BaseOperationRetryConfig
 from .exceptions import (
     DBDeleteAllDataException,
@@ -10,8 +12,6 @@
     DBInsertSingleException,
 )
 from .retry import retry_operation, retry_operation_async
-import logging
-import sqlalchemy as sa
 from sqlalchemy import RowMapping
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session

ddcDatabases/core/persistent.py

@@ -8,6 +8,11 @@
 
 from __future__ import annotations
 
+import asyncio
+import logging
+import threading
+import time
+import weakref
 from .configs import BaseRetryConfig
 from .retry import retry_operation, retry_operation_async
 from .settings import (
@@ -18,18 +23,13 @@
     get_postgresql_settings,
 )
 from abc import ABC, abstractmethod
-import asyncio
 from dataclasses import dataclass
-import logging
 from sqlalchemy import text
 from sqlalchemy.engine import URL, Engine, create_engine
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import Session, sessionmaker
-import threading
-import time
 from typing import Any, Generic, TypeVar, cast
-import weakref
 
 _logger = logging.getLogger(__name__)
 _logger.addHandler(logging.NullHandler())

ddcDatabases/core/retry.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from .configs import BaseRetryConfig
-from .constants import CONNECTION_ERROR_KEYWORDS
 import asyncio
 import logging
 import random
 import time
+from .configs import BaseRetryConfig
+from .constants import CONNECTION_ERROR_KEYWORDS
 from typing import Awaitable, Callable, TypeVar
 
 # Type variable for generic return types

ddcDatabases/core/settings.py

@@ -275,3 +275,46 @@ class OracleSettings(_BaseDBSettings):
 get_mysql_settings = _create_cached_settings_factory(MySQLSettings)
 get_mongodb_settings = _create_cached_settings_factory(MongoDBSettings)
 get_oracle_settings = _create_cached_settings_factory(OracleSettings)
+
+
+def _clear_settings_cache(getter_func: Callable[[], T], reload_env: bool = True) -> None:
+    """Clear the cache for a settings getter function.
+
+    Args:
+        getter_func: The cached getter function to clear
+        reload_env: If True, also reset dotenv loaded flag to reload on next access
+    """
+    global _dotenv_loaded
+    getter_func.cache_clear()  # type: ignore[attr-defined]
+    if reload_env:
+        _dotenv_loaded = False
+
+
+def clear_sqlite_settings_cache(reload_env: bool = True) -> None:
+    """Clear SQLite settings cache. Next call to get_sqlite_settings() will create fresh instance."""
+    _clear_settings_cache(get_sqlite_settings, reload_env)
+
+
+def clear_postgresql_settings_cache(reload_env: bool = True) -> None:
+    """Clear PostgreSQL settings cache. Next call to get_postgresql_settings() will create fresh instance."""
+    _clear_settings_cache(get_postgresql_settings, reload_env)
+
+
+def clear_mssql_settings_cache(reload_env: bool = True) -> None:
+    """Clear MSSQL settings cache. Next call to get_mssql_settings() will create fresh instance."""
+    _clear_settings_cache(get_mssql_settings, reload_env)
+
+
+def clear_mysql_settings_cache(reload_env: bool = True) -> None:
+    """Clear MySQL settings cache. Next call to get_mysql_settings() will create fresh instance."""
+    _clear_settings_cache(get_mysql_settings, reload_env)
+
+
+def clear_mongodb_settings_cache(reload_env: bool = True) -> None:
+    """Clear MongoDB settings cache. Next call to get_mongodb_settings() will create fresh instance."""
+    _clear_settings_cache(get_mongodb_settings, reload_env)
+
+
+def clear_oracle_settings_cache(reload_env: bool = True) -> None:
+    """Clear Oracle settings cache. Next call to get_oracle_settings() will create fresh instance."""
+    _clear_settings_cache(get_oracle_settings, reload_env)

ddcDatabases/mongodb.py

@@ -1,13 +1,13 @@
+import logging
+import sys
 from .core.configs import BaseConnectionConfig, BaseOperationRetryConfig, BaseRetryConfig
 from .core.retry import retry_operation, retry_operation_async
 from .core.settings import get_mongodb_settings
 from dataclasses import dataclass
-import logging
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorCursor
 from pymongo import ASCENDING, DESCENDING, MongoClient
 from pymongo.cursor import Cursor
 from pymongo.errors import PyMongoError
-import sys
 from typing import Any
 
 _logger = logging.getLogger(__name__)

ddcDatabases/mssql.py

@@ -1,3 +1,4 @@
+import logging
 from .core.base import BaseConnection, ConnectionTester
 from .core.configs import (
     BaseConnectionConfig,
@@ -9,7 +10,6 @@
 from .core.settings import get_mssql_settings
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass
-import logging
 from sqlalchemy.engine import URL, Engine, create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import Session

ddcDatabases/mysql.py

@@ -1,3 +1,4 @@
+import logging
 from .core.base import BaseConnection
 from .core.configs import (
     BaseConnectionConfig,
@@ -11,7 +12,6 @@
 from .core.settings import get_mysql_settings
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass
-import logging
 from sqlalchemy.engine import URL, Engine, create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 from typing import Any, AsyncGenerator, Generator