sunholo 0.59.7__py3-none-any.whl → 0.60.0__py3-none-any.whl

sunholo/cli/cli.py

@@ -3,6 +3,8 @@ import argparse
 from .configs import setup_list_configs_subparser
 from .deploy import setup_deploy_subparser
 from .cli_init import setup_init_subparser
+from .merge_texts import setup_merge_text_subparser
+
 
 def main(args=None):
     """
@@ -21,12 +23,14 @@ def main(args=None):
                                        dest='command', 
                                        required=True)
 
-    # Setup deploy command
+    # deploy command
     setup_deploy_subparser(subparsers)
     # Setup list-configs command
     setup_list_configs_subparser(subparsers)
-    # init
+    # init command
     setup_init_subparser(subparsers)
+    # merge-text command
+    setup_merge_text_subparser(subparsers)
 
     args = parser.parse_args(args)
 

sunholo/cli/configs.py

@@ -113,7 +113,7 @@ def setup_list_configs_subparser(subparsers):
         subparsers = parser.add_subparsers()
         setup_list_configs_subparser(subparsers)
     """
-    list_configs_parser = subparsers.add_parser('list-configs', help='Lists all configuration files and their details e.g. `sunholo list-configs --kind=vacConfig --vac=edmonbrain`')
+    list_configs_parser = subparsers.add_parser('list-configs', help='Lists all configuration files and their details')
     list_configs_parser.add_argument('--kind', help='Filter configurations by kind e.g. `--kind=vacConfig`')
     list_configs_parser.add_argument('--vac', help='Filter configurations by VAC name e.g. `--vac=edmonbrain`')
     list_configs_parser.add_argument('--validate', action='store_true', help='Validate the configuration files.')

sunholo/cli/merge_texts.py

@@ -0,0 +1,41 @@
+import os
+from pprint import pprint
+
+from ..utils.big_context import load_gitignore_patterns, merge_text_files
+
+def setup_merge_text_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'merge-text' command.
+
+    Args:
+        subparsers: The subparsers object from argparse.ArgumentParser().
+    """
+    merge_text_parser = subparsers.add_parser('merge-text', help='Merge text files from a source folder into a single output file.')
+    merge_text_parser.add_argument('source_folder', help='Folder containing the text files.')
+    merge_text_parser.add_argument('output_file', help='Output file to write the merged text.')
+    merge_text_parser.add_argument('--gitignore', help='Path to .gitignore file to exclude patterns.', default=None)
+    merge_text_parser.add_argument('--output_tree', action='store_true', help='Set to output the file tree in the console after merging', default=None)
+        
+    merge_text_parser.set_defaults(func=merge_text_files_command)
+
+def merge_text_files_command(args):
+    """
+    Command to merge text files based on the provided arguments.
+    
+    Args:
+        args: Command-line arguments.
+    """
+    gitignore_path = os.path.join(args.source_folder, '.gitignore') if not args.gitignore else args.gitignore
+
+    if os.path.exists(gitignore_path):
+        patterns = load_gitignore_patterns(gitignore_path)
+        print(f"Ignoring patterns from {gitignore_path}")
+    else:
+        patterns = []  # Empty list if no .gitignore
+
+    print(f"Merging text files within {args.source_folder} to {args.output_file}")
+    file_tree = merge_text_files(args.source_folder, args.output_file, patterns)
+    print(f"OK: Merged files available in {args.output_file}")
+    if args.output_tree:
+        print(f"==File Tree for {args.source_folder}")
+        pprint(file_tree)

sunholo/utils/big_context.py

@@ -1,4 +1,5 @@
 import os
+from fnmatch import fnmatch
 
 def has_text_extension(file_path):
     """
@@ -42,6 +43,7 @@ def load_gitignore_patterns(gitignore_path):
     """
     with open(gitignore_path, 'r') as f:
         patterns = [line.strip() for line in f if line.strip() and not line.startswith('#')]
+    patterns.extend(["*.git/*", "*.terraform/*"])
     return patterns
 
 def should_ignore(file_path, patterns):
@@ -59,13 +61,15 @@ def should_ignore(file_path, patterns):
         >>> should_ignore("path/to/file.txt", ["*.txt", "node_modules/"])
         True
     """
-    from fnmatch import fnmatch
     rel_path = os.path.relpath(file_path)
+
     for pattern in patterns:
         if fnmatch(rel_path, pattern) or fnmatch(os.path.basename(rel_path), pattern):
             return True
+
     return False
 
+
 def build_file_tree(source_folder, patterns):
     """
     Build a hierarchical file tree structure of a directory, ignoring files and directories in .gitignore.
@@ -112,6 +116,7 @@ def merge_text_files(source_folder, output_file, patterns):
     file_tree = build_file_tree(source_folder, patterns)
     with open(output_file, 'w', encoding='utf-8') as outfile:
         for root, dirs, files in os.walk(source_folder):
+            print(f"- merging {root}...")
             # Filter out ignored directories
             dirs[:] = [d for d in dirs if not should_ignore(os.path.join(root, d), patterns)]
             # Filter out ignored files
@@ -119,6 +124,8 @@ def merge_text_files(source_folder, output_file, patterns):
             
             for file_name in files:
                 file_path = os.path.join(root, file_name)
+                if file_path == output_file:
+                    continue
                 if has_text_extension(file_path):
                     try:
                         with open(file_path, 'r', encoding='utf-8') as infile:
@@ -129,6 +136,8 @@ def merge_text_files(source_folder, output_file, patterns):
                         print(f"Skipping file (cannot read as text): {file_path}")
         outfile.write("\n--- File Tree ---\n")
         outfile.write("\n".join(file_tree))
+    
+    return file_tree
 
 # Example usage
 if __name__ == "__main__":

{sunholo-0.59.7.dist-info → sunholo-0.60.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.59.7
+Version: 0.60.0
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.59.7.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.60.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.59.7.dist-info → sunholo-0.60.0.dist-info}/RECORD

@@ -32,10 +32,11 @@ sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
 sunholo/chunker/publish.py,sha256=PoT8q3XJeFCg10WrLkYhuaaXIrGVkvUD3-R9IfoWoH4,2703
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/cli.py,sha256=rcO1hMthy5nWC_5sOHqRm7ut70c9JfxFTSjFRBNYuYg,1248
+sunholo/cli/cli.py,sha256=1fWvRzfise-DD7AXMx_-9IaabVR4T9FPzn95qQ4Bk20,1371
 sunholo/cli/cli_init.py,sha256=WReZuMQwDfkRUvssYT7TirUoG6SiT1dTDol8nLI8O70,3418
-sunholo/cli/configs.py,sha256=jHCNz_rANlQI2ZCWnlgJu5QwQc-a_Koi9Hm3XHjHEpE,4608
+sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
+sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
 sunholo/components/__init__.py,sha256=RJGNEihwvRIiDScKis04RHJv4yZGI1UpXlOmuCptNZI,208
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,6353
@@ -84,16 +85,16 @@ sunholo/streaming/streaming.py,sha256=9z6pXINEopuL_Z1RnmgXAoZJum9dzyuOxqYtEYnjf8
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
-sunholo/utils/big_context.py,sha256=qHYtds4Ecf9eZRHVqXho4_q8Je7HD44-vS6RJ6s9Z0Q,5387
+sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
 sunholo/utils/config.py,sha256=WIcJstLkQsM8iMCl_GBpgYdrSWIcnnCJ_uOFHIQX1g8,8500
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 sunholo/vertex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/vertex/init_vertex.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
-sunholo-0.59.7.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.59.7.dist-info/METADATA,sha256=VIsL_Vee2i1tD_9DnxhhpT20IP-l8iAnyXv_A7y8o44,7903
-sunholo-0.59.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.59.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.59.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.59.7.dist-info/RECORD,,
+sunholo-0.60.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.60.0.dist-info/METADATA,sha256=jPNGU1h7W5pvMUmp_noLhzmkT01vru1nmSM10MA1SMU,7903
+sunholo-0.60.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.60.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.60.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.60.0.dist-info/RECORD,,