rgwfuncs 0.0.20__tar.gz → 0.0.22__tar.gz

{rgwfuncs-0.0.20/src/rgwfuncs.egg-info → rgwfuncs-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.20
+Version: 0.0.22
 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.20 → rgwfuncs-0.0.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rgwfuncs"
-version = "0.0.20"
+version = "0.0.22"
 authors = [
   { name = "Ryan Gerard Wilson", email = "ryangerardwilson@gmail.com" },
 ]

{rgwfuncs-0.0.20 → rgwfuncs-0.0.22}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = rgwfuncs
-version = 0.0.20
+version = 0.0.22
 author = Ryan Gerard Wilson
 author_email = ryangerardwilson@gmail.com
 description = A functional programming paradigm for mathematical modelling and data science

{rgwfuncs-0.0.20 → rgwfuncs-0.0.22}/src/rgwfuncs/df_lib.py

@@ -1672,7 +1672,6 @@ def print_n_frequency_cascading(
     report = generate_cascade_report(df, columns, n, order_by)
     print(json.dumps(report, indent=2))
 
-
 def print_n_frequency_linear(df: pd.DataFrame, n: int, columns: list, order_by: str = "FREQ_DESC") -> None:
     """
     Print the linear frequency of top n values for specified columns.
@@ -1681,7 +1680,7 @@ def print_n_frequency_linear(df: pd.DataFrame, n: int, columns: list, order_by:
         df: DataFrame to analyze.
         n: Number of top values to print.
         columns: List of column names to analyze.
-        order_by: Order of frequency: ASC, DESC, FREQ_ASC, FREQ_DESC.
+        order_by: Order of frequency: ASC, DESC, FREQ_ASC, FREQ_DESC, BY_KEYS_ASC, BY_KEYS_DESC.
     """
 
     def generate_linear_report(df, columns, limit, order_by):
@@ -1709,7 +1708,21 @@ 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."""
+        try:
+            [int(key) for key in keys]
+            return True
+        except ValueError:
+            return False
+
     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":
@@ -1720,6 +1733,16 @@ def print_n_frequency_linear(df: pd.DataFrame, n: int, columns: list, order_by:
                     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(

{rgwfuncs-0.0.20 → rgwfuncs-0.0.22/src/rgwfuncs.egg-info}/PKG-INFO

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