cc-py-commons 0.5.17__tar.gz → 0.5.19__tar.gz

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/PKG-INFO

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

cc_py_commons-0.5.19/cc_py_commons/carriers/account_carrier_map.py

@@ -0,0 +1,12 @@
+import datetime
+import uuid
+from dataclasses import dataclass, field
+
+@dataclass
+class AccountCarrierMap:
+  account_id: int
+  carrier_id: uuid.UUID
+  status: str
+  customer_code: str = field(default=None)
+  warmup_email_sent_at: datetime.date = field(default=None)
+  no_dispatch: bool = field(default=False)

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/cc_py_commons/carriers/account_carrier_map_schema.py

@@ -1,18 +1,17 @@
 from marshmallow import fields, EXCLUDE, post_load
 from cc_py_commons.schemas.camel_case_schema import CamelCaseSchema
-from cc_py_commons.carriers.contact_schema import ContactSchema
 from cc_py_commons.carriers.account_carrier_map import AccountCarrierMap
 class AccountCarrierMapSchema(CamelCaseSchema):
   class Meta:
     unknown = EXCLUDE
 
   account_id = fields.Integer()
-  customer_code = fields.String(allow_none=True)
   carrier_id = fields.UUID()
-  status = fields.String(allow_none=True)
-  warmup_email_sent_at = fields.Date(allow_none=True)
-  no_dispatch = fields.Boolean(allow_none=True)
-
+  status = fields.String()
+  customer_code = fields.String(allow_none=True, missing=None)
+  warmup_email_sent_at = fields.Date(allow_none=True, missing=None)
+  no_dispatch = fields.Boolean(allow_none=True, missing=None)
+  
   @post_load
-  def make_bid(self, data, **kwargs):
+  def make_account_carrier_map(self, data, **kwargs):
       return AccountCarrierMap(**data)  

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/cc_py_commons/carriers/carrier_schema.py

@@ -63,7 +63,7 @@ class CarrierSchema(CamelCaseSchema):
   vetting_overall_display = fields.String(allow_none=True)
   last_vetting_time = fields.Date(allow_none=True)
   vetting_remarks = fields.String(allow_none=True)
-
+  
   @post_load
-  def make_bid(self, data, **kwargs):
+  def make_carrier(self, data, **kwargs):
       return Carrier(**data)

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/cc_py_commons/geolocate.py

@@ -75,29 +75,34 @@ def get_location_with_country(city, state, zipcode, country, logger, reset_cache
 
   return data
 
-def get_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger):
+def get_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger, with_duration=False):
   if not origin_latitude or not origin_longitude or \
     not destination_latitude or not destination_longitude:
     raise Exception("Calculating distance requires both origin and destination lat/lng")
 
   from_cache = False
-  pc_miler_can_be_called = False
   distance_cache_key = __get_distance_cache_key(origin_latitude, origin_longitude, destination_latitude, destination_longitude)
-  distance = __get_distance_from_cache(distance_cache_key, logger)
+  distance_data_dict = __get_distance_from_cache(distance_cache_key, logger)
 
-  if distance:
+  if distance_data_dict:
     from_cache = True
 
-  if not distance:      
-    distance = __get_google_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger)
+  missing_duration_and_is_required = (with_duration and not distance_data_dict.get('duration'))
+  if not distance_data_dict or missing_duration_and_is_required:
+      distance_data_dict = __get_google_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger)
 
-  if distance:
-    if not from_cache:
-      __cache_distance(distance_cache_key, distance, logger)
+  if distance_data_dict:
+    if not from_cache or missing_duration_and_is_required:
+      __cache_distance(distance_cache_key, distance_data_dict, logger)
   else:
     logger.debug(f"geolocate.get_distance - Google returned no result for {distance_cache_key}")
 
-  return distance
+  if distance_data_dict:
+    if with_duration:
+      return distance_data_dict
+    else:
+      return distance_data_dict.get('distance')
+  return None
 
 def get_timezone(lat,lng, logger):
   from_cache = False
@@ -124,7 +129,7 @@ def get_timezone(lat,lng, logger):
   return timezone
 
 def __get_google_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger):
-  distance = None
+  distance_data = None
   try:
     gmaps = googlemaps.Client(key=app_config.GOOGLE_API_KEY)
     origins = [f'{origin_latitude} {origin_longitude}']
@@ -137,10 +142,16 @@ def __get_google_distance(origin_latitude, origin_longitude, destination_latitud
     if response and response['rows'][0]['elements'][0].get('distance', None):
       distance_in_meters = response['rows'][0]['elements'][0]['distance']['value']
       distance = distance_in_meters / 1609
+      duration_seconds = response['rows'][0]['elements'][0]['duration']['value']
+      duration_minutes = duration_seconds / 60
+      distance_data = {
+        'distance': distance,
+        'duration': duration_minutes
+      }
   except Exception as e:
     logger.error("geolocate.__get_google_distance: Error while getting distance from google", e)
-    distance = None
-  return distance
+    distance_data = None
+  return distance_data
 
 def __get_google_location(city, state, zipcode, country, logger):
   try:
@@ -351,19 +362,22 @@ def __get_location_string(city, state, zipcode):
 
   return location_string.lower()
 
-def __cache_distance(distance_cache_key, distance, logger):
-  distance_db_conn.set(distance_cache_key, distance)
+def __cache_distance(distance_cache_key, distance_data, logger):
+  distance_db_conn.set(distance_cache_key, str(distance_data))
 
 def __get_distance_from_cache(distance_cache_key, logger):
-  distance = None
+  distance_data = {}
   try:
-    distance = distance_db_conn.get(distance_cache_key)
-    if distance:
-      distance = float(distance)
+    cached_data = distance_db_conn.get(distance_cache_key)
+    if cached_data:
+      if 'duration' in str(cached_data):
+        distance_data = literal_eval(cached_data.decode('utf-8'))
+      else:
+        distance_data['distance'] = float(cached_data)
   except Exception as e:
     logger.warn("geolocate.__get_distance_from_cache: Error while getting distance from cache", e)
-    distance = None
-  return distance
+    distance_data = {}
+  return distance_data
 
 def __get_distance_cache_key(origin_latitude, origin_longitude, destination_latitude, destination_longitude):
   return f'{__truncate(origin_latitude)},{__truncate(origin_longitude)}->{__truncate(destination_latitude)},{__truncate(destination_longitude)}'

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/cc_py_commons.egg-info/PKG-INFO

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

{cc_py_commons-0.5.17 → cc_py_commons-0.5.19}/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.17',
+    version='0.5.19',
     url='https://github.com/Cargo-Chief/py-commons',
     author='CargoChief',
     author_email='engineering@cargochief.com',

cc_py_commons-0.5.17/cc_py_commons/carriers/account_carrier_map.py

@@ -1,12 +0,0 @@
-import datetime
-import uuid
-from dataclasses import dataclass
-
-@dataclass
-class AccountCarrierMap:
-  account_id: int
-  customer_code: str
-  carrier_id: uuid.UUID
-  status: str
-  warmup_email_sent_at: datetime.date
-  no_dispatch: bool