python-ubercode-utils 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

{python_ubercode_utils-2.0.5.dist-info → python_ubercode_utils-2.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ubercode-utils
-Version: 2.0.5
+Version: 2.0.7
 Summary: Core python utilities for all apps
 Home-page: https://github.com/sstacha/python-ubercode-utils
 Author: Steve Stacha

{python_ubercode_utils-2.0.5.dist-info → python_ubercode_utils-2.0.7.dist-info}/RECORD

@@ -4,11 +4,11 @@ ubercode/utils/convert.py,sha256=INxAIlIkwTeHSdVpqm8R_N5MzrSrjY9CduioHipu39g,113
 ubercode/utils/cursor.py,sha256=zHqbmUavCF0l7ck_Tu4PfgSzRO762ULKHYsnqa3r0uY,1118
 ubercode/utils/data.py,sha256=DStj9BAXPSPvQRZwfEQVYt19EoMavyNFt11U8ZnhagE,4364
 ubercode/utils/dataframe.py,sha256=3AYoZGZB7wtN5brBDfRgnuIaEubhRrSc7qx8hi_vaaE,1616
-ubercode/utils/environment.py,sha256=97uYs0zGBkk7TfKuml6Th27kpdtYX_ILwfZTQW3Xac8,15818
+ubercode/utils/environment.py,sha256=aOAtMLOOpNJ_0BPGcAQtzB3D2_TguPodjYxNB0QPDWY,16753
 ubercode/utils/logging.py,sha256=s4yIJWHo9MVO4oSk5IF3z6XTk-FOuyEiKnPFkiza3h4,9204
 ubercode/utils/urls.py,sha256=dkAHH-ZOXkqueKor94fCmwUz6I4KnvAM_XcW8k2XjaY,14507
-python_ubercode_utils-2.0.5.dist-info/LICENSE,sha256=lch0WEJaqJY3C5aCYSr0u6Gw0set96a2fp9ZWJRYuR8,1069
-python_ubercode_utils-2.0.5.dist-info/METADATA,sha256=FGWg4Rw72IguHetBcCIRrWOlWTehbF8DhsLRswBp86k,1225
-python_ubercode_utils-2.0.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-python_ubercode_utils-2.0.5.dist-info/top_level.txt,sha256=5BojzbvNCpPkFXcVQVr7cfovhbYQYAlMKgiHSMgi7VU,9
-python_ubercode_utils-2.0.5.dist-info/RECORD,,
+python_ubercode_utils-2.0.7.dist-info/LICENSE,sha256=lch0WEJaqJY3C5aCYSr0u6Gw0set96a2fp9ZWJRYuR8,1069
+python_ubercode_utils-2.0.7.dist-info/METADATA,sha256=-T6UzN1Qdj6Xj2uIi6Z8u-uAyyMU5WvHHs9_OPZJzC0,1225
+python_ubercode_utils-2.0.7.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+python_ubercode_utils-2.0.7.dist-info/top_level.txt,sha256=5BojzbvNCpPkFXcVQVr7cfovhbYQYAlMKgiHSMgi7VU,9
+python_ubercode_utils-2.0.7.dist-info/RECORD,,

{python_ubercode_utils-2.0.5.dist-info → python_ubercode_utils-2.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.46.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ubercode/utils/environment.py

@@ -71,16 +71,26 @@ class Environment:
         self._env_map = environment_variable_map
 
     @staticmethod
-    def infer_data_type(value):
-        if value is not None:
-            if isinstance(value, bool):
+    def infer_data_type(default_value: Any, env_value: Any) -> str:
+        if default_value is not None:
+            if isinstance(default_value, bool):
                 return 'bool'
-            if isinstance(value, str):
-                return 'str'
-            if isinstance(value, int):
+            if isinstance(default_value, int):
                 return 'int'
-            if isinstance(value, datetime):
+            if isinstance(default_value, datetime):
                 return 'date'
+            if isinstance(default_value, str):
+                return 'str'
+        else:
+            # NOTE: all env vals are sent as strings so 'True', 'False' with no settings var will be str not bool
+            # considering inferring that it is python boolean if True,False with caps.  Will not do lower for
+            # js type true,false we want to pass through as strings lower case in a template; trying not to
+            # infer too much.
+            if env_value is not None and isinstance(env_value, str) and env_value.strip() in ('True', 'False'):
+                return 'bool'
+            # NOTE: we may want to look at some common date/time patters to infer date as well; but bool is
+            # important because things like DEBUG=False will evaluate as True if overridden right now without
+            # the variable being first initialized to something in the settings file.
         return 'str'
 
     def override_variable(self, variable_name: str, default_value: Any = None, environment_variable_name: str = None,
@@ -113,7 +123,7 @@ class Environment:
         if _env_value is not None:
             if data_type is None or data_type not in self.VARIABLE_DATA_TYPES:
                 # infer type from default value
-                data_type = self.infer_data_type(default_value)
+                data_type = self.infer_data_type(default_value, _env_value)
             # attempt to convert to datatype if not str
             if data_type == 'bool':
                 _env_value = convert.to_bool(_env_value)
@@ -128,7 +138,7 @@ class Environment:
                     _log_value = convert.to_mask(_env_value)
                     if _log_from_value != "None":
                         _log_from_value = convert.to_mask(_log_from_value)
-            self._logger.info(f'overriding {variable_name}: [{str(_log_from_value)}] to [{str(_log_value)}]')
+            self._logger.info(f'overriding {variable_name} [{type(_env_value)}]: [{str(_log_from_value)}] to [{str(_log_value)}]')
             return _env_value
         return default_value
 
@@ -199,7 +209,7 @@ class Environment:
                     _log_from_value = 'None'
                     _log_to_value = str(v)
                     # we may be setting up a completely new database from scratch so create if it doesn't exist
-                    if not db_dict[db_parts[1]]:
+                    if not db_dict.get(db_parts[1]):
                         self._logger.debug(f'database {db_parts[0]}[{db_parts[1]}] was not found; creating...')
                         db_dict[db_parts[1]] = {}
                     # we now have db dict; we may not have a property already defined; if not we want to add it