lmnr 0.6.20__py3-none-any.whl → 0.7.0__py3-none-any.whl

lmnr/sdk/browser/patchright_otel.py

@@ -1,6 +1,6 @@
 from lmnr.sdk.browser.playwright_otel import (
-    _wrap_new_page,
-    _wrap_new_page_async,
+    _wrap_bring_to_front_async,
+    _wrap_bring_to_front_sync,
     _wrap_new_browser_sync,
     _wrap_new_browser_async,
     _wrap_new_context_sync,
@@ -18,18 +18,6 @@ from wrapt import wrap_function_wrapper
 _instruments = ("patchright >= 1.9.0",)
 
 WRAPPED_METHODS = [
-    {
-        "package": "patchright.sync_api",
-        "object": "BrowserContext",
-        "method": "new_page",
-        "wrapper": _wrap_new_page,
-    },
-    {
-        "package": "patchright.sync_api",
-        "object": "Browser",
-        "method": "new_page",
-        "wrapper": _wrap_new_page,
-    },
     {
         "package": "patchright.sync_api",
         "object": "BrowserType",
@@ -60,21 +48,15 @@ WRAPPED_METHODS = [
         "method": "launch_persistent_context",
         "wrapper": _wrap_new_context_sync,
     },
+    {
+        "package": "patchright.sync_api",
+        "object": "Page",
+        "method": "bring_to_front",
+        "wrapper": _wrap_bring_to_front_sync,
+    },
 ]
 
 WRAPPED_METHODS_ASYNC = [
-    {
-        "package": "patchright.async_api",
-        "object": "BrowserContext",
-        "method": "new_page",
-        "wrapper": _wrap_new_page_async,
-    },
-    {
-        "package": "patchright.async_api",
-        "object": "Browser",
-        "method": "new_page",
-        "wrapper": _wrap_new_page_async,
-    },
     {
         "package": "patchright.async_api",
         "object": "BrowserType",
@@ -105,6 +87,12 @@ WRAPPED_METHODS_ASYNC = [
         "method": "launch_persistent_context",
         "wrapper": _wrap_new_context_async,
     },
+    {
+        "package": "patchright.async_api",
+        "object": "Page",
+        "method": "bring_to_front",
+        "wrapper": _wrap_bring_to_front_async,
+    },
 ]
 
 

lmnr/sdk/browser/playwright_otel.py

@@ -2,7 +2,12 @@ import logging
 import uuid
 
 from lmnr.opentelemetry_lib.utils.package_check import is_package_installed
-from lmnr.sdk.browser.pw_utils import handle_navigation_async, handle_navigation_sync
+from lmnr.sdk.browser.pw_utils import (
+    start_recording_events_async,
+    start_recording_events_sync,
+    take_full_snapshot,
+    take_full_snapshot_async,
+)
 from lmnr.sdk.browser.utils import with_tracer_and_client_wrapper
 from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
 from lmnr.sdk.client.synchronous.sync_client import LaminarClient
@@ -19,18 +24,16 @@ from wrapt import wrap_function_wrapper
 
 try:
     if is_package_installed("playwright"):
-        from playwright.async_api import Browser, BrowserContext, Page
+        from playwright.async_api import Browser, BrowserContext
         from playwright.sync_api import (
             Browser as SyncBrowser,
             BrowserContext as SyncBrowserContext,
-            Page as SyncPage,
         )
     elif is_package_installed("patchright"):
-        from patchright.async_api import Browser, BrowserContext, Page
+        from patchright.async_api import Browser, BrowserContext
         from patchright.sync_api import (
             Browser as SyncBrowser,
             BrowserContext as SyncBrowserContext,
-            Page as SyncPage,
         )
     else:
         raise ImportError(
@@ -50,44 +53,25 @@ _instruments = ("playwright >= 1.9.0",)
 logger = logging.getLogger(__name__)
 
 
-@with_tracer_and_client_wrapper
-def _wrap_new_page(
-    tracer: Tracer, client: LaminarClient, to_wrap, wrapped, instance, args, kwargs
-):
-    page = wrapped(*args, **kwargs)
-    session_id = str(uuid.uuid4().hex)
-    handle_navigation_sync(page, session_id, client)
-    return page
-
-
-@with_tracer_and_client_wrapper
-async def _wrap_new_page_async(
-    tracer: Tracer, client: AsyncLaminarClient, to_wrap, wrapped, instance, args, kwargs
-):
-    page = await wrapped(*args, **kwargs)
-    session_id = str(uuid.uuid4().hex)
-    await handle_navigation_async(page, session_id, client)
-    return page
-
-
 @with_tracer_and_client_wrapper
 def _wrap_new_browser_sync(
     tracer: Tracer, client: LaminarClient, to_wrap, wrapped, instance, args, kwargs
 ):
     browser: SyncBrowser = wrapped(*args, **kwargs)
     session_id = str(uuid.uuid4().hex)
-    for context in browser.contexts:
 
-        def handle_page_navigation(page: SyncPage):
-            return handle_navigation_sync(page, session_id, client)
+    def create_page_handler(session_id, client):
+        def page_handler(page):
+            start_recording_events_sync(page, session_id, client)
 
-        context.on(
-            "page",
-            handle_page_navigation,
-        )
+        return page_handler
 
+    for context in browser.contexts:
+        page_handler = create_page_handler(session_id, client)
+        context.on("page", page_handler)
         for page in context.pages:
-            handle_navigation_sync(page, session_id, client)
+            start_recording_events_sync(page, session_id, client)
+
     return browser
 
 
@@ -97,14 +81,18 @@ async def _wrap_new_browser_async(
 ):
     browser: Browser = await wrapped(*args, **kwargs)
     session_id = str(uuid.uuid4().hex)
-    for context in browser.contexts:
 
-        async def handle_page_navigation(page: Page):
-            return await handle_navigation_async(page, session_id, client)
+    def create_page_handler(session_id, client):
+        async def page_handler(page):
+            await start_recording_events_async(page, session_id, client)
 
-        context.on("page", handle_page_navigation)
+        return page_handler
+
+    for context in browser.contexts:
+        page_handler = create_page_handler(session_id, client)
+        context.on("page", page_handler)
         for page in context.pages:
-            await handle_navigation_async(page, session_id, client)
+            await start_recording_events_async(page, session_id, client)
     return browser
 
 
@@ -115,15 +103,17 @@ def _wrap_new_context_sync(
     context: SyncBrowserContext = wrapped(*args, **kwargs)
     session_id = str(uuid.uuid4().hex)
 
-    def handle_page_navigation(page: SyncPage):
-        return handle_navigation_sync(page, session_id, client)
+    def create_page_handler(session_id, client):
+        def page_handler(page):
+            start_recording_events_sync(page, session_id, client)
+
+        return page_handler
 
-    context.on(
-        "page",
-        handle_page_navigation,
-    )
+    page_handler = create_page_handler(session_id, client)
+    context.on("page", page_handler)
     for page in context.pages:
-        handle_navigation_sync(page, session_id, client)
+        start_recording_events_sync(page, session_id, client)
+
     return context
 
 
@@ -134,28 +124,37 @@ async def _wrap_new_context_async(
     context: BrowserContext = await wrapped(*args, **kwargs)
     session_id = str(uuid.uuid4().hex)
 
-    async def handle_page_navigation(page):
-        return await handle_navigation_async(page, session_id, client)
+    def create_page_handler(session_id, client):
+        async def page_handler(page):
+            await start_recording_events_async(page, session_id, client)
+
+        return page_handler
 
-    context.on("page", handle_page_navigation)
+    page_handler = create_page_handler(session_id, client)
+    context.on("page", page_handler)
     for page in context.pages:
-        await handle_navigation_async(page, session_id, client)
+        await start_recording_events_async(page, session_id, client)
+
     return context
 
 
+@with_tracer_and_client_wrapper
+def _wrap_bring_to_front_sync(
+    tracer: Tracer, client: LaminarClient, to_wrap, wrapped, instance, args, kwargs
+):
+    wrapped(*args, **kwargs)
+    take_full_snapshot(instance)
+
+
+@with_tracer_and_client_wrapper
+async def _wrap_bring_to_front_async(
+    tracer: Tracer, client: AsyncLaminarClient, to_wrap, wrapped, instance, args, kwargs
+):
+    await wrapped(*args, **kwargs)
+    await take_full_snapshot_async(instance)
+
+
 WRAPPED_METHODS = [
-    {
-        "package": "playwright.sync_api",
-        "object": "BrowserContext",
-        "method": "new_page",
-        "wrapper": _wrap_new_page,
-    },
-    {
-        "package": "playwright.sync_api",
-        "object": "Browser",
-        "method": "new_page",
-        "wrapper": _wrap_new_page,
-    },
     {
         "package": "playwright.sync_api",
         "object": "BrowserType",
@@ -186,21 +185,15 @@ WRAPPED_METHODS = [
         "method": "launch_persistent_context",
         "wrapper": _wrap_new_context_sync,
     },
+    {
+        "package": "playwright.sync_api",
+        "object": "Page",
+        "method": "bring_to_front",
+        "wrapper": _wrap_bring_to_front_sync,
+    },
 ]
 
 WRAPPED_METHODS_ASYNC = [
-    {
-        "package": "playwright.async_api",
-        "object": "BrowserContext",
-        "method": "new_page",
-        "wrapper": _wrap_new_page_async,
-    },
-    {
-        "package": "playwright.async_api",
-        "object": "Browser",
-        "method": "new_page",
-        "wrapper": _wrap_new_page_async,
-    },
     {
         "package": "playwright.async_api",
         "object": "BrowserType",
@@ -231,6 +224,12 @@ WRAPPED_METHODS_ASYNC = [
         "method": "launch_persistent_context",
         "wrapper": _wrap_new_context_async,
     },
+    {
+        "package": "playwright.async_api",
+        "object": "Page",
+        "method": "bring_to_front",
+        "wrapper": _wrap_bring_to_front_async,
+    },
 ]