dnaStreaming 2.2.0__py3-none-any.whl → 2.2.1.dev1__py3-none-any.whl

dnaStreaming/demo/show_ha_stream_async.py

@@ -4,7 +4,7 @@ from dnaStreaming.listener import Listener
 
 listener = Listener()
 quiet_demo = os.getenv('QUIET_DEMO', "false") == "true"
-max_secs = 5
+max_secs = 1000
 print("\n[ACTIVITY] Receiving messages (ASYNC) for {} seconds...\n[0]".format(max_secs), end='')
 
 
@@ -12,9 +12,9 @@ def callback(message, subscription_id):
     callback.counter += 1
     if not quiet_demo:
         if message['action'] != 'del':
-            print('[INFO] [MSG] [{}]: AN: {}, TITLE: {}'.format(callback.counter, message['an'], message['title']))
+            print('[INFO] [SUBSCRIPTION]: {} [MSG] [{}]: AN: {}, TITLE: {}'.format(subscription_id, callback.counter, message['an'], message['title']))
         else:
-            print('[INFO] [MSG] [{}]: AN: {}, *** DELETE ***'.format(callback.counter, message['an']))
+            print('[INFO] [SUBSCRIPTION]: {} [MSG] [{}]: AN: {}, *** DELETE ***'.format(subscription_id, callback.counter, message['an']))
     else:
         if callback.counter % 10 == 0:
             print('[{}]'.format(callback.counter), end='')

dnaStreaming/listener.py

@@ -125,19 +125,20 @@ class Listener(object):
             'Listeners for subscriptions have been configured, set and await message arrival.')
         return subscription
 
-    def listen_async_ha(self, on_message_callback, subscription_id=""):
-        def ack_message_and_callback(message):
+    def listen_async_ha(self, on_message_callback):
+        def ack_message_and_callback(message, subscription_path):
             pubsub_msg = json.loads(message.data)
             logger.info("Received news message with ID: {}".format(
                 pubsub_msg['data'][0]['id']))
             news_msg = pubsub_msg['data'][0]['attributes']
-            on_message_callback(news_msg, subscription_id)
+            short_subscription_id = subscription_path.split("/")[-1]
+            on_message_callback(news_msg, short_subscription_id)
             message.ack()
 
         main_pubsub_client = pubsub_service.get_client(self.config, MAIN_REGION)
         backup_pubsub_client = pubsub_service.get_client(self.config, BACKUP_REGION)
 
-        subscription_id = subscription_id or self.config.subscription()
+        subscription_id = self.config.subscription()
 
         if not subscription_id:
             raise Exception(

dnaStreaming/services/availability_service.py

@@ -38,8 +38,14 @@ def ha_listen(api_host, user_key, subscription_id, stop_event, main_subscription
 
     current_region = MAIN_REGION
 
+    def wrapped_callback(subscription_path):
+        def inner_callback(message):
+            callback(message, subscription_path)
+
+        return inner_callback
+
     streaming_pull_future = main_pubsub_client.subscribe(
-            main_subscription_path, callback=callback)
+        main_subscription_path, callback=wrapped_callback(main_subscription_path))
     
     while not stop_event.is_set():
 
@@ -65,10 +71,10 @@ def ha_listen(api_host, user_key, subscription_id, stop_event, main_subscription
 
             if active_region == MAIN_REGION:
                 streaming_pull_future = main_pubsub_client.subscribe(
-                    main_subscription_path, callback=callback)
+                    main_subscription_path, callback=wrapped_callback(main_subscription_path))
             else: # active_region == BACKUP_REGION
                 streaming_pull_future = backup_pubsub_client.subscribe(
-                    backup_subscription_path, callback=callback)
+                    backup_subscription_path, callback=wrapped_callback(backup_subscription_path))
                 
             logger.warning(f"Started listener in region {active_region}")
 

{dnaStreaming-2.2.0.dist-info → dnaStreaming-2.2.1.dev1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: dnaStreaming
-Version: 2.2.0
+Version: 2.2.1.dev1
 Summary: Dow Jones DNA Streaming Project
 Home-page: https://github.com/dowjones/dj-dna-streams-python
-Download-URL: https://github.com/dowjones/dj-dna-streams-python/archive/release-2.2.0.tar.gz
+Download-URL: https://github.com/dowjones/dj-dna-streams-python/archive/release-2.2.1.dev1.tar.gz
 Author: Zachary Kagan
 Author-email: zachary.kagan@dowjones.com
 License: MIT

{dnaStreaming-2.2.0.dist-info → dnaStreaming-2.2.1.dev1.dist-info}/RECORD

@@ -1,21 +1,21 @@
 dnaStreaming/__init__.py,sha256=Brud0G1kzJ2Fu4FtDveQnHraKl7r26zdSdPK0EqrLp4,752
 dnaStreaming/config.py,sha256=DLNFOvWlj5sLAr39i632yxgWQppYYw_YbUSiUMpy87U,3773
 dnaStreaming/customer_config.json,sha256=hzrReqREkH-j39vgifA-VVUtnkBtQJO4d2QyF8j9NMo,46
-dnaStreaming/listener.py,sha256=QdLlx1CFFNq6SdZVAmo0cc3Rh7TA9tr_iH91CndOzDE,7739
+dnaStreaming/listener.py,sha256=nNARri0SFpo3HbTayYbjNKJiP11VyFhozNLdow8GmjQ,7794
 dnaStreaming/demo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnaStreaming/demo/pubsub_stream.py,sha256=qaxutRGaEuHoDsGCSkJ8tzoXaZbgugrv3plW9CqGxZE,1617
-dnaStreaming/demo/show_ha_stream_async.py,sha256=_a1cbrJAgdsxCn7VfLmxRgLqVfYTEVDrGw8Hf75Y4Yw,1087
+dnaStreaming/demo/show_ha_stream_async.py,sha256=94nQrVwbm39EbE5CB-20RwnhTbe66e7DlyHOXnN_FEY,1162
 dnaStreaming/demo/show_stream.py,sha256=j42YW5_4mMjzQqcGnNfoY_3ABROf9v84Kjs18OE-wvo,1113
 dnaStreaming/demo/show_stream_async.py,sha256=QTXKsQywLamZjlrKci-TrsBmQjTlh8pcFsfDL8HsKt8,1026
 dnaStreaming/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnaStreaming/services/authentication_service.py,sha256=4g3DpvTS8neeDVnFwDsLP0qu59xgAz0wyXm8a7LhPqs,262
-dnaStreaming/services/availability_service.py,sha256=92xROh2nNA2QH_Jev1KFdRQZ45v-Xr4zbqcHc12QItQ,2696
+dnaStreaming/services/availability_service.py,sha256=HtXXtOugj4y9Qzsp-1AcuavvWxshuKyZNbHlQLxcGvU,2953
 dnaStreaming/services/credentials_service.py,sha256=S9nJl1heuNZzDaTrzgzTF52UshR0aiIw3j-oLzEhsj4,806
 dnaStreaming/services/pubsub_service.py,sha256=P0YLy6MNXDVcAKsmVcuNf-WKar-LYawpah3dFnFr648,820
 dnaStreaming/test/__init__.py,sha256=67-6hUa7BZvz64n27sEH0ulQtcg5qH8_Q2ot_XgFdFQ,79
 dnaStreaming/test/test_config.py,sha256=mJPk-yxv49Zwsj0lHV-zcy8fhhlt0RFyfhbgg74g3Jo,3619
-dnaStreaming-2.2.0.dist-info/LICENSE,sha256=l0T3WdIyACkYU-XdqJnaLC5_m1Wa0wJEZSJC4Owc7Y4,1077
-dnaStreaming-2.2.0.dist-info/METADATA,sha256=8NO8CSeWSOnKeuv6V__1kdRKzAL9dcJ8ngjH8Sde8bU,7544
-dnaStreaming-2.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dnaStreaming-2.2.0.dist-info/top_level.txt,sha256=08Lk4-qbvG3EGfiPeUI0NFUjIDJbA2RWO8ntC5friWs,13
-dnaStreaming-2.2.0.dist-info/RECORD,,
+dnaStreaming-2.2.1.dev1.dist-info/LICENSE,sha256=l0T3WdIyACkYU-XdqJnaLC5_m1Wa0wJEZSJC4Owc7Y4,1077
+dnaStreaming-2.2.1.dev1.dist-info/METADATA,sha256=gsxv7B8WaNLdIO4vGE_qM4rw1GrVtqs5DJ3q8nfc3X4,7554
+dnaStreaming-2.2.1.dev1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+dnaStreaming-2.2.1.dev1.dist-info/top_level.txt,sha256=08Lk4-qbvG3EGfiPeUI0NFUjIDJbA2RWO8ntC5friWs,13
+dnaStreaming-2.2.1.dev1.dist-info/RECORD,,

{dnaStreaming-2.2.0.dist-info → dnaStreaming-2.2.1.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any