From 48e13788c16692e3795483fc589b8b3f6a8ab657 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 17 Jul 2024 17:28:45 +0800 Subject: [PATCH] Make _validate_data_input public and move it to Session.virtualfile_in --- pygmt/clib/session.py | 10 ++++++++++ pygmt/helpers/__init__.py | 1 + pygmt/helpers/utils.py | 11 +---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index 1e9489d4720..7a8981fc920 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -37,6 +37,7 @@ data_kind, tempfile_from_geojson, tempfile_from_image, + validate_data_input, ) FAMILIES = [ @@ -1594,6 +1595,15 @@ def virtualfile_in( # noqa: PLR0912 kind = data_kind( data, x, y, z, required_z=required_z, required_data=required_data ) + validate_data_input( + data=data, + x=x, + y=y, + z=z, + required_z=required_z, + required_data=required_data, + kind=kind, + ) if check_kind: valid_kinds = ("file", "arg") if required_data is False else ("file",) diff --git a/pygmt/helpers/__init__.py b/pygmt/helpers/__init__.py index 128b1e31a18..aa87b9d4887 100644 --- a/pygmt/helpers/__init__.py +++ b/pygmt/helpers/__init__.py @@ -22,5 +22,6 @@ is_nonstr_iter, launch_external_viewer, non_ascii_to_octal, + validate_data_input, ) from pygmt.helpers.validators import validate_output_table_type diff --git a/pygmt/helpers/utils.py b/pygmt/helpers/utils.py index 8997a2b0df1..060c357b6da 100644 --- a/pygmt/helpers/utils.py +++ b/pygmt/helpers/utils.py @@ -19,7 +19,7 @@ from pygmt.exceptions import GMTInvalidInput -def _validate_data_input( +def validate_data_input( data=None, x=None, y=None, z=None, required_z=False, required_data=True, kind=None ): """ @@ -193,15 +193,6 @@ def data_kind(data=None, x=None, y=None, z=None, required_z=False, required_data kind = "matrix" else: kind = "vectors" - _validate_data_input( - data=data, - x=x, - y=y, - z=z, - required_z=required_z, - required_data=required_data, - kind=kind, - ) return kind