fix(cli): expands working_dir with default path (#3127)

User should be able to do `bentoml serve my/bento` without having to pass in `--working-dir`

Co-authored-by: Aaron Pham <29749331+aarnphm@users.noreply.github.com>

src/bentoml_cli/serve.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import sys
 import logging
 
@@ -69,7 +70,7 @@ def add_serve_command(cli: click.Group) -> None:
         "--working-dir",
         type=click.Path(),
         help="When loading from source code, specify the directory to find the Service instance",
-        default=".",
+        default=None,
         show_default=True,
     )
     @click.option(
@@ -172,7 +173,11 @@ def serve(  # type: ignore (unused warning)
         - all model store changes will also trigger a restart (new model saved or existing model removed)
         """
         configure_server_logging()
-
+        if working_dir is None:
+            if os.path.isdir(os.path.expanduser(bento)):
+                working_dir = os.path.expanduser(bento)
+            else:
+                working_dir = "."
         if sys.path[0] != working_dir:
             sys.path.insert(0, working_dir)
 
@@ -273,7 +278,7 @@ def serve(  # type: ignore (unused warning)
         "--working-dir",
         type=click.Path(),
         help="When loading from source code, specify the directory to find the Service instance",
-        default=".",
+        default=None,
         show_default=True,
     )
     @click.option(
@@ -369,6 +374,11 @@ def serve_grpc(  # type: ignore (unused warning)
         - all model store changes will also trigger a restart (new model saved or existing model removed)
         """
         configure_server_logging()
+        if working_dir is None:
+            if os.path.isdir(os.path.expanduser(bento)):
+                working_dir = os.path.expanduser(bento)
+            else:
+                working_dir = "."
         if production:
             if reload:
                 logger.warning(

src/bentoml_cli/start.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import sys
 import json
 import logging
@@ -71,7 +72,7 @@ def add_start_command(cli: click.Group) -> None:
         "--working-dir",
         type=click.Path(),
         help="When loading from source code, specify the directory to find the Service instance",
-        default=".",
+        default=None,
         show_default=True,
     )
     @click.option(
@@ -138,6 +139,11 @@ def start_http_server(  # type: ignore (unused warning)
         """
         Start a HTTP API server standalone. This will be used inside Yatai.
         """
+        if working_dir is None:
+            if os.path.isdir(os.path.expanduser(bento)):
+                working_dir = os.path.expanduser(bento)
+            else:
+                working_dir = "."
         if sys.path[0] != working_dir:
             sys.path.insert(0, working_dir)
 
@@ -218,7 +224,7 @@ def start_http_server(  # type: ignore (unused warning)
         "--working-dir",
         type=click.Path(),
         help="When loading from source code, specify the directory to find the Service instance",
-        default=".",
+        default=None,
         show_default=True,
     )
     @add_experimental_docstring
@@ -234,6 +240,11 @@ def start_runner_server(  # type: ignore (unused warning)
         """
         Start Runner server standalone. This will be used inside Yatai.
         """
+        if working_dir is None:
+            if os.path.isdir(os.path.expanduser(bento)):
+                working_dir = os.path.expanduser(bento)
+            else:
+                working_dir = "."
         if sys.path[0] != working_dir:
             sys.path.insert(0, working_dir)
 
@@ -289,7 +300,7 @@ def start_runner_server(  # type: ignore (unused warning)
         "--working-dir",
         type=click.Path(),
         help="When loading from source code, specify the directory to find the Service instance",
-        default=".",
+        default=None,
         show_default=True,
     )
     @click.option(
@@ -356,6 +367,11 @@ def start_grpc_server(  # type: ignore (unused warning)
         """
         Start a gRPC API server standalone. This will be used inside Yatai.
         """
+        if working_dir is None:
+            if os.path.isdir(os.path.expanduser(bento)):
+                working_dir = os.path.expanduser(bento)
+            else:
+                working_dir = "."
         if sys.path[0] != working_dir:
             sys.path.insert(0, working_dir)