dgkafka 1.0.0a16__py3-none-any.whl → 1.0.0a17__py3-none-any.whl

dgkafka/consumer.py

@@ -66,9 +66,24 @@ class KafkaConsumer:
                 self._assign_topic_partition(topic, partition, offset)
         else:
             topics_list = [topics] if isinstance(topics, str) else topics
-            consumer.subscribe(topics_list)
-            self.log_subscription_info()
-            # self.logger.info(f"[*] Subscribed to topics: {topics_list}")
+            consumer.subscribe(topics_list, on_assign=self.on_assign, on_revoke=self.on_revoke)
+
+    def on_assign(self, consumer, partitions):
+        self.kafka_status = "UP"
+        for topic in {p.topic for p in partitions}:
+            new = {p.partition for p in partitions if p.topic == topic}
+            self.logger.debug(f"[@] on_assign {topic} {new if new else '{}'}")
+            old = {p.partition for p in consumer.assignment() if p.topic == topic}
+            old.update(new)
+            self.logger.info(f"[*] Assigned  {topic} {old if old else '{}'}")
+
+    def on_revoke(self, consumer, partitions):
+        for topic in {p.topic for p in partitions}:
+            new = {p.partition for p in partitions if p.topic == topic}
+            self.logger.debug(f"[@] on_revoke {topic} {new if new else '{}'}")
+            old = {p.partition for p in consumer.assignment() if p.topic == topic}
+            old.difference_update(new)
+            self.logger.info(f"[*] Assigned  {topic} {old if old else '{}'}")
 
     def _assign_topic_partition(self, topic: str, partition: int, offset: OffsetType) -> None:
         """Assign to specific partition"""
@@ -122,16 +137,16 @@ class KafkaConsumer:
         consumer = self._ensure_consumer()
 
         try:
-            # Получаем текущие подписки
-            subscribed_topics = consumer.subscription()
-
             # Получаем текущие назначения (assignments)
             assignments = consumer.assignment()
 
             # Получаем текущие позиции (offsets)
             current_offsets = []
             if assignments:
-                current_offsets = consumer.position(assignments)
+                current_offsets = [consumer.position(tp) for tp in assignments]
+
+            # Для получения подписок используем список топиков из assignments
+            subscribed_topics = list({tp.topic for tp in assignments}) if assignments else None
 
             # Формируем информацию о назначениях
             assignments_info = []
@@ -152,10 +167,11 @@ class KafkaConsumer:
                 })
 
             return {
-                'subscribed_topics': list(subscribed_topics) if subscribed_topics else None,
+                'subscribed_topics': subscribed_topics,
                 'assignments': assignments_info if assignments_info else None,
                 'current_offsets': offsets_info if offsets_info else None
             }
+
         except KafkaException as ex:
             self.logger.error(f"[x] Failed to get subscription info: {ex}")
             raise
@@ -170,13 +186,12 @@ class KafkaConsumer:
             self.logger.info("[!] Not subscribed to any topics")
 
         if info['assignments']:
-            self.logger.info("[*] Current assignments:")
+            self.logger.info("[*] Current partition assignments:")
             for assignment in info['assignments']:
                 self.logger.info(f"    - {assignment['topic']} [partition {assignment['partition']}]")
-        else:
-            self.logger.info("[!] No partition assignments")
 
         if info['current_offsets']:
-            self.logger.info("[*] Current offsets:")
+            self.logger.info("[*] Current read positions:")
             for offset in info['current_offsets']:
-                self.logger.info(f"    - {offset['topic']} [partition {offset['partition']}]: offset {offset['offset']}")
+                self.logger.info(
+                    f"    - {offset['topic']} [partition {offset['partition']}]: position {offset['offset']}")

{dgkafka-1.0.0a16.dist-info → dgkafka-1.0.0a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgkafka
-Version: 1.0.0a16
+Version: 1.0.0a17
 Summary: Kafka clients
 Home-page: https://gitlab.com/gng-group/dgkafka.git
 Author: Malanris

{dgkafka-1.0.0a16.dist-info → dgkafka-1.0.0a17.dist-info}/RECORD

@@ -2,12 +2,12 @@ dgkafka/__init__.py,sha256=fnqVZROyHXipdmhqZaa9XUjvQe795JJKFakwTndAiIw,286
 dgkafka/avro_consumer.py,sha256=fI-VYQdw3bQJoDN4jS0F5Aa78wlxmjg5lmnTumw9FDs,2917
 dgkafka/avro_producer.py,sha256=UL0RBaEKl_lbNF1UI-4w8R3AIEGHYI-Vna3iVZIlJqo,5421
 dgkafka/config.py,sha256=TmfB0IOauSPr4B8InOZdoebAEGeabs7HZUXuozAFFlk,3828
-dgkafka/consumer.py,sha256=NwbKKIgJv_RLS3_qdURbz6JeP3nsxjL3C6i_hSRJf3E,7467
+dgkafka/consumer.py,sha256=OfONH61xj1sD4Z0YIQngfJOOwkx8Ko9waNYCKoXtJL4,8371
 dgkafka/errors.py,sha256=PaH46tXameS--hrrUXKhQkZlBHvMSMPmjhVeRkmFvV0,95
 dgkafka/json_consumer.py,sha256=7Gzn7C9WpyCTPDV6eFDugAx5gC9vdV-HrTh3Nv--zIE,1152
 dgkafka/producer.py,sha256=WHVhw5HyJINxvUg_j_9iiQ0N7I3jc4niFXpZfkDHUOQ,6519
-dgkafka-1.0.0a16.dist-info/licenses/LICENSE,sha256=pAZXnNE2dxxwXFIduGyn1gpvPefJtUYOYZOi3yeGG94,1068
-dgkafka-1.0.0a16.dist-info/METADATA,sha256=iEvamGQHFQ-o6X6wCcJ6I9-KW53weE5FYDzS-r6S-d8,6062
-dgkafka-1.0.0a16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dgkafka-1.0.0a16.dist-info/top_level.txt,sha256=GyNrxOh7IPdL0t2SxH8DWxg3fUma-ezQ1Kz4zIr2B7U,8
-dgkafka-1.0.0a16.dist-info/RECORD,,
+dgkafka-1.0.0a17.dist-info/licenses/LICENSE,sha256=pAZXnNE2dxxwXFIduGyn1gpvPefJtUYOYZOi3yeGG94,1068
+dgkafka-1.0.0a17.dist-info/METADATA,sha256=OML5JG3E8w6nYbMXUNMB_q3iSxplfy-g7y8FTMNosig,6062
+dgkafka-1.0.0a17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dgkafka-1.0.0a17.dist-info/top_level.txt,sha256=GyNrxOh7IPdL0t2SxH8DWxg3fUma-ezQ1Kz4zIr2B7U,8
+dgkafka-1.0.0a17.dist-info/RECORD,,