rgwfuncs 0.0.95__py3-none-any.whl → 0.0.97__py3-none-any.whl

rgwfuncs/df_lib.py

@@ -318,7 +318,7 @@ def load_data_from_query(db_preset_name: str, query: str, config: Optional[Union
         db_preset_name: The name of the database preset in the configuration file.
         query: The SQL query to execute.
         config (Optional[Union[str, dict]], optional): Configuration source. Can be:
-            - None: Uses default path '~/.rgwfuncsrc'
+            - None: Searches for '.rgwfuncsrc' in current directory and upwards
             - str: Path to a JSON configuration file
             - dict: Direct configuration dictionary
 
@@ -326,21 +326,33 @@ def load_data_from_query(db_preset_name: str, query: str, config: Optional[Union
         A DataFrame containing the query result.
 
     Raises:
-        FileNotFoundError: If the configuration file is not found.
+        FileNotFoundError: If no '.rgwfuncsrc' file is found after traversing all parent directories.
         ValueError: If the database preset or db_type is invalid.
     """
 
     def get_config(config: Optional[Union[str, dict]] = None) -> dict:
-        """Get telegram configuration either from a path or direct dictionary."""
+        """Get configuration either from a path, direct dictionary, or by searching upwards."""
         def get_config_from_file(config_path: str) -> dict:
             """Load configuration from a JSON file."""
             with open(config_path, 'r') as file:
                 return json.load(file)
 
+        def find_config_file() -> str:
+            """Search for '.rgwfuncsrc' in current directory and upwards."""
+            current_dir = os.getcwd()
+            while True:
+                config_path = os.path.join(current_dir, '.rgwfuncsrc')
+                if os.path.isfile(config_path):
+                    return config_path
+                parent_dir = os.path.dirname(current_dir)
+                if parent_dir == current_dir:  # Reached root directory
+                    raise FileNotFoundError("No '.rgwfuncsrc' file found in current or parent directories")
+                current_dir = parent_dir
+
         # Determine the config to use
         if config is None:
-            # Default to ~/.rgwfuncsrc if no config provided
-            config_path = os.path.expanduser('~/.rgwfuncsrc')
+            # Search for .rgwfuncsrc upwards from current directory
+            config_path = find_config_file()
             return get_config_from_file(config_path)
         elif isinstance(config, str):
             # If config is a string, treat it as a path and load it
@@ -811,7 +823,7 @@ def filter_indian_mobiles(df: pd.DataFrame, mobile_col: str) -> pd.DataFrame:
     """
     Filter and return DataFrame rows containing valid Indian mobile numbers.
 
-    This function processes a DataFrame to extract and retain rows where the specified column matches the typical format for Indian mobile numbers. An Indian mobile number is expected to be a digit-only string starting with 6, 7, 8, or 9, and should have at least 4 distinct digits.
+    This function processes a DataFrame to extract and retain rows where the specified column matches the typical format for Indian mobile numbers. An Indian mobile number is expected to be a 10-digit string starting with 6, 7, 8, or 9, containing only digits, and having at least 4 distinct digits.
 
     Parameters:
     - df (pd.DataFrame): The DataFrame to filter.
@@ -828,6 +840,7 @@ def filter_indian_mobiles(df: pd.DataFrame, mobile_col: str) -> pd.DataFrame:
             df[mobile_col].apply(
                 lambda x: (
                     str(x).isdigit() and
+                    len(str(x)) == 10 and
                     str(x).startswith(('6', '7', '8', '9')) and
                     len(set(str(x))) >= 4
                 )

{rgwfuncs-0.0.95.dist-info → rgwfuncs-0.0.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rgwfuncs
-Version: 0.0.95
+Version: 0.0.97
 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.95.dist-info → rgwfuncs-0.0.97.dist-info}/RECORD

@@ -1,12 +1,12 @@
 rgwfuncs/__init__.py,sha256=LSn54Tlyskcb6Wab_wUpPLB6UGMe5LdrB3GU88mDEbU,1712
 rgwfuncs/algebra_lib.py,sha256=rKFITfpWfgdBswnbMUuS41XgndEt-jUVz2ObO_ik7eM,42234
-rgwfuncs/df_lib.py,sha256=BoBICtf_uy1AOuduGenJemtTTpF4alalSq0Nuyy88F4,76207
+rgwfuncs/df_lib.py,sha256=3foomRHlunCpf_accTcqfdgwDmSPIVkVCnlWJ4ag4XQ,76947
 rgwfuncs/docs_lib.py,sha256=i63NzX-V8cGhikYdtkRGAEe2VcuwpXxDUyTRa9xI7l8,1972
 rgwfuncs/interactive_shell_lib.py,sha256=YN0ZnM5twIsOeDKuOQ9ZGURCvvBX0RZjM4a1vO1C3E8,4281
 rgwfuncs/str_lib.py,sha256=hE0VfP6rhQpczsKyCZvH3G1aMRwngKnkW3NTYCEc0Po,3208
-rgwfuncs-0.0.95.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.95.dist-info/METADATA,sha256=TPX6a5GjVlF_KIUytC2J_bi5nILxBSp9ArUoMuwRC8s,62223
-rgwfuncs-0.0.95.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rgwfuncs-0.0.95.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.95.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.95.dist-info/RECORD,,
+rgwfuncs-0.0.97.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.97.dist-info/METADATA,sha256=_fYQgW1uFSm-5VmPO-Sl31_NdE7Y3HAMfaQr0SI3f7I,62223
+rgwfuncs-0.0.97.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rgwfuncs-0.0.97.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.97.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.97.dist-info/RECORD,,

{rgwfuncs-0.0.95.dist-info → rgwfuncs-0.0.97.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any