ry-pg-utils 1.0.7__tar.gz → 1.0.9__tar.gz

{ry_pg_utils-1.0.7/src/ry_pg_utils.egg-info → ry_pg_utils-1.0.9}/PKG-INFO

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

ry_pg_utils-1.0.9/VERSION

@@ -0,0 +1 @@
+1.0.9

{ry_pg_utils-1.0.7 → ry_pg_utils-1.0.9}/src/ry_pg_utils/ipc/channels.py

@@ -3,10 +3,9 @@ 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,
-    DatabaseSettingsPb,
 )
 
 # Channels
 DATABASE_CHANNEL = Channel("DATABASE_CHANNEL", DatabaseConfigPb)
-DATABASE_CONFIG_CHANNEL = Channel("DATABASE_CONFIG_CHANNEL", DatabaseSettingsPb)
+DATABASE_CONFIG_CHANNEL = Channel("DATABASE_CONFIG_CHANNEL", DatabaseConfigPb)
 DATABASE_NOTIFY_CHANNEL = Channel("DATABASE_NOTIFY_CHANNEL", DatabaseNotificationPb)

{ry_pg_utils-1.0.7 → ry_pg_utils-1.0.9}/src/ry_pg_utils/updater.py

@@ -11,7 +11,7 @@ from ryutils.verbose import Verbose
 from ry_pg_utils.connect import close_engine, init_database, is_database_initialized
 from ry_pg_utils.ipc import channels
 from ry_pg_utils.pb_types.database_pb2 import (  # pylint: disable=no-name-in-module
-    DatabaseSettingsPb,
+    DatabaseConfigPb,
     PostgresMessagePb,
     PostgresPb,
 )
@@ -21,14 +21,22 @@ DB_RETRY_TIME = 5.0
 
 
 def get_database_settings(
-    message_pb: DatabaseSettingsPb, backend_id: str, verbose: bool = False
+    message_pb: DatabaseConfigPb, backend_id: str, verbose: bool = False
 ) -> T.Optional[PostgresInfo]:
-    raw_db_config_pb = message_pb.postgres.get(backend_id, None)
+    # Access the nested databaseSettings field
+    if not message_pb.HasField("databaseSettings"):
+        return None
 
-    if raw_db_config_pb is None:
+    database_settings = message_pb.databaseSettings
+
+    # Check if this is the primary database
+    if not database_settings.primaryDatabase:
         return None
 
-    if not message_pb.primaryDatabase:
+    # Get the postgres config for this backend
+    raw_db_config_pb = database_settings.postgres.get(backend_id, None)
+
+    if raw_db_config_pb is None:
         return None
 
     db_config_pb: PostgresPb = raw_db_config_pb
@@ -84,7 +92,7 @@ class DbUpdater(RedisClientBase):
         self.logging_error_db_callback = logging_error_db_callback
 
     @message_handler
-    def handle_database_config_message(self, message_pb: DatabaseSettingsPb) -> None:
+    def handle_database_config_message(self, message_pb: DatabaseConfigPb) -> None:
         database_settings = get_database_settings(message_pb, backend_id=self.backend_id)
 
         if database_settings is not None:

{ry_pg_utils-1.0.7 → ry_pg_utils-1.0.9/src/ry_pg_utils.egg-info}/PKG-INFO

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

ry_pg_utils-1.0.7/VERSION

@@ -1 +0,0 @@
-1.0.7