sunholo 0.88.2__py3-none-any.whl → 0.88.4__py3-none-any.whl

sunholo/cli/cli_init.py

@@ -1,6 +1,8 @@
 import os
+import yaml
 import shutil
 from ..utils.config import get_module_filepath
+from ..utils.parsers import sanitize_cloudrun_name
 
 def init_project(args):
     """
@@ -26,15 +28,18 @@ sunholo init my_genai_project
 
 This will create a new directory named `my_genai_project` with the template files, allowing users to start building their GenAI application.
     """
-    project_name = args.project_name
+    from .sun_rich import console
+
+    project_name = sanitize_cloudrun_name(args.project_name)
     current_dir = os.getcwd()  # This captures the current directory where the command is run
     project_dir = os.path.join(current_dir, project_name)
 
-    print(f"Initializing project: {project_name} in directory: {project_dir}")
+    console.rule(project_name)
+    console.print(f"Initializing in directory: {project_dir}")
 
     # Create project directory
     if os.path.exists(project_dir):
-        print(f"Directory {project_dir} already exists. Please choose a different project name.")
+        console.print(f"[bold red]ERROR: Directory {project_dir} already exists. Please choose a different project name.[/bold red]")
         return
 
     os.makedirs(project_dir)
@@ -48,6 +53,8 @@ This will create a new directory named `my_genai_project` with the template file
             shutil.copy(src_path, dest_path)
         elif os.path.isdir(src_path):
             shutil.copytree(src_path, dest_path)
+    
+
 
     # Determine the location of the generated.tfvars file
     terraform_dir = args.terraform_dir or os.getenv('MULTIVAC_TERRAFORM_DIR')
@@ -59,19 +66,15 @@ This will create a new directory named `my_genai_project` with the template file
     # Get the service account, either from the CLI argument or default
     service_account = args.service_account or "sa-llmops"  # Default service account
 
-    # Determine the relative path for the cloud build included directories
-    def get_relative_application_path(full_path: str, base_dir: str) -> str:
-        application_base_index = full_path.find("application/")
-        if application_base_index != -1:
-            return full_path[application_base_index:]
-        return os.path.relpath(full_path, base_dir)
-
     # Paths to be included in the cloud build (based on the current working directory)
     # We want paths to start from 'application/system_services/{project_name}'
     relative_base = os.path.relpath(current_dir, os.path.join(current_dir, "..", ".."))
     included_path = os.path.join(relative_base, project_name, "**")
     cloud_build_path = os.path.join(relative_base, project_name, "cloudbuild.yaml")
 
+    update_cloudbuild_template(project_dir, project_name, os.path.join(relative_base, project_name))
+    write_vac_config(project_dir, project_name)
+
     # Define the cloud_run configuration for 'discord-server' with the correct project_dir path
     cloud_run_config = {
         project_name: {
@@ -97,13 +100,109 @@ This will create a new directory named `my_genai_project` with the template file
     try:
         from ..terraform import TerraformVarsEditor
         editor = TerraformVarsEditor(tfvars_file, terraform_dir)
-        editor.update_from_dict(cloud_run_config, 'cloud_run')
-        print(f"{tfvars_file} file initialized and updated successfully.")
+        editor.update_from_dict(cloud_run_config, 'cloud_run_autogenerated')
     except ImportError as e:
-        print(f"Error initializing TerraformVarsEditor: {e}")
+        console.print(f"Error initializing TerraformVarsEditor: {e}")
+
+    from rich.panel import Panel
+
+    console.print(
+        Panel((
+            "Next steps: \n"
+            f" - Navigate to [orange]{project_dir}/config[/orange] and customize VAC configuration files.\n"
+            f" - Add your own GenAI app logic to [orange]{project_dir}/vac_service.py[/orange]\n"
+            f" - Check terraform [orange]{terraform_dir}/generated.tfvars[/orange] for Multivac deployment"
+            ), 
+            title=f"Project [bold orange]{project_name}[/bold orange] initialized successfully.",
+            subtitle=project_dir),
+            )
+    console.rule()
+
+def update_cloudbuild_template(project_dir: str, service_name: str, build_folder: str):
+    """
+    Updates the cloudbuild.yaml template file by replacing the `CHANGE_ME` placeholders with actual values.
+
+    Args:
+    -----
+    project_dir : str
+        The directory where the project and cloudbuild.yaml are located.
+    service_name : str
+        The name of the service to be used in Cloud Run.
+    build_folder : str
+        The build folder where the Docker build will take place.
+
+    Example:
+    -------
+    update_cloudbuild_template('/path/to/project', 'my_service', 'src')
+    """
+    cloudbuild_path = os.path.join(project_dir, "cloudbuild.yaml")
+
+    # Define the substitutions to replace CHANGE_ME
+    substitutions = {
+        "_SERVICE_NAME": service_name,
+        "_BUILD_FOLDER": build_folder,
+    }
+
+    # Read the cloudbuild.yaml template
+    with open(cloudbuild_path, 'r') as file:
+        content = file.read()
+
+    # Replace each placeholder with its corresponding value
+    for placeholder, value in substitutions.items():
+        content = content.replace(f"{placeholder}: CHANGE_ME", f"{placeholder}: {value}")
+
+
+    # Write the updated content back to cloudbuild.yaml
+    with open(cloudbuild_path, 'w') as file:
+        file.write(content)
+
+    print(f"cloudbuild.yaml updated successfully with service name '{service_name}' and build folder '{build_folder}'.")
+
+def write_vac_config(project_dir: str, service_name: str):
+    """
+    Writes the vac_config.yaml file with the provided service name as the key.
+    """
+    vac_config_content = {
+        'kind': 'vacConfig',
+        'apiVersion': 'v1',
+        'vac': {
+            service_name: {  # Use the service name here
+                'llm': 'vertex',
+                'model': 'gemini-1.5-pro-preview-0514',
+                'agent': 'vertex-genai',
+                'display_name': 'Template VAC',
+                'memory': [
+                    {
+                        'llamaindex-native': {
+                            'vectorstore': 'llamaindex'
+                        }
+                    }
+                ],
+                'gcp_config': {
+                    'project_id': 'llamaindex_project',
+                    'location': 'europe-west1',
+                    'rag_id': '1234544343434'  # Replace with actual RAG ID
+                },
+                'chunker': {
+                    'chunk_size': 1000,
+                    'overlap': 200
+                }
+            }
+        }
+    }
+
+    config_dir = os.path.join(project_dir, 'config')
+    if not os.path.exists(config_dir):
+        os.makedirs(config_dir)
+
+    vac_config_path = os.path.join(config_dir, 'vac_config.yaml')
+
+    # Write the YAML configuration to the file
+    with open(vac_config_path, 'w') as file:
+        yaml.dump(vac_config_content, file, default_flow_style=False)
+
+    print(f"vac_config.yaml written successfully with service name '{service_name}'.")
 
-    print(f"Project {project_name} initialized successfully.")
-    print(f"Navigate to {project_dir} and customize the configuration files in the 'config' directory.")
 
 def setup_init_subparser(subparsers):
     """

sunholo/utils/parsers.py

@@ -15,6 +15,40 @@ import re
 import hashlib
 import urllib.parse
 
+def sanitize_cloudrun_name(name: str) -> str:
+    """
+    Sanitizes the project name to be a valid Cloud Run service name.
+    
+    - Converts to lowercase.
+    - Replaces invalid characters with hyphens.
+    - Ensures the name starts with a letter.
+    - Trims the name to be less than 64 characters.
+    - Removes trailing hyphens.
+    
+    Args:
+        name (str): The original project name.
+    
+    Returns:
+        str: The sanitized project name.
+    """
+    # Convert to lowercase
+    name = name.lower()
+    
+    # Replace invalid characters with hyphens
+    name = re.sub(r'[^a-z0-9-]', '-', name)
+    
+    # Ensure the name starts with a letter
+    if not name[0].isalpha():
+        name = 'a' + name
+    
+    # Trim to 63 characters to leave room for suffixes if needed
+    name = name[:63]
+    
+    # Remove trailing hyphens
+    name = name.rstrip('-')
+    
+    return name
+
 def validate_extension_id(ext_id):
     """
     Ensures the passed string fits the criteria for an extension ID.

{sunholo-0.88.2.dist-info → sunholo-0.88.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.88.2
+Version: 0.88.4
 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.88.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.88.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.88.2.dist-info → sunholo-0.88.4.dist-info}/RECORD

@@ -44,7 +44,7 @@ sunholo/chunker/splitter.py,sha256=QLAEsJOpEYFZr9-UGZUuAlNVyjfCWb8jvzCHg0rVShE,6
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/cli/chat_vac.py,sha256=jTmCt62U4uqJjeGp_XfIbxnafAAOhQAJMi8TxSkeKlM,23164
 sunholo/cli/cli.py,sha256=q-ATmnWnc_PPo2q31xhqpp-m3GtOSBoqh0gvMeSo4XU,4374
-sunholo/cli/cli_init.py,sha256=jifczqRd4ATrfUPl-LYCpuhURZiEwqAy1MaAgpSdxQ4,5025
+sunholo/cli/cli_init.py,sha256=31DdDecaYoREkoa5itjAElSJu_gmod5V4Z3h4ohKqU8,8296
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
 sunholo/cli/embedder.py,sha256=v-FKiSPHaQzB6ctClclYueIf3bf3CqYtC1oRgPfT4dY,5566
@@ -131,7 +131,7 @@ sunholo/utils/config_class.py,sha256=4uY7i7y18bDLvGNY1PiQ8c4LM-whopsjEWZerHEckwQ
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=Fa0IhCX12bZ1ctF_PKN8PNYd7hihEUfb90kilBfUDjg,1411
-sunholo/utils/parsers.py,sha256=Xv6R5-8V3_gkfsNtV-PoXwj6QxOny_ngDiXWxgycnuU,5532
+sunholo/utils/parsers.py,sha256=LxzkCTBQ4uYhf0FfqiO4yWeP_yqVaMz_fw7sMu7mq5E,6421
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
@@ -143,9 +143,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.88.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.88.2.dist-info/METADATA,sha256=HUlu0wOukUKSs4pQW1k2F3xwu8x6nQD8WRO4dukQGKk,7706
-sunholo-0.88.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-sunholo-0.88.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.88.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.88.2.dist-info/RECORD,,
+sunholo-0.88.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.88.4.dist-info/METADATA,sha256=Uur6zt3dM6bwdo4jirZRZ1sTvlFzhurLhJpg2H-NdU8,7706
+sunholo-0.88.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+sunholo-0.88.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.88.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.88.4.dist-info/RECORD,,