Fix deprecated datetime.utcnow() and test assertion for clean_text

storage/db.py

@@ -4,7 +4,7 @@ import logging
 import re
 from pathlib import Path
 from typing import Optional
-from datetime import datetime
+import datetime
 
 from .models import (
     Document, ExtractedTool, TTP, Tradecraft, Entity,
@@ -172,7 +172,7 @@ class MosaicDB:
     def update_document_extraction_time(self, doc_id: str):
         self.conn.execute(
             "UPDATE documents SET last_extracted_at = ? WHERE id = ?",
-            (datetime.utcnow().isoformat(), doc_id)
+            (datetime.datetime.datetime.now(datetime.timezone.utc).isoformat(), doc_id)
         )
         self.conn.commit()
 
@@ -289,8 +289,8 @@ class MosaicDB:
             ON CONFLICT(doc_id, extractor)
             DO UPDATE SET status = ?, error = ?, last_run = ?, token_count = ?
         """, (
-            doc_id, extractor, status, error, datetime.utcnow().isoformat(), token_count,
-            status, error, datetime.utcnow().isoformat(), token_count
+            doc_id, extractor, status, error, datetime.datetime.now(datetime.timezone.utc).isoformat(), token_count,
+            status, error, datetime.datetime.now(datetime.timezone.utc).isoformat(), token_count
         ))
         self.conn.commit()
 

storage/jsonl_store.py

@@ -3,7 +3,7 @@ import json
 import hashlib
 import logging
 from pathlib import Path
-from datetime import datetime
+import datetime
 from typing import Optional
 
 from .db import MosaicDB
@@ -45,7 +45,7 @@ class JSONLStore:
                 logger.info("No data for category: %s", cat)
                 continue
 
-            timestamp = datetime.utcnow().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.datetime.now(datetime.timezone.utc).strftime("%Y%m%d_%H%M%S")
             filename = f"{cat}_{timestamp}.jsonl"
             filepath = self.output_dir / filename