simplify

Author: soodoku

layoutlens/__init__.py

@@ -5,9 +5,11 @@
 """
 
 # Import the main API
+from .analyzer import VisionAnalyzer
 from .api.core import AnalysisResult, BatchResult, ComparisonResult, LayoutLens
 from .api.test_suite import UITestCase, UITestResult, UITestSuite
 from .cache import AnalysisCache, create_cache
+from .capture import Capture
 from .config import Config
 from .exceptions import (
     AnalysisError,
@@ -40,6 +42,8 @@
     "UITestCase",
     "UITestSuite",
     "UITestResult",
+    "VisionAnalyzer",
+    "Capture",
     "Config",
     # Exceptions
     "LayoutLensError",

layoutlens/vision/analyzer.py layoutlens/analyzer.pylayoutlens/vision/analyzer.py renamed to layoutlens/analyzer.py

@@ -15,9 +15,9 @@
 import openai
 from pydantic import BaseModel, Field, ValidationError
 
-from ..logger import get_logger
-from ..prompts import Instructions, PromptTemplate
-from ..prompts.experts import AccessibilityExpert
+from .logger import get_logger
+from .prompts import Instructions, PromptTemplate
+from .prompts.experts import AccessibilityExpert
 
 
 class VisionAnalysisResponse(BaseModel):

layoutlens/api/core.py

@@ -28,6 +28,9 @@
 # Import caching
 from ..cache import create_cache
 
+# Import vision components
+from ..capture import Capture
+
 # Import custom exceptions
 from ..exceptions import (
     AnalysisError,
@@ -45,9 +48,6 @@
 # Import enhanced prompt system
 from ..prompts import Instructions, get_expert
 
-# Import vision components
-from ..vision.capture import Capture
-
 
 @dataclass(slots=True)
 class AnalysisResult:

layoutlens/vision/capture.py layoutlens/capture.pylayoutlens/vision/capture.py renamed to layoutlens/capture.py

@@ -13,8 +13,8 @@
 
 from playwright.async_api import async_playwright
 
-from ..config import ViewportConfig
-from ..logger import get_logger, log_performance_metric
+from .config import ViewportConfig
+from .logger import get_logger, log_performance_metric
 
 
 class Capture:

layoutlens/logger.py

@@ -25,52 +25,6 @@
     "DEBUG": logging.DEBUG,
 }
 
-# Sensitive data patterns to redact from logs
-SENSITIVE_PATTERNS = [
-    re.compile(r'(api[_-]?key["\']?\s*[:=]\s*["\']?)([a-zA-Z0-9_-]{10,})', re.IGNORECASE),
-    re.compile(r'(authorization["\']?\s*[:=]\s*["\']?)([a-zA-Z0-9_.-]{10,})', re.IGNORECASE),
-    re.compile(r"(bearer\s+)([a-zA-Z0-9_.-]{10,})", re.IGNORECASE),
-    re.compile(r"(sk-[a-zA-Z0-9]{20,})", re.IGNORECASE),  # OpenAI API keys
-]
-
-
-class SensitiveDataFilter(logging.Filter):
-    """Filter to redact sensitive information from log messages."""
-
-    def filter(self, record: logging.LogRecord) -> bool:
-        """Filter and sanitize log record."""
-        if hasattr(record, "msg") and isinstance(record.msg, str):
-            record.msg = self.redact_sensitive_data(record.msg)
-
-        # Also sanitize args if present
-        if hasattr(record, "args") and record.args:
-            if isinstance(record.args, dict):
-                # For dict args, sanitize values
-                sanitized_args = {}
-                for k, v in record.args.items():
-                    if isinstance(v, str):
-                        sanitized_args[k] = self.redact_sensitive_data(v)
-                    else:
-                        sanitized_args[k] = v
-                record.args = sanitized_args
-            elif isinstance(record.args, tuple):
-                # For tuple args, sanitize each element
-                sanitized_args = []
-                for arg in record.args:
-                    if isinstance(arg, str):
-                        sanitized_args.append(self.redact_sensitive_data(arg))
-                    else:
-                        sanitized_args.append(arg)
-                record.args = tuple(sanitized_args)
-
-        return True
-
-    def redact_sensitive_data(self, text: str) -> str:
-        """Redact sensitive data from text using regex patterns."""
-        for pattern in SENSITIVE_PATTERNS:
-            text = pattern.sub(r"\1***REDACTED***", text)
-        return text
-
 
 def get_logger(name: str) -> logging.Logger:
     """Get a configured logger instance for the given name.
@@ -87,10 +41,6 @@ def get_logger(name: str) -> logging.Logger:
     """
     logger = logging.getLogger(f"layoutlens.{name}")
 
-    # Add sensitive data filter if not already present
-    if not any(isinstance(f, SensitiveDataFilter) for f in logger.filters):
-        logger.addFilter(SensitiveDataFilter())
-
     return logger
 
 
@@ -146,7 +96,6 @@ def setup_logging(
         console_handler = logging.StreamHandler()
         console_handler.setLevel(LOG_LEVELS.get(level.upper(), logging.INFO))
         console_handler.setFormatter(formatter)
-        console_handler.addFilter(SensitiveDataFilter())
         root_logger.addHandler(console_handler)
 
     # File handler with rotation
@@ -160,7 +109,6 @@ def setup_logging(
         )
         file_handler.setLevel(LOG_LEVELS.get(file_level.upper(), logging.DEBUG))
         file_handler.setFormatter(formatter)
-        file_handler.addFilter(SensitiveDataFilter())
         root_logger.addHandler(file_handler)
 
 

layoutlens/vision/__init__.py

@@ -12,7 +12,7 @@
 class TestSimpleWorkflow:
     """Test simple LayoutLens workflows with current architecture."""
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_single_page_analysis(self, mock_acompletion, mock_capture):
@@ -56,7 +56,7 @@ async def test_single_page_analysis(self, mock_acompletion, mock_capture):
             # Cleanup
             Path(temp_file).unlink()
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_page_comparison(self, mock_acompletion, mock_capture):

tests/integration/test_simple_workflow.py

@@ -342,7 +342,7 @@ def test_invalid_cache_type(self):
 class TestLayoutLensCacheIntegration:
     """Test caching integration with LayoutLens."""
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_cache_hit(self, mock_acompletion, mock_capture):
@@ -383,7 +383,7 @@ async def test_cache_hit(self, mock_acompletion, mock_capture):
             assert stats["misses"] == 1
             assert stats["hit_rate"] == 0.5
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_cache_disabled(self, mock_acompletion, mock_capture):

tests/test_caching.py

@@ -56,7 +56,7 @@ def test_config_imports(self):
     def test_vision_components(self):
         """Test vision components can be imported."""
         try:
-            from layoutlens.vision import Capture, VisionAnalyzer
+            from layoutlens import Capture, VisionAnalyzer
 
             self.assertTrue(True, "Vision components imported successfully")
         except ImportError as e:
@@ -107,7 +107,7 @@ def test_url_detection(self):
 
     @pytest.mark.asyncio
     @patch("layoutlens.api.core.acompletion")
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     async def test_analyze_url_flow(self, mock_capture, mock_acompletion):
         """Test the full analyze URL workflow."""
         from layoutlens.api.core import LayoutLens
@@ -159,7 +159,7 @@ async def test_analyze_screenshot_flow(self):
         with self.assertRaises(LayoutFileNotFoundError):
             await lens.analyze("/nonexistent/file.png", "Test query")
 
-    @patch("layoutlens.vision.analyzer.openai.OpenAI")
+    @patch("layoutlens.analyzer.openai.OpenAI")
     @pytest.mark.asyncio
     async def test_compare_method(self, mock_openai):
         """Test the compare method functionality."""
@@ -216,18 +216,18 @@ class TestVisionComponents(unittest.TestCase):
     def setUp(self):
         self.mock_api_key = "sk-test-key-12345"
 
-    @patch("layoutlens.vision.analyzer.openai.OpenAI")
+    @patch("layoutlens.analyzer.openai.OpenAI")
     def test_vision_analyzer_initialization(self, mock_openai):
         """Test VisionAnalyzer initialization."""
-        from layoutlens.vision.analyzer import VisionAnalyzer
+        from layoutlens.analyzer import VisionAnalyzer
 
         analyzer = VisionAnalyzer(api_key=self.mock_api_key)
         self.assertEqual(analyzer.model, "gpt-4o-mini")
 
     def test_url_capture_viewports(self):
         """Test Capture viewport configurations."""
+        from layoutlens.capture import Capture
         from layoutlens.config import ViewportConfig
-        from layoutlens.vision.capture import Capture
 
         capture = Capture()
 
@@ -260,7 +260,8 @@ def test_layout_comparator(self):
         # LayoutComparator functionality is now integrated into LayoutLens.compare()
         # This test verifies the old separate class is no longer available
         with self.assertRaises(ImportError):
-            from layoutlens.vision.comparator import LayoutComparator
+            # LayoutComparator was removed in favor of direct API methods
+            from layoutlens.comparator import LayoutComparator
 
 
 class TestGitHubIntegration(unittest.TestCase):
@@ -282,9 +283,8 @@ def test_required_files_exist(self):
         required_files = [
             "layoutlens/api/__init__.py",
             "layoutlens/api/core.py",
-            "layoutlens/vision/__init__.py",
-            "layoutlens/vision/analyzer.py",
-            "layoutlens/vision/capture.py",
+            "layoutlens/analyzer.py",
+            "layoutlens/capture.py",
         ]
 
         for file_path in required_files:
@@ -310,8 +310,8 @@ def test_python_files_syntax(self):
         """Test that all Python files have valid syntax."""
         python_files = [
             "layoutlens/api/core.py",
-            "layoutlens/vision/analyzer.py",
-            "layoutlens/vision/capture.py",
+            "layoutlens/analyzer.py",
+            "layoutlens/capture.py",
         ]
 
         for file_path in python_files:
@@ -364,8 +364,8 @@ def test_missing_dependencies_handling(self):
         # This test verifies the dependencies are properly declared.
 
         try:
-            from layoutlens.vision.analyzer import VisionAnalyzer
-            from layoutlens.vision.capture import Capture
+            from layoutlens.analyzer import VisionAnalyzer
+            from layoutlens.capture import Capture
 
             # If we can import these, dependencies are available
             self.assertTrue(True, "Core dependencies are available")

tests/test_comprehensive.py

@@ -143,7 +143,7 @@ async def test_file_not_found_error(self):
             assert "Error" in result.answer
             assert "nonexistent.png" in result.answer
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @pytest.mark.asyncio
     async def test_screenshot_error(self, mock_capture):
         """Test graceful handling when screenshot capture fails."""
@@ -160,7 +160,7 @@ async def test_screenshot_error(self, mock_capture):
             assert "Error" in result.answer
             assert "Browser failed" in result.answer
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_analysis_error(self, mock_acompletion, mock_capture):
@@ -218,7 +218,7 @@ def test_nested_error_information(self):
 class TestGracefulDegradation:
     """Test graceful degradation when errors occur."""
 
-    @patch("layoutlens.vision.capture.Capture.screenshots")
+    @patch("layoutlens.capture.Capture.screenshots")
     @patch("layoutlens.api.core.acompletion")
     @pytest.mark.asyncio
     async def test_analysis_failure_handling(self, mock_acompletion, mock_capture):