lmnr 0.6.14__tar.gz → 0.6.16__tar.gz

{lmnr-0.6.14 → lmnr-0.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lmnr
-Version: 0.6.14
+Version: 0.6.16
 Summary: Python SDK for Laminar
 License: Apache-2.0
 Author: lmnr.ai
@@ -58,8 +58,8 @@ Requires-Dist: opentelemetry-instrumentation-cohere (>=0.40.12) ; extra == "all"
 Requires-Dist: opentelemetry-instrumentation-cohere (>=0.40.12) ; extra == "cohere"
 Requires-Dist: opentelemetry-instrumentation-crewai (>=0.40.12) ; extra == "all"
 Requires-Dist: opentelemetry-instrumentation-crewai (>=0.40.12) ; extra == "crewai"
-Requires-Dist: opentelemetry-instrumentation-google-generativeai (>=0.40.12) ; extra == "all"
-Requires-Dist: opentelemetry-instrumentation-google-generativeai (>=0.40.12) ; extra == "google-generativeai"
+Requires-Dist: opentelemetry-instrumentation-google-generativeai (<0.40.10) ; extra == "all"
+Requires-Dist: opentelemetry-instrumentation-google-generativeai (<0.40.10) ; extra == "google-generativeai"
 Requires-Dist: opentelemetry-instrumentation-groq (>=0.40.12) ; extra == "all"
 Requires-Dist: opentelemetry-instrumentation-groq (>=0.40.12) ; extra == "groq"
 Requires-Dist: opentelemetry-instrumentation-haystack (>=0.40.12) ; extra == "all"

{lmnr-0.6.14 → lmnr-0.6.16}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.6.14"
+version = "0.6.16"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -57,7 +57,13 @@ bedrock=["opentelemetry-instrumentation-bedrock>=0.40.12"]
 chromadb=["opentelemetry-instrumentation-chromadb>=0.40.12"]
 cohere=["opentelemetry-instrumentation-cohere>=0.40.12"]
 crewai=["opentelemetry-instrumentation-crewai>=0.40.12"]
-google-generativeai=["opentelemetry-instrumentation-google-generativeai>=0.40.12"]
+# Newer versions of the instrumentation library try to wrap both
+# google-generativeai and google-genai. The latter seems not very
+# thoroughly tested. We have our own instrumentation of the latter; the
+# former is on deprecation path, so we pin it to the latest version not
+# wrapping google-genai.
+# https://github.com/traceloop/openllmetry/pull/3014
+google-generativeai=["opentelemetry-instrumentation-google-generativeai<0.40.10"]
 groq=["opentelemetry-instrumentation-groq>=0.40.12"]
 haystack=["opentelemetry-instrumentation-haystack>=0.40.12"]
 lancedb=["opentelemetry-instrumentation-lancedb>=0.40.12"]
@@ -89,7 +95,8 @@ all = [
   "opentelemetry-instrumentation-chromadb>=0.40.12",
   "opentelemetry-instrumentation-cohere>=0.40.12",
   "opentelemetry-instrumentation-crewai>=0.40.12",
-  "opentelemetry-instrumentation-google-generativeai>=0.40.12",
+  # See comment above on the google-generativeai extra.
+  "opentelemetry-instrumentation-google-generativeai<0.40.10",
   "opentelemetry-instrumentation-groq>=0.40.12",
   "opentelemetry-instrumentation-haystack>=0.40.12",
   "opentelemetry-instrumentation-lancedb>=0.40.12",

lmnr-0.6.16/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/skyvern/__init__.py

@@ -0,0 +1,193 @@
+from lmnr.opentelemetry_lib.decorators import json_dumps
+from lmnr.sdk.browser.utils import with_tracer_wrapper
+from lmnr.sdk.utils import get_input_from_func_args
+from lmnr.version import __version__
+
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.trace import get_tracer, Tracer
+from typing import Collection
+from wrapt import wrap_function_wrapper
+import pydantic
+
+try:
+    from skyvern import Skyvern
+except ImportError as e:
+    raise ImportError(
+        f"Attempted to import {__file__}, but it is designed "
+        "to patch Skyvern, which is not installed. Use `pip install skyvern` "
+        "to install Skyvern or remove this import."
+    ) from e
+
+_instruments = ("skyvern >= 0.1.0",)
+
+WRAPPED_METHODS = [
+    {
+        "package": "skyvern.library.skyvern",
+        "object": "Skyvern",  # Class name
+        "method": "run_task", # Method name
+        "span_name": "Skyvern.run_task",
+        "span_type": "DEFAULT",
+    },
+    {
+        "package": "skyvern.webeye.scraper.scraper",
+        # No "object" field for module-level functions
+        "method": "get_interactable_element_tree", # Function name
+        "span_name": "get_interactable_element_tree",
+        "span_type": "DEFAULT",
+    },
+    {
+        "package": "skyvern.forge.agent",
+        "object": "ForgeAgent",
+        "method": "execute_step",
+        "span_name": "ForgeAgent.execute_step",
+        "span_type": "DEFAULT",
+    },
+    {  
+        "package": "skyvern.services.task_v2_service",  
+        "method": "initialize_task_v2",  
+        "span_name": "initialize_task_v2",  
+        "span_type": "DEFAULT",  
+    },
+    {  
+        "package": "skyvern.services.task_v2_service",  
+        "method": "run_task_v2_helper",  
+        "span_name": "run_task_v2_helper",  
+        "span_type": "DEFAULT",  
+    },
+    {  
+        "package": "skyvern.forge.sdk.workflow.models.block",
+        "object": "Block",
+        "method": "_generate_workflow_run_block_description",  
+        "span_name": "Block._generate_workflow_run_block_description",  
+        "span_type": "DEFAULT",  
+    },       
+    {  
+        "package": "skyvern.webeye.actions.handler",  
+        "method": "extract_information_for_navigation_goal",  
+        "span_name": "extract_information_for_navigation_goal",  
+        "span_type": "DEFAULT",  
+    },  
+]
+
+
+@with_tracer_wrapper
+async def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
+    span_name = to_wrap.get("span_name")
+    attributes = {
+        "lmnr.span.type": to_wrap.get("span_type"),
+    }
+    
+    attributes["lmnr.span.input"] = json_dumps(
+        get_input_from_func_args(wrapped, True, args, kwargs)
+    )
+    
+    with tracer.start_as_current_span(span_name, attributes=attributes) as span:
+        try:  
+            result = await wrapped(*args, **kwargs)  
+                
+            to_serialize = result  
+            serialized = (  
+                to_serialize.model_dump_json()  
+                if isinstance(to_serialize, pydantic.BaseModel)  
+                else json_dumps(to_serialize)  
+            )  
+            span.set_attribute("lmnr.span.output", serialized)  
+            return result  
+                
+        except Exception as e:  
+            span.record_exception(e)  
+            raise
+
+
+def instrument_llm_handler(tracer: Tracer):  
+    from skyvern.forge import app  
+      
+    # Store the original handler  
+    original_handler = app.LLM_API_HANDLER  
+      
+    async def wrapped_llm_handler(*args, **kwargs):  
+
+        prompt_name = kwargs.get("prompt_name", "")
+
+        if prompt_name:
+            span_name = f"{prompt_name}"
+        else:
+            span_name = "app.LLM_API_HANDLER"
+
+        attributes = {  
+            "lmnr.span.type": "DEFAULT",  
+        }  
+
+        with tracer.start_as_current_span(span_name, attributes=attributes) as span:  
+            try:  
+                result = await original_handler(*args, **kwargs)  
+
+                to_serialize = result
+                serialized = (
+                    to_serialize.model_dump_json()
+                    if isinstance(to_serialize, pydantic.BaseModel)
+                    else json_dumps(to_serialize)
+                )
+                span.set_attribute("lmnr.span.output", serialized)  
+                return result  
+            except Exception as e:  
+                span.record_exception(e)  
+                raise
+      
+    # Replace the global handler  
+    app.LLM_API_HANDLER = wrapped_llm_handler
+
+
+class SkyvernInstrumentor(BaseInstrumentor):
+    def __init__(self):
+        super().__init__()
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _instruments
+
+    def _instrument(self, **kwargs):
+
+        tracer_provider = kwargs.get("tracer_provider")
+        tracer = get_tracer(__name__, __version__, tracer_provider)
+
+        instrument_llm_handler(tracer)
+
+        for wrapped_method in WRAPPED_METHODS:
+            wrap_package = wrapped_method.get("package")
+            wrap_object = wrapped_method.get("object")
+            wrap_method = wrapped_method.get("method")
+
+            # For class methods: "Class.method", for module functions: just "function_name"
+            if wrap_object:
+                target = f"{wrap_object}.{wrap_method}"
+            else:
+                target = wrap_method
+
+            try:
+                wrap_function_wrapper(
+                    wrap_package,
+                    target,
+                    _wrap(
+                        tracer,
+                        wrapped_method,
+                    ),
+                )
+            except ModuleNotFoundError:
+                pass  # that's ok, we're not instrumenting everything
+
+    def _uninstrument(self, **kwargs):
+
+        for wrapped_method in WRAPPED_METHODS:
+            wrap_package = wrapped_method.get("package")
+            wrap_object = wrapped_method.get("object")
+            wrap_method = wrapped_method.get("method")
+
+            # For class methods: "package.Class", for module functions: just "package"
+            if wrap_object:
+                module_path = f"{wrap_package}.{wrap_object}"
+            else:
+                module_path = wrap_package
+
+            unwrap(module_path, wrap_method)
+

{lmnr-0.6.14 → lmnr-0.6.16}/src/lmnr/opentelemetry_lib/tracing/_instrument_initializers.py

@@ -345,6 +345,14 @@ class SageMakerInstrumentorInitializer(InstrumentorInitializer):
 
         return SageMakerInstrumentor()
 
+class SkyvernInstrumentorInitializer(InstrumentorInitializer):
+    def init_instrumentor(self, *args, **kwargs) -> BaseInstrumentor | None:
+        if not is_package_installed("skyvern"):
+            return None
+
+        from ..opentelemetry.instrumentation.skyvern import SkyvernInstrumentor
+
+        return SkyvernInstrumentor()
 
 class TogetherInstrumentorInitializer(InstrumentorInitializer):
     def init_instrumentor(self, *args, **kwargs) -> BaseInstrumentor | None:

{lmnr-0.6.14 → lmnr-0.6.16}/src/lmnr/opentelemetry_lib/tracing/instruments.py

@@ -40,13 +40,13 @@ class Instruments(Enum):
     QDRANT = "qdrant"
     REPLICATE = "replicate"
     SAGEMAKER = "sagemaker"
+    SKYVERN = "skyvern"
     TOGETHER = "together"
     TRANSFORMERS = "transformers"
     VERTEXAI = "vertexai"
     WATSONX = "watsonx"
     WEAVIATE = "weaviate"
 
-
 INSTRUMENTATION_INITIALIZERS: dict[
     Instruments, initializers.InstrumentorInitializer
 ] = {
@@ -77,6 +77,7 @@ INSTRUMENTATION_INITIALIZERS: dict[
     Instruments.QDRANT: initializers.QdrantInstrumentorInitializer(),
     Instruments.REPLICATE: initializers.ReplicateInstrumentorInitializer(),
     Instruments.SAGEMAKER: initializers.SageMakerInstrumentorInitializer(),
+    Instruments.SKYVERN: initializers.SkyvernInstrumentorInitializer(),
     Instruments.TOGETHER: initializers.TogetherInstrumentorInitializer(),
     Instruments.TRANSFORMERS: initializers.TransformersInstrumentorInitializer(),
     Instruments.VERTEXAI: initializers.VertexAIInstrumentorInitializer(),

{lmnr-0.6.14 → lmnr-0.6.16}/src/lmnr/sdk/browser/browser_use_otel.py

@@ -76,9 +76,16 @@ async def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
         )
     else:
         if not to_wrap.get("ignore_input"):
-            attributes["lmnr.span.input"] = json_dumps(
-                get_input_from_func_args(wrapped, True, args, kwargs)
-            )
+            inp_dict = get_input_from_func_args(wrapped, True, args, kwargs)
+            # Add task to the `agent.run` span input
+            if to_wrap.get("method") == "run" and hasattr(instance, "task"):
+                inp_dict["task"] = instance.task
+            attributes["lmnr.span.input"] = json_dumps(inp_dict)
+    if to_wrap.get("method") == "step" and to_wrap.get("object") == "Agent":
+        # Add step number to the `agent.step` span name
+        step_info = kwargs.get("step_info", args[0] if len(args) > 0 else None)
+        if step_info and hasattr(step_info, "step_number"):
+            span_name = f"agent.step.{step_info.step_number}"
     with tracer.start_as_current_span(span_name, attributes=attributes) as span:
         span.set_attributes(attributes)
         result = await wrapped(*args, **kwargs)

{lmnr-0.6.14 → lmnr-0.6.16}/src/lmnr/sdk/browser/pw_utils.py

@@ -45,19 +45,6 @@ INJECT_PLACEHOLDER = """
 
     window.lmnrRrwebEventsBatch = new Set();
     
-    // Track page focus state
-    window.lmnrPageIsFocused = true;
-    
-    window.addEventListener('blur', () => {
-        window.lmnrPageIsFocused = false;
-        console.log('Page lost focus');
-    });
-    
-    window.addEventListener('focus', () => {
-        window.lmnrPageIsFocused = true;
-        console.log('Page gained focus');
-    });
-
     // Utility function to compress individual event data
     async function compressEventData(data) {
         const jsonString = JSON.stringify(data);
@@ -76,10 +63,6 @@ INJECT_PLACEHOLDER = """
 
     // Add heartbeat events
     setInterval(async () => {
-        if (!window.lmnrPageIsFocused) {
-            return;
-        }
-
         window.lmnrRrweb.record.addCustomEvent('heartbeat', {
             title: document.title,
             url: document.URL,
@@ -88,19 +71,17 @@ INJECT_PLACEHOLDER = """
     }, 1000);
 
     window.lmnrRrweb.record({
-        async emit(event) {
-            // Ignore events when page is not focused
-            if (!window.lmnrPageIsFocused) {
-                return;
-            }
-            
+        async emit(event) {    
             // Compress the data field
             const compressedEvent = {
                 ...event,
                 data: await compressEventData(event.data)
             };
             window.lmnrRrwebEventsBatch.add(compressedEvent);
-        }
+        },
+        recordCanvas: true,
+        collectFonts: true,
+        recordCrossOriginIframes: true
     });
 }
 """
@@ -115,7 +96,7 @@ async def send_events_async(
         events = await page.evaluate(
             """
         () => {
-            if (!window.lmnrPageIsFocused || typeof window.lmnrGetAndClearEvents !== 'function') {
+            if (typeof window.lmnrGetAndClearEvents !== 'function') {
                 return [];
             }
             return window.lmnrGetAndClearEvents();
@@ -144,7 +125,7 @@ def send_events_sync(
         events = page.evaluate(
             """
         () => {
-            if (!window.lmnrPageIsFocused || typeof window.lmnrGetAndClearEvents !== 'function') {
+            if (typeof window.lmnrGetAndClearEvents !== 'function') {
                 return [];
             }
             return window.lmnrGetAndClearEvents();

{lmnr-0.6.14 → lmnr-0.6.16}/src/lmnr/version.py

@@ -3,7 +3,7 @@ import httpx
 from packaging import version
 
 
-__version__ = "0.6.14"
+__version__ = "0.6.16"
 PYTHON_VERSION = f"{sys.version_info.major}.{sys.version_info.minor}"