simplify signature initialization for optimization

Remove unnecessary lazy loading mechanism from signatures since they are always
loaded during server startup when CodegateSecrets is created. This simplifies
the code and makes the initialization flow singular, which will reduce
uneeded lazy loading on every call

Author: lukehinds

src/codegate/cli.py

@@ -331,7 +331,6 @@ def serve(
         logger.exception("Unexpected error occurred")
         click.echo(f"Error: {e}", err=True)
         sys.exit(1)
-        
 
 
 async def run_servers(cfg: Config, app) -> None:

src/codegate/pipeline/secrets/secrets.py

@@ -26,9 +26,8 @@ class CodegateSecrets(PipelineStep):
     def __init__(self):
         """Initialize the CodegateSecrets pipeline step."""
         super().__init__()
-        # Initialize signatures eagerly
+        # Initialize and load signatures immediately
         CodegateSignatures.initialize("signatures.yaml")
-        CodegateSignatures._ensure_signatures_loaded()
 
     @property
     def name(self) -> str:

src/codegate/pipeline/secrets/signatures.py

@@ -39,7 +39,6 @@ class CodegateSignatures:
     """Main class for detecting secrets in text using regex patterns."""
 
     _instance_lock: ClassVar[Lock] = Lock()
-    _signatures_loaded: ClassVar[bool] = False
     _signature_groups: ClassVar[List[SignatureGroup]] = []
     _compiled_regexes: ClassVar[Dict[str, re.Pattern]] = {}
     _yaml_path: ClassVar[Optional[str]] = None
@@ -48,23 +47,22 @@ class CodegateSignatures:
     def reset(cls) -> None:
         """Reset the cached patterns."""
         with cls._instance_lock:
-            cls._signatures_loaded = False
             cls._signature_groups = []
             cls._compiled_regexes = {}
             cls._yaml_path = None
             logger.debug("SecretFinder cache reset")
 
     @classmethod
     def initialize(cls, yaml_path: str) -> None:
-        """Initialize the SecretFinder with a YAML file path."""
+        """Initialize the SecretFinder with a YAML file path and load signatures."""
         if not Path(yaml_path).exists():
             raise FileNotFoundError(f"Signatures file not found: {yaml_path}")
 
         with cls._instance_lock:
             # Only initialize if not already initialized with this path
             if cls._yaml_path != yaml_path:
                 cls._yaml_path = yaml_path
-                cls._signatures_loaded = False
+                cls._load_signatures()
                 logger.debug(f"SecretFinder initialized with {yaml_path}")
 
     @classmethod
@@ -174,6 +172,10 @@ def _add_signature_group(cls, name: str, patterns: Dict[str, str]) -> None:
     def _load_signatures(cls) -> None:
         """Load signature patterns from the YAML file."""
         try:
+            # Clear existing signatures before loading new ones
+            cls._signature_groups = []
+            cls._compiled_regexes = {}
+
             yaml_data = cls._load_yaml(cls._yaml_path)
 
             # Add custom GitHub token patterns
@@ -207,32 +209,14 @@ def _load_signatures(cls) -> None:
             logger.error(f"Error loading signatures: {e}")
             raise
 
-    @classmethod
-    def _ensure_signatures_loaded(cls) -> None:
-        """Ensure signatures are loaded before use."""
-        if not cls._signatures_loaded:
-            with cls._instance_lock:
-                if not cls._signatures_loaded:
-                    if not cls._yaml_path:
-                        raise RuntimeError("SecretFinder not initialized. Call initialize() first.")
-                    try:
-                        cls._load_signatures()
-                        cls._signatures_loaded = True
-                    except Exception as e:
-                        logger.error(f"Failed to load signatures: {e}")
-                        raise
-
     @classmethod
     def find_in_string(cls, text: str) -> List[Match]:
         """Search for secrets in the provided string."""
         if not text:
             return []
 
-        try:
-            cls._ensure_signatures_loaded()
-        except Exception as e:
-            logger.error(f"Failed to load signatures: {e}")
-            return []
+        if not cls._yaml_path:
+            raise RuntimeError("SecretFinder not initialized. Call initialize() first.")
 
         matches = []
         lines = text.splitlines()

tests/pipeline/secrets/test_signatures.py

@@ -69,14 +69,12 @@ def test_initialize_and_reset(temp_yaml_file):
 
     CodegateSignatures.reset()
     assert CodegateSignatures._yaml_path is None
-    assert not CodegateSignatures._signatures_loaded
     assert not CodegateSignatures._signature_groups
     assert not CodegateSignatures._compiled_regexes
 
 
 def test_find_in_string_with_aws_credentials(temp_yaml_file):
     CodegateSignatures.initialize(temp_yaml_file)
-    CodegateSignatures._signatures_loaded = False  # Force reload of signatures
 
     test_string = """
     aws_access_key = 'AKIAIOSFODNN7EXAMPLE'
@@ -100,7 +98,6 @@ def test_find_in_string_with_github_token():
 
     try:
         CodegateSignatures.initialize(f.name)
-        CodegateSignatures._signatures_loaded = False  # Force reload of signatures
 
         test_string = "github_token = 'ghp_1234567890abcdef1234567890abcdef123456'"
         matches = CodegateSignatures.find_in_string(test_string)
@@ -121,7 +118,6 @@ def test_find_in_string_with_github_token():
 
 def test_find_in_string_with_no_matches(temp_yaml_file):
     CodegateSignatures.initialize(temp_yaml_file)
-    CodegateSignatures._signatures_loaded = False  # Force reload of signatures
 
     test_string = "No secrets here!"
     matches = CodegateSignatures.find_in_string(test_string)
@@ -158,7 +154,6 @@ def test_duplicate_patterns():
 
     try:
         CodegateSignatures.initialize(f.name)
-        CodegateSignatures._signatures_loaded = False  # Force reload of signatures
 
         test_string = "aws_key = 'AKIAIOSFODNN7EXAMPLE'"
         matches = CodegateSignatures.find_in_string(test_string)

tests/test_cli.py

@@ -105,13 +105,6 @@ def test_provider_registration(mock_registry, mock_secrets_mgr, mock_pipeline_fa
     assert "ollama" in provider_names
 
 
-@patch("codegate.server.CodegateSignatures")
-def test_signatures_initialization(mock_signatures, mock_pipeline_factory) -> None:
-    """Test that signatures are initialized correctly."""
-    init_app(mock_pipeline_factory)
-    mock_signatures.initialize.assert_called_once_with("signatures.yaml")
-
-
 def test_pipeline_initialization(mock_pipeline_factory) -> None:
     """Test that pipelines are initialized correctly."""
     app = init_app(mock_pipeline_factory)

tests/test_server.py

@@ -99,13 +99,6 @@ def test_provider_registration(mock_registry, mock_secrets_mgr, mock_pipeline_fa
     assert "ollama" in provider_names
 
 
-@patch("codegate.server.CodegateSignatures")
-def test_signatures_initialization(mock_signatures, mock_pipeline_factory) -> None:
-    """Test that signatures are initialized correctly."""
-    init_app(mock_pipeline_factory)
-    mock_signatures.initialize.assert_called_once_with("signatures.yaml")
-
-
 def test_pipeline_initialization(mock_pipeline_factory) -> None:
     """Test that pipelines are initialized correctly."""
     app = init_app(mock_pipeline_factory)