Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions frontend/src/libs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ export const riseRouterException = (status = 404, json = 'Not Found'): never =>
throw new Response(json, { status });
};

export const base64ToArrayBuffer = (base64: string) => {
const binaryString = atob(base64);
const bytes = new Uint8Array(binaryString.length);
for (let i = 0; i < binaryString.length; i++) {
bytes[i] = binaryString.charCodeAt(i);
}
return bytes;
};

export const isValidUrl = (urlString: string) => {
try {
return Boolean(new URL(urlString));
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/services/project.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { API } from 'api';
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';

import { base64ToArrayBuffer } from 'libs';
import fetchBaseQueryHeaders from 'libs/fetchBaseQueryHeaders';

const decoder = new TextDecoder('utf-8');

// Helper function to transform backend response to frontend format
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const transformProjectResponse = (project: any): IProject => ({
Expand Down Expand Up @@ -130,7 +133,7 @@ export const projectApi = createApi({
transformResponse: (response: { logs: ILogItem[]; next_token: string }) => {
const logs = response.logs.map((logItem) => ({
...logItem,
message: logItem.message,
message: decoder.decode(base64ToArrayBuffer(logItem.message)),
}));

return {
Expand Down
17 changes: 15 additions & 2 deletions src/dstack/_internal/server/services/logs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
from dstack._internal.server.schemas.logs import PollLogsRequest
from dstack._internal.server.schemas.runner import LogEvent as RunnerLogEvent
from dstack._internal.server.services.logs.aws import BOTO_AVAILABLE, CloudWatchLogStorage
from dstack._internal.server.services.logs.base import LogStorage, LogStorageError
from dstack._internal.server.services.logs.base import (
LogStorage,
LogStorageError,
b64encode_raw_message,
)
from dstack._internal.server.services.logs.filelog import FileLogStorage
from dstack._internal.server.services.logs.gcp import GCP_LOGGING_AVAILABLE, GCPLogStorage
from dstack._internal.utils.common import run_async
Expand Down Expand Up @@ -75,4 +79,13 @@ def write_logs(


async def poll_logs_async(project: ProjectModel, request: PollLogsRequest) -> JobSubmissionLogs:
return await run_async(get_log_storage().poll_logs, project=project, request=request)
job_submission_logs = await run_async(
get_log_storage().poll_logs, project=project, request=request
)
# Logs are stored in plaintext but transmitted in base64 for API/CLI backward compatibility.
# Old logs stored in base64 are encoded twice for transmission and shown as base64 in CLI/UI.
# We live with that.
# TODO: Drop base64 encoding in 0.20.
for log_event in job_submission_logs.logs:
log_event.message = b64encode_raw_message(log_event.message.encode())
return job_submission_logs
3 changes: 2 additions & 1 deletion src/dstack/api/_public/runs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import base64
import queue
import tempfile
import threading
Expand Down Expand Up @@ -228,7 +229,7 @@ def logs(
),
)
for log in resp.logs:
yield log.message.encode()
yield base64.b64decode(log.message)
next_token = resp.next_token
if next_token is None:
break
Expand Down
8 changes: 4 additions & 4 deletions src/tests/_internal/server/routers/test_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ async def test_returns_logs(
{
"timestamp": "2023-10-06T10:01:53.234234+00:00",
"log_source": "stdout",
"message": "Hello",
"message": "SGVsbG8=",
},
{
"timestamp": "2023-10-06T10:01:53.234235+00:00",
"log_source": "stdout",
"message": "World",
"message": "V29ybGQ=",
},
{
"timestamp": "2023-10-06T10:01:53.234236+00:00",
"log_source": "stdout",
"message": "!",
"message": "IQ==",
},
],
"next_token": None,
Expand All @@ -93,7 +93,7 @@ async def test_returns_logs(
{
"timestamp": "2023-10-06T10:01:53.234236+00:00",
"log_source": "stdout",
"message": "!",
"message": "IQ==",
},
],
"next_token": None,
Expand Down
Loading