sqlalchemy-multiple-db 1.8.0__tar.gz → 2.1.0__tar.gz

sqlalchemy-multiple-db-2.1.0/PKG-INFO

@@ -0,0 +1,81 @@
+Metadata-Version: 2.1
+Name: sqlalchemy-multiple-db
+Version: 2.1.0
+Summary: Helper for easily connect to multiple databases.
+Home-page: https://github.com/bigbag/sqlalchemy-multiple-db
+Download-URL: https://pypi.python.org/pypi/sqlalchemy-multiple-db
+Author: Pavel Liashkov
+Author-email: pavel.liashkov@protonmail.com
+Maintainer: Pavel Liashkov
+Maintainer-email: pavel.liashkov@protonmail.com
+License: Apache License, Version 2.0
+Platform: POSIX
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Operating System :: POSIX
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# sqlalchemy-multiple-db
+
+[![CI](https://github.com/bigbag/sqlalchemy-multiple-db/workflows/CI/badge.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/actions?query=workflow%3ACI)
+[![codecov](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db/branch/main/graph/badge.svg)](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db)
+[![pypi](https://img.shields.io/pypi/v/sqlalchemy-multiple-db.svg)](https://pypi.python.org/pypi/sqlalchemy-multiple-db)
+[![downloads](https://img.shields.io/pypi/dm/sqlalchemy-multiple-db.svg)](https://pypistats.org/packages/sqlalchemy-multiple-db)
+[![versions](https://img.shields.io/pypi/pyversions/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db)
+[![license](https://img.shields.io/github/license/bigbag/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/blob/master/LICENSE)
+
+**sqlalchemy-multiple-db** helper for easily connect to multiple databases.
+
+
+* [Project Changelog](CHANGELOG.md)
+
+## Installation
+
+sqlalchemy-multiple-db is available on PyPI.
+Use pip to install:
+
+    $ pip install sqlalchemy-multiple-db
+
+## Basic Usage
+```py
+from sqlalchemy_multiple_db import DBConfig, db
+
+db.setup({"test1": DBConfig(dsn="sqlite://"), "test2": DBConfig(dsn="sqlite://")})
+
+with db.session_scope("test1") as session:
+    assert session.execute("select 1;")
+
+with db.session_scope("test2") as session:
+    assert session.execute("select 1;")
+
+db.shutdown()
+
+db.setup(DBConfig(dsn="sqlite://"))
+
+with db.session_scope() as session:
+    assert session.execute("select 1;")
+
+db.shutdown()
+
+```
+
+## License
+
+sqlalchemy-multiple-db is developed and distributed under the Apache 2.0 license.
+
+## Reporting a Security Vulnerability
+
+See our [security policy](https://github.com/bigbag/sqlalchemy-multiple-db/security/policy).

{sqlalchemy-multiple-db-1.8.0 → sqlalchemy-multiple-db-2.1.0}/README.md

@@ -10,6 +10,8 @@
 **sqlalchemy-multiple-db** helper for easily connect to multiple databases.
 
 
+* [Project Changelog](CHANGELOG.md)
+
 ## Installation
 
 sqlalchemy-multiple-db is available on PyPI.

{sqlalchemy-multiple-db-1.8.0 → sqlalchemy-multiple-db-2.1.0}/setup.py

@@ -18,6 +18,10 @@ CLASSIFIERS = [
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: POSIX",
     "Topic :: Software Development",
     "Topic :: Software Development :: Libraries",
@@ -42,7 +46,7 @@ setup(
     platforms=["POSIX"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.7",
-    install_requires=["SQLAlchemy>=1.4,<1.5"],
+    install_requires=["SQLAlchemy>=1.4,<2.1"],
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,

sqlalchemy-multiple-db-2.1.0/sqlalchemy_multiple_db/__init__.py

@@ -0,0 +1,3 @@
+from .helper import DEFAULT_DB_NAME, DBConfig, DBHelper, db
+
+__all__ = ["DEFAULT_DB_NAME", "DBConfig", "DBHelper", "db"]

{sqlalchemy-multiple-db-1.8.0 → sqlalchemy-multiple-db-2.1.0}/sqlalchemy_multiple_db/helper.py

@@ -2,10 +2,12 @@ import logging
 from contextlib import contextmanager
 from dataclasses import dataclass, field
 from json import dumps, loads
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Generator, Tuple, Union
 
 from sqlalchemy import create_engine
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, scoped_session, sessionmaker
+from sqlalchemy.sql import text
 
 logger = logging.getLogger(__name__)
 
@@ -24,22 +26,17 @@ DEFAULT_ENGINE_OPTIONS = {
 @dataclass
 class DBConfig:
     dsn: str
-    session_options: Optional[Dict[str, Any]] = None
-    engine_options: Optional[Dict[str, Any]] = None
+    session_options: Dict[str, Any] = field(default_factory=dict)
+    engine_options: Dict[str, Any] = field(default_factory=dict)
 
     def __post_init__(self):
-        session_options = DEFAULT_SESSION_OPTIONS
-        session_options.update(self.session_options or {})
-        self.session_options = session_options
-
-        engine_options = DEFAULT_ENGINE_OPTIONS
-        engine_options.update(self.engine_options or {})
-        self.engine_options = engine_options
+        self.session_options = {**DEFAULT_SESSION_OPTIONS, **self.session_options}
+        self.engine_options = {**DEFAULT_ENGINE_OPTIONS, **self.engine_options}
 
 
 @dataclass
 class DBHelper:
-    sessions: Dict[str, Session] = field(init=False, repr=False)
+    sessions: Dict[str, scoped_session] = field(init=False, repr=False)
     config: Dict[str, DBConfig] = field(init=False, repr=False)
 
     def __getattribute__(self, db_name):
@@ -50,13 +47,14 @@ class DBHelper:
                 print(f"DB: You need to call setup() for getting attribute {db_name}")
             raise exc
 
-    def create_scoped_session(self, config: DBConfig) -> Session:
-        session: scoped_session = scoped_session(
-            sessionmaker(
-                bind=create_engine(config.dsn, **config.engine_options), **config.session_options
-            )
+    def create_scoped_session(self, config: DBConfig) -> scoped_session:
+        engine_options = config.engine_options or {}
+        session_options = config.session_options or {}
+
+        session = scoped_session(
+            sessionmaker(bind=create_engine(config.dsn, **engine_options), **session_options)
         )
-        return session
+        return session  # type: ignore
 
     def setup(self, config: Union[DBConfig, Dict[str, DBConfig]]):
         if isinstance(config, DBConfig):
@@ -68,32 +66,38 @@ class DBHelper:
         for db_name, cfg in config.items():
             self.sessions[db_name] = self.create_scoped_session(cfg)
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         for session in self.sessions.values():
             session.remove()
+        self.sessions.clear()
 
     @contextmanager
-    def session_scope(self, db_name: str = DEFAULT_DB_NAME):
-        session = db.sessions[db_name]
+    def session_scope(self, db_name: str = DEFAULT_DB_NAME) -> Generator[Session, None, None]:
+        session = self.sessions.get(db_name)
+        if not session:
+            raise ValueError(f"No session found for database: {db_name}")
         try:
-            yield session
+            yield session()
+            session.commit()
+        except Exception:
+            session.rollback()
+            raise
         finally:
-            session.close()
+            session.remove()
 
-    def get_status_info(self) -> Tuple[Dict[str, Any], bool]:
+    def get_status_info(self) -> Tuple[Dict[str, Dict[str, str]], bool]:
         full_status = True
         full_status_info = {}
-
         for db_name, session in self.sessions.items():
             status = True
             try:
-                session.execute("select 1;")
-            except Exception as e:
+                session.execute(text("SELECT 1"))
+            except SQLAlchemyError as e:
+                logger.exception(f"Database {db_name} connection failed: {e}")
                 status &= False
                 full_status &= False
-                logger.exception(e)
             finally:
-                session.close()
+                session.remove()
 
             full_status_info[db_name] = {"status": "OK"} if status else {"status": "FAILED"}
 

{sqlalchemy-multiple-db-1.8.0 → sqlalchemy-multiple-db-2.1.0}/sqlalchemy_multiple_db/version.py

@@ -1,3 +1,3 @@
 __all__ = "VERSION"
 
-VERSION = "1.8.0"
+VERSION = "2.1.0"

sqlalchemy-multiple-db-2.1.0/sqlalchemy_multiple_db.egg-info/PKG-INFO

@@ -0,0 +1,81 @@
+Metadata-Version: 2.1
+Name: sqlalchemy-multiple-db
+Version: 2.1.0
+Summary: Helper for easily connect to multiple databases.
+Home-page: https://github.com/bigbag/sqlalchemy-multiple-db
+Download-URL: https://pypi.python.org/pypi/sqlalchemy-multiple-db
+Author: Pavel Liashkov
+Author-email: pavel.liashkov@protonmail.com
+Maintainer: Pavel Liashkov
+Maintainer-email: pavel.liashkov@protonmail.com
+License: Apache License, Version 2.0
+Platform: POSIX
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Operating System :: POSIX
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# sqlalchemy-multiple-db
+
+[![CI](https://github.com/bigbag/sqlalchemy-multiple-db/workflows/CI/badge.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/actions?query=workflow%3ACI)
+[![codecov](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db/branch/main/graph/badge.svg)](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db)
+[![pypi](https://img.shields.io/pypi/v/sqlalchemy-multiple-db.svg)](https://pypi.python.org/pypi/sqlalchemy-multiple-db)
+[![downloads](https://img.shields.io/pypi/dm/sqlalchemy-multiple-db.svg)](https://pypistats.org/packages/sqlalchemy-multiple-db)
+[![versions](https://img.shields.io/pypi/pyversions/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db)
+[![license](https://img.shields.io/github/license/bigbag/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/blob/master/LICENSE)
+
+**sqlalchemy-multiple-db** helper for easily connect to multiple databases.
+
+
+* [Project Changelog](CHANGELOG.md)
+
+## Installation
+
+sqlalchemy-multiple-db is available on PyPI.
+Use pip to install:
+
+    $ pip install sqlalchemy-multiple-db
+
+## Basic Usage
+```py
+from sqlalchemy_multiple_db import DBConfig, db
+
+db.setup({"test1": DBConfig(dsn="sqlite://"), "test2": DBConfig(dsn="sqlite://")})
+
+with db.session_scope("test1") as session:
+    assert session.execute("select 1;")
+
+with db.session_scope("test2") as session:
+    assert session.execute("select 1;")
+
+db.shutdown()
+
+db.setup(DBConfig(dsn="sqlite://"))
+
+with db.session_scope() as session:
+    assert session.execute("select 1;")
+
+db.shutdown()
+
+```
+
+## License
+
+sqlalchemy-multiple-db is developed and distributed under the Apache 2.0 license.
+
+## Reporting a Security Vulnerability
+
+See our [security policy](https://github.com/bigbag/sqlalchemy-multiple-db/security/policy).

sqlalchemy-multiple-db-2.1.0/sqlalchemy_multiple_db.egg-info/requires.txt

@@ -0,0 +1 @@
+SQLAlchemy<2.1,>=1.4

sqlalchemy-multiple-db-1.8.0/PKG-INFO

@@ -1,74 +0,0 @@
-Metadata-Version: 2.1
-Name: sqlalchemy-multiple-db
-Version: 1.8.0
-Summary: Helper for easily connect to multiple databases.
-Home-page: https://github.com/bigbag/sqlalchemy-multiple-db
-Author: Pavel Liashkov
-Author-email: pavel.liashkov@protonmail.com
-Maintainer: Pavel Liashkov
-Maintainer-email: pavel.liashkov@protonmail.com
-License: Apache License, Version 2.0
-Download-URL: https://pypi.python.org/pypi/sqlalchemy-multiple-db
-Description: # sqlalchemy-multiple-db
-        
-        [![CI](https://github.com/bigbag/sqlalchemy-multiple-db/workflows/CI/badge.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/actions?query=workflow%3ACI)
-        [![codecov](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db/branch/main/graph/badge.svg)](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db)
-        [![pypi](https://img.shields.io/pypi/v/sqlalchemy-multiple-db.svg)](https://pypi.python.org/pypi/sqlalchemy-multiple-db)
-        [![downloads](https://img.shields.io/pypi/dm/sqlalchemy-multiple-db.svg)](https://pypistats.org/packages/sqlalchemy-multiple-db)
-        [![versions](https://img.shields.io/pypi/pyversions/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db)
-        [![license](https://img.shields.io/github/license/bigbag/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/blob/master/LICENSE)
-        
-        **sqlalchemy-multiple-db** helper for easily connect to multiple databases.
-        
-        
-        ## Installation
-        
-        sqlalchemy-multiple-db is available on PyPI.
-        Use pip to install:
-        
-            $ pip install sqlalchemy-multiple-db
-        
-        ## Basic Usage
-        ```py
-        from sqlalchemy_multiple_db import DBConfig, db
-        
-        db.setup({"test1": DBConfig(dsn="sqlite://"), "test2": DBConfig(dsn="sqlite://")})
-        
-        with db.session_scope("test1") as session:
-            assert session.execute("select 1;")
-        
-        with db.session_scope("test2") as session:
-            assert session.execute("select 1;")
-        
-        db.shutdown()
-        
-        db.setup(DBConfig(dsn="sqlite://"))
-        
-        with db.session_scope() as session:
-            assert session.execute("select 1;")
-        
-        db.shutdown()
-        
-        ```
-        
-        ## License
-        
-        sqlalchemy-multiple-db is developed and distributed under the Apache 2.0 license.
-        
-        ## Reporting a Security Vulnerability
-        
-        See our [security policy](https://github.com/bigbag/sqlalchemy-multiple-db/security/policy).
-        
-Platform: POSIX
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Operating System :: POSIX
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown

sqlalchemy-multiple-db-1.8.0/sqlalchemy_multiple_db/__init__.py

@@ -1,3 +0,0 @@
-from .helper import DBConfig, DBHelper, db
-
-__all__ = ["DBConfig", "DBHelper", "db"]

sqlalchemy-multiple-db-1.8.0/sqlalchemy_multiple_db.egg-info/PKG-INFO

@@ -1,74 +0,0 @@
-Metadata-Version: 2.1
-Name: sqlalchemy-multiple-db
-Version: 1.8.0
-Summary: Helper for easily connect to multiple databases.
-Home-page: https://github.com/bigbag/sqlalchemy-multiple-db
-Author: Pavel Liashkov
-Author-email: pavel.liashkov@protonmail.com
-Maintainer: Pavel Liashkov
-Maintainer-email: pavel.liashkov@protonmail.com
-License: Apache License, Version 2.0
-Download-URL: https://pypi.python.org/pypi/sqlalchemy-multiple-db
-Description: # sqlalchemy-multiple-db
-        
-        [![CI](https://github.com/bigbag/sqlalchemy-multiple-db/workflows/CI/badge.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/actions?query=workflow%3ACI)
-        [![codecov](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db/branch/main/graph/badge.svg)](https://codecov.io/gh/bigbag/sqlalchemy-multiple-db)
-        [![pypi](https://img.shields.io/pypi/v/sqlalchemy-multiple-db.svg)](https://pypi.python.org/pypi/sqlalchemy-multiple-db)
-        [![downloads](https://img.shields.io/pypi/dm/sqlalchemy-multiple-db.svg)](https://pypistats.org/packages/sqlalchemy-multiple-db)
-        [![versions](https://img.shields.io/pypi/pyversions/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db)
-        [![license](https://img.shields.io/github/license/bigbag/sqlalchemy-multiple-db.svg)](https://github.com/bigbag/sqlalchemy-multiple-db/blob/master/LICENSE)
-        
-        **sqlalchemy-multiple-db** helper for easily connect to multiple databases.
-        
-        
-        ## Installation
-        
-        sqlalchemy-multiple-db is available on PyPI.
-        Use pip to install:
-        
-            $ pip install sqlalchemy-multiple-db
-        
-        ## Basic Usage
-        ```py
-        from sqlalchemy_multiple_db import DBConfig, db
-        
-        db.setup({"test1": DBConfig(dsn="sqlite://"), "test2": DBConfig(dsn="sqlite://")})
-        
-        with db.session_scope("test1") as session:
-            assert session.execute("select 1;")
-        
-        with db.session_scope("test2") as session:
-            assert session.execute("select 1;")
-        
-        db.shutdown()
-        
-        db.setup(DBConfig(dsn="sqlite://"))
-        
-        with db.session_scope() as session:
-            assert session.execute("select 1;")
-        
-        db.shutdown()
-        
-        ```
-        
-        ## License
-        
-        sqlalchemy-multiple-db is developed and distributed under the Apache 2.0 license.
-        
-        ## Reporting a Security Vulnerability
-        
-        See our [security policy](https://github.com/bigbag/sqlalchemy-multiple-db/security/policy).
-        
-Platform: POSIX
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Operating System :: POSIX
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown

sqlalchemy-multiple-db-1.8.0/sqlalchemy_multiple_db.egg-info/requires.txt

@@ -1 +0,0 @@
-SQLAlchemy<1.5,>=1.4