beamlit 0.0.31rc39__py3-none-any.whl → 0.0.31rc41__py3-none-any.whl

beamlit/common/instrumentation.py

@@ -8,22 +8,16 @@ from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
     OTLPSpanExporter,
 )
-from opentelemetry.instrumentation.fastapi import (  # type: ignore
-    FastAPIInstrumentor,
-)
-from opentelemetry.instrumentation.httpx import (  # type: ignore
-    HTTPXClientInstrumentor,
-)
-from opentelemetry.instrumentation.logging import (  # type: ignore
-    LoggingInstrumentor,
-)
+from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
+from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
+from opentelemetry.instrumentation.logging import LoggingInstrumentor
+from opentelemetry.metrics import NoOpMeterProvider
 from opentelemetry.sdk.metrics import MeterProvider
-from opentelemetry.sdk.metrics.export import (
-    PeriodicExportingMetricReader,
-)
+from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.trace import NoOpTracerProvider
 from typing_extensions import Dict
 
 from .settings import get_settings
@@ -57,11 +51,20 @@ def get_resource_attributes() -> Dict[str, Any]:
     return resources_dict
 
 
-def get_metrics_exporter() -> OTLPMetricExporter:
+def get_metrics_exporter() -> OTLPMetricExporter | None:
+    settings = get_settings()
+    if settings is None:
+        raise Exception("Settings are not initialized")
+    if not settings.enable_opentelemetry:
+        # Return None or a NoOpExporter equivalent
+        return None
     return OTLPMetricExporter()
 
 
-def get_span_exporter() -> OTLPSpanExporter:
+def get_span_exporter() -> OTLPSpanExporter | None:
+    settings = get_settings()
+    if not settings.enable_opentelemetry:
+        return None
     return OTLPSpanExporter()
 
 
@@ -71,6 +74,16 @@ def instrument_app(app: FastAPI):
     settings = get_settings()
     if settings is None:
         raise Exception("Settings are not initialized")
+
+    if not settings.enable_opentelemetry:
+        # Use NoOp implementations to stub tracing and metrics
+        trace.set_tracer_provider(NoOpTracerProvider())
+        tracer = trace.get_tracer(__name__)
+
+        metrics.set_meter_provider(NoOpMeterProvider())
+        meter = metrics.get_meter(__name__)
+        return
+
     resource = Resource.create(
         {
             "service.name": settings.name,
@@ -78,24 +91,33 @@ def instrument_app(app: FastAPI):
             "service.workspace": settings.workspace,
         }
     )
-    # Set up the TracerProvider
-    trace_provider = TracerProvider(resource=resource)
-    span_processor = BatchSpanProcessor(get_span_exporter())
-    trace_provider.add_span_processor(span_processor)
-    trace.set_tracer_provider(trace_provider)
-    tracer = trace_provider.get_tracer(__name__)
-
-    metrics_exporter = PeriodicExportingMetricReader(get_metrics_exporter())
-    meter_provider = MeterProvider(
-        resource=resource, metric_readers=[metrics_exporter]
-    )
-    metrics.set_meter_provider(meter_provider)
-    meter = meter_provider.get_meter(__name__)
 
-    FastAPIInstrumentor.instrument_app(  # type: ignore
-        app=app, tracer_provider=trace_provider, meter_provider=meter_provider
+    # 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())
+        trace_provider.add_span_processor(span_processor)
+        trace.set_tracer_provider(trace_provider)
+        tracer = trace_provider.get_tracer(__name__)
+    else:
+        tracer = trace.get_tracer(__name__)
+
+    # Set up the MeterProvider if not already set
+    if not isinstance(metrics.get_meter_provider(), MeterProvider):
+        metrics_exporter = PeriodicExportingMetricReader(get_metrics_exporter())
+        meter_provider = MeterProvider(
+            resource=resource, metric_readers=[metrics_exporter]
+        )
+        metrics.set_meter_provider(meter_provider)
+        meter = meter_provider.get_meter(__name__)
+    else:
+        meter = metrics.get_meter(__name__)
+
+    # Only instrument the app when OpenTelemetry is enabled
+    FastAPIInstrumentor.instrument_app(
+        app=app, tracer_provider=trace.get_tracer_provider(), meter_provider=metrics.get_meter_provider()
     )
-    HTTPXClientInstrumentor().instrument(meter_provider=meter_provider)  # type: ignore
-    LoggingInstrumentor(tracer_provider=trace_provider).instrument(
+    HTTPXClientInstrumentor().instrument(meter_provider=metrics.get_meter_provider())
+    LoggingInstrumentor(tracer_provider=trace.get_tracer_provider()).instrument(
         set_logging_format=True
     )

beamlit/common/settings.py

@@ -67,6 +67,7 @@ class Settings(BaseSettings):
     mcp_hub_url: str = Field(default="https://mcp-hub-server.beamlit.workers.com")
     registry_url: str = Field(default="https://us.registry.beamlit.com")
     log_level: str = Field(default="INFO")
+    enable_opentelemetry: bool = Field(default=False)
     agent: SettingsAgent = SettingsAgent()
     server: SettingsServer = SettingsServer()
     authentication: SettingsAuthentication = SettingsAuthentication()

beamlit/deploy/deploy.py

@@ -23,7 +23,7 @@ from .parser import Resource, get_description, get_parameters, get_resources
 sys.path.insert(0, os.getcwd())
 sys.path.insert(0, os.path.join(os.getcwd(), "src"))
 
-
+random_id = str(uuid.uuid4())[:8]
 def slugify(name: str) -> str:
     return name.lower().replace(" ", "-").replace("_", "-")
 
@@ -32,7 +32,7 @@ def get_runtime_image(type: str, name: str) -> str:
     registry_url = settings.registry_url.replace("https://", "").replace("http://", "")
     image = f"{registry_url}/{settings.workspace}/{type}s/{name}"
     # Generate a random ID to ensure unique image tags
-    image = f"{image}:{str(uuid.uuid4())[:8]}"
+    image = f"{image}:{random_id}"
     return image
 
 

beamlit/serve/app.py

@@ -41,13 +41,14 @@ logger.info(
     f" on {settings.server.host}:{settings.server.port}"
 )
 
-Traceloop.init(
-    app_name=settings.name,
-    exporter=get_span_exporter(),
-    metrics_exporter=get_metrics_exporter(),
-    resource_attributes=get_resource_attributes(),
-    should_enrich_metrics=os.getenv("ENRICHED_METRICS", "false") == "true",
-)
+if settings.enable_opentelemetry:
+    Traceloop.init(
+        app_name=settings.name,
+        exporter=get_span_exporter(),
+        metrics_exporter=get_metrics_exporter(),
+        resource_attributes=get_resource_attributes(),
+        should_enrich_metrics=os.getenv("ENRICHED_METRICS", "false") == "true",
+    )
 
 app = FastAPI(docs_url=None, redoc_url=None)
 app.add_middleware(

{beamlit-0.0.31rc39.dist-info → beamlit-0.0.31rc41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.31rc39
+Version: 0.0.31rc41
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.31rc39.dist-info → beamlit-0.0.31rc41.dist-info}/RECORD

@@ -131,13 +131,13 @@ beamlit/authentication/device_mode.py,sha256=tmr22gllKOZwBRub_QjF5pYa425x-nE8tQN
 beamlit/common/__init__.py,sha256=vj4_boIBVitMsaQR8BqBqE2eupOIh6MWBAYlYyCCH98,341
 beamlit/common/error.py,sha256=f9oJDFxhoHK-vpjxBgEp0NwWIk0N_THPemUI7uQxVzU,270
 beamlit/common/generate.py,sha256=LtdCju_QayRS4lZrrb_0VHqWWvTcv4Mbf-iV1TB_Qko,7522
-beamlit/common/instrumentation.py,sha256=MsBDfFcMYqGDiHHj4j5hLHE4EWxZExkhmCeFS3SKzJY,3181
+beamlit/common/instrumentation.py,sha256=GVYeat7qCcqzDoKSYig3s8ZCC172R9JiQIr3Evv3kik,4293
 beamlit/common/logger.py,sha256=nN_dSOl4bs13QU3Rod-w3e3jYOnlSrHx3_bs-ACY6Aw,1115
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
-beamlit/common/settings.py,sha256=gKg8YAQ0NJymY1J-D55F1_wfrPwGb8Jmp5ojrjveZwI,5869
+beamlit/common/settings.py,sha256=_4oCVrJZOMaTZoK2Zzo2DWqtUyBsspuOH3iAJ_nU0tw,5923
 beamlit/common/utils.py,sha256=jouz5igBvT37Xn_e94-foCHyQczVim-UzVcoIF6RWJ4,657
 beamlit/deploy/__init__.py,sha256=GS7l7Jtm2yKs7iNLKcfjYO-rAhUzggQ3xiYSf3oxLBY,91
-beamlit/deploy/deploy.py,sha256=5rcPJhz0xtjG_9EUpZuoSwgIkqbE-LPqSF1FoXarMQM,9915
+beamlit/deploy/deploy.py,sha256=xo2fAdF6jR1cG75sXMzpqsJlG_qGAKVnMwjuDa_8sk8,9936
 beamlit/deploy/format.py,sha256=PJ8kU7Y1pwiS3tqqyvFaag9LO3jju-4ua574163VPk4,1820
 beamlit/deploy/parser.py,sha256=Ga0poCZkoRnuTw082QnTcNGCBJncoRAnVsn8-1FsaJE,6907
 beamlit/functions/__init__.py,sha256=_RPG1Bfg54JGdIPnViAU6n9zD7E1cDNsdXi8oYGskzE,138
@@ -252,10 +252,10 @@ beamlit/models/websocket_channel.py,sha256=jg3vN7yS_oOIwGtndtIUr1LsyEA58RXLXahqS
 beamlit/models/workspace.py,sha256=l__bIpbA4oJvxXo7UbEoCcqkvu9MiNt5aXXpZ3bgwHg,4309
 beamlit/models/workspace_labels.py,sha256=WbnUY6eCTkUNdY7hhhSF-KQCl8fWFfkCf7hzCTiNp4A,1246
 beamlit/models/workspace_user.py,sha256=70CcifQWYbeWG7TDui4pblTzUe5sVK0AS19vNCzKE8g,3423
-beamlit/serve/app.py,sha256=ys7jymdAY1K2FLOrUnNWJA9_tr7B9VGvKpF1F03glEU,3492
+beamlit/serve/app.py,sha256=QzReZZjGFQWhNA1XBDq81rsn9zpEihtLZLrfZi9ThT0,3554
 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.31rc39.dist-info/METADATA,sha256=LExxyq0JitobbxrS5Nq3N-sdAfbLaVGd9JW4kZ9FUV4,2405
-beamlit-0.0.31rc39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.31rc39.dist-info/RECORD,,
+beamlit-0.0.31rc41.dist-info/METADATA,sha256=4Q1xmITkbqqcVdkeR0OMCX4UI0q8QlKj12h3sE_ps-Q,2405
+beamlit-0.0.31rc41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.31rc41.dist-info/RECORD,,