Fix CI deps and format for 1.2.2

Author: Flamehaven CI

flamehaven_filesearch/api.py

@@ -11,6 +11,7 @@
 
 try:
     from cryptography.fernet import Fernet, InvalidToken
+
     _CRYPTO_AVAILABLE = True
 except ImportError:  # pragma: no cover - fallback when cryptography missing
     _CRYPTO_AVAILABLE = False
@@ -27,7 +28,9 @@ def __init__(self, key: Optional[str] = None):
         if key and _CRYPTO_AVAILABLE:
             try:
                 # Accept either raw Fernet key or 32-byte base64url
-                self._fernet = Fernet(key.encode() if not key.startswith("gAAAA") else key)
+                self._fernet = Fernet(
+                    key.encode() if not key.startswith("gAAAA") else key
+                )
                 self.enabled = True
             except Exception as exc:  # pragma: no cover - defensive
                 logger.warning("Invalid encryption key, disabling encryption: %s", exc)

flamehaven_filesearch/auth.py

@@ -4,60 +4,62 @@
 Production-ready logging with JSON format for log aggregation systems.
 """
 
-import logging
-import sys
-
-try:
-    from pythonjsonlogger import jsonlogger
-    _JSONLOGGER_AVAILABLE = True
-except ImportError:  # pragma: no cover - fallback when dependency missing
-    _JSONLOGGER_AVAILABLE = False
-    jsonlogger = None
-
-
-if _JSONLOGGER_AVAILABLE:
-
-    class CustomJsonFormatter(jsonlogger.JsonFormatter):
-        """
-        Custom JSON formatter with additional fields
-
-        Adds request_id, service_name, and environment to all log records.
-        """
-
-        def add_fields(self, log_record, record, message_dict):
-            super(CustomJsonFormatter, self).add_fields(
-                log_record, record, message_dict
-            )
-
-            # Add service identification
-            log_record["service"] = "flamehaven-filesearch"
-            log_record["version"] = "1.2.2"
-
-            # Add request ID if available
-            if hasattr(record, "request_id"):
-                log_record["request_id"] = record.request_id
-
-            # Add environment (from env var or default to 'development')
-            import os
-
-            log_record["environment"] = os.getenv("ENVIRONMENT", "development")
-
-            # Ensure timestamp is present
-            if "timestamp" not in log_record:
-                from datetime import datetime
-
-                log_record["timestamp"] = datetime.utcnow().isoformat() + "Z"
-
-            # Add level name
-            log_record["level"] = record.levelname
-else:
-
-    class CustomJsonFormatter(logging.Formatter):
-        """Fallback plain formatter when python-json-logger is unavailable."""
-
-        def format(self, record):
-            base = super().format(record)
-            return base
+import logging
+import sys
+
+try:
+    from pythonjsonlogger import jsonlogger
+
+    _JSONLOGGER_AVAILABLE = True
+except ImportError:  # pragma: no cover - fallback when dependency missing
+    _JSONLOGGER_AVAILABLE = False
+    jsonlogger = None
+
+
+if _JSONLOGGER_AVAILABLE:
+
+    class CustomJsonFormatter(jsonlogger.JsonFormatter):
+        """
+        Custom JSON formatter with additional fields
+
+        Adds request_id, service_name, and environment to all log records.
+        """
+
+        def add_fields(self, log_record, record, message_dict):
+            super(CustomJsonFormatter, self).add_fields(
+                log_record, record, message_dict
+            )
+
+            # Add service identification
+            log_record["service"] = "flamehaven-filesearch"
+            log_record["version"] = "1.2.2"
+
+            # Add request ID if available
+            if hasattr(record, "request_id"):
+                log_record["request_id"] = record.request_id
+
+            # Add environment (from env var or default to 'development')
+            import os
+
+            log_record["environment"] = os.getenv("ENVIRONMENT", "development")
+
+            # Ensure timestamp is present
+            if "timestamp" not in log_record:
+                from datetime import datetime
+
+                log_record["timestamp"] = datetime.utcnow().isoformat() + "Z"
+
+            # Add level name
+            log_record["level"] = record.levelname
+
+else:
+
+    class CustomJsonFormatter(logging.Formatter):
+        """Fallback plain formatter when python-json-logger is unavailable."""
+
+        def format(self, record):
+            base = super().format(record)
+            return base
 
 
 def setup_json_logging(log_level=logging.INFO, **kwargs):
@@ -71,36 +73,36 @@ def setup_json_logging(log_level=logging.INFO, **kwargs):
     # Support logging.basicConfig-style signatures (level=...)
     effective_level = kwargs.get("level", log_level)
 
-    # Create JSON formatter (or fallback)
-    if _JSONLOGGER_AVAILABLE:
-        formatter = CustomJsonFormatter(
-            "%(timestamp)s %(level)s %(name)s %(message)s %(request_id)s "
-            "%(service)s %(version)s %(environment)s",
-            rename_fields={
-                "levelname": "level",
-                "name": "logger",
-                "asctime": "timestamp",
-            },
-            datefmt="%Y-%m-%dT%H:%M:%S",
-        )
-    else:
-        formatter = logging.Formatter(
-            "%(asctime)s %(levelname)s %(name)s %(message)s",
-            datefmt="%Y-%m-%dT%H:%M:%S",
-        )
+    # Create JSON formatter (or fallback)
+    if _JSONLOGGER_AVAILABLE:
+        formatter = CustomJsonFormatter(
+            "%(timestamp)s %(level)s %(name)s %(message)s %(request_id)s "
+            "%(service)s %(version)s %(environment)s",
+            rename_fields={
+                "levelname": "level",
+                "name": "logger",
+                "asctime": "timestamp",
+            },
+            datefmt="%Y-%m-%dT%H:%M:%S",
+        )
+    else:
+        formatter = logging.Formatter(
+            "%(asctime)s %(levelname)s %(name)s %(message)s",
+            datefmt="%Y-%m-%dT%H:%M:%S",
+        )
 
     # Configure root logger
     root_logger = logging.getLogger()
     root_logger.setLevel(effective_level)
 
     # Remove existing handlers
-    for handler in root_logger.handlers[:]:
-        root_logger.removeHandler(handler)
-
-    # Add handler to stdout
-    json_handler = logging.StreamHandler(sys.stdout)
-    json_handler.setFormatter(formatter)
-    root_logger.addHandler(json_handler)
+    for handler in root_logger.handlers[:]:
+        root_logger.removeHandler(handler)
+
+    # Add handler to stdout
+    json_handler = logging.StreamHandler(sys.stdout)
+    json_handler.setFormatter(formatter)
+    root_logger.addHandler(json_handler)
 
     # Set level for specific loggers
     logging.getLogger("uvicorn.access").setLevel(logging.WARNING)

flamehaven_filesearch/encryption.py

@@ -26,12 +26,12 @@
 registry = CollectorRegistry()
 
 # Application info
-app_info = Info(
-    "flamehaven_filesearch_app", "Application information", registry=registry
-)
-app_info.info(
-    {"version": "1.2.2", "service": "flamehaven-filesearch", "framework": "fastapi"}
-)
+app_info = Info(
+    "flamehaven_filesearch_app", "Application information", registry=registry
+)
+app_info.info(
+    {"version": "1.2.2", "service": "flamehaven-filesearch", "framework": "fastapi"}
+)
 
 # Request metrics
 http_requests_total = Counter(
@@ -164,11 +164,11 @@
 )
 
 
-_requests_ts = deque(maxlen=5000)
-_errors_ts = deque(maxlen=2000)
-
-
-class MetricsCollector:
+_requests_ts = deque(maxlen=5000)
+_errors_ts = deque(maxlen=2000)
+
+
+class MetricsCollector:
     """
     Helper class for collecting and updating metrics
     """
@@ -183,27 +183,27 @@ def _sum_metric(name: str) -> float:
                     total += float(sample.value)
         return total
 
-    @staticmethod
-    def summary() -> dict:
-        """Lightweight summary for /metrics JSON endpoint."""
-        now = time.time()
-        req_60 = len([t for t in _requests_ts if now - t <= 60])
-        req_300 = len([t for t in _requests_ts if now - t <= 300])
-        err_60 = len([t for t in _errors_ts if now - t <= 60])
-        err_300 = len([t for t in _errors_ts if now - t <= 300])
-        return {
-            "requests_total": MetricsCollector._sum_metric("http_requests_total"),
-            "errors_total": MetricsCollector._sum_metric("errors_total"),
-            "rate_limit_exceeded": MetricsCollector._sum_metric(
-                "rate_limit_exceeded_total"
-            ),
-            "cache_hits_total": MetricsCollector._sum_metric("cache_hits_total"),
-            "cache_misses_total": MetricsCollector._sum_metric("cache_misses_total"),
-            "requests_last_60s": req_60,
-            "requests_last_300s": req_300,
-            "errors_last_60s": err_60,
-            "errors_last_300s": err_300,
-        }
+    @staticmethod
+    def summary() -> dict:
+        """Lightweight summary for /metrics JSON endpoint."""
+        now = time.time()
+        req_60 = len([t for t in _requests_ts if now - t <= 60])
+        req_300 = len([t for t in _requests_ts if now - t <= 300])
+        err_60 = len([t for t in _errors_ts if now - t <= 60])
+        err_300 = len([t for t in _errors_ts if now - t <= 300])
+        return {
+            "requests_total": MetricsCollector._sum_metric("http_requests_total"),
+            "errors_total": MetricsCollector._sum_metric("errors_total"),
+            "rate_limit_exceeded": MetricsCollector._sum_metric(
+                "rate_limit_exceeded_total"
+            ),
+            "cache_hits_total": MetricsCollector._sum_metric("cache_hits_total"),
+            "cache_misses_total": MetricsCollector._sum_metric("cache_misses_total"),
+            "requests_last_60s": req_60,
+            "requests_last_300s": req_300,
+            "errors_last_60s": err_60,
+            "errors_last_300s": err_300,
+        }
 
     @staticmethod
     def record_request(method: str, endpoint: str, status: int, duration: float):
@@ -227,7 +227,6 @@ def record_request(method: str, endpoint: str, status: int, duration: float):
         while _requests_ts and now - _requests_ts[0] > 300:
             _requests_ts.popleft()
 
-
     @staticmethod
     def record_file_upload(store: str, size_bytes: int, duration: float, success: bool):
         """
@@ -295,7 +294,6 @@ def record_error(error_type: str, endpoint: str):
         while _errors_ts and now - _errors_ts[0] > 300:
             _errors_ts.popleft()
 
-
     @staticmethod
     def update_system_metrics():
         """