Refactor to check kind in data_kind function

Author: seisman

pygmt/src/grdcut.py

@@ -117,7 +117,7 @@ def grdcut(
         raise GMTInvalidInput(msg)
 
     # Determine the output data kind based on the input data kind.
-    match inkind := data_kind(grid):
+    match inkind := data_kind(grid, check_kind="raster"):
         case "grid" | "image":
             outkind = inkind
         case "file":
@@ -128,7 +128,7 @@ def grdcut(
 
     with Session() as lib:
         with (
-            lib.virtualfile_in(check_kind="raster", data=grid) as vingrd,
+            lib.virtualfile_in(data=grid) as vingrd,
             lib.virtualfile_out(kind=outkind, fname=outgrid) as voutgrd,
         ):
             kwargs["G"] = voutgrd

pygmt/src/legend.py

@@ -89,10 +89,7 @@ def legend(
         if kwargs.get("F") is None:
             kwargs["F"] = box
 
-    kind = data_kind(spec)
-    if kind not in {"empty", "file", "stringio"}:
-        msg = f"Unrecognized data type: {type(spec)}"
-        raise GMTInvalidInput(msg)
+    kind = data_kind(spec, check_kind=("empty", "file", "stringio"))
     if kind == "file" and is_nonstr_iter(spec):
         msg = "Only one legend specification file is allowed."
         raise GMTInvalidInput(msg)

pygmt/src/meca.py

@@ -49,7 +49,7 @@ def _preprocess_spec(spec, colnames, override_cols):
         Dictionary of column names and values to override in the input data. Only makes
         sense if ``spec`` is a dict or :class:`pandas.DataFrame`.
     """
-    kind = data_kind(spec)  # Determine the kind of the input data.
+    kind = data_kind(spec, check_kind="vector")  # Determine the kind of the input data.
 
     # Convert pandas.DataFrame and numpy.ndarray to dict.
     if isinstance(spec, pd.DataFrame):
@@ -359,5 +359,5 @@ def meca(  # noqa: PLR0913
         kwargs["A"] = _auto_offset(spec)
     kwargs["S"] = f"{_convention.code}{scale}"
     with Session() as lib:
-        with lib.virtualfile_in(check_kind="vector", data=spec) as vintbl:
+        with lib.virtualfile_in(data=spec) as vintbl:
             lib.call_module(module="meca", args=build_arg_list(kwargs, infile=vintbl))

pygmt/src/plot.py

@@ -232,7 +232,7 @@ def plot(  # noqa: PLR0912
     # parameter.
     self._activate_figure()
 
-    kind = data_kind(data)
+    kind = data_kind(data, check_kind="vector")
     if kind == "empty":  # Data is given via a series of vectors.
         data = {"x": x, "y": y}
         # Parameters for vector styles
@@ -280,5 +280,5 @@ def plot(  # noqa: PLR0912
         kwargs["S"] = "s0.2c"
 
     with Session() as lib:
-        with lib.virtualfile_in(check_kind="vector", data=data) as vintbl:
+        with lib.virtualfile_in(data=data) as vintbl:
             lib.call_module(module="plot", args=build_arg_list(kwargs, infile=vintbl))

pygmt/src/plot3d.py

@@ -210,7 +210,7 @@ def plot3d(  # noqa: PLR0912
     # parameter.
     self._activate_figure()
 
-    kind = data_kind(data)
+    kind = data_kind(data, check_kind="vector")
     if kind == "empty":  # Data is given via a series of vectors.
         data = {"x": x, "y": y, "z": z}
         # Parameters for vector styles
@@ -259,5 +259,5 @@ def plot3d(  # noqa: PLR0912
         kwargs["S"] = "u0.2c"
 
     with Session() as lib:
-        with lib.virtualfile_in(check_kind="vector", data=data, mincols=3) as vintbl:
+        with lib.virtualfile_in(data=data, mincols=3) as vintbl:
             lib.call_module(module="plot3d", args=build_arg_list(kwargs, infile=vintbl))

pygmt/src/text.py

@@ -191,7 +191,7 @@ def text_(  # noqa: PLR0912
         raise GMTInvalidInput(msg)
 
     data_is_required = position is None
-    kind = data_kind(textfiles, required=data_is_required)
+    kind = data_kind(textfiles, required=data_is_required, check_kind="vector")
 
     if position is not None and (text is None or is_nonstr_iter(text)):
         msg = "'text' can't be None or array when 'position' is given."
@@ -261,7 +261,7 @@ def text_(  # noqa: PLR0912
 
     with Session() as lib:
         with lib.virtualfile_in(
-            check_kind="vector", data=textfiles or data, required=data_is_required
+            data=textfiles or data, required=data_is_required
         ) as vintbl:
             lib.call_module(
                 module="text",

pygmt/src/x2sys_cross.py

@@ -195,7 +195,7 @@ def x2sys_cross(
 
     file_contexts: list[contextlib.AbstractContextManager[Any]] = []
     for track in tracks:
-        match data_kind(track):
+        match data_kind(track, check_kind="vector"):
             case "file":
                 file_contexts.append(contextlib.nullcontext(track))
             case "vectors":