move key_dtype_str from BaseGrouper to Grouping

Author: natmokval

pandas/core/groupby/grouper.py

@@ -440,6 +440,7 @@ def __init__(
         in_axis: bool = False,
         dropna: bool = True,
         uniques: ArrayLike | None = None,
+        key_dtype_str: bool = False,
     ) -> None:
         self.level = level
         self._orig_grouper = grouper
@@ -452,6 +453,7 @@ def __init__(
         self.in_axis = in_axis
         self._dropna = dropna
         self._uniques = uniques
+        self.key_dtype_str = key_dtype_str
 
         # we have a single grouper which may be a myriad of things,
         # some of which are dependent on the passing in level
@@ -666,6 +668,8 @@ def groups(self) -> dict[Hashable, Index]:
         codes, uniques = self._codes_and_uniques
         uniques = Index._with_infer(uniques, name=self.name)
         cats = Categorical.from_codes(codes, uniques, validate=False)
+        if not self.key_dtype_str:
+            cats = [(i,) for i in cats]
         return self._index.groupby(cats)
 
     @property
@@ -893,6 +897,7 @@ def is_in_obj(gpr) -> bool:
                 observed=observed,
                 in_axis=in_axis,
                 dropna=dropna,
+                key_dtype_str=key_dtype_str,
             )
             if not isinstance(gpr, Grouping)
             else gpr
@@ -905,9 +910,7 @@ def is_in_obj(gpr) -> bool:
         groupings.append(Grouping(Index([], dtype="int"), np.array([], dtype=np.intp)))
 
     # create the internals grouper
-    grouper = ops.BaseGrouper(
-        group_axis, groupings, sort=sort, dropna=dropna, key_dtype_str=key_dtype_str
-    )
+    grouper = ops.BaseGrouper(group_axis, groupings, sort=sort, dropna=dropna)
     return grouper, frozenset(exclusions), obj
 
 

pandas/core/groupby/ops.py

@@ -584,15 +584,13 @@ def __init__(
         groupings: Sequence[grouper.Grouping],
         sort: bool = True,
         dropna: bool = True,
-        key_dtype_str: bool = True,
     ) -> None:
         assert isinstance(axis, Index), axis
 
         self.axis = axis
         self._groupings: list[grouper.Grouping] = list(groupings)
         self._sort = sort
         self.dropna = dropna
-        self.key_dtype_str = key_dtype_str
 
     @property
     def groupings(self) -> list[grouper.Grouping]:
@@ -706,10 +704,7 @@ def size(self) -> Series:
     @cache_readonly
     def groups(self) -> dict[Hashable, Index]:
         """dict {group name -> group labels}"""
-        if len(self.groupings) == 1 and not self.key_dtype_str:
-            result = self.groupings[0].groups
-
-        if self.key_dtype_str and len(self.groupings) == 1:
+        if len(self.groupings) == 1:
             return self.groupings[0].groups
         result_index, ids = self.result_index_and_ids
         values = result_index._values
@@ -770,7 +765,7 @@ def result_index_and_ids(self) -> tuple[Index, npt.NDArray[np.intp]]:
             if ping._passed_categorical:
                 levels[k] = level.set_categories(ping._orig_cats)
 
-        if self.key_dtype_str and len(self.groupings) == 1:
+        if len(self.groupings) == 1:
             result_index = levels[0]
             result_index.name = self.names[0]
             ids = ensure_platform_int(self.codes[0])