beamlit 0.0.34rc54__tar.gz → 0.0.34rc56__tar.gz

{beamlit-0.0.34rc54 → beamlit-0.0.34rc56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.34rc54
+Version: 0.0.34rc56
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12
@@ -17,6 +17,7 @@ Requires-Dist: opentelemetry-api>=1.28.2
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.2
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.49b2
 Requires-Dist: opentelemetry-instrumentation-httpx>=0.49b2
+Requires-Dist: opentelemetry-instrumentation-system-metrics>=0.50b0
 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

{beamlit-0.0.34rc54 → beamlit-0.0.34rc56}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beamlit"
-version = "0.0.34.pre-54"
+version = "0.0.34.pre-56"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -32,6 +32,7 @@ dependencies = [
     "opentelemetry-api>=1.28.2",
     "opentelemetry-instrumentation-fastapi>=0.49b2",
     "opentelemetry-instrumentation-httpx>=0.49b2",
+    "opentelemetry-instrumentation-system-metrics>=0.50b0",
 ]
 [dependency-groups]
 dev = [

{beamlit-0.0.34rc54 → beamlit-0.0.34rc56}/src/beamlit/common/instrumentation.py

@@ -1,7 +1,12 @@
+import logging
 from typing import Any
 
 from fastapi import FastAPI
-from opentelemetry import metrics, trace
+from opentelemetry import _logs, metrics, trace
+from opentelemetry._logs import set_logger_provider
+from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
+    OTLPLogExporter,
+)
 from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
     OTLPMetricExporter,
 )
@@ -10,7 +15,12 @@ from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
 )
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
+from opentelemetry.instrumentation.system_metrics import (
+    SystemMetricsInstrumentor,
+)
 from opentelemetry.metrics import NoOpMeterProvider
+from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
 from opentelemetry.sdk.resources import Resource
@@ -19,22 +29,28 @@ from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.trace import NoOpTracerProvider
 from typing_extensions import Dict
 
+from beamlit.authentication import get_authentication_headers
+
 from .settings import get_settings
 
 tracer: trace.Tracer | None = None
 meter: metrics.Meter | None = None
+logger: LoggerProvider | None = None
 
 
-def get_tracer() -> trace.Tracer:
-    if tracer is None:
-        raise Exception("Tracer is not initialized")
-    return tracer
+def auth_headers() -> Dict[str, str]:
+    settings = get_settings()
+    headers = get_authentication_headers(settings)
+    return {
+        "x-beamlit-authorization": headers.get("X-Beamlit-Authorization", ""),
+        "x-beamlit-workspace": headers.get("X-Beamlit-Workspace", ""),
+    }
 
 
-def get_meter() -> metrics.Meter:
-    if meter is None:
-        raise Exception("Meter is not initialized")
-    return meter
+def get_logger() -> LoggerProvider:
+    if logger is None:
+        raise Exception("Logger is not initialized")
+    return logger
 
 
 def get_resource_attributes() -> Dict[str, Any]:
@@ -43,8 +59,6 @@ def get_resource_attributes() -> 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
@@ -52,28 +66,29 @@ def get_resource_attributes() -> Dict[str, Any]:
 
 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()
+    return OTLPMetricExporter(headers=auth_headers())
 
 
 def get_span_exporter() -> OTLPSpanExporter | None:
     settings = get_settings()
     if not settings.enable_opentelemetry:
         return None
-    return OTLPSpanExporter()
+    return OTLPSpanExporter(headers=auth_headers())
+
+
+def get_log_exporter() -> OTLPLogExporter | None:
+    settings = get_settings()
+    if not settings.enable_opentelemetry:
+        return None
+    return OTLPLogExporter(headers=auth_headers())
 
 
 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())
@@ -111,9 +126,24 @@ def instrument_app(app: FastAPI):
         meter = meter_provider.get_meter(__name__)
     else:
         meter = metrics.get_meter(__name__)
+
+    if not isinstance(_logs.get_logger_provider(), LoggerProvider):
+        logger_provider = LoggerProvider()
+        set_logger_provider(logger_provider)
+        logger_provider.add_log_record_processor(
+            BatchLogRecordProcessor(get_log_exporter())
+        )
+        handler = LoggingHandler(
+            level=logging.NOTSET, logger_provider=logger_provider
+        )
+        logging.getLogger().addHandler(handler)
+    else:
+        logger_provider = _logs.get_logger_provider()
+
     # Only instrument the app when OpenTelemetry is enabled
     FastAPIInstrumentor.instrument_app(app)
     HTTPXClientInstrumentor().instrument()
+    SystemMetricsInstrumentor().instrument()
 
 
 def shutdown_instrumentation():

{beamlit-0.0.34rc54 → beamlit-0.0.34rc56}/src/integrationtest/agent.py

@@ -12,17 +12,19 @@ from beamlit.agents import agent
         },
         "spec": {
             "description": "A chat agent using Beamlit to handle your tasks.",
-            "model": "gpt-4o-mini",
-            "policies": ["only-us"],
+            "model": "gpt-3-5-turbo",
         },
     },
 )
-async def main(agent, chat_model, tools, body, headers=None, query_params=None, **_):
+async def main(
+    agent, chat_model, tools, body, headers=None, query_params=None, **_
+):
     agent_config = {"configurable": {"thread_id": str(uuid.uuid4())}}
-    if body.get("inputs"):
-        body["input"] = body["inputs"]
+    json = await body.json()
+    # if "inputs" in json:
+    # body["input"] = json["inputs"]
 
-    agent_body = {"messages": [("user", body["input"])]}
+    agent_body = {"messages": [("user", json["inputs"])]}
     responses = []
 
     async for chunk in agent.astream(agent_body, config=agent_config):

{beamlit-0.0.34rc54 → beamlit-0.0.34rc56}/uv.lock

@@ -172,6 +172,7 @@ dependencies = [
     { name = "opentelemetry-exporter-otlp" },
     { name = "opentelemetry-instrumentation-fastapi" },
     { name = "opentelemetry-instrumentation-httpx" },
+    { name = "opentelemetry-instrumentation-system-metrics" },
     { name = "opentelemetry-sdk" },
     { name = "pydantic" },
     { name = "pydantic-settings" },
@@ -201,6 +202,7 @@ requires-dist = [
     { name = "opentelemetry-exporter-otlp", specifier = ">=1.28.2" },
     { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.49b2" },
     { name = "opentelemetry-instrumentation-httpx", specifier = ">=0.49b2" },
+    { name = "opentelemetry-instrumentation-system-metrics", specifier = ">=0.50b0" },
     { name = "opentelemetry-sdk", specifier = ">=1.28.2" },
     { name = "pydantic", specifier = ">=2.10.3,<2.11.0" },
     { name = "pydantic-settings", specifier = ">=2.6.1,<2.7.0" },
@@ -1516,6 +1518,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a6/86/08880581575628870d3c052398b8e764bd0cb18f5d17b3620aefa791592e/opentelemetry_instrumentation_sqlalchemy-0.50b0-py3-none-any.whl", hash = "sha256:7385c380d3567f28a5a6e9b453400900f4b095230a244a13e3f54b4f3d36bd19", size = 13503 },
 ]
 
+[[package]]
+name = "opentelemetry-instrumentation-system-metrics"
+version = "0.50b0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "opentelemetry-api" },
+    { name = "opentelemetry-instrumentation" },
+    { name = "psutil" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/82/8a/35c91af1dfcba12fb8052deee766355792a96d3aac740eb465bf9b20cbec/opentelemetry_instrumentation_system_metrics-0.50b0.tar.gz", hash = "sha256:1da218c6df465aac6ad3a5e4e657d7c298fc934783beae83e35ec71a2855cdf4", size = 13813 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b2/10/c9470a98c659b0069c39a944389afbff2d8fe94aa3b826a0a36442e695b5/opentelemetry_instrumentation_system_metrics-0.50b0-py3-none-any.whl", hash = "sha256:3457ea6dd0b4c5a0353df106ed8883eec94093a316448b71cf75b53d64b17596", size = 12055 },
+]
+
 [[package]]
 name = "opentelemetry-instrumentation-threading"
 version = "0.50b0"
@@ -1788,6 +1804,21 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/fd/b2/ab07b09e0f6d143dfb839693aa05765257bceaa13d03bf1a696b78323e7a/protobuf-5.29.3-py3-none-any.whl", hash = "sha256:0a18ed4a24198528f2333802eb075e59dea9d679ab7a6c5efb017a59004d849f", size = 172550 },
 ]
 
+[[package]]
+name = "psutil"
+version = "6.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1f/5a/07871137bb752428aa4b659f910b399ba6f291156bdea939be3e96cae7cb/psutil-6.1.1.tar.gz", hash = "sha256:cf8496728c18f2d0b45198f06895be52f36611711746b7f30c464b422b50e2f5", size = 508502 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/99/ca79d302be46f7bdd8321089762dd4476ee725fce16fc2b2e1dbba8cac17/psutil-6.1.1-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed7fe2231a444fc219b9c42d0376e0a9a1a72f16c5cfa0f68d19f1a0663e8", size = 247511 },
+    { url = "https://files.pythonhosted.org/packages/0b/6b/73dbde0dd38f3782905d4587049b9be64d76671042fdcaf60e2430c6796d/psutil-6.1.1-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:0bdd4eab935276290ad3cb718e9809412895ca6b5b334f5a9111ee6d9aff9377", size = 248985 },
+    { url = "https://files.pythonhosted.org/packages/17/38/c319d31a1d3f88c5b79c68b3116c129e5133f1822157dd6da34043e32ed6/psutil-6.1.1-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b6e06c20c05fe95a3d7302d74e7097756d4ba1247975ad6905441ae1b5b66003", size = 284488 },
+    { url = "https://files.pythonhosted.org/packages/9c/39/0f88a830a1c8a3aba27fededc642da37613c57cbff143412e3536f89784f/psutil-6.1.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97f7cb9921fbec4904f522d972f0c0e1f4fabbdd4e0287813b21215074a0f160", size = 287477 },
+    { url = "https://files.pythonhosted.org/packages/47/da/99f4345d4ddf2845cb5b5bd0d93d554e84542d116934fde07a0c50bd4e9f/psutil-6.1.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33431e84fee02bc84ea36d9e2c4a6d395d479c9dd9bba2376c1f6ee8f3a4e0b3", size = 289017 },
+    { url = "https://files.pythonhosted.org/packages/38/53/bd755c2896f4461fd4f36fa6a6dcb66a88a9e4b9fd4e5b66a77cf9d4a584/psutil-6.1.1-cp37-abi3-win32.whl", hash = "sha256:eaa912e0b11848c4d9279a93d7e2783df352b082f40111e078388701fd479e53", size = 250602 },
+    { url = "https://files.pythonhosted.org/packages/7b/d7/7831438e6c3ebbfa6e01a927127a6cb42ad3ab844247f3c5b96bea25d73d/psutil-6.1.1-cp37-abi3-win_amd64.whl", hash = "sha256:f35cfccb065fff93529d2afb4a2e89e363fe63ca1e4a5da22b603a85833c2649", size = 254444 },
+]
+
 [[package]]
 name = "pydantic"
 version = "2.10.5"