sqlalchemy-query-helpers 1.0.102__py3-none-any.whl → 1.0.104__py3-none-any.whl

sqlalchemy_query_helpers/main.py

@@ -1,5 +1,6 @@
 from sqlalchemy import create_engine, MetaData, Table, select
 from sqlalchemy.orm import sessionmaker, Query, DeclarativeMeta, session
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm.session import Session
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.dialects.mysql import insert
@@ -16,9 +17,15 @@ class DB:
     Session: sessionmaker = None
     session: Session = None
 
-    def __init__(self, db_name, base: DeclarativeMeta, use_os_env=True, echo=False):
+    def __init__(self, db_name, base: DeclarativeMeta, db_url: str | None = None, echo=False):
+        """
+        :param db_url: URL as "{user}:{password}@{host}" without [schema + netloc], 
+            that will use as f'mysql+pymysql://{db_url}'. 
+            It's convenient to store this string as an OS environment variable.
+            None - Use OS environment variables: 'DB_USER', 'DB_PASSWORD', 'DB_HOST'.
+        """
         self.base = base
-        engine_str = self.make_engine_str(use_os_env)
+        engine_str = self.make_engine_str(db_url)
         self.engine = create_engine(f'{engine_str}/{db_name}', echo=echo)
         self.Session = sessionmaker(bind=self.engine)
         # self.session = self.Session()
@@ -31,12 +38,14 @@ class DB:
             self.session.close()
 
     @staticmethod
-    def make_engine_str(use_os_env) -> str:
+    def make_engine_str(db_url: str | None) -> str:
         """
         Create an engine string (schema + netloc), like "mysql+pymysql://USER:PASSWORD@HOST"
-        :param use_os_env: Use OS envs 'DB_USER', 'DB_PASSWORD', 'DB_HOST', instead the `cfg.py` file
+        :param db_url: URL as "{user}:{password}@{host}" that will use as f'mysql+pymysql://{db_url}'. 
+            It's convenient to store this string as an OS environment variable.
+            None - Use OS environment variables: 'DB_USER', 'DB_PASSWORD', 'DB_HOST'.
         """
-        if use_os_env:
+        if not db_url:
             import os
             try:
                 user = os.environ['DB_USER']
@@ -44,9 +53,9 @@ class DB:
                 host = os.environ['DB_HOST']
             except KeyError:
                 raise RuntimeError("Set the 'DB_USER', 'DB_PASSWORD', 'DB_HOST' OS env variables")
+            engine_str = f'mysql+pymysql://{user}:{password}@{host}'
         else:
-            from cfg import user, password, host
-        engine_str = f'mysql+pymysql://{user}:{password}@{host}'
+            engine_str = f'mysql+pymysql://{db_url}'
         return engine_str
 
     def get_predefined_table(self, table_name: str, base_metadata=None):
@@ -106,19 +115,21 @@ class DB:
         return new_rowid
 
     def insert_many(self, t, rows: Union[list, tuple], mfields: Union[list, tuple] = None, do_commit=True):
-        for row in rows:
-            row = self.__to_dict(row, mfields, use_orm_keys=True)
-            m = t(**row)
-            self.session.add(m)
-        if do_commit:
-            self.session.commit()
+        with self.Session() as s:
+            for row in rows:
+                row = self.__to_dict(row, mfields, use_orm_keys=True)
+                m = t(**row)
+                s.add(m)
+            if do_commit:
+                s.commit()
 
-    def insert_one(self, t, row: Union[list, tuple], mfields: Union[list, tuple] = None, ignore=False):
+    def insert_one(self, t, row: Union[dict, list, tuple], mfields: Union[list, tuple] = None, ignore=False):
         q = insert(t).values(self.__to_dict(row, mfields))
         if ignore:
             q = q.prefix_with('IGNORE', dialect='mysql')
-        r = self.session.execute(q)
-        self.session.commit()
+        with self.Session() as s:
+            r = s.execute(q)
+            s.commit()
         return r.lastrowid
 
     def insert_ignore(self, t, row: Union[dict, list, tuple], mfields: Iterable[InstrumentedAttribute] = None) -> bool:
@@ -126,18 +137,19 @@ class DB:
         return is_inserted
 
     def insert_ignore_many(self, t, rows: List[dict], mfields: Iterable[InstrumentedAttribute] = None) -> bool:
-        is_inserted = False
-        for row in rows:
-            row = self.__to_dict(row, mfields, use_orm_keys=True)
-            try:
-                with self.session.begin_nested():
-                    m = t(**row)
-                    self.session.add(m)
-                is_inserted = True
-            except IntegrityError:
-                # print(f'already in DB: {row}')
-                pass
-        self.session.commit()
+        with self.Session() as s:
+            is_inserted = False
+            for row in rows:
+                row = self.__to_dict(row, mfields, use_orm_keys=True)
+                try:
+                    with s.begin_nested():
+                        m = t(**row)
+                        s.add(m)
+                    is_inserted = True
+                except IntegrityError:
+                    # print(f'already in DB: {row}')
+                    pass
+            s.commit()
         return is_inserted
 
     def insert_ignore_core(self, t, row: Union[dict, list, tuple], mfields: Union[list, tuple] = None) -> None:
@@ -170,7 +182,8 @@ class DB:
     def update(self, t, row: Union[dict, list, tuple], cause_keys: Union[list, tuple], mfields: Union[list, tuple] = None) -> (bool, bool):
         row = self.__to_dict(row, mfields)
         in_keys, not_in_keys = self.__check_modelkeys(row, cause_keys)  # get_check_args(row, keys)
-        rows_updates = Query(t, session=self.session).filter_by(**in_keys).update(not_in_keys)
+        with self.Session() as s:
+            rows_updates = s.query(t).filter_by(**in_keys).update(not_in_keys)
         # q = update(t).values(**not_in_keys).where(**in_keys)
         # rows_updates = self.db.session.execute(q)
         # self.db.session.commit()
@@ -184,7 +197,8 @@ class DB:
         cause_dict, to_insert_dict = self.__check_modelkeys(row, cause_dict)
         # r = Query(t, session=self.session).filter_by(**cause_dict).first()
         q = select(t).where(**cause_dict).limit(1)
-        r = self.session.execute(q).first()
+        with self.Session() as s:
+            r = s.execute(q).first()
         if r:
             for k, v in to_insert_dict.items():
                 if vars(r)[k] != v:

{sqlalchemy_query_helpers-1.0.102.dist-info → sqlalchemy_query_helpers-1.0.104.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sqlalchemy-query-helpers
-Version: 1.0.102
+Version: 1.0.104
 Summary: Some helpers for SQLAlchemy
 Author-email: vladiscripts <blagopoluchie12@gmail.com>
 Project-URL: Homepage, https://github.com/vladiscripts/sqlalchemy-query-helpers
@@ -12,6 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy
+Dynamic: license-file
 
 Пакет содержит хелперы для пакета SQLAlchmy - методов `insert`, `upsert`, `update` и другое.
 

sqlalchemy_query_helpers-1.0.104.dist-info/RECORD

@@ -0,0 +1,7 @@
+sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
+sqlalchemy_query_helpers/main.py,sha256=4bEa1vnm7iUdykmgJi9b8D5SWNog93i6OrnUHgFhe30,14006
+sqlalchemy_query_helpers-1.0.104.dist-info/licenses/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
+sqlalchemy_query_helpers-1.0.104.dist-info/METADATA,sha256=X_47uSGf-vYqFXZIHRlNdx9R6-GRaWWSDOo2XBJli-M,2621
+sqlalchemy_query_helpers-1.0.104.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlalchemy_query_helpers-1.0.104.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
+sqlalchemy_query_helpers-1.0.104.dist-info/RECORD,,

{sqlalchemy_query_helpers-1.0.102.dist-info → sqlalchemy_query_helpers-1.0.104.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sqlalchemy_query_helpers-1.0.102.dist-info/RECORD

@@ -1,7 +0,0 @@
-sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
-sqlalchemy_query_helpers/main.py,sha256=P8TLCQVT8L0l9iwmWnSxFZfpX0HaLuXuAi98zJPdCFQ,13282
-sqlalchemy_query_helpers-1.0.102.dist-info/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
-sqlalchemy_query_helpers-1.0.102.dist-info/METADATA,sha256=YOWWGLBJlFw3iUu5UCs59aNc7xuPhfTo2ahP1fO5ZfE,2599
-sqlalchemy_query_helpers-1.0.102.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sqlalchemy_query_helpers-1.0.102.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
-sqlalchemy_query_helpers-1.0.102.dist-info/RECORD,,