beamlit 0.0.31rc38__tar.gz → 0.0.31rc40__tar.gz

{beamlit-0.0.31rc38 → beamlit-0.0.31rc40}/PKG-INFO

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

{beamlit-0.0.31rc38 → beamlit-0.0.31rc40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beamlit"
-version = "0.0.31.pre-38"
+version = "0.0.31.pre-40"
 description = "Add your description here"
 readme = "README.md"
 authors = [

beamlit-0.0.31rc40/src/beamlit/common/instrumentation.py

@@ -0,0 +1,123 @@
+from typing import Any
+
+from fastapi import FastAPI
+from opentelemetry import metrics, trace
+from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
+    OTLPMetricExporter,
+)
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
+    OTLPSpanExporter,
+)
+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.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
+
+tracer: trace.Tracer | None = None
+meter: metrics.Meter | None = None
+
+
+def get_tracer() -> trace.Tracer:
+    if tracer is None:
+        raise Exception("Tracer is not initialized")
+    return tracer
+
+
+def get_meter() -> metrics.Meter:
+    if meter is None:
+        raise Exception("Meter is not initialized")
+    return meter
+
+
+def get_resource_attributes() -> Dict[str, Any]:
+    resources = Resource.create()
+    resources_dict: Dict[str, Any] = {}
+    for key in resources.attributes:
+        resources_dict[key] = resources.attributes[key]
+    settings = get_settings()
+    if settings is None:
+        raise Exception("Settings are not initialized")
+    resources_dict["workspace"] = settings.workspace
+    resources_dict["service.name"] = settings.name
+    return resources_dict
+
+
+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 | None:
+    settings = get_settings()
+    if not settings.enable_opentelemetry:
+        return None
+    return OTLPSpanExporter()
+
+
+def instrument_app(app: FastAPI):
+    global tracer
+    global meter
+    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,
+            "service.namespace": settings.workspace,
+            "service.workspace": settings.workspace,
+        }
+    )
+
+    # 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=metrics.get_meter_provider())
+    LoggingInstrumentor(tracer_provider=trace.get_tracer_provider()).instrument(
+        set_logging_format=True
+    )

{beamlit-0.0.31rc38 → beamlit-0.0.31rc40}/src/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-0.0.31rc38 → beamlit-0.0.31rc40}/src/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.31rc38 → beamlit-0.0.31rc40}/src/integrationtest/.beamlit/agents/agent-custom/agent.yaml

@@ -9,10 +9,10 @@ metadata:
 spec:
   enabled: true
   policies: []
-  functions: [helloworld_2]
+  functions: [helloworld]
   agentChain: []
   model: gpt-4o-mini
   runtime:
-    image: us.registry.beamlit.com/main/agents/agent-custom
+    image: us.registry.beamlit.com/main/agents/agent-custom:9280b44d
     description: |
       A chat agent using Beamlit to handle your tasks.

beamlit-0.0.31rc40/src/integrationtest/.beamlit/agents/agent-custom/destination.txt

@@ -0,0 +1 @@
+us.registry.beamlit.com/main/agents/agent-custom:9280b44d

beamlit-0.0.31rc40/src/integrationtest/.beamlit/functions/helloworld/Dockerfile

@@ -0,0 +1,23 @@
+
+FROM python:3.12-slim
+
+ARG UV_VERSION="latest"
+RUN apt update && apt install -y curl
+
+# Install uv.
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+RUN curl -fsSL https://raw.githubusercontent.com/beamlit/toolkit/main/install.sh | BINDIR=/bin sh
+WORKDIR /beamlit
+
+# Install the application dependencies.
+COPY pyproject.toml /beamlit/pyproject.toml
+COPY uv.lock /beamlit/uv.lock
+RUN uv sync --no-cache
+
+COPY README.m[d] /beamlit/README.md
+COPY LICENS[E] /beamlit/LICENSE
+COPY . /beamlit/src
+
+ENV PATH="/beamlit/.venv/bin:$PATH"
+
+ENTRYPOINT ["bl","serve","--port","80","--module","functions.helloworld.helloworld"]

beamlit-0.0.31rc40/src/integrationtest/.beamlit/functions/helloworld/destination.txt

@@ -0,0 +1 @@
+us.registry.beamlit.com/main/functions/helloworld:109b61a4

beamlit-0.0.31rc40/src/integrationtest/.beamlit/functions/helloworld/function.yaml

@@ -0,0 +1,19 @@
+
+apiVersion: beamlit.com/v1alpha1
+kind: Function
+metadata:
+  name: helloworld
+  displayName: helloworld
+  environment: production
+spec:
+  enabled: true
+  policies: []
+  description: |
+    A function for saying hello to the world.
+  parameters: 
+    - name: query
+      type: string
+      required: true
+      description: Parameter query
+  runtime:
+    image: us.registry.beamlit.com/main/functions/helloworld:109b61a4

beamlit-0.0.31rc38/src/beamlit/common/instrumentation.py

@@ -1,101 +0,0 @@
-from typing import Any
-
-from fastapi import FastAPI
-from opentelemetry import metrics, trace
-from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
-    OTLPMetricExporter,
-)
-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.sdk.metrics import MeterProvider
-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 typing_extensions import Dict
-
-from .settings import get_settings
-
-tracer: trace.Tracer | None = None
-meter: metrics.Meter | None = None
-
-
-def get_tracer() -> trace.Tracer:
-    if tracer is None:
-        raise Exception("Tracer is not initialized")
-    return tracer
-
-
-def get_meter() -> metrics.Meter:
-    if meter is None:
-        raise Exception("Meter is not initialized")
-    return meter
-
-
-def get_resource_attributes() -> Dict[str, Any]:
-    resources = Resource.create()
-    resources_dict: Dict[str, Any] = {}
-    for key in resources.attributes:
-        resources_dict[key] = resources.attributes[key]
-    settings = get_settings()
-    if settings is None:
-        raise Exception("Settings are not initialized")
-    resources_dict["workspace"] = settings.workspace
-    resources_dict["service.name"] = settings.name
-    return resources_dict
-
-
-def get_metrics_exporter() -> OTLPMetricExporter:
-    return OTLPMetricExporter()
-
-
-def get_span_exporter() -> OTLPSpanExporter:
-    return OTLPSpanExporter()
-
-
-def instrument_app(app: FastAPI):
-    global tracer
-    global meter
-    settings = get_settings()
-    if settings is None:
-        raise Exception("Settings are not initialized")
-    resource = Resource.create(
-        {
-            "service.name": settings.name,
-            "service.namespace": settings.workspace,
-            "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
-    )
-    HTTPXClientInstrumentor().instrument(meter_provider=meter_provider)  # type: ignore
-    LoggingInstrumentor(tracer_provider=trace_provider).instrument(
-        set_logging_format=True
-    )

beamlit-0.0.31rc38/src/integrationtest/.beamlit/agents/agent-custom/destination.txt

@@ -1 +0,0 @@
-us.registry.beamlit.com/main/agents/agent-custom