pgsync 4.2.0__tar.gz → 4.2.1__tar.gz

{pgsync-4.2.0 → pgsync-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgsync
-Version: 4.2.0
+Version: 4.2.1
 Summary: Postgres to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -32,33 +32,33 @@ License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: async-timeout==5.0.1
 Requires-Dist: backports-datetime-fromisoformat==2.0.3
-Requires-Dist: boto3==1.40.1
-Requires-Dist: botocore==1.40.1
+Requires-Dist: boto3==1.40.35
+Requires-Dist: botocore==1.40.35
 Requires-Dist: certifi==2025.8.3
-Requires-Dist: charset-normalizer==3.4.2
+Requires-Dist: charset-normalizer==3.4.3
 Requires-Dist: click==8.1.8
 Requires-Dist: elastic-transport==8.17.1
-Requires-Dist: elasticsearch==8.19.0
+Requires-Dist: elasticsearch==8.19.1
 Requires-Dist: elasticsearch-dsl==8.15.4
 Requires-Dist: environs==14.3.0
 Requires-Dist: events==0.5
-Requires-Dist: greenlet==3.2.3
+Requires-Dist: greenlet==3.2.4
 Requires-Dist: idna==3.10
 Requires-Dist: jmespath==1.0.1
-Requires-Dist: marshmallow==4.0.0
+Requires-Dist: marshmallow==4.0.1
 Requires-Dist: opensearch-dsl==2.1.0
 Requires-Dist: opensearch-py==3.0.0
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-dotenv==1.1.1
-Requires-Dist: redis==6.2.0
-Requires-Dist: requests==2.32.4
+Requires-Dist: redis==6.4.0
+Requires-Dist: requests==2.32.5
 Requires-Dist: requests-aws4auth==1.3.1
-Requires-Dist: s3transfer==0.13.1
+Requires-Dist: s3transfer==0.14.0
 Requires-Dist: six==1.17.0
-Requires-Dist: sqlalchemy==2.0.42
+Requires-Dist: sqlalchemy==2.0.43
 Requires-Dist: sqlparse==0.5.3
-Requires-Dist: typing-extensions==4.14.1
+Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: urllib3==1.26.20
 Dynamic: author
 Dynamic: author-email
@@ -88,7 +88,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+
-- [Redis](https://redis.io) 3.1.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-4.2.0 → pgsync-4.2.1}/README.md

@@ -66,7 +66,7 @@ the search capabilities of [Elasticsearch](https://www.elastic.co/products/elast
 
 #### How it works
 
-PGSync is written in Python (supporting version 3.9 onwards) and the stack is composed of: [Redis](https://redis.io), [Elasticsearch](https://www.elastic.co/products/elastic-stack)/[OpenSearch](https://opensearch.org/), [Postgres](https://www.postgresql.org), and [SQLAlchemy](https://www.sqlalchemy.org).
+PGSync is written in Python (supporting version 3.9 onwards) and the stack is composed of: [Redis](https://redis.io)/[Valkey](https://valkey.io), [Elasticsearch](https://www.elastic.co/products/elastic-stack)/[OpenSearch](https://opensearch.org/), [Postgres](https://www.postgresql.org), and [SQLAlchemy](https://www.sqlalchemy.org).
 
 PGSync leverages the [logical decoding](https://www.postgresql.org/docs/current/logicaldecoding.html) feature of [Postgres](https://www.postgresql.org) (introduced in PostgreSQL 9.4) to capture a continuous stream of change events.
 This feature needs to be enabled in your [Postgres](https://www.postgresql.org) configuration file by setting in the postgresql.conf file:
@@ -136,7 +136,7 @@ To start all services with Docker, follow these steps:
 
 Environment variable placeholders - full list [here](https://pgsync.com/env-vars):
 
-- redis_host_address — Address of the Redis server (e.g., host.docker.internal for local Docker setup)
+- redis_host_address — Address of the Redis/Valkey server (e.g., host.docker.internal for local Docker setup)
 - username — PostgreSQL username
 - password — PostgreSQL password
 - postgres_host — Host address for PostgreSQL instance (e.g., host.docker.internal)
@@ -192,7 +192,7 @@ Key features of PGSync are:
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+
-- [Redis](https://redis.io) 3.1.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-4.2.0 → pgsync-4.2.1}/README.rst

@@ -10,7 +10,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+
-- [Redis](https://redis.io) 3.1.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = "Tolu Aina"
 __email__ = "tolu@pgsync.com"
-__version__ = "4.2.0"
+__version__ = "4.2.1"

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/helper.py

@@ -29,7 +29,7 @@ def teardown(
     Args:
         drop_db (bool, optional): Whether to drop the database. Defaults to True.
         truncate_db (bool, optional): Whether to truncate the database. Defaults to True.
-        delete_redis (bool, optional): Whether to delete Redis. Defaults to True.
+        delete_redis (bool, optional): Whether to delete Redis/Valkey. Defaults to True.
         drop_index (bool, optional): Whether to drop the index. Defaults to True.
         delete_checkpoint (bool, optional): Whether to delete the checkpoint. Defaults to True.
         config (Optional[str], optional): The configuration file path. Defaults to None.

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/node.py

@@ -133,6 +133,7 @@ class Node(object):
     relationship: t.Optional[dict] = None
     parent: t.Optional[Node] = None
     base_tables: t.Optional[list] = None
+    is_through: bool = False
 
     def __post_init__(self):
         self.model: sa.sql.Alias = self.models(self.table, self.schema)
@@ -328,8 +329,9 @@ class Tree(threading.local):
             self.root = node
 
         self.tables.add(node.table)
-        for through in node.relationship.throughs:
-            self.tables.add(through.table)
+        for through_node in node.relationship.throughs:
+            through_node.is_through = True
+            self.tables.add(through_node.table)
 
         for child in nodes.get("children", []):
             node.add_child(self.build(child))

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/querybuilder.py

@@ -108,66 +108,125 @@ class QueryBuilder(threading.local):
         return expression
 
     # this is for handling non-through tables
-    def get_foreign_keys(self, node_a: Node, node_b: Node) -> dict:
-        if (node_a, node_b) not in self._cache:
-            foreign_keys: dict = {}
-            # if either offers a foreign_key via relationship, use it!
-            if (
-                node_a.relationship.foreign_key.parent
-                or node_b.relationship.foreign_key.parent
-            ):
-                if node_a.relationship.foreign_key.parent:
-                    foreign_keys[node_a.parent.name] = sorted(
-                        node_a.relationship.foreign_key.parent
-                    )
-                    foreign_keys[node_a.name] = sorted(
-                        node_a.relationship.foreign_key.child
-                    )
-                if node_b.relationship.foreign_key.parent:
-                    foreign_keys[node_b.parent.name] = sorted(
-                        node_b.relationship.foreign_key.parent
-                    )
-                    foreign_keys[node_b.name] = sorted(
-                        node_b.relationship.foreign_key.child
-                    )
-
-            else:
-                fkeys: dict = defaultdict(list)
-                if node_a.model.foreign_keys:
-                    for key in node_a.model.original.foreign_keys:
-                        if key._table_key() == str(node_b.model.original):
-                            fkeys[
-                                f"{key.parent.table.schema}."
-                                f"{key.parent.table.name}"
-                            ].append(str(key.parent.name))
-                            fkeys[
-                                f"{key.column.table.schema}."
-                                f"{key.column.table.name}"
-                            ].append(str(key.column.name))
-                if not fkeys:
-                    if node_b.model.original.foreign_keys:
-                        for key in node_b.model.original.foreign_keys:
-                            if key._table_key() == str(node_a.model.original):
-                                fkeys[
-                                    f"{key.parent.table.schema}."
-                                    f"{key.parent.table.name}"
-                                ].append(str(key.parent.name))
-                                fkeys[
-                                    f"{key.column.table.schema}."
-                                    f"{key.column.table.name}"
-                                ].append(str(key.column.name))
-                if not fkeys:
-                    raise ForeignKeyError(
-                        f"No foreign key relationship between "
-                        f"{node_a.model.original} and {node_b.model.original}"
-                    )
+    def get_foreign_keys(
+        self, node_a: Node, node_b: Node
+    ) -> t.Dict[str, t.List[str]]:
+        """
+        Return all FK columns between node_a and node_b, keyed by fully qualified table name.
+        Example:
+        {
+            "public.child":  ["child_fk1", "child_fk2"],
+            "public.parent": ["id1", "id2"],
+        }
+        """
+        cache_key: t.Tuple[t.Any, t.Any] = (node_a, node_b)
+        if cache_key in self._cache:
+            return self._cache[cache_key]
+
+        fkeys: t.MutableMapping[str, t.List[str]] = defaultdict(list)
+
+        def add(table_key: t.Optional[str], col: t.Optional[str]) -> None:
+            if not table_key or not col:
+                return
+            if col not in fkeys[table_key]:
+                fkeys[table_key].append(col)
+
+        def qname(sa_table: t.Any) -> t.Optional[str]:
+            """schema-qualified table name from a SQLAlchemy Table (or None)."""
+            if sa_table is None:
+                return None
+            schema = getattr(sa_table, "schema", None)
+            name = getattr(sa_table, "name", None) or getattr(
+                sa_table, "key", None
+            )
+            if not name:
+                return None
+            return f"{schema}.{name}" if schema else str(name)
+
+        def node_table_key(
+            node: t.Any, *, prefer_parent: bool
+        ) -> t.Optional[str]:
+            """Best-effort table key from node or its parent; never raises."""
+            if prefer_parent:
+                parent = getattr(node, "parent", None)
+                parent_name = getattr(parent, "name", None)
+                if parent_name:
+                    return str(parent_name)
+            node_name = getattr(node, "name", None)
+            if node_name:
+                return str(node_name)
+            # fallback to sqlalchemy table
+            return qname(
+                getattr(getattr(node, "model", None), "original", None)
+            )
 
-                for table, columns in fkeys.items():
-                    foreign_keys[table] = columns
+        # merge relationship provided hints (if any); do NOT short-circuit
+        for node in (node_a, node_b):
+            rel_fk = getattr(
+                getattr(node, "relationship", None), "foreign_key", None
+            )
+            if not rel_fk:
+                continue
 
-            self._cache[(node_a, node_b)] = foreign_keys
+            parent_tbl_key = node_table_key(node, prefer_parent=True)
+            child_tbl_key = node_table_key(node, prefer_parent=False)
+
+            def merge_side(
+                side_obj: t.Any, fallback_tbl_key: t.Optional[str]
+            ) -> None:
+                # accept dict[str, list[str]] (preferred), or an iterable[str], or a single str
+                if isinstance(side_obj, dict):
+                    for tbl, cols in side_obj.items():
+                        tkey = str(tbl)
+                        for c in cols or []:
+                            add(tkey, str(c))
+                elif isinstance(side_obj, (list, tuple, set)):
+                    for c in side_obj:
+                        add(fallback_tbl_key, str(c))
+                elif isinstance(side_obj, str):
+                    add(fallback_tbl_key, side_obj)
+
+            # parent table cols
+            merge_side(getattr(rel_fk, "parent", None), parent_tbl_key)
+            # child table cols
+            merge_side(getattr(rel_fk, "child", None), child_tbl_key)
+
+        # SQLAlchemy introspection in both directions (A -> B and B -> A)
+        A = getattr(getattr(node_a, "model", None), "original", None)
+        B = getattr(getattr(node_b, "model", None), "original", None)
+
+        A_q = qname(A)
+        B_q = qname(B)
+
+        # helper to compare tables
+        def same_table(t1: t.Any, t2: t.Any) -> bool:
+            return qname(t1) is not None and qname(t1) == qname(t2)
+
+        if A is not None and B is not None:
+            for fk in getattr(A, "foreign_keys", []):
+                # does A have an FK pointing to B?
+                if same_table(getattr(fk, "column", None).table, B):
+                    # child col in A
+                    add(qname(fk.parent.table), str(fk.parent.name))
+                    # parent col in B
+                    add(qname(fk.column.table), str(fk.column.name))
+
+            for fk in getattr(B, "foreign_keys", []):
+                # does B have an FK pointing to A?
+                if same_table(getattr(fk, "column", None).table, A):
+                    # child col in B
+                    add(qname(fk.parent.table), str(fk.parent.name))
+                    # parent col in A
+                    add(qname(fk.column.table), str(fk.column.name))
+
+        if not fkeys:
+            raise ForeignKeyError(
+                f"No foreign key relationship between {A_q or node_a} and {B_q or node_b}"
+            )
 
-        return self._cache[(node_a, node_b)]
+        result: t.Dict[str, t.List[str]] = dict(fkeys)
+        self._cache[cache_key] = result
+        return result
 
     def _get_foreign_keys(self, node_a: Node, node_b: Node) -> dict:
         """This is for handling through nodes."""
@@ -462,15 +521,18 @@ class QueryBuilder(threading.local):
 
     def _through(self, node: Node) -> None:  # noqa: C901
         through: Node = node.relationship.throughs[0]
-        foreign_keys: dict = self.get_foreign_keys(node, through)
+        # base: fks from through -> node
+        base = self.get_foreign_keys(through, node)
+        foreign_keys: t.Dict[str, t.List[str]] = {
+            k: list(v) for k, v in base.items()
+        }
 
-        for key, values in self.get_foreign_keys(through, node.parent).items():
-            if key in foreign_keys:
-                for value in values:
-                    if value not in foreign_keys[key]:
-                        foreign_keys[key].append(value)
+        for table, cols in self.get_foreign_keys(through, node.parent).items():
+            if table not in foreign_keys:
                 continue
-            foreign_keys[key] = values
+            dst = foreign_keys[table]
+            # extend uniquely and preserve order
+            dst.extend([col for col in cols if col not in dst])
 
         foreign_key_columns: list = self._get_column_foreign_keys(
             node.model.columns,
@@ -612,7 +674,7 @@ class QueryBuilder(threading.local):
 
         parent_foreign_key_columns: list = self._get_column_foreign_keys(
             through.columns,
-            foreign_keys,
+            base,
             schema=node.schema,
         )
         where: list = []
@@ -662,7 +724,7 @@ class QueryBuilder(threading.local):
         left_foreign_keys = foreign_keys[node.name]
         right_foreign_keys: list = self._get_column_foreign_keys(
             through.columns,
-            foreign_keys,
+            base,
             table=through.table,
             schema=node.schema,
         )

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/redisqueue.py

@@ -18,10 +18,10 @@ logger = logging.getLogger(__name__)
 
 
 class RedisQueue(object):
-    """Simple Queue with Redis Backend."""
+    """Simple Queue with Redis/Valkey Backend."""
 
     def __init__(self, name: str, namespace: str = "queue", **kwargs):
-        """Init Simple Queue with Redis Backend."""
+        """Init Simple Queue with Redis/Valkey Backend."""
         url: str = get_redis_url(**kwargs)
         self.key: str = f"{namespace}:{name}"
         self._meta_key: str = f"{self.key}:meta"
@@ -88,6 +88,7 @@ class RedisQueue(object):
         """Delete all items from the named queue."""
         logger.info(f"Deleting redis key: {self.key}")
         self.__db.delete(self.key)
+        logger.info(f"Deleted redis key: {self.key}")
 
     def set_meta(self, value: t.Any) -> None:
         """Store an arbitrary JSON-serialisable value in a dedicated key."""

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/settings.py

@@ -194,20 +194,20 @@ if PG_URL_RO:
     PG_SSLMODE_RO = None
     PG_SSLROOTCERT_RO = None
 
-# Redis:
+# Redis/Valkey
 REDIS_AUTH = env.str("REDIS_AUTH", default=None)
 REDIS_USER = env.str("REDIS_USER", default=None)
 REDIS_DB = env.int("REDIS_DB", default=0)
 REDIS_HOST = env.str("REDIS_HOST", default="localhost")
-# redis poll interval (in secs)
+# redis/valkey poll interval (in secs)
 REDIS_POLL_INTERVAL = env.float("REDIS_POLL_INTERVAL", default=0.01)
 REDIS_PORT = env.int("REDIS_PORT", default=6379)
-# number of items to read from Redis at a time
+# number of items to read from Redis/Valkey at a time
 REDIS_READ_CHUNK_SIZE = env.int("REDIS_READ_CHUNK_SIZE", default=1000)
 REDIS_SCHEME = env.str("REDIS_SCHEME", default="redis")
-# redis socket connection timeout
+# redis/valkey socket connection timeout
 REDIS_SOCKET_TIMEOUT = env.int("REDIS_SOCKET_TIMEOUT", default=5)
-# number of items to write to Redis at a time
+# number of items to write to Redis/Valkey at a time
 REDIS_WRITE_CHUNK_SIZE = env.int("REDIS_WRITE_CHUNK_SIZE", default=500)
 REDIS_URL = env.str("REDIS_URL", default=None)
 REDIS_RETRY_ON_TIMEOUT = env.bool(

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/sync.py

@@ -510,7 +510,9 @@ class Sync(Base, metaclass=Singleton):
     ) -> list:
         fields: dict = defaultdict(list)
         primary_values: list = [
-            payload.data[key] for key in node.model.primary_keys
+            payload.data[key]
+            for key in node.model.primary_keys
+            if key in payload.data
         ]
         primary_fields: dict = dict(
             zip(node.model.primary_keys, primary_values)
@@ -586,7 +588,60 @@ class Sync(Base, metaclass=Singleton):
     def _insert_op(
         self, node: Node, filters: dict, payloads: t.List[Payload]
     ) -> dict:
-        if node.table in self.tree.tables:
+        if node.is_through:
+
+            # handle case where we insert into a through table
+            # set the parent as the new entity that has changed
+            foreign_keys = self.query_builder.get_foreign_keys(
+                node.parent,
+                node,
+            )
+
+            # if the node is directly related to parent and share a common field name
+            for payload in payloads:
+                columns = foreign_keys.get(node.name, [])
+                for column in columns:
+                    if column in payload.data:
+                        filters[node.parent.table].append(
+                            {column: payload.data[column]}
+                        )
+
+            # find all Elasticsearch/OpenSearch docs with fields
+            # that match the filters and add their root to the query filter
+            """
+            +------+
+            | Root |
+            |------|
+            | id   |
+            | ...  |
+            +------+
+                |
+                | 1..*
+                v
+            +---------+        +---------------+        +---------+
+            |  NodeA  | 1    * |  ThroughTable | *    1 |  NodeB  |
+            |---------|--------|---------------|--------|---------|
+            | id      |        | nodeA_id      |        | id      |
+            | ...     |        | nodeB_id      |        | ...     |
+            +---------+        +---------------+        +---------+
+            NodeA represents the grandparent from through table
+            NodeB represents the parent from through table
+            ThroughTable represents the relationship between NodeA and NodeB
+
+            """
+            _filters: list = []
+            for payload in payloads:
+                _filters = self._root_primary_key_resolver(
+                    node.parent, payload, _filters
+                )
+                if node.parent.parent:
+                    _filters = self._root_primary_key_resolver(
+                        node.parent.parent, payload, _filters
+                    )
+            if _filters:
+                filters[self.tree.root.table].extend(_filters)
+
+        elif node.table in self.tree.tables:
             if node.is_root:
                 for payload in payloads:
                     primary_values = [
@@ -639,20 +694,6 @@ class Sync(Base, metaclass=Singleton):
                 if _filters:
                     filters[self.tree.root.table].extend(_filters)
 
-        else:
-            # handle case where we insert into a through table
-            # set the parent as the new entity that has changed
-            foreign_keys = self.query_builder.get_foreign_keys(
-                node.parent,
-                node,
-            )
-
-            for payload in payloads:
-                for i, key in enumerate(foreign_keys[node.name]):
-                    filters[node.parent.table].append(
-                        {foreign_keys[node.parent.name][i]: payload.data[key]}
-                    )
-
         return filters
 
     def _update_op(
@@ -1118,9 +1159,9 @@ class Sync(Base, metaclass=Singleton):
     @property
     def txid_current(self) -> int:
         """
-        Get last committed transaction id from the database or redis.
+        Get last committed transaction id from the database or redis/valkey.
         """
-        # If we are in read-only mode, we can only get the txid from Redis
+        # If we are in read-only mode, we can only get the txid from Redis/Valkey
         if getattr(self._thread_local, "read_only", False):
             return self.redis.get_meta(default={}).get("txid_current", 0)
         # If we are not in read-only mode, we can get the txid from the database
@@ -1138,6 +1179,7 @@ class Sync(Base, metaclass=Singleton):
             )
         else:
             payloads = self.redis.pop()
+
         if payloads:
             logger.debug(f"_poll_redis: {payloads}")
             with self.lock:
@@ -1151,7 +1193,7 @@ class Sync(Base, metaclass=Singleton):
     @threaded
     @exception
     def poll_redis(self) -> None:
-        """Consumer which polls Redis continuously."""
+        """Consumer which polls Redis/Valkey continuously."""
         if settings.PG_HOST_RO or settings.PG_PORT_RO:
             logger.info("Setting read only consumer")
             self._thread_local.read_only = True
@@ -1172,7 +1214,7 @@ class Sync(Base, metaclass=Singleton):
 
     @exception
     async def async_poll_redis(self) -> None:
-        """Consumer which polls Redis continuously."""
+        """Consumer which polls Redis/Valkey continuously."""
         while True:
             await self._async_poll_redis()
 
@@ -1283,11 +1325,11 @@ class Sync(Base, metaclass=Singleton):
 
     def _on_publish(self, payloads: t.List[Payload]) -> None:
         """
-        Redis publish event handler.
+        Redis/Valkey publish event handler.
 
         This is triggered by poll_redis.
-        It is called when an event is received from Redis.
-        Deserialize the payload from Redis and sync to Elasticsearch/OpenSearch
+        It is called when an event is received from Redis/Valkey.
+        Deserialize the payload from Redis/Valkey and sync to Elasticsearch/OpenSearch
         """
         # this is used for the views.
         # we substitute the views for the base table here
@@ -1424,9 +1466,9 @@ class Sync(Base, metaclass=Singleton):
 
         NB: pulls as well as receives in order to avoid missing data.
 
-        1. Buffer all ongoing changes from db to Redis.
+        1. Buffer all ongoing changes from db to Redis/Valkey
         2. Pull everything so far and also replay replication logs.
-        3. Consume all changes from Redis.
+        3. Consume all changes from Redis/Valkey.
         """
         if settings.USE_ASYNC:
             self._conn = self.engine.connect().connection
@@ -1442,14 +1484,14 @@ class Sync(Base, metaclass=Singleton):
             ]
 
         else:
-            # sync up to and produce items in the Redis cache
+            # sync up to and produce items in the Redis/Valkey cache
             if self.producer:
                 self.poll_db()
                 # sync up to current transaction_id
                 self.pull()
 
             # start a background worker consumer thread to
-            # poll Redis and populate Elasticsearch/OpenSearch
+            # poll Redis/Valkey and populate Elasticsearch/OpenSearch
             if self.consumer:
                 for _ in range(self.num_workers):
                     self.poll_redis()

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/trigger.py

@@ -1,4 +1,4 @@
-"""PGSync Trigger template.
+"""PGSync trigger template.
 
 This module contains a template for creating a PostgreSQL trigger function that notifies updates asynchronously.
 The trigger function constructs a notification as a JSON object and sends it to a channel using PG_NOTIFY.

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync/urls.py

@@ -136,18 +136,18 @@ def get_redis_url(
     db: t.Optional[str] = None,
 ) -> str:
     """
-    Return the URL to connect to Redis.
+    Return the URL to connect to Redis/Valkey.
 
     Args:
-        scheme (Optional[str]): The scheme to use for the Redis connection. Defaults to None.
-        host (Optional[str]): The Redis host to connect to. Defaults to None.
-        username (Optional[str]): The Redis username to use for authentication. Defaults to None.
-        password (Optional[str]): The Redis password to use for authentication. Defaults to None.
-        port (Optional[int]): The Redis port to connect to. Defaults to None.
-        db (Optional[str]): The Redis database to connect to. Defaults to None.
+        scheme (Optional[str]): The scheme to use for the Redis/Valkey connection. Defaults to None.
+        host (Optional[str]): The Redis/Valkey host to connect to. Defaults to None.
+        username (Optional[str]): The Redis/Valkey username to use for authentication. Defaults to None.
+        password (Optional[str]): The Redis/Valkey password to use for authentication. Defaults to None.
+        port (Optional[int]): The Redis/Valkey port to connect to. Defaults to None.
+        db (Optional[str]): The Redis/Valkey database to connect to. Defaults to None.
 
     Returns:
-        str: The Redis connection URL.
+        str: The Redis/Valkey connection URL.
     """
     host = host or REDIS_HOST
     username = username or REDIS_USER

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgsync
-Version: 4.2.0
+Version: 4.2.1
 Summary: Postgres to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -32,33 +32,33 @@ License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: async-timeout==5.0.1
 Requires-Dist: backports-datetime-fromisoformat==2.0.3
-Requires-Dist: boto3==1.40.1
-Requires-Dist: botocore==1.40.1
+Requires-Dist: boto3==1.40.35
+Requires-Dist: botocore==1.40.35
 Requires-Dist: certifi==2025.8.3
-Requires-Dist: charset-normalizer==3.4.2
+Requires-Dist: charset-normalizer==3.4.3
 Requires-Dist: click==8.1.8
 Requires-Dist: elastic-transport==8.17.1
-Requires-Dist: elasticsearch==8.19.0
+Requires-Dist: elasticsearch==8.19.1
 Requires-Dist: elasticsearch-dsl==8.15.4
 Requires-Dist: environs==14.3.0
 Requires-Dist: events==0.5
-Requires-Dist: greenlet==3.2.3
+Requires-Dist: greenlet==3.2.4
 Requires-Dist: idna==3.10
 Requires-Dist: jmespath==1.0.1
-Requires-Dist: marshmallow==4.0.0
+Requires-Dist: marshmallow==4.0.1
 Requires-Dist: opensearch-dsl==2.1.0
 Requires-Dist: opensearch-py==3.0.0
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-dotenv==1.1.1
-Requires-Dist: redis==6.2.0
-Requires-Dist: requests==2.32.4
+Requires-Dist: redis==6.4.0
+Requires-Dist: requests==2.32.5
 Requires-Dist: requests-aws4auth==1.3.1
-Requires-Dist: s3transfer==0.13.1
+Requires-Dist: s3transfer==0.14.0
 Requires-Dist: six==1.17.0
-Requires-Dist: sqlalchemy==2.0.42
+Requires-Dist: sqlalchemy==2.0.43
 Requires-Dist: sqlparse==0.5.3
-Requires-Dist: typing-extensions==4.14.1
+Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: urllib3==1.26.20
 Dynamic: author
 Dynamic: author-email
@@ -88,7 +88,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+
-- [Redis](https://redis.io) 3.1.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-4.2.0 → pgsync-4.2.1}/pgsync.egg-info/requires.txt

@@ -1,30 +1,30 @@
 async-timeout==5.0.1
 backports-datetime-fromisoformat==2.0.3
-boto3==1.40.1
-botocore==1.40.1
+boto3==1.40.35
+botocore==1.40.35
 certifi==2025.8.3
-charset-normalizer==3.4.2
+charset-normalizer==3.4.3
 click==8.1.8
 elastic-transport==8.17.1
-elasticsearch==8.19.0
+elasticsearch==8.19.1
 elasticsearch-dsl==8.15.4
 environs==14.3.0
 events==0.5
-greenlet==3.2.3
+greenlet==3.2.4
 idna==3.10
 jmespath==1.0.1
-marshmallow==4.0.0
+marshmallow==4.0.1
 opensearch-dsl==2.1.0
 opensearch-py==3.0.0
 psycopg2-binary==2.9.10
 python-dateutil==2.9.0.post0
 python-dotenv==1.1.1
-redis==6.2.0
-requests==2.32.4
+redis==6.4.0
+requests==2.32.5
 requests-aws4auth==1.3.1
-s3transfer==0.13.1
+s3transfer==0.14.0
 six==1.17.0
-sqlalchemy==2.0.42
+sqlalchemy==2.0.43
 sqlparse==0.5.3
-typing-extensions==4.14.1
+typing-extensions==4.15.0
 urllib3==1.26.20

{pgsync-4.2.0 → pgsync-4.2.1}/tests/test_redisqueue.py

@@ -3,7 +3,7 @@
 import json
 
 import pytest
-from mock import patch
+from mock import call, patch
 from redis.exceptions import ConnectionError
 
 from pgsync.redisqueue import RedisQueue
@@ -87,9 +87,10 @@ class TestRedisQueue(object):
         queue.push([4, 5, 6])
         assert queue.qsize == 6
         queue.delete()
-        mock_logger.info.assert_called_once_with(
-            "Deleting redis key: queue:something"
-        )
+        assert mock_logger.info.call_args_list == [
+            call("Deleting redis key: queue:something"),
+            call("Deleted redis key: queue:something"),
+        ]
         assert queue.qsize == 0
 
     def test_pop_visible_in_snapshot(self):

{pgsync-4.2.0 → pgsync-4.2.1}/tests/test_sync_nested_children.py

@@ -1797,6 +1797,108 @@ class TestNestedChildren(object):
         assert_resync_empty(sync, nodes)
         sync.search_client.close()
 
+    def test_insert_grand_child_through_child_op(
+        self,
+        data,
+        nodes,
+        book_cls,
+        author_cls,
+        city_cls,
+        country_cls,
+        continent_cls,
+        book_author_cls,
+    ):
+        """
+        Insert a new grand child (author) via the through child (book_author),
+        with an entirely new city/country/continent (Sydney/Australia).
+        """
+        book_author = book_author_cls(
+            id=8,
+            book_isbn="def",  # attach new author to existing book 'def'
+            author=author_cls(
+                id=6,
+                name="Italo Calvino",
+                birth_year=1923,
+                city=city_cls(
+                    id=6,
+                    name="Sydney",
+                    country=country_cls(
+                        id=6,
+                        name="Australia",
+                        continent=continent_cls(
+                            id=7,
+                            name="Australia",
+                        ),
+                    ),
+                ),
+            ),
+        )
+
+        doc = {
+            "index": "testdb",
+            "database": "testdb",
+            "nodes": nodes,
+        }
+
+        sync = Sync(doc)
+        session = sync.session
+        with subtransactions(session):
+            session.add(book_author)
+
+        sync.search_client.bulk(
+            sync.index, [sort_list(doc) for doc in sync.sync()]
+        )
+        sync.search_client.refresh("testdb")
+
+        docs = search(sync.search_client, "testdb")
+        assert len(docs) == 3
+        docs = sorted(docs, key=lambda k: k["isbn"])
+
+        expected_def_meta = {
+            "book": {"isbn": ["def"]},
+            "author": {"id": [1, 2, 6]},  # new author id=6
+            "book_author": {"id": [2, 5, 8]},  # new through id=8
+            "book_language": {"id": [2, 5, 8]},
+            "book_subject": {"id": [2, 5, 7]},
+            "city": {"id": [1, 2, 6]},  # Sydney id=6 added
+            "continent": {"id": [1, 2, 7]},  # Australia id=7 added
+            "country": {"id": [1, 2, 6]},  # Australia id=6 added
+            "language": {"id": [1, 2, 3]},
+            "publisher": {"id": [2]},
+            "subject": {"id": [2, 4, 5]},
+        }
+
+        expected_new_author = {
+            "id": 6,
+            "name": "Italo Calvino",
+            "city_label": {
+                "id": 6,
+                "name": "Sydney",
+                "country_label": {
+                    "id": 6,
+                    "name": "Australia",
+                    "continent_label": {"name": "Australia"},
+                },
+            },
+        }
+
+        # pull out the 'def' book doc
+        def_doc = next(d for d in docs if d["isbn"] == "def")
+
+        # meta checks
+        for key, val in expected_def_meta.items():
+            assert def_doc["_meta"][key] == val
+
+        # author list contains new author
+        assert any(
+            a["id"] == expected_new_author["id"] for a in def_doc["authors"]
+        )
+        new_author_doc = next(a for a in def_doc["authors"] if a["id"] == 6)
+        assert new_author_doc == expected_new_author
+
+        assert_resync_empty(sync, nodes)
+        sync.search_client.close()
+
     def test_delete_through_child_op(self, sync, data, nodes, book_author_cls):
         # delete a new through child with op
         doc = {