ry-pg-utils 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

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/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.dist-info → ry_pg_utils-1.0.9.dist-info}/METADATA

@@ -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.dist-info → ry_pg_utils-1.0.9.dist-info}/RECORD

@@ -6,17 +6,17 @@ ry_pg_utils/notify_trigger.py,sha256=_dsuPkoqjnSQqWrsdZK3FqI6zG5UuygVXHwtERwN99Y
 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=TbUKJHQarzRrDjcbjbzIhy1sO61o-YhEG594gWnI0LA,5831
+ry_pg_utils/updater.py,sha256=nfOR2hpf83buaJc0oyiHf0xfE1pl51CYOz1PuRid198,6103
 ry_pg_utils/ipc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ry_pg_utils/ipc/channels.py,sha256=sjYuRjmqWMN26v8m6Qm72lecwOJ1dZAF-qfcDR-qjsY,525
+ry_pg_utils/ipc/channels.py,sha256=3w88R_BW5wLW7NX4iNAS3akgXo0JFQufdR7y-l_dNGE,499
 ry_pg_utils/pb_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ry_pg_utils/pb_types/database_pb2.py,sha256=yf__HycGrVoU8pzhYdnOhXhfAkgjeGl80ls_RsLemy4,2780
 ry_pg_utils/pb_types/database_pb2.pyi,sha256=svpmlEY_99dA_u3CJqn7CO5D7CH2pAGTOqlhVMZLXC4,5689
 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.7.dist-info/licenses/LICENSE,sha256=PYnig94SABlde939TWrqvOqQkkfjuHttf8KpWKlPFlA,1068
-ry_pg_utils-1.0.7.dist-info/METADATA,sha256=-ib-1zWpEBdqneZ2wjbUivhGdv_hAtSJH8IwzE0x4Ns,18039
-ry_pg_utils-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ry_pg_utils-1.0.7.dist-info/top_level.txt,sha256=OruzbmsQHYyPnAw8RichQ5GK1Sxj-MQwWfJ93PEHXIM,12
-ry_pg_utils-1.0.7.dist-info/RECORD,,
+ry_pg_utils-1.0.9.dist-info/licenses/LICENSE,sha256=PYnig94SABlde939TWrqvOqQkkfjuHttf8KpWKlPFlA,1068
+ry_pg_utils-1.0.9.dist-info/METADATA,sha256=eHg0wS2vfpifjX9vEntJEPSLJOucwhylSfnMgrdpN-s,18039
+ry_pg_utils-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ry_pg_utils-1.0.9.dist-info/top_level.txt,sha256=OruzbmsQHYyPnAw8RichQ5GK1Sxj-MQwWfJ93PEHXIM,12
+ry_pg_utils-1.0.9.dist-info/RECORD,,