cc-py-commons 0.5.12__tar.gz → 0.5.13__tar.gz

{cc_py_commons-0.5.12 → cc_py_commons-0.5.13}/PKG-INFO

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

{cc_py_commons-0.5.12 → cc_py_commons-0.5.13}/cc_py_commons/geolocate.py

@@ -5,10 +5,10 @@ from cc_py_commons.config.env import app_config
 from cc_py_commons.utils.redis import location_db_conn, distance_db_conn, timezone_db_conn
 from ast import literal_eval
 
-def get_location(city, state, zipcode, logger):
-  return get_location_with_country(city, state, zipcode, None, logger)
+def get_location(city, state, zipcode, logger, reset_cache=False):
+  return get_location_with_country(city, state, zipcode, None, logger, reset_cache)
 
-def get_location_with_country(city, state, zipcode, country, logger):
+def get_location_with_country(city, state, zipcode, country, logger, reset_cache=False):
   from_cache = False
   postcode = zipcode
 
@@ -16,7 +16,9 @@ def get_location_with_country(city, state, zipcode, country, logger):
     parts = zipcode.split('-')
     postcode = parts[0] if len(parts) > 0 else zipcode
 
-  data = __get_location_from_cache(city, state, postcode, logger)
+  data = None
+  if not reset_cache:
+    data = __get_location_from_cache(city, state, postcode, logger)
 
   if data:
     if data.get('country') and (not postcode or postcode == data.get('postcode')):
@@ -285,11 +287,15 @@ def __get_google_location(city, state, zipcode, country, logger):
       
       # For some locals like neighborhood google does not return postal_code
       ## if zipcode is present run it only and verify against city
-      if data and not data['postcode'] and zipcode:
-        response = gmaps.geocode(zipcode)
+      if data and not data['postcode']:
+        if zipcode:
+          response = gmaps.geocode(zipcode)
+        else:
+          response = gmaps.reverse_geocode((data['lat'], data['lng']))
         post_code_data = __parse_response(response)
         data['postcode'] = post_code_data['postcode'] if post_code_data else None
-      
+        if data['postcode']:
+          __cache_location(city, state, zipcode, data, logger)
       return data
   except googlemaps.exceptions.Timeout as e:
     msg = "geolocate.__get_google_location - Location lookup timed out {0}, {1}, {2}: {3}".format(city, state, zipcode, e)

{cc_py_commons-0.5.12 → cc_py_commons-0.5.13}/cc_py_commons.egg-info/PKG-INFO

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

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