diff --git a/stubs/networkx/networkx/_typing.pyi b/stubs/networkx/networkx/_typing.pyi index b82d9673deb0..2c838378fbb8 100644 --- a/stubs/networkx/networkx/_typing.pyi +++ b/stubs/networkx/networkx/_typing.pyi @@ -6,7 +6,8 @@ from typing_extensions import TypeVar import numpy as np -_ScalarT = TypeVar("_ScalarT", bound=bool | int | float | complex | str | bytes | np.generic) +Scalar: TypeAlias = bool | int | float | complex | str | bytes | np.generic +_ScalarT = TypeVar("_ScalarT", bound=Scalar) _GenericT = TypeVar("_GenericT", bound=np.generic) _GenericT_co = TypeVar("_GenericT_co", bound=np.generic, covariant=True) _ShapeT_co = TypeVar("_ShapeT_co", bound=tuple[int, ...], default=Any, covariant=True) diff --git a/stubs/networkx/networkx/classes/function.pyi b/stubs/networkx/networkx/classes/function.pyi index 8ac27209e6a0..d2f33a7505e8 100644 --- a/stubs/networkx/networkx/classes/function.pyi +++ b/stubs/networkx/networkx/classes/function.pyi @@ -1,8 +1,9 @@ from _typeshed import Incomplete, SupportsItems, SupportsKeysAndGetItem, Unused from collections.abc import Callable, Collection, Generator, Iterable, Iterator -from typing import Literal, TypeVar, overload +from typing import Any, Literal, TypeVar, overload from networkx import _dispatchable +from networkx._typing import Scalar from networkx.algorithms.planarity import PlanarEmbedding from networkx.classes.digraph import DiGraph from networkx.classes.graph import Graph, _EdgeData, _NBunch, _Node, _NodeData @@ -82,15 +83,15 @@ def to_directed(graph): ... def to_undirected(graph): ... def create_empty_copy(G: Graph[_Node], with_data: bool = True): ... -# incomplete: Can "Any scalar value" be enforced? +# Values can be a dict-like mapping or any scalar value when name is provided @overload def set_node_attributes( G: Graph[_Node], - values: SupportsItems[_Node, Unused], + values: SupportsItems[_Node, Unused] | Scalar, name: str, *, - backend=None, # @_dispatchable adds these arguments, but we can't use this decorator with @overload - **backend_kwargs, + backend: str | None = None, # @_dispatchable adds these arguments, but we can't use this decorator with @overload + **backend_kwargs: Any, ) -> None: ... @overload def set_node_attributes( @@ -98,8 +99,8 @@ def set_node_attributes( values: SupportsItems[_Node, SupportsKeysAndGetItem[Incomplete, Incomplete] | Iterable[tuple[Incomplete, Incomplete]]], name: None = None, *, - backend=None, - **backend_kwargs, + backend: str | None = None, + **backend_kwargs: Any, ) -> None: ... @_dispatchable @@ -107,26 +108,38 @@ def get_node_attributes(G: Graph[_Node], name: str, default=None) -> dict[_Node, @_dispatchable def remove_node_attributes(G: Graph[_Node], *attr_names, nbunch=None) -> None: ... +@overload +def set_edge_attributes( + G: MultiGraph[_Node], + values: dict[tuple[_Node, _Node, Incomplete], Incomplete] | Scalar, + name: str, + *, + backend: str | None = None, + **backend_kwargs: Any, +) -> None: ... @overload def set_edge_attributes( G: Graph[_Node], - values: SupportsItems[tuple[_Node, _Node], Incomplete], + values: SupportsItems[tuple[_Node, _Node], Incomplete] | Scalar, name: str, *, backend: str | None = None, # @_dispatchable adds these arguments, but we can't use this decorator with @overload - **backend_kwargs, + **backend_kwargs: Any, ) -> None: ... @overload def set_edge_attributes( - G: MultiGraph[_Node], - values: dict[tuple[_Node, _Node, Incomplete], Incomplete], - name: str, + G: Graph[_Node], + values: ( + SupportsItems[ + tuple[_Node, _Node], SupportsKeysAndGetItem[Incomplete, Incomplete] | Iterable[tuple[Incomplete, Incomplete]] + ] + | Incomplete + ), + name: None = None, *, backend: str | None = None, - **backend_kwargs, + **backend_kwargs: Any, ) -> None: ... -@overload -def set_edge_attributes(G: Graph[_Node], values, name: None = None, *, backend: str | None = None, **backend_kwargs) -> None: ... @_dispatchable def get_edge_attributes(G: Graph[_Node], name: str, default=None) -> dict[tuple[_Node, _Node], Incomplete]: ...