fix: usage tracking for bentoml build (#5321)

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

src/bentoml/_internal/utils/analytics/cli_events.py

@@ -1,7 +1,7 @@
-import typing as t
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
-from ..filesystem import calc_dir_size
 from .schemas import BentoBuildEvent
 
 if TYPE_CHECKING:
@@ -11,26 +11,31 @@
 def _cli_bentoml_build_event(
     cmd_group: str,
     cmd_name: str,
-    return_value: "t.Optional[Bento]",
+    return_value: Bento | None,
 ) -> BentoBuildEvent:  # pragma: no cover
-    if return_value is not None:
-        bento = return_value
-        return BentoBuildEvent(
-            cmd_group=cmd_group,
-            cmd_name=cmd_name,
-            bento_creation_timestamp=bento.info.creation_time,
-            bento_size_in_kb=calc_dir_size(bento.path_of("/")) / 1024,
-            model_size_in_kb=calc_dir_size(bento.path_of("/models")) / 1024,
-            num_of_models=len(bento.info.all_models),
-            num_of_runners=len(bento.info.runners),
-            model_types=[m.module for m in bento.info.all_models],
-            runnable_types=[r.runnable_type for r in bento.info.runners],
-        )
+    from ...bento.bento import BentoInfo
+    from ...bento.bento import BentoInfoV2
+
+    if return_value is None:
+        return BentoBuildEvent(cmd_group=cmd_group, cmd_name=cmd_name)
+    bento = return_value
+    total_size = bento.total_size()
+    if isinstance(bento.info, BentoInfoV2):
+        num_of_runners = len(bento.info.services) - 1
+    elif isinstance(bento.info, BentoInfo):
+        num_of_runners = len(bento.info.runners)
     else:
-        return BentoBuildEvent(
-            cmd_group=cmd_group,
-            cmd_name=cmd_name,
-        )
+        num_of_runners = 0
+    return BentoBuildEvent(
+        cmd_group=cmd_group,
+        cmd_name=cmd_name,
+        bento_creation_timestamp=bento.info.creation_time,
+        bento_size_in_kb=bento.file_size / 1024,
+        model_size_in_kb=(total_size - bento.file_size) / 1024,
+        num_of_models=len(bento.info.all_models),
+        num_of_runners=num_of_runners,
+        model_types=[m.module or "" for m in bento.info.all_models],
+    )
 
 
-cli_events_map = {"cli": {"build": _cli_bentoml_build_event}}
+cli_events_map = {"bentos": {"build": _cli_bentoml_build_event}}

src/bentoml/_internal/utils/analytics/schemas.py

@@ -155,14 +155,14 @@ class CliEvent(EventMeta):
 
 @attr.define
 class BentoBuildEvent(CliEvent):
+    bentoml_version: str = BENTOML_VERSION
     bento_creation_timestamp: t.Optional[datetime] = attr.field(default=None)
     bento_size_in_kb: float = attr.field(default=0)
     model_size_in_kb: float = attr.field(default=0)
 
     num_of_models: int = attr.field(default=0)
     num_of_runners: int = attr.field(default=0)
     model_types: t.List[str] = attr.field(factory=list)
-    runnable_types: t.List[str] = attr.field(factory=list)
 
 
 @attr.define