cc-py-commons 0.5.42__tar.gz → 0.5.44__tar.gz

{cc_py_commons-0.5.42 → cc_py_commons-0.5.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc_py_commons
-Version: 0.5.42
+Version: 0.5.44
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.42 → cc_py_commons-0.5.44}/cc_py_commons/config/env.py

@@ -24,7 +24,7 @@ class Config(object):
   TIMEZONE_CACHE_PASSWORD = os.getenv('TIMEZONE_CACHE_PASSWORD')
   PC_MILER_HOURLY_LIMIT = 14000
   PC_MILER_MONTHLY_LIMIT = 300000
-  PARSED_CARRIER_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:carrier-hub-sns-test'
+  PARSED_CARRIER_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:parsed-carrier-handler-test'
   PARSED_CARRIER_SNS_SUBJECT = 'parsed-carrier'
   PARSED_CARRIER_SNS_CLASS_NAME = 'com.cargochief.sdk.carrierhub.notifications.ParsedCarrierNotification'
   BOOK_LOAD_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:booking-agent-book-load-test'
@@ -41,7 +41,7 @@ class Config(object):
   IMPORT_CARRIERS_SNS_SUBJECT = 'import-carriers'
   IMPORT_CARRIERS_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-2:791608169866:mcleod-import-carriers-test'
   MINIMUM_MILES_PER_DAY = int(os.getenv('MINIMUM_MILES_PER_DAY', 300))
-  BOOKING_ASSISTANT_FLOW_QUEUE='https://sqs.us-west-1.amazonaws.com/791608169866/booking-assistant-flow-dev'
+  BOOKING_ASSISTANT_FLOW_QUEUE = 'https://sqs.us-west-1.amazonaws.com/791608169866/booking-agent-worker-test'
   BOOKING_ASSISTANT_DELAY_SECONDS=os.environ.get('BOOKING_ASSISTANT_DELAY_SECONDS', 0)
   TURVO_LOADS_BUCKET = 'turvo-loads-dev'
   ALJEX_LOADS_BUCKET = 'aljex-loads-dev'
@@ -99,7 +99,7 @@ class StagingConfig(Config):
 
 class ProductionConfig(Config):
   """Configurations for running in dev mode, with a remote database."""
-  PARSED_CARRIER_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:mcleod-parsed-carrier-prod'
+  PARSED_CARRIER_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:parsed-carrier-handler-prod'
   BOOK_LOAD_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:booking-agent-book-load-prod'
   BOOKING_ASSISTANT_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:booking-assistant-flow-prod'
   IMPORT_MOVEMENTS_SNS_TOPIC_ARN = 'arn:aws:sns:us-west-1:791608169866:mcleod-import-movements-prod'

cc_py_commons-0.5.44/cc_py_commons/sns/booking_assistant_flow_notification.py

@@ -0,0 +1,37 @@
+import json
+import traceback
+
+from cc_py_commons.sns.sns_service import SnsService
+from cc_py_commons.utils import json_logger
+
+
+class BookingAssistantFlowNotification:
+
+	def __init__(self, app_config):
+		self._app_config = app_config
+
+	def send(self, user_id, load, params, capacity_search_equipments, request_id, auto_invite_details=None):
+		'''
+	  Sends and event to the Booking Assistant Flow SQS queue specified in the config.
+	  Returns the messageId of the enqueued message for later retrieval.
+	  '''
+		c4_account_id = load.get('accountId')
+		subject = self._app_config.BOOKING_ASSISTANT_SNS_SUBJECT
+		event = {
+			'userId': user_id,
+			'loadDTO': load,
+			'payload': params,
+			'capacitySearchEquipments': capacity_search_equipments,
+			'requestId': request_id,
+			'subject': f'{subject}',
+			'className': f'{self._app_config.BOOKING_ASSISTANT_SNS_CLASS_NAME}',
+			'autoInviteDetails': auto_invite_details
+		}
+		json_logger.debug(c4_account_id, 'Sending booking assistant flow SNS notification',
+						  topic=self._app_config.BOOKING_ASSISTANT_SNS_TOPIC_ARN, event=event)
+		try:
+			sns_service = SnsService()
+			return sns_service.send(self._app_config.BOOKING_ASSISTANT_SNS_TOPIC_ARN, subject, json.dumps(event))
+		except Exception as e:
+			json_logger.warning(c4_account_id, 'Failed to send BookingAssistantFlowNotification',
+								error=str(e), stacktrace=traceback.format_exc())

{cc_py_commons-0.5.42 → cc_py_commons-0.5.44}/cc_py_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc-py-commons
-Version: 0.5.42
+Version: 0.5.44
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.42 → cc_py_commons-0.5.44}/cc_py_commons.egg-info/SOURCES.txt

@@ -111,7 +111,6 @@ cc_py_commons/sns/booking_agent/constants.py
 cc_py_commons/sns/booking_agent/send_sns_notification.py
 cc_py_commons/sqs/__init__.py
 cc_py_commons/sqs/booking_assistant_cancel_quote_notification.py
-cc_py_commons/sqs/booking_assistant_flow_event.py
 cc_py_commons/sqs/sqs_service.py
 cc_py_commons/tests/__init__.py
 cc_py_commons/tests/test_case_conversion.py

{cc_py_commons-0.5.42 → cc_py_commons-0.5.44}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 setup(
     name='cc_py_commons',
     description='Common code for microservices',
-    version='0.5.42',
+    version='0.5.44',
     url='https://github.com/Cargo-Chief/py-commons',
     author='CargoChief',
     author_email='engineering@cargochief.com',

cc_py_commons-0.5.42/cc_py_commons/sns/booking_assistant_flow_notification.py

@@ -1,27 +0,0 @@
-import json
-
-from cc_py_commons.sns.sns_service import SnsService
-from cc_py_commons.utils.logger_v2 import logger
-
-class BookingAssistantFlowNotification:
-
-  def __init__(self, app_config):
-    self._app_config = app_config
-
-  def send(self, user_id, load, params):
-    message = {
-      'userId': user_id,
-      'loadDTO': load,
-      'payload': params,
-      'subject': f'{self._app_config.BOOKING_ASSISTANT_SNS_SUBJECT}',
-      'className': f'{self._app_config.BOOKING_ASSISTANT_SNS_CLASS_NAME}'
-    }
-    logger.debug(f"sending messsage {message} to {self._app_config.BOOKING_ASSISTANT_SNS_TOPIC_ARN}")
-
-    try:
-      sns_service = SnsService()
-      sns_service.send(self._app_config.BOOKING_ASSISTANT_SNS_TOPIC_ARN,
-        self._app_config.BOOKING_ASSISTANT_SNS_SUBJECT, json.dumps(message))
-    except Exception as e:
-      logger.error(f"failed to send BookingAssistantFlowNotification message: {e}")
-      logger.error(f"BookingAssistantFlowNotification message: {message}")

cc_py_commons-0.5.42/cc_py_commons/sqs/booking_assistant_flow_event.py

@@ -1,31 +0,0 @@
-import json
-
-from cc_py_commons.config.env import app_config
-from cc_py_commons.sqs.sqs_service import SqsService
-from cc_py_commons.utils.logger_v2 import logger
-
-class BookingAssistantFlowEvent:
-
-	def send(self, user_id, load, params, capacity_search_equipments, request_id, auto_invite_details=None):
-		'''
-		Sends and event to the Booking Assistant Flow SQS queue specified in the config.
-		Returns the messageId of the enqueued message for later retrieval.
-		'''
-		event = {
-			'userId': user_id,
-			'loadDTO': load,
-			'payload': params,
-			'capacitySearchEquipments': capacity_search_equipments,
-			'requestId': request_id,
-			'subject': f'{app_config.BOOKING_ASSISTANT_SNS_SUBJECT}',
-			'className': f'{app_config.BOOKING_ASSISTANT_SNS_CLASS_NAME}',
-			'autoInviteDetails': auto_invite_details
-		}
-		logger.debug(f"sending event {event} to {app_config.BOOKING_ASSISTANT_FLOW_QUEUE}")
-
-		try:
-			sqs_service = SqsService()
-			return sqs_service.send(app_config.BOOKING_ASSISTANT_FLOW_QUEUE, json.dumps(event), app_config.BOOKING_ASSISTANT_DELAY_SECONDS)
-		except Exception as e:
-			logger.error(f"failed to send BookingAssistantFlowEvent message: {e}")
-			logger.error(f"BookingAssistantFlowEvent message: {event}")