improve logging display at connection

Author: dimitri-yatsenko

datajoint/connection.py

@@ -12,7 +12,7 @@
 import pathlib
 
 from .settings import config
-from . import errors
+from . import errors, __version__
 from .dependencies import Dependencies
 from .blob import pack, unpack
 from .hash import uuid_from_buffer
@@ -190,15 +190,20 @@ def __init__(self, host, user, password, port=None, init_fun=None, use_tls=None)
         self.conn_info["ssl_input"] = use_tls
         self.conn_info["host_input"] = host_input
         self.init_fun = init_fun
-        logger.info("Connecting {user}@{host}:{port}".format(**self.conn_info))
         self._conn = None
         self._query_cache = None
         connect_host_hook(self)
         if self.is_connected:
-            logger.info("Connected {user}@{host}:{port}".format(**self.conn_info))
+            logger.info(
+                "DataJoint {version} connected {user}@{host}:{port}".format(
+                    version=__version__, **self.conn_info
+                )
+            )
             self.connection_id = self.query("SELECT connection_id()").fetchone()[0]
         else:
-            raise errors.LostConnectionError("Connection failed.")
+            raise errors.LostConnectionError(
+                "Connection failed {user}@{host}:{port}".format(**self.conn_info)
+            )
         self._in_transaction = False
         self.schemas = dict()
         self.dependencies = Dependencies(self)

datajoint/schemas.py

@@ -482,8 +482,8 @@ def list_tables(self):
         return [
             t
             for d, t in (
-                full_t.replace("`", "").split(".")
-                for full_t in self.connection.dependencies.topo_sort()
+                table_name.replace("`", "").split(".")
+                for table_name in self.connection.dependencies.topo_sort()
             )
             if d == self.database
         ]

datajoint/settings.py

@@ -1,5 +1,5 @@
 """
-Settings for DataJoint.
+Settings for DataJoint
 """
 
 from contextlib import contextmanager
@@ -48,7 +48,8 @@
         "database.use_tls": None,
         "enable_python_native_blobs": True,  # python-native/dj0 encoding support
         "add_hidden_timestamp": False,
-        "filepath_checksum_size_limit": None,  # file size limit for when to disable checksums
+        # file size limit for when to disable checksums
+        "filepath_checksum_size_limit": None,
     }
 )
 
@@ -117,6 +118,7 @@ def load(self, filename):
         if filename is None:
             filename = LOCALCONFIG
         with open(filename, "r") as fid:
+            logger.info(f"Reading dj.config from {filename}")
             self._conf.update(json.load(fid))
 
     def save_local(self, verbose=False):
@@ -236,7 +238,8 @@ class __Config:
 
         def __init__(self, *args, **kwargs):
             self._conf = dict(default)
-            self._conf.update(dict(*args, **kwargs))  # use the free update to set keys
+            # use the free update to set keys
+            self._conf.update(dict(*args, **kwargs))
 
         def __getitem__(self, key):
             return self._conf[key]
@@ -250,7 +253,9 @@ def __setitem__(self, key, value):
             valid_logging_levels = {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}
             if key == "loglevel":
                 if value not in valid_logging_levels:
-                    raise ValueError(f"{'value'} is not a valid logging value")
+                    raise ValueError(
+                        f"{'value'} is not a valid logging value {tuple(valid_logging_levels)}"
+                    )
                 logger.setLevel(value)
 
 
@@ -292,6 +297,8 @@ def __setitem__(self, key, value):
     )
     if v is not None
 }
-config.update(mapping)
+if mapping:
+    logger.info(f"Loaded settings {tuple(mapping)} from environment variables.")
+    config.update(mapping)
 
 logger.setLevel(log_levels[config["loglevel"]])

datajoint/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.14.3"
+__version__ = "0.14.4"
 
 assert len(__version__) <= 10  # The log table limits version to the 10 characters