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

rgwfuncs/str_lib.py

@@ -16,25 +16,49 @@ 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 in current or parent directories.
+        ValueError: If the config parameter is neither a path string nor a dictionary, or if the config file is empty/invalid.
         RuntimeError: If the preset is not found or necessary details are missing.
     """
-
     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)
+            print(f"Reading config from: {config_path}")  # Debug line
+            with open(config_path, 'r', encoding='utf-8') as file:
+                content = file.read()
+                print(f"Config content (first 100 chars): {content[:100]}...")  # Debug line
+                if not content.strip():
+                    raise ValueError(f"Config file {config_path} is empty")
+                try:
+                    return json.loads(content)
+                except json.JSONDecodeError as e:
+                    raise ValueError(f"Invalid JSON in config file {config_path}: {e}")
+
+        def find_config_file() -> str:
+            """Search for '.rgwfuncsrc' in current directory and upwards."""
+            current_dir = os.getcwd()
+            print(f"Starting config search from: {current_dir}")  # Debug line
+            while True:
+                config_path = os.path.join(current_dir, '.rgwfuncsrc')
+                print(f"Checking for config at: {config_path}")  # Debug line
+                if os.path.isfile(config_path):
+                    print(f"Found config at: {config_path}")  # Debug line
+                    return config_path
+                parent_dir = os.path.dirname(current_dir)
+                if parent_dir == current_dir:  # Reached root directory
+                    raise FileNotFoundError(f"No '.rgwfuncsrc' file found in {os.getcwd()} 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 +77,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.97.dist-info → rgwfuncs-0.0.99.dist-info}/METADATA

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

@@ -3,10 +3,10 @@ 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=hE0VfP6rhQpczsKyCZvH3G1aMRwngKnkW3NTYCEc0Po,3208
-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/str_lib.py,sha256=Nhpw3bpVASVPd7UlyIqtyBSmvqKk1FSuj7KRWSlowiw,4804
+rgwfuncs-0.0.99.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.99.dist-info/METADATA,sha256=bzcFyWtxOIYWEjVYrV-fz8kkvCTER-qtrLdrsf3APNI,62223
+rgwfuncs-0.0.99.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rgwfuncs-0.0.99.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.99.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.99.dist-info/RECORD,,