Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix metrics timestamps (#1083)
Jakub Novákab906adcd3a0
diff --git a/.changeset/ready-planes-sink.md b/.changeset/ready-planes-sink.mdnew file mode 100644index 000000000..1d76e3f79--- /dev/null+++ b/.changeset/ready-planes-sink.md@@ -0,0 +1,5 @@+---+'e2b': patch+---++fix: adjust timestamp conversion to remove millisecondsdiff --git a/.changeset/wise-worlds-turn.md b/.changeset/wise-worlds-turn.mdnew file mode 100644index 000000000..25d351008--- /dev/null+++ b/.changeset/wise-worlds-turn.md@@ -0,0 +1,5 @@+---+'@e2b/python-sdk': patch+---++fix:timestamp conversion for metric endpointsdiff --git a/packages/js-sdk/src/sandbox/sandboxApi.ts b/packages/js-sdk/src/sandbox/sandboxApi.tsindex 54fcb7aa0..4878e8b73 100644--- a/packages/js-sdk/src/sandbox/sandboxApi.ts+++ b/packages/js-sdk/src/sandbox/sandboxApi.ts@@ -193,11 +193,11 @@ export interface SandboxMetricsOpts extends SandboxApiOpts {/*** Start time for the metrics, defaults to the start of the sandbox*/- start?: string | Date+ start?: Date/*** End time for the metrics, defaults to the current time*/- end?: string | Date+ end?: Date}/**@@ -370,12 +370,17 @@ export class SandboxApi {const config = new ConnectionConfig(opts)const client = new ApiClient(config)+ // JS timestamp is in milliseconds, convert to unix (seconds)+ const start = opts?.start+ ? Math.round(opts.start.getTime() / 1000)+ : undefined+ const end = opts?.end ? Math.round(opts.end.getTime() / 1000) : undefinedconst res = await client.api.GET('/sandboxes/{sandboxID}/metrics', {params: {path: {sandboxID: sandboxId,- start: opts?.start,- end: opts?.end,+ start,+ end,},},signal: config.getSignal(opts?.requestTimeoutMs),diff --git a/packages/js-sdk/tests/sandbox/metrics.test.ts b/packages/js-sdk/tests/sandbox/metrics.test.tsindex da66eb47b..35445f91b 100644--- a/packages/js-sdk/tests/sandbox/metrics.test.ts+++ b/packages/js-sdk/tests/sandbox/metrics.test.ts@@ -4,6 +4,7 @@ import { SandboxMetrics } from '../../src'import { sandboxTest, isDebug, wait } from '../setup.js'sandboxTest.skipIf(isDebug)('sbx metrics', async ({ sandbox }) => {+ const now = new Date()let metrics: SandboxMetrics[]for (let i = 0; i < 15; i++) {metrics = await sandbox.getMetrics()@@ -21,4 +22,7 @@ sandboxTest.skipIf(isDebug)('sbx metrics', async ({ sandbox }) => {expect(metric.memUsed).toBeDefined()expect(metric.cpuUsedPct).toBeDefined()expect(metric.cpuCount).toBeDefined()++ metrics = await sandbox.getMetrics({ start: now, end: new Date() })+ expect(metrics.length).toBeGreaterThan(0)})diff --git a/packages/python-sdk/e2b/sandbox_async/sandbox_api.py b/packages/python-sdk/e2b/sandbox_async/sandbox_api.pyindex 763abee71..aabbd709c 100644--- a/packages/python-sdk/e2b/sandbox_async/sandbox_api.py+++ b/packages/python-sdk/e2b/sandbox_async/sandbox_api.py@@ -229,8 +229,8 @@ class SandboxApi(SandboxBase):api_client = get_api_client(config)res = await get_sandboxes_sandbox_id_metrics.asyncio_detailed(sandbox_id,- start=int(start.timestamp() * 1000) if start else UNSET,- end=int(end.timestamp() * 1000) if end else UNSET,+ start=int(start.timestamp()) if start else UNSET,+ end=int(end.timestamp()) if end else UNSET,client=api_client,)diff --git a/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py b/packages/python-sdk/e2b/sandbox_sync/sandbox_api.pyindex 76e1a0f25..18a3af798 100644--- a/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py+++ b/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py@@ -219,8 +219,8 @@ class SandboxApi(SandboxBase):api_client = get_api_client(config)res = get_sandboxes_sandbox_id_metrics.sync_detailed(sandbox_id,- start=int(start.timestamp() * 1000) if start else None,- end=int(end.timestamp() * 1000) if end else None,+ start=int(start.timestamp()) if start else None,+ end=int(end.timestamp()) if end else None,client=api_client,)diff --git a/packages/python-sdk/tests/async/sandbox_async/test_metrics.py b/packages/python-sdk/tests/async/sandbox_async/test_metrics.pyindex 0982a5a49..069733907 100644--- a/packages/python-sdk/tests/async/sandbox_async/test_metrics.py+++ b/packages/python-sdk/tests/async/sandbox_async/test_metrics.py@@ -1,10 +1,12 @@import asyncio+import datetimeimport pytest@pytest.mark.skip_debug()async def test_sbx_metrics(async_sandbox_factory):+ start_time = datetime.datetime.now()sbx = await async_sandbox_factory(timeout=20)# Wait for the sandbox to have some metrics@@ -24,3 +26,6 @@ async def test_sbx_metrics(async_sandbox_factory):assert metric.mem_total is not Noneassert metric.disk_used is not Noneassert metric.disk_total is not None++ metrics = await sbx.get_metrics(start=start_time, end=datetime.datetime.now())+ assert len(metrics) > 0diff --git a/packages/python-sdk/tests/sync/sandbox_sync/test_metrics.py b/packages/python-sdk/tests/sync/sandbox_sync/test_metrics.pyindex 675920149..d4895c544 100644--- a/packages/python-sdk/tests/sync/sandbox_sync/test_metrics.py+++ b/packages/python-sdk/tests/sync/sandbox_sync/test_metrics.py@@ -1,3 +1,4 @@+import datetimeimport timeimport pytest@@ -5,6 +6,7 @@ import pytest@pytest.mark.skip_debug()def test_sbx_metrics(sandbox_factory) -> None:+ start_time = datetime.datetime.now()sbx = sandbox_factory(timeout=60)# Wait for the sandbox to have some metricsmetrics = []@@ -23,3 +25,6 @@ def test_sbx_metrics(sandbox_factory) -> None:assert metric.mem_total is not Noneassert metric.disk_used is not Noneassert metric.disk_total is not None++ metrics = sbx.get_metrics(start=start_time, end=datetime.datetime.now())+ assert len(metrics) > 0