Merge master into pre/v2.1

- Resolve conflicts in settings.py and version.py
- Keep use_tls Field with validation_alias from pre/v2.1
- Use database_prefix (renamed from schema_prefix) from master
- Bump version to 2.1.0a9

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: dimitri-yatsenko

src/datajoint/autopopulate.py

@@ -605,7 +605,7 @@ def _populate1(
                 jobs.complete(key)
             return False
 
-        logger.debug(f"Making {key} -> {self.full_table_name}")
+        logger.jobs(f"Making {key} -> {self.full_table_name}")
         self.__class__._allow_insert = True
 
         try:
@@ -636,7 +636,7 @@ def _populate1(
                 exception=error.__class__.__name__,
                 msg=": " + str(error) if str(error) else "",
             )
-            logger.debug(f"Error making {key} -> {self.full_table_name} - {error_message}")
+            logger.jobs(f"Error making {key} -> {self.full_table_name} - {error_message}")
             if jobs is not None:
                 jobs.error(key, error_message=error_message, error_stack=traceback.format_exc())
             if not suppress_errors or isinstance(error, SystemExit):
@@ -647,7 +647,7 @@ def _populate1(
         else:
             self.connection.commit_transaction()
             duration = time.time() - start_time
-            logger.debug(f"Success making {key} -> {self.full_table_name}")
+            logger.jobs(f"Success making {key} -> {self.full_table_name}")
 
             # Update hidden job metadata if table has the columns
             if self._has_job_metadata_attrs():

src/datajoint/logging.py

@@ -2,14 +2,44 @@
 import os
 import sys
 
+# Custom log level for job/populate status messages
+# DEBUG (10) < JOBS (15) < INFO (20) < WARNING (30) < ERROR (40)
+JOBS = 15
+logging.addLevelName(JOBS, "JOBS")
+
+
+def jobs(self, message, *args, **kwargs):
+    """Log job status messages (make start/success/error)."""
+    if self.isEnabledFor(JOBS):
+        self._log(JOBS, message, args, **kwargs)
+
+
+logging.Logger.jobs = jobs
+
 logger = logging.getLogger(__name__.split(".")[0])
 
 log_level = os.getenv("DJ_LOG_LEVEL", "info").upper()
+log_stream = os.getenv("DJ_LOG_STREAM", "stdout").lower()
+
+
+class LevelAwareFormatter(logging.Formatter):
+    """Format INFO messages cleanly, show level for warnings/errors and JOBS."""
+
+    def format(self, record):
+        timestamp = self.formatTime(record, "%Y-%m-%d %H:%M:%S")
+        if record.levelno >= logging.WARNING:
+            return f"[{timestamp}][{record.levelname}]: {record.getMessage()}"
+        elif record.levelno == JOBS:
+            return f"[{timestamp}][JOBS]: {record.getMessage()}"
+        else:
+            return f"[{timestamp}] {record.getMessage()}"
 
-log_format = logging.Formatter("[%(asctime)s][%(levelname)s]: %(message)s")
 
-stream_handler = logging.StreamHandler()  # default handler
-stream_handler.setFormatter(log_format)
+# Select output stream: stdout (default, no red highlighting) or stderr
+# Configurable via DJ_LOG_STREAM=stdout|stderr
+output_stream = sys.stderr if log_stream == "stderr" else sys.stdout
+stream_handler = logging.StreamHandler(output_stream)
+stream_handler.setFormatter(LevelAwareFormatter())
 
 logger.setLevel(level=log_level)
 logger.handlers = [stream_handler]

src/datajoint/settings.py

@@ -65,7 +65,7 @@
     "database.password": "DJ_PASS",
     "database.backend": "DJ_BACKEND",
     "database.port": "DJ_PORT",
-    "database.schema_prefix": "DJ_SCHEMA_PREFIX",
+    "database.database_prefix": "DJ_DATABASE_PREFIX",
     "database.create_tables": "DJ_CREATE_TABLES",
     "loglevel": "DJ_LOG_LEVEL",
     "display.diagram_direction": "DJ_DIAGRAM_DIRECTION",
@@ -198,11 +198,11 @@ class DatabaseSettings(BaseSettings):
     port: int | None = Field(default=None, validation_alias="DJ_PORT")
     reconnect: bool = True
     use_tls: bool | None = Field(default=None, validation_alias="DJ_USE_TLS")
-    schema_prefix: str = Field(
+    database_prefix: str = Field(
         default="",
-        validation_alias="DJ_SCHEMA_PREFIX",
-        description="Project-specific prefix for schema names. "
-        "Not automatically applied; use dj.config.database.schema_prefix when creating schemas.",
+        validation_alias="DJ_DATABASE_PREFIX",
+        description="Prefix for database/schema names. "
+        "Not automatically applied; use dj.config.database.database_prefix when creating schemas.",
     )
     create_tables: bool = Field(
         default=True,

src/datajoint/version.py

@@ -1,4 +1,4 @@
 # version bump auto managed by Github Actions:
 # label_prs.yaml(prep), release.yaml(bump), post_release.yaml(edit)
 # manually set this version will be eventually overwritten by the above actions
-__version__ = "2.1.0a8"
+__version__ = "2.1.0a9"