Add CI/CD pipeline, adjust for integration with CleverSwarm and other python services

amqp/adapter/test_amq_message_factory.py

@@ -9,7 +9,7 @@ class AMQMessageFactoryTest(TestCase):
         raw = "\002\027A64f3b5af4d00000a4000|m=POST|d=clever-pybook.localhost|p=/debug|h={Accept=[*/*],X-Forwarded-Host=[clever-pybook.localhost:8085],User-Agent=[curl/8.7.1],X-Forwarded-Proto=[http],X-Forwarded-For=[172.18.0.1],Host=[clever-pybook.localhost:8085],Accept-Encoding=[gzip],Content-Length=[1475],X-Forwarded-Port=[8085],X-Real-Ip=[172.18.0.1],X-Forwarded-Server=[c5945bef67d1],Content-Type=[multipart/form-data; boundary=------------------------j1RjIqLrFH07XMsyMvpS1v]}|t={traceparent=00-bed6eb7de0d8ccf4c80b145a4bfec357-8d1f3bafc471bf0f-01}|b=TEST_ME"
         msg = AMQMessageFactory.from_bytes(raw.encode("utf-8"))
         self.assertIsNotNone(msg.id)
-        self.assertEqual(msg.id.as_string(),'64F3B5AF4D00000A4000','SnowflakeID incorrectly parsed.')
+        self.assertEqual(msg.id.as_string(),'64F3B5AF4D00000A4000'.lower(),'SnowflakeID incorrectly parsed.')
         self.assertEqual(msg.headers["Content-Type"][0], "multipart/form-data; boundary=------------------------j1RjIqLrFH07XMsyMvpS1v")
 
     def test_generate_snowflake_id(self):
@@ -24,10 +24,10 @@ class AMQMessageFactoryTest(TestCase):
         _i1 = _f.generate_snowflake_id()
         _i2 = _f.generate_snowflake_id()
         _i3 = _f.generate_snowflake_id()
-        self.assertEqual('0007F000', _i0.as_string()[-8:], 'Instance ID and sequence not set correctly')
-        self.assertEqual('0007F001', _i1.as_string()[-8:], 'Instance ID and sequence not set correctly')
-        self.assertEqual('0007F002', _i2.as_string()[-8:], 'Instance ID and sequence not set correctly')
-        self.assertEqual('0007F003', _i3.as_string()[-8:], 'Instance ID and sequence not set correctly')
+        self.assertEqual('0007F000'.lower(), _i0.as_string()[-8:], 'Instance ID and sequence not set correctly')
+        self.assertEqual('0007F001'.lower(), _i1.as_string()[-8:], 'Instance ID and sequence not set correctly')
+        self.assertEqual('0007F002'.lower(), _i2.as_string()[-8:], 'Instance ID and sequence not set correctly')
+        self.assertEqual('0007F003'.lower(), _i3.as_string()[-8:], 'Instance ID and sequence not set correctly')
 
     def test_create_request_message(self):
         _f = AMQMessageFactory(34)
@@ -65,4 +65,4 @@ class AMQMessageFactoryTest(TestCase):
         _f = AMQMessageFactory(35)
         _req = _f.create_request_message("PUT", "localhost", "/test/me", {"k1": ["v1"], "k2": ["v2"]}, "Quick brown fox")
         _as_str = _f.to_string(_req)
-        self.assertGreater(_as_str.index("domain='localhost'"), 0, "Expected content not found")
+        self.assertGreater(_as_str.index("domain='localhost'"), 0, "Expected content not found")

amqp/service/amq_service.py

@@ -6,7 +6,6 @@ from asyncio import Future
 
 from amqp.adapter.amq_message_factory import AMQMessageFactory
 from amqp.adapter.amq_route_factory import AMQRouteFactory
-from cleverswarm.clever_swarm_adapter import CleverSwarmAdapter
 from amqp.adapter.service_message_factory import CleverMicroServiceMessageFactory
 
 from amqp.config.amq_configuration import AMQConfiguration
@@ -87,7 +86,7 @@ class AMQService:
 
 if __name__ == "__main__":
     amq_configuration: AMQConfiguration = AMQConfiguration()
-    amq_service: AMQService = AMQService(amq_configuration, CleverSwarmAdapter(amq_configuration))
-    amq_service.rabbit_mq_consumer.channel.start_consuming()
+    # amq_service: AMQService = AMQService(amq_configuration, CleverSwarmAmqpAdapter(amq_configuration))
+    # amq_service.rabbit_mq_consumer.channel.start_consuming()
     # amq_service.consumer_thread.cancel()
     # amq_service.rabbit_mq_consumer.connection.close()

amqp/service/service_message_handler.py

@@ -13,7 +13,7 @@ from pika.channel import Channel
 
 from amqp.adapter.amq_message_factory import AMQMessageFactory
 from amqp.adapter.amq_response_factory import AMQResponseFactory
-from cleverswarm.clever_swarm_adapter import CleverSwarmAdapter
+from cleverswarm.clever_swarm_adapter import CleverSwarmAmqpAdapter
 from amqp.model.model import AMQResponse, AMQMessage
 from amqp.router.router_base import AMQ_REPLY_TO_EXCHANGE
 from amqp.router.serializer import map_as_string
@@ -37,8 +37,8 @@ def set_text(carrier, key, value):
 
 
 class AMQServiceMessageHandler:
-    def __init__(self, service_adapter: CleverSwarmAdapter, tracer: Tracer, message_factory: AMQMessageFactory):
-        self.http_adapter: CleverSwarmAdapter = service_adapter
+    def __init__(self, service_adapter: CleverSwarmAmqpAdapter, tracer: Tracer, message_factory: AMQMessageFactory):
+        self.http_adapter: CleverSwarmAmqpAdapter = service_adapter
         self.tracer = tracer
         self.message_factory: AMQMessageFactory = message_factory
         # Dictionary to store outstanding Futures