ry-pg-utils 1.0.10__tar.gz → 1.0.11__tar.gz

{ry_pg_utils-1.0.10/src/ry_pg_utils.egg-info → ry_pg_utils-1.0.11}/PKG-INFO

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

ry_pg_utils-1.0.11/VERSION

@@ -0,0 +1 @@
+1.0.11

{ry_pg_utils-1.0.10 → ry_pg_utils-1.0.11}/src/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-1.0.10 → ry_pg_utils-1.0.11}/src/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-1.0.10 → ry_pg_utils-1.0.11}/src/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 → ry_pg_utils-1.0.11/src/ry_pg_utils.egg-info}/PKG-INFO

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

ry_pg_utils-1.0.10/VERSION

@@ -1 +0,0 @@
-1.0.10