cc-py-commons 0.4.9__tar.gz → 0.5.1__tar.gz

{cc_py_commons-0.4.9 → cc_py_commons-0.5.1}/PKG-INFO

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

{cc_py_commons-0.4.9/cc_py_commons/db → cc_py_commons-0.5.1/cc_py_commons/rfp}/create_table.py

@@ -6,7 +6,7 @@ def execute(table_name):
 	try:
 		conn = db_connection.get()
 		cursor = conn.cursor()
-		sql_query = f"CREATE TABLE {table_name} (search_result text)"
+		sql_query = f"CREATE TABLE {table_name} (search_result text, error text)"
 		cursor.execute(sql_query)
 		conn.commit()
 	finally:

cc_py_commons-0.5.1/cc_py_commons/services/c4/get_account_settings.py

@@ -0,0 +1,21 @@
+import requests
+
+from cc_py_commons.utils.logger_v2 import logger
+from .constants import C4_API_AUTH_TOKEN, C4_API_URL
+
+
+def execute(user_id):
+	url = f"{C4_API_URL}/api/v1/user/{user_id}/accountSettings"
+	token = f"Bearer {C4_API_AUTH_TOKEN}"
+	headers = {
+		"Authorization": token
+	}
+	logger.debug(f"Getting account settings: URL: {url}, Headers: {headers}")
+
+	response = requests.get(url, headers=headers)
+
+	if response.status_code != 200:
+		logger.warning(f"Request to get account settings failed with status code: {response.status_code}")
+		return None
+
+	return response.json().get('data')

cc_py_commons-0.5.1/cc_py_commons/services/mercury/get_lane_price.py

@@ -0,0 +1,52 @@
+import os
+import requests
+
+from cc_py_commons.utils.logger_v2 import logger
+
+MERCURY_URL = os.environ.get("MERCURY_URL")
+MERCURY_TOKEN = os.environ.get("MERCURY_TOKEN")
+
+
+'''
+	Either returns lane price data or None. 
+	This does not provide error details to the consumer in case the lookup fails.
+'''
+def execute(params):
+	url = f"{MERCURY_URL}/lanePricing"
+	token = f"Bearer {MERCURY_TOKEN}"
+	headers = {
+		"Authorization": token
+	}
+	response = requests.get(url, params=params, headers=headers)
+
+	if response.status_code != 200:
+		logger.warning(
+			f"Lane Pricing lookup failed for params: {params} - {response.status_code}:{response.text}")
+		return None
+
+	return response.json()
+
+'''
+	Returns a dict with data and error key. 
+	data refers to the lane price data if the price was generated.
+	error contains the stringified status code and text of Mercury response in case the lookup failed.
+'''
+def execute_v2(params):
+	result = {
+		'data': None,
+		'error': None
+	}
+	url = f"{MERCURY_URL}/lanePricing"
+	token = f"Bearer {MERCURY_TOKEN}"
+	headers = {
+		"Authorization": token
+	}
+	response = requests.get(url, params=params, headers=headers)
+
+	if response.status_code != 200:
+		error = f'{response.status_code}:{response.text}'
+		result['error'] = error
+		logger.warning(f"Lane Pricing lookup failed for params: {params} - {error}")
+	else:
+		result['data'] = response.json()
+	return result

{cc_py_commons-0.4.9 → cc_py_commons-0.5.1}/cc_py_commons.egg-info/PKG-INFO

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

{cc_py_commons-0.4.9 → cc_py_commons-0.5.1}/cc_py_commons.egg-info/SOURCES.txt

@@ -25,8 +25,6 @@ cc_py_commons/config/mcleod_load_fields.py
 cc_py_commons/config/pc_miler_config.py
 cc_py_commons/db/__init__.py
 cc_py_commons/db/connection.py
-cc_py_commons/db/create_table.py
-cc_py_commons/db/delete_table.py
 cc_py_commons/lanes/__init__.py
 cc_py_commons/lanes/carrier_lane.py
 cc_py_commons/lanes/carrier_lane_schema.py
@@ -49,6 +47,7 @@ cc_py_commons/quotes/quote.py
 cc_py_commons/quotes/quote_schema.py
 cc_py_commons/quotes/quote_status.py
 cc_py_commons/rfp/__init__.py
+cc_py_commons/rfp/create_table.py
 cc_py_commons/rfp/lane_price_result_fields.py
 cc_py_commons/rfp/price_lane_file_input_fields.py
 cc_py_commons/rfp/rfp_status.py
@@ -68,6 +67,7 @@ cc_py_commons/services/c4/__init__.py
 cc_py_commons/services/c4/amazon_session_token.py
 cc_py_commons/services/c4/constants.py
 cc_py_commons/services/c4/get_account.py
+cc_py_commons/services/c4/get_account_settings.py
 cc_py_commons/services/c4/get_integration.py
 cc_py_commons/services/c4/get_users_for_account.py
 cc_py_commons/services/c4/refresh_amazon_token.py
@@ -88,6 +88,8 @@ cc_py_commons/services/mercury/get_lane_price_for_bulk.py
 cc_py_commons/services/mercury/list_clients.py
 cc_py_commons/services/mercury/post_import_stat.py
 cc_py_commons/services/mercury/update_import_stat.py
+cc_py_commons/services/mercury/db/__init__.py
+cc_py_commons/services/mercury/db/delete_table.py
 cc_py_commons/services/slack/__init__.py
 cc_py_commons/services/slack/send_slack_message.py
 cc_py_commons/sns/__init__.py

{cc_py_commons-0.4.9 → cc_py_commons-0.5.1}/setup.py

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

cc_py_commons-0.4.9/cc_py_commons/services/mercury/get_lane_price.py

@@ -1,23 +0,0 @@
-import os
-import requests
-
-from cc_py_commons.utils.logger_v2 import logger
-
-MERCURY_URL = os.environ.get("MERCURY_URL")
-MERCURY_TOKEN = os.environ.get("MERCURY_TOKEN")
-
-
-def execute(params):
-	url = f"{MERCURY_URL}/lanePricing"
-	token = f"Bearer {MERCURY_TOKEN}"
-	headers = {
-		"Authorization": token
-	}
-	response = requests.get(url, params=params, headers=headers)
-
-	if response.status_code != 200:
-		logger.warning(
-			f"Lane Pricing lookup failed for params: {params} - {response.status_code}:{response.text}")
-		return None
-
-	return response.json()