rgwfuncs 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

rgwfuncs/df_lib.py

@@ -1708,47 +1708,36 @@ def print_n_frequency_linear(df: pd.DataFrame, n: int, columns: list, order_by:
 
         return report
 
-    def can_convert_keys_to_int(keys):
-        """Helper function to check if all keys can be converted to integers."""
+    def try_parse_numeric(val):
+        """Attempt to parse a value as an integer or float."""
         try:
-            [int(key) for key in keys]
-            return True
+            return int(val)
         except ValueError:
-            return False
+            try:
+                return float(val)
+            except ValueError:
+                return val
 
     def sort_frequency(frequency, order_by):
         keys = frequency.keys()
-        
-        # Determine if we can sort by integer values of keys
-        if can_convert_keys_to_int(keys):
-            keys = list(map(int, keys))  # Convert keys to integers, and keep original order
 
-        if order_by == "ASC":
-            return dict(sorted(frequency.items(), key=lambda item: item[0]))
-        elif order_by == "DESC":
-            return dict(
-                sorted(
-                    frequency.items(),
-                    key=lambda item: item[0],
-                    reverse=True))
-        elif order_by == "FREQ_ASC":
-            return dict(sorted(frequency.items(), key=lambda item: item[1]))
-        elif order_by == "BY_KEYS_ASC":
-            if isinstance(keys[0], int):
-                return dict(sorted(frequency.items(), key=lambda item: int(item[0])))
-            else:
-                return dict(sorted(frequency.items()))
-        elif order_by == "BY_KEYS_DESC":
-            if isinstance(keys[0], int):
-                return dict(sorted(frequency.items(), key=lambda item: int(item[0]), reverse=True))
-            else:
-                return dict(sorted(frequency.items(), reverse=True))
-        else:  # Default to "FREQ_DESC"
-            return dict(
-                sorted(
-                    frequency.items(),
-                    key=lambda item: item[1],
-                    reverse=True))
+        # Convert keys to numerical values where possible, leaving `NaN` as a special string
+        parsed_keys = [(try_parse_numeric(key), key) for key in keys]
+
+        if order_by in {"BY_KEYS_ASC", "BY_KEYS_DESC"}:
+            reverse = order_by == "BY_KEYS_DESC"
+            sorted_items = sorted(frequency.items(), key=lambda item: try_parse_numeric(item[0]), reverse=reverse)
+        else:
+            if order_by == "ASC":
+                sorted_items = sorted(frequency.items(), key=lambda item: item[0])
+            elif order_by == "DESC":
+                sorted_items = sorted(frequency.items(), key=lambda item: item[0], reverse=True)
+            elif order_by == "FREQ_ASC":
+                sorted_items = sorted(frequency.items(), key=lambda item: item[1])
+            else:  # Default to "FREQ_DESC"
+                sorted_items = sorted(frequency.items(), key=lambda item: item[1], reverse=True)
+
+        return dict(sorted_items)
 
     report = generate_linear_report(df, columns, n, order_by)
     print(json.dumps(report, indent=2))

{rgwfuncs-0.0.22.dist-info → rgwfuncs-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.22
+Version: 0.0.23
 Summary: A functional programming paradigm for mathematical modelling and data science
 Home-page: https://github.com/ryangerardwilson/rgwfunc
 Author: Ryan Gerard Wilson

rgwfuncs-0.0.23.dist-info/RECORD

@@ -0,0 +1,9 @@
+rgwfuncs/__init__.py,sha256=2nrp3c5VmVrKh0Ih6zELL8niH9nAHN0XnObqe-EpxlE,1169
+rgwfuncs/df_lib.py,sha256=8KMn4FucI19EFBHUoGOS7R4mo0degg6A6802sjy7BH4,67677
+rgwfuncs/str_lib.py,sha256=I5B0WOGaLUGaedMG7hqiKnIqV7Jc9h1RYlgOiC_-iGY,3678
+rgwfuncs-0.0.23.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+rgwfuncs-0.0.23.dist-info/METADATA,sha256=_mVsZMv4umMXMW_Q2hBxABMm75pKuvJgMIMBldXxCtk,34680
+rgwfuncs-0.0.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.23.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.23.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.23.dist-info/RECORD,,

rgwfuncs-0.0.22.dist-info/RECORD

@@ -1,9 +0,0 @@
-rgwfuncs/__init__.py,sha256=2nrp3c5VmVrKh0Ih6zELL8niH9nAHN0XnObqe-EpxlE,1169
-rgwfuncs/df_lib.py,sha256=nd-F7NGraUINuZUIqYHo2QwUNTjESgBlxKDQbbqlhS8,68050
-rgwfuncs/str_lib.py,sha256=I5B0WOGaLUGaedMG7hqiKnIqV7Jc9h1RYlgOiC_-iGY,3678
-rgwfuncs-0.0.22.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-rgwfuncs-0.0.22.dist-info/METADATA,sha256=aQ86F5Sb5XUGej267Y-hwVuAYqObbuNfy5vcbCxmgYY,34680
-rgwfuncs-0.0.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.22.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.22.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.22.dist-info/RECORD,,