Fix issue tuple as dimension

xarray/core/dataset.py

@@ -1381,9 +1381,14 @@ def _construct_dataarray(self, name: Hashable) -> "DataArray":
         try:
             variable = self._variables[name]
         except KeyError:
-            _, name, variable = _get_virtual_variable(
-                self._variables, name, self._level_coords, self.dims
-            )
+            if isinstance(name, tuple):
+                raise KeyError(
+                    "The dimension provided is a tuple, you may intended to pass a list"
+                )
+            else:
+                _, name, variable = _get_virtual_variable(
+                    self._variables, name, self._level_coords, self.dims
+                )
 
         needed_dims = set(variable.dims)
 
@@ -5983,10 +5988,11 @@ def sortby(self, variables, ascending=True):
         """
         from .dataarray import DataArray
 
-        if not isinstance(variables, list):
+        if not isinstance(variables, (list, tuple)):
             variables = [variables]
         else:
             variables = variables
+
         variables = [v if isinstance(v, DataArray) else self[v] for v in variables]
         aligned_vars = align(self, *variables, join="left")
         aligned_self = aligned_vars[0]

xarray/tests/test_dataarray.py

@@ -4429,6 +4429,11 @@ def test_sortby(self):
         actual = da.sortby(["x", "y"])
         assert_equal(actual, expected)
 
+        # test not throwing an error if sorted with tuple
+        expected = sorted2d
+        actual = da.sortby(da.dims)
+        assert_equal(actual, expected)
+
     @requires_bottleneck
     def test_rank(self):
         # floats

xarray/tests/test_dataset.py

@@ -3296,13 +3296,16 @@ def test_getitem(self):
         expected = data.isel(dim1=0)
         assert_identical(expected, actual)
 
-    def test_getitem_hashable(self):
+    def test_error_tuple(self):
         data = create_test_data()
         data[(3, 4)] = data["var1"] + 1
         expected = data["var1"] + 1
         expected.name = (3, 4)
         assert_identical(expected, data[(3, 4)])
-        with pytest.raises(KeyError, match=r"('var1', 'var2')"):
+        with pytest.raises(
+            KeyError,
+            match="The dimension provided is a tuple, you may intended to pass a list",
+        ):
             data[("var1", "var2")]
 
     def test_virtual_variables_default_coords(self):