dstack 0.19.25rc1__py3-none-any.whl → 0.19.27__py3-none-any.whl

dstack/_internal/server/services/logging.py

@@ -1,14 +1,22 @@
 from typing import Union
 
-from dstack._internal.server.models import GatewayModel, JobModel, ProbeModel, RunModel
+from dstack._internal.server.models import (
+    GatewayModel,
+    InstanceModel,
+    JobModel,
+    ProbeModel,
+    RunModel,
+)
 
 
-def fmt(model: Union[RunModel, JobModel, GatewayModel, ProbeModel]) -> str:
+def fmt(model: Union[RunModel, JobModel, InstanceModel, GatewayModel, ProbeModel]) -> str:
     """Consistent string representation of a model for logging."""
     if isinstance(model, RunModel):
         return f"run({model.id.hex[:6]}){model.run_name}"
     if isinstance(model, JobModel):
         return f"job({model.id.hex[:6]}){model.job_name}"
+    if isinstance(model, InstanceModel):
+        return f"instance({model.id.hex[:6]}){model.name}"
     if isinstance(model, GatewayModel):
         return f"gateway({model.id.hex[:6]}){model.name}"
     if isinstance(model, ProbeModel):

dstack/_internal/server/services/logs/__init__.py

@@ -7,14 +7,14 @@ from dstack._internal.server import settings
 from dstack._internal.server.models import ProjectModel
 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 import aws as aws_logs
+from dstack._internal.server.services.logs import gcp as gcp_logs
 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
 from dstack._internal.utils.logging import get_logger
 
@@ -29,9 +29,9 @@ def get_log_storage() -> LogStorage:
     if _log_storage is not None:
         return _log_storage
     if settings.SERVER_CLOUDWATCH_LOG_GROUP:
-        if BOTO_AVAILABLE:
+        if aws_logs.BOTO_AVAILABLE:
             try:
-                _log_storage = CloudWatchLogStorage(
+                _log_storage = aws_logs.CloudWatchLogStorage(
                     group=settings.SERVER_CLOUDWATCH_LOG_GROUP,
                     region=settings.SERVER_CLOUDWATCH_LOG_REGION,
                 )
@@ -44,9 +44,11 @@ def get_log_storage() -> LogStorage:
         else:
             logger.error("Cannot use CloudWatch Logs storage: boto3 is not installed")
     elif settings.SERVER_GCP_LOGGING_PROJECT:
-        if GCP_LOGGING_AVAILABLE:
+        if gcp_logs.GCP_LOGGING_AVAILABLE:
             try:
-                _log_storage = GCPLogStorage(project_id=settings.SERVER_GCP_LOGGING_PROJECT)
+                _log_storage = gcp_logs.GCPLogStorage(
+                    project_id=settings.SERVER_GCP_LOGGING_PROJECT
+                )
             except LogStorageError as e:
                 logger.error("Failed to initialize GCP Logs storage: %s", e)
             except Exception: