Fix test and format code

Author: FlorentinD

graphdatascience/graph/base_graph_proc_runner.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import pathlib
 import warnings
@@ -31,7 +33,6 @@
 from .graph_type_check import (
     from_graph_type_check,
     graph_type_check,
-    graph_type_check_optional,
 )
 from .ogb_loader import OGBLLoader, OGBNLoader
 

graphdatascience/graph/graph_type_check.py

@@ -1,5 +1,5 @@
 from functools import wraps
-from typing import Any, Callable, Optional, TypeVar, cast
+from typing import Any, Callable, TypeVar, cast
 
 from .graph_object import Graph
 
@@ -20,20 +20,6 @@ def wrapper(self: Any, G: Graph, *args: Any, **kwargs: Any) -> Any:
     return cast(F, wrapper)
 
 
-def graph_type_check_optional(func: F) -> F:
-    @wraps(func)
-    def wrapper(self: Any, G: Optional[Graph] = None, *args: Any, **kwargs: Any) -> Any:
-        if isinstance(G, str):
-            raise TypeError(
-                f"The parameter 'G' takes a `Graph` object, but received string '{G}'. "
-                "To resolve a graph name string into a `Graph` object, please use `gds.graph.get`"
-            )
-
-        return func(self, G, *args, **kwargs)
-
-    return cast(F, wrapper)
-
-
 def from_graph_type_check(func: F) -> F:
     @wraps(func)
     def wrapper(self: Any, graph_name: str, from_G: Graph, *args: Any, **kwargs: Any) -> Any:

graphdatascience/tests/integration/test_graph_ops.py

@@ -228,19 +228,6 @@ def test_graph_drop(gds: GraphDataScience) -> None:
 def test_graph_type_check(gds: GraphDataScience) -> None:
     G, _ = gds.graph.project(GRAPH_NAME, "*", "*")
 
-    # Call without providing optional `Graph` without raising
-    gds.graph.list()
-
-    # Raise when optional `Graph` is string
-    with pytest.raises(
-        TypeError,
-        match=(
-            f"The parameter 'G' takes a `Graph` object, but received string '{G.name()}'. "
-            "To resolve a graph name string into a `Graph` object, please use `gds.graph.get`"
-        ),
-    ):
-        gds.graph.list(G.name())  # type: ignore
-
     # Raise when second positional from_G `Graph` is string
     with pytest.raises(
         TypeError,
@@ -251,16 +238,6 @@ def test_graph_type_check(gds: GraphDataScience) -> None:
     ):
         gds.beta.graph.project.subgraph("s", G.name(), "n.x > 1", "*", concurrency=2)  # type: ignore
 
-    # Raise when first positional G `Graph` is string
-    with pytest.raises(
-        TypeError,
-        match=(
-            f"The parameter 'G' takes a `Graph` object, but received string '{G.name()}'. "
-            "To resolve a graph name string into a `Graph` object, please use `gds.graph.get`"
-        ),
-    ):
-        gds.graph.list(G.name())  # type: ignore
-
     result = gds.graph.drop(G, True)
     assert result is not None
     assert result["graphName"] == GRAPH_NAME