Added amqp, fixed examples, lint, and tests

examples/1_hello_world/hello_client.py

@@ -2,12 +2,14 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
+    ControlPlaneConfig,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
     IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 
@@ -42,16 +44,18 @@ def simple_client_callback(
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 1883,
-                'protocol': 'mqtt3.1.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 1883},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='mqtt3.1.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
     """
     step two: construct the initial messages you want to send. In this case we will only send a single starting message.
 
@@ -73,7 +77,7 @@ def simple_client_callback(
     ]
     config = IntersectClientConfig(
         initial_message_event_config=IntersectClientCallback(messages_to_send=initial_messages),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world/hello_service.py

@@ -1,6 +1,7 @@
 import logging
 
 from intersect_sdk import (
+    ControlPlaneConfig,
     HierarchyConfig,
     IntersectBaseCapabilityImplementation,
     IntersectService,
@@ -9,6 +10,7 @@
     intersect_message,
     intersect_status,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -44,16 +46,19 @@ def say_hello_to_name(self, name: str) -> str:
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 1883,
-                'protocol': 'mqtt3.1.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 1883},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='mqtt3.1.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
+
     config = IntersectServiceConfig(
         hierarchy=HierarchyConfig(
             organization='hello-organization',
@@ -62,7 +67,7 @@ def say_hello_to_name(self, name: str) -> str:
             subsystem='hello-subsystem',
             service='hello-service',
         ),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world_amqp/hello_client.py

@@ -2,12 +2,14 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
+    ControlPlaneConfig,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
     IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 logging.getLogger('pika').setLevel(logging.WARNING)
@@ -43,16 +45,18 @@ def simple_client_callback(
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 5672,
-                'protocol': 'amqp0.9.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 5672},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='amqp0.9.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
 
     """
     step two: construct the initial messages you want to send. In this case we will only send a single starting message.
@@ -75,7 +79,7 @@ def simple_client_callback(
     ]
     config = IntersectClientConfig(
         initial_message_event_config=IntersectClientCallback(messages_to_send=initial_messages),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world_amqp/hello_service.py

@@ -1,6 +1,7 @@
 import logging
 
 from intersect_sdk import (
+    ControlPlaneConfig,
     HierarchyConfig,
     IntersectBaseCapabilityImplementation,
     IntersectService,
@@ -9,6 +10,7 @@
     intersect_message,
     intersect_status,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 logging.getLogger('pika').setLevel(logging.WARNING)
@@ -45,16 +47,19 @@ def say_hello_to_name(self, name: str) -> str:
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 5672,
-                'protocol': 'amqp0.9.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 5672},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='amqp0.9.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
+
     config = IntersectServiceConfig(
         hierarchy=HierarchyConfig(
             organization='hello-organization',
@@ -63,7 +68,7 @@ def say_hello_to_name(self, name: str) -> str:
             subsystem='hello-subsystem',
             service='hello-service',
         ),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world_events/hello_client.py

@@ -2,12 +2,14 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
+    ControlPlaneConfig,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
     IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 
@@ -63,16 +65,18 @@ def simple_event_callback(
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 1883,
-                'protocol': 'mqtt3.1.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 1883},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='mqtt3.1.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
     """
     step two: construct the initial messages you want to send. In this case we will only send a single starting message.
 
@@ -99,7 +103,7 @@ def simple_event_callback(
                 'hello-organization.hello-facility.hello-system.hello-subsystem.hello-service'
             ],
         ),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world_events/hello_service.py

@@ -1,6 +1,7 @@
 import logging
 
 from intersect_sdk import (
+    ControlPlaneConfig,
     HierarchyConfig,
     IntersectBaseCapabilityImplementation,
     IntersectEventDefinition,
@@ -10,6 +11,7 @@
     intersect_message,
     intersect_status,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -48,16 +50,18 @@ def say_hello_to_name(self, name: str) -> str:
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
-    from_config_file = {
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 1883,
-                'protocol': 'mqtt3.1.1',
-            },
-        ],
-    }
+    broker_configs = [
+        {'host': 'localhost', 'port': 1883},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='mqtt3.1.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
     config = IntersectServiceConfig(
         hierarchy=HierarchyConfig(
             organization='hello-organization',
@@ -66,7 +70,7 @@ def say_hello_to_name(self, name: str) -> str:
             subsystem='hello-subsystem',
             service='hello-service',
         ),
-        **from_config_file,
+        brokers=brokers,
     )
 
     """

examples/1_hello_world_minio/hello_client.py

@@ -2,13 +2,15 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
+    ControlPlaneConfig,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
     IntersectDataHandler,
     IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
+from intersect_sdk.config.shared import BrokerConfig
 
 logging.basicConfig(level=logging.INFO)
 
@@ -43,6 +45,20 @@ def simple_client_callback(
 
     In most cases, everything under from_config_file should come from a configuration file, command line arguments, or environment variables.
     """
+
+    broker_configs = [
+        {'host': 'localhost', 'port': 1883},
+    ]
+
+    brokers = [
+        ControlPlaneConfig(
+            protocol='mqtt3.1.1',
+            username='intersect_username',
+            password='intersect_password',
+            brokers=[BrokerConfig(**broker) for broker in broker_configs],
+        )
+    ]
+
     from_config_file = {
         # NOTE: for this example, you will need a MINIO instance configured at this stage.
         'data_stores': {
@@ -53,15 +69,7 @@ def simple_client_callback(
                     'port': 9000,
                 },
             ],
-        },
-        'brokers': [
-            {
-                'username': 'intersect_username',
-                'password': 'intersect_password',
-                'port': 1883,
-                'protocol': 'mqtt3.1.1',
-            },
-        ],
+        }
     }
     """
     step two: construct the initial messages you want to send. In this case we will only send a single starting message.
@@ -86,6 +94,7 @@ def simple_client_callback(
     ]
     config = IntersectClientConfig(
         initial_message_event_config=IntersectClientCallback(messages_to_send=initial_messages),
+        brokers=brokers,
         **from_config_file,
     )