Fix ty 0.0.17 typing regressions

Author: tobiasraabe

src/_pytask/coiled_utils.py

@@ -22,12 +22,30 @@ class Function:
 __all__ = ["Function"]
 
 
+_MISSING = object()
+
+
+def _get_coiled_attribute(func: Function, *names: str, default: Any = _MISSING) -> Any:
+    """Get an attribute from coiled function objects with private/public fallbacks."""
+    for name in names:
+        value = getattr(func, name, _MISSING)
+        if value is not _MISSING:
+            return value
+    if default is not _MISSING:
+        return default
+    names_as_text = ", ".join(repr(name) for name in names)
+    msg = f"Cannot find coiled attribute(s) {names_as_text} on {func!r}."
+    raise AttributeError(msg)
+
+
 def extract_coiled_function_kwargs(func: Function) -> dict[str, Any]:
     """Extract the kwargs for a coiled function."""
     return {
-        "cluster_kwargs": func._cluster_kwargs,  # ty: ignore[possibly-missing-attribute]
+        "cluster_kwargs": _get_coiled_attribute(
+            func, "_cluster_kwargs", "cluster_kwargs"
+        ),
         "keepalive": func.keepalive,
-        "environ": func._environ,  # ty: ignore[possibly-missing-attribute]
-        "local": func._local,  # ty: ignore[possibly-missing-attribute]
-        "name": func._name,  # ty: ignore[possibly-missing-attribute]
+        "environ": _get_coiled_attribute(func, "_environ", "environ"),
+        "local": _get_coiled_attribute(func, "_local", "local", default=None),
+        "name": _get_coiled_attribute(func, "_name", "name", default=None),
     }

src/_pytask/path.py

@@ -331,10 +331,10 @@ def _import_module_using_spec(
             break
     else:
         spec = importlib.util.spec_from_file_location(module_name, str(module_path))
-    if spec is not None:
+    if spec is not None and spec.loader is not None:
         mod = importlib.util.module_from_spec(spec)
         sys.modules[module_name] = mod
-        spec.loader.exec_module(mod)  # ty: ignore[possibly-missing-attribute]
+        spec.loader.exec_module(mod)
         _insert_missing_modules(sys.modules, module_name)
         return mod
 

src/_pytask/task_utils.py

@@ -186,7 +186,7 @@ def wrapper(func: T) -> TaskDecorated[T]:
 
     # When decorator is used without parentheses, call wrapper directly.
     if is_task_function(name) and kwargs is None:
-        return wrapper(cast("T", name))
+        return wrapper(cast("T", name))  # ty: ignore[invalid-argument-type]
     return wrapper
 
 

tests/test_collect.py

@@ -10,6 +10,7 @@
 
 from _pytask.collect import _find_shortest_uniquely_identifiable_name_for_tasks
 from _pytask.collect import pytask_collect_node
+from _pytask.node_protocols import PPathNode
 from pytask import CollectionOutcome
 from pytask import ExitCode
 from pytask import NodeInfo
@@ -237,6 +238,7 @@ def test_pytask_collect_node_does_not_raise_error_if_path_is_not_normalized(
         )
         assert not record
 
+    assert isinstance(result, PPathNode)
     assert str(result.path) == str(real_node)