Migrate EventEmitter to SimplePubSub

fnoop · fnoop · commit 7a36700fecdb · 2021-09-12T18:15:38.000+01:00
diff --git a/maverick_api/modules/__init__.py b/maverick_api/modules/__init__.py
@@ -6,7 +6,7 @@
 import time
 
 from graphql import GraphQLField, GraphQLObjectType, GraphQLSchema
-from graphql.pyutils.event_emitter import EventEmitter
+from graphql.pyutils.simple_pub_sub import SimplePubSub
 from tornado.options import options
 import tornado.ioloop
 
@@ -42,7 +42,7 @@ def __init__(self, child, **kwargs):
         self.q = {}
         self.m = {}
         self.s = {}
-        self.subscriptions = EventEmitter()
+        self.subscriptions = SimplePubSub()
 
     def get_mutation_args(self, GraphQLObject):
         return {
diff --git a/maverick_api/modules/api/authentication/__init__.py b/maverick_api/modules/api/authentication/__init__.py
@@ -5,7 +5,7 @@
     GraphQLObjectType,
     GraphQLString,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 from maverick_api.modules import schemaBase
 from maverick_api.modules.base.tornadoql.session_control import GraphQLSession
@@ -111,4 +111,4 @@ def set_auth(self, root, info, **kwargs):
 
     def sub_auth(self, root, info, **kwargs):
         """AuthenticationRequest subscription handler"""
-        return EventEmitterAsyncIterator(self.subscriptions, __name__)
+        return SimplePubSubIterator(self.subscriptions, __name__)
diff --git a/maverick_api/modules/api/maverick/maverick_configure.py b/maverick_api/modules/api/maverick/maverick_configure.py
@@ -13,7 +13,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -146,7 +146,7 @@ def process_callback(self, *args, **kwargs):
         return self.configure_command
 
     def sub_configure_command_status(self, root, info):
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, self.subscription_string + self.name,
         )
 
diff --git a/maverick_api/modules/api/maverick/maverick_service.py b/maverick_api/modules/api/maverick/maverick_service.py
@@ -24,7 +24,7 @@
     GraphQLString,
     GraphQLBoolean,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -463,7 +463,7 @@ def emit_subscription(self, service_command):
         )
 
     def sub_service_status(self, root, info):
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, self.subscription_string + self.service_command_name,
         )
 
diff --git a/maverick_api/modules/api/maverick/maverick_shell.py b/maverick_api/modules/api/maverick/maverick_shell.py
@@ -14,7 +14,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -156,7 +156,7 @@ def complete_process_callback(self, *args, **kwargs):
         )
 
     def sub_shell_command_status(self, root, info):
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, self.subscription_string + self.name,
         )
 
diff --git a/maverick_api/modules/api/maverick/maverick_shutdown.py b/maverick_api/modules/api/maverick/maverick_shutdown.py
@@ -12,7 +12,7 @@
     GraphQLBoolean,
     GraphQLInt,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -99,7 +99,7 @@ def process_callback(self, *args, **kwargs):
         return self.shutdown_command
 
     def sub_shutdown_command_status(self, root, info):
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, self.subscription_string + self.name,
         )
 
diff --git a/maverick_api/modules/api/mavros/mavros_imu.py b/maverick_api/modules/api/mavros/mavros_imu.py
@@ -13,7 +13,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -83,7 +83,7 @@ def set_imu_message(self, root, info, **kwargs):
 
     def sub_imu_message(self, root, info):
         """ImuMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, "maverick_api.modules.api.mavros.ImuSchema" + "Imu"
         )
 
diff --git a/maverick_api/modules/api/mavros/mavros_mission.py b/maverick_api/modules/api/mavros/mavros_mission.py
@@ -25,7 +25,7 @@
     GraphQLInputObjectType,
     GraphQLInputField,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -259,7 +259,7 @@ def update_mission(self, root, info, **kwargs):
 
     def sub_mission(self, root, info):
         """Mission subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.MissionSchema" + "Mission",
         )
@@ -383,7 +383,7 @@ def update_mission_list(self, root, info, **kwargs):
 
     def sub_mission_list(self, root, info):
         """Mission list subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.MissionSchema" + "MissionList",
         )
@@ -433,7 +433,7 @@ def update_mission_database(self, root, info, **kwargs):
 
     def sub_mission_database(self, root, info):
         """Mission database subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.MissionSchema" + "MissionDatabase",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_mode.py b/maverick_api/modules/api/mavros/mavros_mode.py
@@ -16,7 +16,7 @@
     GraphQLString,
     GraphQLInt,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -130,7 +130,7 @@ def update_mode(self, root, info, **kwargs):
 
     def sub_mode(self, root, info):
         """mode subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions, "maverick_api.modules.api.mavros.ModeSchema" + "Mode"
         )
 
diff --git a/maverick_api/modules/api/mavros/mavros_nav_sat_fix.py b/maverick_api/modules/api/mavros/mavros_nav_sat_fix.py
@@ -13,7 +13,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -85,7 +85,7 @@ def set_nav_sat_fix_message(self, root, info, **kwargs):
 
     def sub_nav_sat_fix_message(self, root, info):
         """NavSatFixMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.NavSatFixSchema" + "NavSatFix",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_param.py b/maverick_api/modules/api/mavros/mavros_param.py
@@ -40,7 +40,7 @@
 )
 from graphql.language.ast import FloatValueNode, IntValueNode, StringValueNode
 from graphql.error import INVALID
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -263,7 +263,7 @@ def update_parameter(self, root, info, **kwargs):
 
     def sub_parameter(self, root, info):
         application_log.debug(f"Parameter subscription handler")
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.ParamSchema" + "Parameter",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_pose_stamped.py b/maverick_api/modules/api/mavros/mavros_pose_stamped.py
@@ -13,7 +13,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -84,7 +84,7 @@ def set_pose_stamped_message(self, root, info, **kwargs):
 
     def sub_pose_stamped_message(self, root, info):
         """PoseStampedMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.PoseStampedSchema" + "PoseStamped",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_status_text.py b/maverick_api/modules/api/mavros/mavros_status_text.py
@@ -7,7 +7,7 @@
 
 # graphql imports
 from graphql import GraphQLField, GraphQLObjectType, GraphQLString, GraphQLInt
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -73,7 +73,7 @@ def set_status_text_message(self, root, info, **kwargs):
 
     def sub_status_text_message(self, root, info):
         """StatusTextMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.StatusTextSchema" + "StatusText",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_vehicle_info.py b/maverick_api/modules/api/mavros/mavros_vehicle_info.py
@@ -20,7 +20,7 @@
     GraphQLString,
     GraphQLInt,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -157,7 +157,7 @@ def update_vehicle_info(self, root, info, **kwargs):
 
     def sub_vehicle_info(self, root, info):
         """Vehicle info subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.VehicleInfoSchema" + "VehicleInfo",
         )
@@ -180,7 +180,7 @@ def get_vehicle_info_list(self, root, info, **kwargs):
 
     def sub_vehicle_info_list(self, root, info):
         """Vehicle info list subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.VehicleInfoSchema" + "VehicleInfoList",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_vehicle_state.py b/maverick_api/modules/api/mavros/mavros_vehicle_state.py
@@ -13,7 +13,7 @@
     GraphQLBoolean,
     GraphQLInt,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -81,7 +81,7 @@ def set_state_message(self, root, info, **kwargs):
 
     def sub_state_message(self, root, info):
         """StateMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.VehicleStateSchema" + "VehicleState",
         )
diff --git a/maverick_api/modules/api/mavros/mavros_vfr_hud.py b/maverick_api/modules/api/mavros/mavros_vfr_hud.py
@@ -14,7 +14,7 @@
     GraphQLInt,
     GraphQLFloat,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_sub_pub import SimplePubSubIterator
 
 application_log = logging.getLogger("tornado.application")
 
@@ -88,7 +88,7 @@ def set_vfr_hud_message(self, root, info, **kwargs):
 
     def sub_vfr_hud_message(self, root, info):
         """VfrHudMessage subscription handler"""
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.mavros.VfrHudSchema" + "VfrHud",
         )
diff --git a/maverick_api/modules/api/status/__init__.py b/maverick_api/modules/api/status/__init__.py
@@ -15,7 +15,7 @@
     GraphQLString,
     GraphQLInt,
 )
-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator
+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator
 
 from maverick_api.modules import moduleBase
 from maverick_api.modules import schemaBase
@@ -118,7 +118,7 @@ def get_report(self, root, info):
     def sub_report(self, root, info, **kwargs):
         """API status report subscription handler"""
         application_log.info(f"API status report subscription handler {info}")
-        return EventEmitterAsyncIterator(
+        return SimplePubSubIterator(
             self.subscriptions,
             "maverick_api.modules.api.status.StatusSchema" + "Status",
         )

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`GraphQLInt,`
`14`	`14`	`GraphQLFloat,`
`15`	`15`	`)`
`16`		`-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator`
	`16`	`+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator`
`17`	`17`
`18`	`18`	`application_log = logging.getLogger("tornado.application")`
`19`	`19`
`@@ -146,7 +146,7 @@ def process_callback(self, args, *kwargs):`
`146`	`146`	`return self.configure_command`
`147`	`147`
`148`	`148`	`def sub_configure_command_status(self, root, info):`
`149`		`- return EventEmitterAsyncIterator(`
	`149`	`+ return SimplePubSubIterator(`
`150`	`150`	`self.subscriptions, self.subscription_string + self.name,`
`151`	`151`	`)`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`GraphQLString,`
`25`	`25`	`GraphQLBoolean,`
`26`	`26`	`)`
`27`		`-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator`
	`27`	`+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator`
`28`	`28`
`29`	`29`	`application_log = logging.getLogger("tornado.application")`
`30`	`30`
`@@ -463,7 +463,7 @@ def emit_subscription(self, service_command):`
`463`	`463`	`)`
`464`	`464`
`465`	`465`	`def sub_service_status(self, root, info):`
`466`		`- return EventEmitterAsyncIterator(`
	`466`	`+ return SimplePubSubIterator(`
`467`	`467`	`self.subscriptions, self.subscription_string + self.service_command_name,`
`468`	`468`	`)`
`469`	`469`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`GraphQLInt,`
`15`	`15`	`GraphQLFloat,`
`16`	`16`	`)`
`17`		`-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator`
	`17`	`+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator`
`18`	`18`
`19`	`19`	`application_log = logging.getLogger("tornado.application")`
`20`	`20`
`@@ -156,7 +156,7 @@ def complete_process_callback(self, args, *kwargs):`
`156`	`156`	`)`
`157`	`157`
`158`	`158`	`def sub_shell_command_status(self, root, info):`
`159`		`- return EventEmitterAsyncIterator(`
	`159`	`+ return SimplePubSubIterator(`
`160`	`160`	`self.subscriptions, self.subscription_string + self.name,`
`161`	`161`	`)`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`GraphQLBoolean,`
`13`	`13`	`GraphQLInt,`
`14`	`14`	`)`
`15`		`-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator`
	`15`	`+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator`
`16`	`16`
`17`	`17`	`application_log = logging.getLogger("tornado.application")`
`18`	`18`
`@@ -99,7 +99,7 @@ def process_callback(self, args, *kwargs):`
`99`	`99`	`return self.shutdown_command`
`100`	`100`
`101`	`101`	`def sub_shutdown_command_status(self, root, info):`
`102`		`- return EventEmitterAsyncIterator(`
	`102`	`+ return SimplePubSubIterator(`
`103`	`103`	`self.subscriptions, self.subscription_string + self.name,`
`104`	`104`	`)`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`GraphQLString,`
`17`	`17`	`GraphQLInt,`
`18`	`18`	`)`
`19`		`-from graphql.pyutils.event_emitter import EventEmitterAsyncIterator`
	`19`	`+from graphql.pyutils.simple_pub_sub import SimplePubSubIterator`
`20`	`20`
`21`	`21`	`application_log = logging.getLogger("tornado.application")`
`22`	`22`
`@@ -130,7 +130,7 @@ def update_mode(self, root, info, **kwargs):`
`130`	`130`
`131`	`131`	`def sub_mode(self, root, info):`
`132`	`132`	`"""mode subscription handler"""`
`133`		`- return EventEmitterAsyncIterator(`
	`133`	`+ return SimplePubSubIterator(`
`134`	`134`	`self.subscriptions, "maverick_api.modules.api.mavros.ModeSchema" + "Mode"`
`135`	`135`	`)`
`136`	`136`