Rename function in light of subtle change in functionality

src/blueapi/core/context.py

@@ -18,7 +18,7 @@
 from blueapi.config import EnvironmentConfig, SourceKind
 from blueapi.utils import (
     BlueapiPlanModelConfig,
-    is_sourced_from_module,
+    is_function_sourced_from_module,
     load_module_all,
 )
 
@@ -109,7 +109,8 @@ def plan_2(...) -> MsgGenerator:
             # in which case we only inspect objects listed there, regardless of their
             # original source module.
             if (
-                hasattr(module, "__all__") or is_sourced_from_module(obj, module)
+                hasattr(module, "__all__")
+                or is_function_sourced_from_module(obj, module)
             ) and is_bluesky_plan_generator(obj):
                 self.register_plan(obj)
 

src/blueapi/utils/__init__.py

@@ -2,7 +2,7 @@
 from .connect_devices import connect_devices
 from .file_permissions import get_owner_gid, is_sgid_set
 from .invalid_config_error import InvalidConfigError
-from .modules import is_sourced_from_module, load_module_all
+from .modules import is_function_sourced_from_module, load_module_all
 from .serialization import serialize
 from .thread_exception import handle_all_exceptions
 
@@ -17,5 +17,5 @@
     "connect_devices",
     "is_sgid_set",
     "get_owner_gid",
-    "is_sourced_from_module",
+    "is_function_sourced_from_module",
 ]

tests/unit_tests/utils/functions_b.py

@@ -1,3 +1,6 @@
+from .functions_a import a, b  # noqa: F401
+
+
 def c(): ...
 
 

tests/unit_tests/utils/test_modules.py

@@ -1,6 +1,6 @@
 from importlib import import_module
 
-from blueapi.utils import is_sourced_from_module, load_module_all
+from blueapi.utils import is_function_sourced_from_module, load_module_all
 
 
 def test_imports_all():
@@ -15,14 +15,14 @@ def test_imports_everything_without_all():
 
 def test_source_is_in_module():
     module = import_module(".functions_b", package="tests.unit_tests.utils")
-    assert is_sourced_from_module(module.__dict__["c"], module)
+    assert is_function_sourced_from_module(module.__dict__["c"], module)
 
 
 def test_source_is_not_in_module():
     module = import_module(".functions_b", package="tests.unit_tests.utils")
-    assert not is_sourced_from_module(module.__dict__["a"], module)
+    assert not is_function_sourced_from_module(module.__dict__["a"], module)
 
 
 def test_source_check_on_non_function():
     module = import_module(".functions_b", package="tests.unit_tests.utils")
-    assert not is_sourced_from_module(module.__dict__["e"], module)
+    assert not is_function_sourced_from_module(module.__dict__["e"], module)