LCORE-1438: minor fixes

dev-tools/mcp-mock-server/server.py

@@ -24,7 +24,7 @@
 import sys
 import threading
 from http.server import HTTPServer, BaseHTTPRequestHandler
-from datetime import datetime
+from datetime import datetime, UTC
 from pathlib import Path
 from typing import Any
 
@@ -38,21 +38,20 @@ class MCPMockHandler(BaseHTTPRequestHandler):
 
     def log_message(self, format: str, *args: Any) -> None:
         """Log requests with timestamp."""  # pylint: disable=redefined-builtin
-        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        timestamp = datetime.now(tz=UTC).strftime("%Y-%m-%d %H:%M:%S")
         print(f"[{timestamp}] {format % args}")
 
     def _capture_headers(self) -> None:
         """Capture all headers from the request."""
         last_headers.clear()
 
         # Capture all headers for debugging
-        for header_name, value in self.headers.items():
-            last_headers[header_name] = value
+        last_headers.update(dict(self.headers.items()))
 
         # Log the request
         request_log.append(
             {
-                "timestamp": datetime.now().isoformat(),
+                "timestamp": datetime.now(tz=UTC).isoformat(),
                 "method": self.command,
                 "path": self.path,
                 "headers": dict(last_headers),

pyproject.toml

@@ -223,7 +223,7 @@ disable = ["R0801"]
 extend-exclude = ["tests/profiles/syntax_error.py"]
 
 [tool.ruff.lint]
-extend-select = ["TID251", "UP006", "UP007", "UP010", "UP017", "UP035", "RUF100", "B009", "B010"]
+extend-select = ["TID251", "UP006", "UP007", "UP010", "UP017", "UP035", "RUF100", "B009", "B010", "DTZ005"]
 
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 unittest = { msg = "use pytest instead of unittest" }

scripts/gen_doc.py

@@ -25,7 +25,7 @@ def generate_docfile(directory):
             f"# List of source files stored in `{directory}` directory",
             file=indexfile,
         )
-        print("", file=indexfile)
+        print(file=indexfile)
         files = sorted(os.listdir())
 
         for file in files:

src/app/endpoints/rlsapi_v1.py

@@ -6,7 +6,7 @@
 
 import functools
 import time
-from datetime import datetime
+from datetime import datetime, UTC
 from typing import Annotated, Any, Optional, cast
 
 import jinja2
@@ -123,7 +123,7 @@ def _build_instructions(systeminfo: RlsapiV1SystemInfo) -> str:
     Returns:
         The rendered instructions string for the LLM.
     """
-    date_today = datetime.now().strftime("%B %d, %Y")
+    date_today = datetime.now(tz=UTC).strftime("%B %d, %Y")
 
     return _get_prompt_template().render(
         date=date_today,

src/quota/revokable_quota_limiter.py

@@ -1,6 +1,6 @@
 """Simple quota limiter where quota can be revoked."""
 
-from datetime import datetime
+from datetime import datetime, UTC
 
 from models.config import QuotaHandlersConfiguration
 from log import get_logger
@@ -140,7 +140,7 @@ def _revoke_quota(self, set_statement: str, subject_id: str) -> None:
                               revoked.
         """
         # timestamp to be used
-        revoked_at = datetime.now()
+        revoked_at = datetime.now(tz=UTC)
 
         cursor = self.connection.cursor()
         cursor.execute(
@@ -188,7 +188,7 @@ def _increase_quota(self, set_statement: str, subject_id: str) -> None:
             subject_id (str): Identifier of the subject whose quota will be increased.
         """
         # timestamp to be used
-        updated_at = datetime.now()
+        updated_at = datetime.now(tz=UTC)
 
         cursor = self.connection.cursor()
         cursor.execute(
@@ -286,7 +286,7 @@ def _consume_tokens(
             change.
         """
         # timestamp to be used
-        updated_at = datetime.now()
+        updated_at = datetime.now(tz=UTC)
 
         to_be_consumed = input_tokens + output_tokens
 
@@ -329,7 +329,7 @@ def _init_quota(self, subject_id: str = "") -> None:
             initialize. Defaults to empty string.
         """
         # timestamp to be used
-        revoked_at = datetime.now()
+        revoked_at = datetime.now(tz=UTC)
 
         if self.sqlite_connection_config is not None:
             cursor = self.connection.cursor()

src/quota/token_usage_history.py

@@ -6,7 +6,7 @@
 """
 
 import sqlite3
-from datetime import datetime
+from datetime import datetime, UTC
 from typing import Any, Optional
 
 import psycopg2
@@ -135,7 +135,7 @@ def consume_tokens(  # pylint: disable=too-many-arguments,too-many-positional-ar
             return
 
         # timestamp to be used
-        updated_at = datetime.now()
+        updated_at = datetime.now(tz=UTC)
 
         # it is not possible to use context manager there, because SQLite does
         # not support it

tests/unit/test_configuration.py

@@ -446,49 +446,56 @@ def test_configuration_not_loaded() -> None:
     """Test that accessing configuration before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.configuration  # pylint: disable=pointless-statement
+        c = cfg.configuration
+        assert c is not None
 
 
 def test_service_configuration_not_loaded() -> None:
     """Test that accessing service_configuration before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.service_configuration  # pylint: disable=pointless-statement
+        c = cfg.service_configuration
+        assert c is not None
 
 
 def test_llama_stack_configuration_not_loaded() -> None:
     """Test that accessing llama_stack_configuration before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.llama_stack_configuration  # pylint: disable=pointless-statement
+        c = cfg.llama_stack_configuration
+        assert c is not None
 
 
 def test_user_data_collection_configuration_not_loaded() -> None:
     """Test that accessing user_data_collection_configuration before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.user_data_collection_configuration  # pylint: disable=pointless-statement
+        c = cfg.user_data_collection_configuration
+        assert c is not None
 
 
 def test_mcp_servers_not_loaded() -> None:
     """Test that accessing mcp_servers before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.mcp_servers  # pylint: disable=pointless-statement
+        c = cfg.mcp_servers
+        assert c is not None
 
 
 def test_authentication_configuration_not_loaded() -> None:
     """Test that accessing authentication_configuration before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.authentication_configuration  # pylint: disable=pointless-statement
+        c = cfg.authentication_configuration
+        assert c is not None
 
 
 def test_customization_not_loaded() -> None:
     """Test that accessing customization before loading raises an error."""
     cfg = AppConfig()
     with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
-        cfg.customization  # pylint: disable=pointless-statement
+        c = cfg.customization
+        assert c is not None
 
 
 def test_load_configuration_with_customization_system_prompt_path(tmpdir: Path) -> None: