fix: allow import service defined under a Python package (#3794)

fix import service defined under a python package

Author: parano

src/bentoml/_internal/service/loader.py

@@ -102,7 +102,7 @@ def recover_standalone_env_change():
                 '"<module>:<attribute>" or "<module>'
             )
 
-        if os.path.exists(import_path):
+        if os.path.isfile(import_path):
             import_path = os.path.realpath(import_path)
             # Importing from a module file path:
             if not import_path.startswith(working_dir):

tests/unit/_internal/service_loader/bento_service_in_module/__init__.py

@@ -0,0 +1,4 @@
+import bentoml
+
+svc_i = bentoml.Service("test-bento-service-in-module-i")
+svc_ii = bentoml.Service("test-bento-service-in-module-ii")

tests/unit/_internal/service_loader/bento_service_in_module/multi_service.py

@@ -0,0 +1,3 @@
+import bentoml
+
+svc = bentoml.Service("test-bento-service-in-module-single")

tests/unit/_internal/service_loader/bento_service_in_module/single_service.py

@@ -0,0 +1,4 @@
+import bentoml
+
+svc_i = bentoml.Service("test-multi-service-in-package-i")
+svc_ii = bentoml.Service("test-multi-service-in-package-ii")

tests/unit/_internal/service_loader/multi_service_in_package/__init__.py

@@ -0,0 +1,3 @@
+import bentoml
+
+svc = bentoml.Service("test-bento-service-in-package")

tests/unit/_internal/service_loader/single_service_in_package/__init__.py

@@ -0,0 +1,59 @@
+import pytest
+
+from bentoml.exceptions import ImportServiceError
+from bentoml._internal.service.loader import import_service
+
+
+@pytest.mark.usefixtures("change_test_dir")
+def test_load_by_service_file():
+    svc = import_service("bento_service_in_module/single_service.py")
+    assert svc.name == "test-bento-service-in-module-single"
+
+    svc = import_service("./bento_service_in_module/single_service.py:svc")
+    assert svc.name == "test-bento-service-in-module-single"
+
+    svc = import_service("./single_service_in_package/__init__.py")
+    assert svc.name == "test-bento-service-in-package"
+
+    svc = import_service("./single_service_in_package/__init__.py:svc")
+    assert svc.name == "test-bento-service-in-package"
+
+
+@pytest.mark.usefixtures("change_test_dir")
+def test_load_by_module_name():
+    svc = import_service("bento_service_in_module.single_service")
+    assert svc.name == "test-bento-service-in-module-single"
+
+    svc = import_service("bento_service_in_module.single_service:svc")
+    assert svc.name == "test-bento-service-in-module-single"
+
+    svc = import_service("single_service_in_package")
+    assert svc.name == "test-bento-service-in-package"
+
+    svc = import_service("single_service_in_package:svc")
+    assert svc.name == "test-bento-service-in-package"
+
+
+@pytest.mark.usefixtures("change_test_dir")
+def test_load_multi_service_module():
+    svc = import_service("bento_service_in_module.multi_service:svc_i")
+    assert svc.name == "test-bento-service-in-module-i"
+
+    svc = import_service("bento_service_in_module.multi_service:svc_ii")
+    assert svc.name == "test-bento-service-in-module-ii"
+
+    with pytest.raises(
+        ImportServiceError, match="Multiple Service instances found in module"
+    ):
+        import_service("bento_service_in_module.multi_service")
+
+    svc = import_service("multi_service_in_package:svc_i")
+    assert svc.name == "test-multi-service-in-package-i"
+
+    svc = import_service("multi_service_in_package:svc_ii")
+    assert svc.name == "test-multi-service-in-package-ii"
+
+    with pytest.raises(
+        ImportServiceError, match="Multiple Service instances found in module"
+    ):
+        import_service("multi_service_in_package")