rgwfuncs 0.0.97__py3-none-any.whl → 0.0.98__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- rgwfuncs/str_lib.py +19 -7
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/METADATA +1 -1
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/RECORD +7 -7
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/WHEEL +0 -0
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/entry_points.txt +0 -0
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/licenses/LICENSE +0 -0
- {rgwfuncs-0.0.97.dist-info → rgwfuncs-0.0.98.dist-info}/top_level.txt +0 -0
rgwfuncs/str_lib.py
CHANGED
@@ -16,25 +16,38 @@ def send_telegram_message(preset_name: str, message: str, config: Optional[Union
|
|
16
16
|
preset_name (str): The name of the preset to use for sending the message.
|
17
17
|
message (str): The message to send.
|
18
18
|
config (Optional[Union[str, dict]], optional): Configuration source. Can be:
|
19
|
-
- None:
|
19
|
+
- None: Searches for '.rgwfuncsrc' in current directory and upwards
|
20
20
|
- str: Path to a JSON configuration file
|
21
21
|
- dict: Direct configuration dictionary
|
22
22
|
|
23
23
|
Raises:
|
24
|
+
FileNotFoundError: If no '.rgwfuncsrc' file is found after traversing all parent directories.
|
24
25
|
RuntimeError: If the preset is not found or necessary details are missing.
|
26
|
+
ValueError: If the config parameter is neither a path string nor a dictionary.
|
25
27
|
"""
|
26
|
-
|
27
28
|
def get_config(config: Optional[Union[str, dict]] = None) -> dict:
|
28
|
-
"""Get
|
29
|
+
"""Get configuration either from a path, direct dictionary, or by searching upwards."""
|
29
30
|
def get_config_from_file(config_path: str) -> dict:
|
30
31
|
"""Load configuration from a JSON file."""
|
31
32
|
with open(config_path, 'r') as file:
|
32
33
|
return json.load(file)
|
33
34
|
|
35
|
+
def find_config_file() -> str:
|
36
|
+
"""Search for '.rgwfuncsrc' in current directory and upwards."""
|
37
|
+
current_dir = os.getcwd()
|
38
|
+
while True:
|
39
|
+
config_path = os.path.join(current_dir, '.rgwfuncsrc')
|
40
|
+
if os.path.isfile(config_path):
|
41
|
+
return config_path
|
42
|
+
parent_dir = os.path.dirname(current_dir)
|
43
|
+
if parent_dir == current_dir: # Reached root directory
|
44
|
+
raise FileNotFoundError("No '.rgwfuncsrc' file found in current or parent directories")
|
45
|
+
current_dir = parent_dir
|
46
|
+
|
34
47
|
# Determine the config to use
|
35
48
|
if config is None:
|
36
|
-
#
|
37
|
-
config_path =
|
49
|
+
# Search for .rgwfuncsrc upwards from current directory
|
50
|
+
config_path = find_config_file()
|
38
51
|
return get_config_from_file(config_path)
|
39
52
|
elif isinstance(config, str):
|
40
53
|
# 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
|
|
53
66
|
return preset
|
54
67
|
return None
|
55
68
|
|
56
|
-
def get_telegram_bot_details(
|
57
|
-
config: dict, preset_name: str) -> Tuple[str, str]:
|
69
|
+
def get_telegram_bot_details(config: dict, preset_name: str) -> Tuple[str, str]:
|
58
70
|
"""Retrieve the Telegram bot token and chat ID from the preset."""
|
59
71
|
preset = get_telegram_preset(config, preset_name)
|
60
72
|
if not preset:
|
@@ -3,10 +3,10 @@ rgwfuncs/algebra_lib.py,sha256=rKFITfpWfgdBswnbMUuS41XgndEt-jUVz2ObO_ik7eM,42234
|
|
3
3
|
rgwfuncs/df_lib.py,sha256=3foomRHlunCpf_accTcqfdgwDmSPIVkVCnlWJ4ag4XQ,76947
|
4
4
|
rgwfuncs/docs_lib.py,sha256=i63NzX-V8cGhikYdtkRGAEe2VcuwpXxDUyTRa9xI7l8,1972
|
5
5
|
rgwfuncs/interactive_shell_lib.py,sha256=YN0ZnM5twIsOeDKuOQ9ZGURCvvBX0RZjM4a1vO1C3E8,4281
|
6
|
-
rgwfuncs/str_lib.py,sha256=
|
7
|
-
rgwfuncs-0.0.
|
8
|
-
rgwfuncs-0.0.
|
9
|
-
rgwfuncs-0.0.
|
10
|
-
rgwfuncs-0.0.
|
11
|
-
rgwfuncs-0.0.
|
12
|
-
rgwfuncs-0.0.
|
6
|
+
rgwfuncs/str_lib.py,sha256=Nho_MrRquDkgQL96huj8sw3OF2S6LCOwGsS_gd9h7lo,4029
|
7
|
+
rgwfuncs-0.0.98.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
|
8
|
+
rgwfuncs-0.0.98.dist-info/METADATA,sha256=XMYT6VoBy7sxoBlz4ReNZA1iENAnKQSSdHuAx3E5Gqk,62223
|
9
|
+
rgwfuncs-0.0.98.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
|
10
|
+
rgwfuncs-0.0.98.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
|
11
|
+
rgwfuncs-0.0.98.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
|
12
|
+
rgwfuncs-0.0.98.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|