rgwfuncs 0.0.96__py3-none-any.whl → 0.0.98__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

rgwfuncs/str_lib.py

@@ -16,25 +16,38 @@ def send_telegram_message(preset_name: str, message: str, config: Optional[Union
         preset_name (str): The name of the preset to use for sending the message.
         message (str): The message to send.
         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
 
     Raises:
+        FileNotFoundError: If no '.rgwfuncsrc' file is found after traversing all parent directories.
         RuntimeError: If the preset is not found or necessary details are missing.
+        ValueError: If the config parameter is neither a path string nor a dictionary.
     """
-
     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
@@ -53,8 +66,7 @@ def send_telegram_message(preset_name: str, message: str, config: Optional[Union
                 return preset
         return None
 
-    def get_telegram_bot_details(
-            config: dict, preset_name: str) -> Tuple[str, str]:
+    def get_telegram_bot_details(config: dict, preset_name: str) -> Tuple[str, str]:
         """Retrieve the Telegram bot token and chat ID from the preset."""
         preset = get_telegram_preset(config, preset_name)
         if not preset:

{rgwfuncs-0.0.96.dist-info → rgwfuncs-0.0.98.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rgwfuncs
-Version: 0.0.96
+Version: 0.0.98
 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.98.dist-info/RECORD

@@ -0,0 +1,12 @@
+rgwfuncs/__init__.py,sha256=LSn54Tlyskcb6Wab_wUpPLB6UGMe5LdrB3GU88mDEbU,1712
+rgwfuncs/algebra_lib.py,sha256=rKFITfpWfgdBswnbMUuS41XgndEt-jUVz2ObO_ik7eM,42234
+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=Nho_MrRquDkgQL96huj8sw3OF2S6LCOwGsS_gd9h7lo,4029
+rgwfuncs-0.0.98.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.98.dist-info/METADATA,sha256=XMYT6VoBy7sxoBlz4ReNZA1iENAnKQSSdHuAx3E5Gqk,62223
+rgwfuncs-0.0.98.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rgwfuncs-0.0.98.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.98.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.98.dist-info/RECORD,,

{rgwfuncs-0.0.96.dist-info → rgwfuncs-0.0.98.dist-info}/WHEEL

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

rgwfuncs-0.0.96.dist-info/RECORD

@@ -1,12 +0,0 @@
-rgwfuncs/__init__.py,sha256=LSn54Tlyskcb6Wab_wUpPLB6UGMe5LdrB3GU88mDEbU,1712
-rgwfuncs/algebra_lib.py,sha256=rKFITfpWfgdBswnbMUuS41XgndEt-jUVz2ObO_ik7eM,42234
-rgwfuncs/df_lib.py,sha256=QgEydReadUBbBkyWGaDfB_OjtALGdjKmzp_S9YZlUks,76266
-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.96.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.96.dist-info/METADATA,sha256=s2T3236W7cPHPnCM8dsFHk238-BIfncEBpzjVDToBwc,62223
-rgwfuncs-0.0.96.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-rgwfuncs-0.0.96.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.96.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.96.dist-info/RECORD,,