ry-pg-utils 1.0.10__py3-none-any.whl → 1.0.14__py3-none-any.whl

ry_pg_utils/config.py

@@ -39,14 +39,14 @@ pg_config = Config(
     postgres_db=os.getenv("POSTGRES_DB"),
     postgres_user=os.getenv("POSTGRES_USER"),
     postgres_password=os.getenv("POSTGRES_PASSWORD"),
-    do_publish_db=False,
+    do_publish_db=True,
     use_local_db_only=True,
     backend_id=(
         os.getenv("POSTGRES_USER")
         or f"{socket.gethostname()}_{socket.gethostbyname(socket.gethostname())}"
     ),
-    add_backend_to_all=True,
-    add_backend_to_tables=True,
+    add_backend_to_all=False,
+    add_backend_to_tables=False,
     raise_on_use_before_init=True,
     ssh_host=os.getenv("SSH_HOST"),
     ssh_port=_ssh_port,

ry_pg_utils/connect.py

@@ -5,11 +5,10 @@ import threading
 import typing as T
 
 from ryutils import log
-from sqlalchemy import Column, String, create_engine, event
+from sqlalchemy import String, create_engine, event
 from sqlalchemy.engine.base import Engine
 from sqlalchemy.exc import OperationalError
-from sqlalchemy.orm import declarative_base, declared_attr, scoped_session, sessionmaker
-from sqlalchemy.orm.decl_api import DeclarativeMeta
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, scoped_session, sessionmaker
 from sqlalchemy.orm.scoping import ScopedSession
 from sqlalchemy_utils import database_exists
 from tenacity import retry, stop_after_attempt, wait_exponential
@@ -22,20 +21,19 @@ BACKEND_ID_VARIABLE = "backend_id"
 ENGINE: T.Dict[str, Engine] = {}
 THREAD_SAFE_SESSION_FACTORY: T.Dict[str, ScopedSession] = {}
 
-# Base class with optional backend_id field
+
+# Modern SQLAlchemy 2.0 declarative base
 if config.pg_config.add_backend_to_all:
-    # Add any common fields here
-    class CommonBaseModel:
-        @declared_attr
-        def backend_id(cls: T.Any) -> Column:  # pylint: disable=no-self-argument
-            return Column(String(256), nullable=False)
 
-    Base = declarative_base(name="Base", cls=CommonBaseModel)
+    class Base(DeclarativeBase):
+        """Base class with automatic backend_id field."""
+
+        backend_id: Mapped[str] = mapped_column(String(256), nullable=False)
+
 else:
-    Base = declarative_base(name="Base")
 
-# Add type annotation for Base
-Base: DeclarativeMeta  # type: ignore
+    class Base(DeclarativeBase):  # type: ignore[no-redef]
+        """Base class for all SQLAlchemy models."""
 
 
 def get_table_name(

ry_pg_utils/ipc/channels.py

@@ -1,11 +1,11 @@
 from ry_redis_bus.channels import Channel
 
-from ry_pg_utils.pb_types.database_pb2 import DatabaseConfigPb  # pylint: disable=no-name-in-module
 from ry_pg_utils.pb_types.database_pb2 import (  # pylint: disable=no-name-in-module
     DatabaseNotificationPb,
+    PostgresMessagePb,
 )
 
 # Channels
-DATABASE_CHANNEL = Channel("DATABASE_CHANNEL", DatabaseConfigPb)
-DATABASE_CONFIG_CHANNEL = Channel("DATABASE_CONFIG_CHANNEL", DatabaseConfigPb)
+DATABASE_CHANNEL = Channel("DATABASE_CHANNEL", PostgresMessagePb)
+DATABASE_CONFIG_CHANNEL = Channel("DATABASE_CONFIG_CHANNEL", PostgresMessagePb)
 DATABASE_NOTIFY_CHANNEL = Channel("DATABASE_NOTIFY_CHANNEL", DatabaseNotificationPb)

ry_pg_utils/updater.py

@@ -45,14 +45,12 @@ def get_database_settings(
 class DbUpdater(RedisClientBase):
     do_publish_db: bool
     postgres_info: PostgresInfo
-    backend_id: str
     logging_error_db_callback: T.Callable[[str, str], None] | None
 
     def __init__(
         self,
         redis_info: RedisInfo,
         args: argparse.Namespace,
-        backend_id: str,
         verbose: Verbose,
         logging_error_db_callback: T.Callable[[str, str], None] | None = None,
     ):

{ry_pg_utils-1.0.10.dist-info → ry_pg_utils-1.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ry-pg-utils
-Version: 1.0.10
+Version: 1.0.14
 Summary: Utility functions for PostgreSQL
 Author: Ross Yeager
 Author-email: ryeager12@email.com

{ry_pg_utils-1.0.10.dist-info → ry_pg_utils-1.0.14.dist-info}/RECORD

@@ -1,22 +1,22 @@
 ry_pg_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ry_pg_utils/config.py,sha256=7W-JLNxZDoursPArtoKyOiEqUABGyO1ZEkTdlVBzdVM,1522
-ry_pg_utils/connect.py,sha256=jF-Sj9oySPDfTlOh4_C6c03t4KW5Sef_MLHx_sh52a4,10108
+ry_pg_utils/config.py,sha256=56FQwRdkAjrzR4IFWKLZdt6NeULxAIrQyhnKC5XJ7-M,1523
+ry_pg_utils/connect.py,sha256=ECasbbwXCsj1pJwz_er2aKW613X73X30EQyS_TgX5i0,9942
 ry_pg_utils/dynamic_table.py,sha256=VBkfbATRk_pW3EtAFHvMkGG0fLZMebw_LdWkFaDDugw,6866
 ry_pg_utils/notify_trigger.py,sha256=_dsuPkoqjnSQqWrsdZK3FqI6zG5UuygVXHwtERwN99Y,12069
 ry_pg_utils/parse_args.py,sha256=swFYq2-nBggul67C9ibNzsf9goEXDKZkLNSISbJZgOw,751
 ry_pg_utils/postgres_info.py,sha256=mj9er830jvrJXUFuFKx1EmZMjuEpMDcd901kgYb_Cck,1495
 ry_pg_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ry_pg_utils/updater.py,sha256=vmsmiRZuKQlwNbtz6MAYOOfQPvq0lJm2pQuHCMdPCU0,5606
+ry_pg_utils/updater.py,sha256=qEj1Wc4f-z5ixw_twqvG4vXdlTICSi7fBPZzzbGeafY,5561
 ry_pg_utils/ipc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ry_pg_utils/ipc/channels.py,sha256=3w88R_BW5wLW7NX4iNAS3akgXo0JFQufdR7y-l_dNGE,499
+ry_pg_utils/ipc/channels.py,sha256=U8MKblm8I-LfokmkC-WuCJmUjr-1KGQJB5Fsdnc1R8M,424
 ry_pg_utils/pb_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ry_pg_utils/pb_types/database_pb2.py,sha256=j56AaBNQOFHp19O-8egcil3e0x8rujhlnAFuXIyMvx0,1886
 ry_pg_utils/pb_types/database_pb2.pyi,sha256=PtBakRFPx_o9PkpvYgn0doNoaoz6X03eI9TrnpfamkI,3267
 ry_pg_utils/pb_types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ry_pg_utils/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ry_pg_utils/tools/db_query.py,sha256=sQESUB3zxv3h2bKcodfwJHKHGXdSn6BNaBiyZvg6eNY,19557
-ry_pg_utils-1.0.10.dist-info/licenses/LICENSE,sha256=PYnig94SABlde939TWrqvOqQkkfjuHttf8KpWKlPFlA,1068
-ry_pg_utils-1.0.10.dist-info/METADATA,sha256=RyQKGCyHMMGCXymlI1PJeb7cXn8jPAq-cRhYKN3BB8c,18040
-ry_pg_utils-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ry_pg_utils-1.0.10.dist-info/top_level.txt,sha256=OruzbmsQHYyPnAw8RichQ5GK1Sxj-MQwWfJ93PEHXIM,12
-ry_pg_utils-1.0.10.dist-info/RECORD,,
+ry_pg_utils-1.0.14.dist-info/licenses/LICENSE,sha256=PYnig94SABlde939TWrqvOqQkkfjuHttf8KpWKlPFlA,1068
+ry_pg_utils-1.0.14.dist-info/METADATA,sha256=24mYDITuQCHhUnq-VyogPzhDiLIFhLn0u721srSkF3o,18040
+ry_pg_utils-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ry_pg_utils-1.0.14.dist-info/top_level.txt,sha256=OruzbmsQHYyPnAw8RichQ5GK1Sxj-MQwWfJ93PEHXIM,12
+ry_pg_utils-1.0.14.dist-info/RECORD,,