beamlit 0.0.34rc78__py3-none-any.whl → 0.0.34rc79__py3-none-any.whl

beamlit/common/instrumentation.py

@@ -1,5 +1,6 @@
+import importlib
 import logging
-from typing import Any
+from typing import Any, Optional, Type
 
 from fastapi import FastAPI
 from opentelemetry import _logs, metrics, trace
@@ -13,8 +14,9 @@ from opentelemetry.exporter.otlp.proto.http.metric_exporter import (
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,
 )
-from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
-from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
+from opentelemetry.instrumentation.fastapi import (  # type: ignore
+    FastAPIInstrumentor,
+)
 from opentelemetry.metrics import NoOpMeterProvider
 from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
@@ -34,6 +36,8 @@ tracer: trace.Tracer | None = None
 meter: metrics.Meter | None = None
 logger: LoggerProvider | None = None
 
+log = logging.getLogger(__name__)
+
 
 def auth_headers() -> Dict[str, str]:
     settings = get_settings()
@@ -82,6 +86,121 @@ def get_log_exporter() -> OTLPLogExporter | None:
     return OTLPLogExporter(headers=auth_headers())
 
 
+def _import_class(module_path: str, class_name: str) -> Optional[Type]:  # type: ignore
+    """Dynamically import a class from a module path."""
+    try:
+        module = importlib.import_module(module_path)
+        return getattr(module, class_name)
+    except (ImportError, AttributeError) as e:
+        log.error(f"Could not import {class_name} from {module_path}: {str(e)}")
+        return None
+
+
+# Define mapping of instrumentor info: (module path, class name, required package)
+INSTRUMENTOR_CONFIGS = {
+    "httpx": (
+        "opentelemetry.instrumentation.httpx",
+        "HTTPXClientInstrumentor",
+        "httpx",
+    ),
+    "anthropic": (
+        "opentelemetry.instrumentation.anthropic",
+        "AnthropicInstrumentor",
+        "anthropic",
+    ),
+    "chroma": (
+        "opentelemetry.instrumentation.chroma",
+        "ChromaInstrumentor",
+        "chromadb",
+    ),
+    "cohere": (
+        "opentelemetry.instrumentation.cohere",
+        "CohereInstrumentor",
+        "cohere",
+    ),
+    "groq": ("opentelemetry.instrumentation.groq", "GroqInstrumentor", "groq"),
+    "lance": (
+        "opentelemetry.instrumentation.lance",
+        "LanceInstrumentor",
+        "pylance",
+    ),
+    "langchain": (
+        "opentelemetry.instrumentation.langchain",
+        "LangchainInstrumentor",
+        "langchain",
+    ),
+    "llama_index": (
+        "opentelemetry.instrumentation.llama_index",
+        "LlamaIndexInstrumentor",
+        "llama_index",
+    ),
+    "marqo": (
+        "opentelemetry.instrumentation.marqo",
+        "MarqoInstrumentor",
+        "marqo",
+    ),
+    "milvus": (
+        "opentelemetry.instrumentation.milvus",
+        "MilvusInstrumentor",
+        "pymilvus",
+    ),
+    "mistralai": (
+        "opentelemetry.instrumentation.mistralai",
+        "MistralAiInstrumentor",
+        "mistralai",
+    ),
+    "ollama": (
+        "opentelemetry.instrumentation.ollama",
+        "OllamaInstrumentor",
+        "ollama",
+    ),
+    "openai": (
+        "opentelemetry.instrumentation.openai",
+        "OpenAIInstrumentor",
+        "openai",
+    ),
+    "pinecone": (
+        "opentelemetry.instrumentation.pinecone",
+        "PineconeInstrumentor",
+        "pinecone",
+    ),
+    "qdrant": (
+        "opentelemetry.instrumentation.qdrant",
+        "QdrantInstrumentor",
+        "qdrant_client",
+    ),
+    "replicate": (
+        "opentelemetry.instrumentation.replicate",
+        "ReplicateInstrumentor",
+        "replicate",
+    ),
+    "together": (
+        "opentelemetry.instrumentation.together",
+        "TogetherAiInstrumentor",
+        "together",
+    ),
+    "watsonx": (
+        "opentelemetry.instrumentation.watsonx",
+        "WatsonxInstrumentor",
+        "ibm_watson_machine_learning",
+    ),
+    "weaviate": (
+        "opentelemetry.instrumentation.weaviate",
+        "WeaviateInstrumentor",
+        "weaviate",
+    ),
+}
+
+
+def _is_package_installed(package_name: str) -> bool:
+    """Check if a package is installed."""
+    try:
+        importlib.import_module(package_name)
+        return True
+    except (ImportError, ModuleNotFoundError):
+        return False
+
+
 def instrument_app(app: FastAPI):
     global tracer
     global meter
@@ -106,7 +225,7 @@ def instrument_app(app: FastAPI):
     # Set up the TracerProvider if not already set
     if not isinstance(trace.get_tracer_provider(), TracerProvider):
         trace_provider = TracerProvider(resource=resource)
-        span_processor = BatchSpanProcessor(get_span_exporter())
+        span_processor = BatchSpanProcessor(get_span_exporter())  # type: ignore
         trace_provider.add_span_processor(span_processor)
         trace.set_tracer_provider(trace_provider)
         tracer = trace_provider.get_tracer(__name__)
@@ -115,7 +234,7 @@ def instrument_app(app: FastAPI):
 
     # Set up the MeterProvider if not already set
     if not isinstance(metrics.get_meter_provider(), MeterProvider):
-        metrics_exporter = PeriodicExportingMetricReader(get_metrics_exporter())
+        metrics_exporter = PeriodicExportingMetricReader(get_metrics_exporter())  # type: ignore
         meter_provider = MeterProvider(
             resource=resource, metric_readers=[metrics_exporter]
         )
@@ -128,7 +247,7 @@ def instrument_app(app: FastAPI):
         logger_provider = LoggerProvider(resource=resource)
         set_logger_provider(logger_provider)
         logger_provider.add_log_record_processor(
-            BatchLogRecordProcessor(get_log_exporter())
+            BatchLogRecordProcessor(get_log_exporter())  # type: ignore
         )
         handler = LoggingHandler(
             level=logging.NOTSET, logger_provider=logger_provider
@@ -138,8 +257,27 @@ def instrument_app(app: FastAPI):
         logger_provider = _logs.get_logger_provider()
 
     # Only instrument the app when OpenTelemetry is enabled
-    FastAPIInstrumentor.instrument_app(app)
-    HTTPXClientInstrumentor().instrument()
+    FastAPIInstrumentor.instrument_app(app)  # type: ignore
+
+    for name, (
+        module_path,
+        class_name,
+        required_package,
+    ) in INSTRUMENTOR_CONFIGS.items():
+        if _is_package_installed(required_package):
+            instrumentor_class = _import_class(module_path, class_name)  # type: ignore
+            if instrumentor_class:
+                try:
+                    instrumentor_class().instrument()
+                    log.info(f"Successfully instrumented {name}")
+                except Exception as e:
+                    log.error(f"Failed to instrument {name}: {str(e)}")
+            else:
+                log.error(f"Could not load instrumentor for {name}")
+        else:
+            log.debug(
+                f"Skipping {name} instrumentation - required package '{required_package}' not installed"
+            )
 
 
 def shutdown_instrumentation():

beamlit/serve/app.py

@@ -10,12 +10,9 @@ from uuid import uuid4
 from asgi_correlation_id import CorrelationIdMiddleware
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import JSONResponse
-from traceloop.sdk import Traceloop
 
 from beamlit.common import HTTPError, get_settings, init
 from beamlit.common.instrumentation import (
-    get_resource_attributes,
-    get_span_exporter,
     instrument_app,
     shutdown_instrumentation,
 )
@@ -58,13 +55,6 @@ app.add_middleware(
 app.add_middleware(AddProcessTimeHeader)
 app.add_middleware(AccessLogMiddleware)
 instrument_app(app)
-if settings.enable_opentelemetry:
-    Traceloop.init(
-        app_name=settings.name,
-        exporter=get_span_exporter(),
-        resource_attributes=get_resource_attributes(),
-        should_enrich_metrics=os.getenv("ENRICHED_METRICS", "false") == "true",
-    )
 
 
 @app.get("/health")

{beamlit-0.0.34rc78.dist-info → beamlit-0.0.34rc79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.34rc78
+Version: 0.0.34rc79
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12
@@ -15,9 +15,27 @@ Requires-Dist: langgraph<0.3.0,>=0.2.40
 Requires-Dist: mcp>=1.1.2
 Requires-Dist: opentelemetry-api>=1.28.2
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.2
+Requires-Dist: opentelemetry-instrumentation-anthropic>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.35.0
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.49b2
+Requires-Dist: opentelemetry-instrumentation-groq>=0.35.0
 Requires-Dist: opentelemetry-instrumentation-httpx>=0.49b2
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-openai>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.35.0
 Requires-Dist: opentelemetry-instrumentation-system-metrics>=0.50b0
+Requires-Dist: opentelemetry-instrumentation-together>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.35.0
 Requires-Dist: opentelemetry-sdk>=1.28.2
 Requires-Dist: pydantic-settings<2.7.0,>=2.6.1
 Requires-Dist: pydantic<2.11.0,>=2.10.3
@@ -25,7 +43,6 @@ Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: pyyaml<6.1.0,>=6.0.2
 Requires-Dist: requests<2.33.0,>=2.32.3
-Requires-Dist: traceloop-sdk>=0.33.12
 Description-Content-Type: text/markdown
 
 # beamlit

{beamlit-0.0.34rc78.dist-info → beamlit-0.0.34rc79.dist-info}/RECORD

@@ -131,7 +131,7 @@ beamlit/authentication/credentials.py,sha256=p_1xenabCbQuRz7BiFk7oTK4uCxAt_zoyku
 beamlit/authentication/device_mode.py,sha256=LNHjoKe3u4TWApLKO34cJjN92UsVkHSYSbXr6eKxo64,3721
 beamlit/common/__init__.py,sha256=saX5X3hRCJ9erSlXuSkZ2VGgquvpgdcofAU_9sM4bCE,354
 beamlit/common/error.py,sha256=f9oJDFxhoHK-vpjxBgEp0NwWIk0N_THPemUI7uQxVzU,270
-beamlit/common/instrumentation.py,sha256=u-eZjv1hWMAlYQ3b6YPmOPHBJCCgPebLuLO5DhDRgAA,5351
+beamlit/common/instrumentation.py,sha256=TKBbLNSPz0TKGufxSbVuLdJ9Tunh7-Y967SxwIX4j-o,9287
 beamlit/common/logger.py,sha256=nN_dSOl4bs13QU3Rod-w3e3jYOnlSrHx3_bs-ACY6Aw,1115
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
 beamlit/common/settings.py,sha256=OL1pZLB3BgN7QPCz9VR7gjYb-LoYpelilS7rU7FubCE,3962
@@ -280,10 +280,10 @@ beamlit/models/websocket_channel.py,sha256=jg3vN7yS_oOIwGtndtIUr1LsyEA58RXLXahqS
 beamlit/models/workspace.py,sha256=J_YibDQqp0esl1G941ryVQCQfGk0EDSo4qXrjUWDXI8,4261
 beamlit/models/workspace_labels.py,sha256=WbnUY6eCTkUNdY7hhhSF-KQCl8fWFfkCf7hzCTiNp4A,1246
 beamlit/models/workspace_user.py,sha256=70CcifQWYbeWG7TDui4pblTzUe5sVK0AS19vNCzKE8g,3423
-beamlit/serve/app.py,sha256=_aG2UVQ3Y85rUW3ehu9TlzLnowkfh54IIz558ftqOMw,3638
+beamlit/serve/app.py,sha256=ROS_tb9cO4GvOQKCwloyAzpYraTdIb3oG6sChXikeNw,3285
 beamlit/serve/middlewares/__init__.py,sha256=1dVmnOmhAQWvWktqHkKSIX-YoF6fmMU8xkUQuhg_rJU,148
 beamlit/serve/middlewares/accesslog.py,sha256=Mu4T4_9OvHybjA0ApzZFpgi2C8f3X1NbUk-76v634XM,631
 beamlit/serve/middlewares/processtime.py,sha256=lDAaIasZ4bwvN-HKHvZpaD9r-yrkVNZYx4abvbjbrCg,411
-beamlit-0.0.34rc78.dist-info/METADATA,sha256=T3UNX5GmFkovN9C3aFTf5Vonj8VGqQlc68aR7m-xVOU,2441
-beamlit-0.0.34rc78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.34rc78.dist-info/RECORD,,
+beamlit-0.0.34rc79.dist-info/METADATA,sha256=IrL2gJ5NSmdT8TtON7BnbT5ke8z3Dn22XW5xbL_c1oA,3506
+beamlit-0.0.34rc79.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.34rc79.dist-info/RECORD,,