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

sunholo/cli/cli_init.py

@@ -27,7 +27,8 @@ 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
-    project_dir = os.path.join(os.getcwd(), 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}")
 
@@ -48,6 +49,59 @@ This will create a new directory named `my_genai_project` with the template file
         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')
+    if terraform_dir is None:
+        raise ValueError("Must specify a terraform_dir or use the MULTIVAC_TERRAFORM_DIR environment variable")
+    
+    tfvars_file = os.path.join(terraform_dir, 'generated.tfvars')
+
+    # 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")
+
+    # Define the cloud_run configuration for 'discord-server' with the correct project_dir path
+    cloud_run_config = {
+        project_name: {
+            "cpu": "1",
+            "memory": "2Gi",
+            "max_instance_count": 3,
+            "timeout_seconds": 1500,
+            "port": 8080,
+            "service_account": service_account,
+            "invokers": ["allUsers"],
+            "cloud_build": {
+                "included": [included_path],
+                "path": cloud_build_path,
+                "substitutions": {},
+                "repo_name": "",
+                "repo_owner": ""
+            }
+        }
+    }
+
+
+    # Initialize the TerraformVarsEditor and update the .tfvars 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.")
+    except ImportError as e:
+        print(f"Error initializing TerraformVarsEditor: {e}")
+
     print(f"Project {project_name} initialized successfully.")
     print(f"Navigate to {project_dir} and customize the configuration files in the 'config' directory.")
 
@@ -57,4 +111,6 @@ def setup_init_subparser(subparsers):
     """
     init_parser = subparsers.add_parser('init', help='Initializes a new Multivac project.')
     init_parser.add_argument('project_name', help='The name of the new project.')
+    init_parser.add_argument('--terraform-dir', help='The directory where Terraform files will be generated.')
+    init_parser.add_argument('--service-account', help='The service account to use for Cloud Run. Defaults to "sa-llmops"')
     init_parser.set_defaults(func=init_project)

sunholo/terraform/tfvars_editor.py

@@ -6,6 +6,7 @@ except ImportError:
 import json
 import subprocess
 import os
+import io
 from typing import Dict, Any
 from ..custom_logging import log
 
@@ -57,7 +58,7 @@ class TerraformVarsEditor:
         tfvars_file : str
             The path to the .tfvars file to be edited.
         terraform_dir : str
-            The directory where Terraform commands will be executed (default is current directory).
+            The directory where Terraform commands will be executed (default is current directory). Will use MULTIVAC_TERRAFORM_DIR env var if present.
 
         Example:
         -------
@@ -65,6 +66,12 @@ class TerraformVarsEditor:
         """
         if hcl2 is None:
             raise ImportError('hcl2 is required for parsing terraform files, install via `pip install sunholo[iac]`')
+
+        # Check for the MULTIVAC_TERRAFORM_DIR environment variable
+        if terraform_dir == '.' and 'MULTIVAC_TERRAFORM_DIR' in os.environ:
+            terraform_dir = os.environ['MULTIVAC_TERRAFORM_DIR']
+        
+        log.info(f'MULTIVAC_TERRAFORM_DIR environment variable is set to {terraform_dir}')
         
         self.tfvars_file = tfvars_file
         self.terraform_dir = terraform_dir
@@ -144,8 +151,10 @@ class TerraformVarsEditor:
             The dictionary containing the instance data.
 
         Example:
-        -------
-        editor.update_or_add_instance('cloud_run', 'new_service', {'cpu': '1', 'memory': '2Gi'})
+        
+        ```python
+        editor.update_or_add_instance('cloud_run', 'new_service', (your dict))
+        ```
         """
         if main_key not in self.tfvars_data:
             self.tfvars_data[main_key] = {}
@@ -154,7 +163,7 @@ class TerraformVarsEditor:
 
     def validate_terraform(self) -> bool:
         """
-        Runs `terraform validate` in the specified directory.
+        Runs `terraform init` followed by `terraform validate` in the specified directory.
 
         Returns:
         -------
@@ -163,18 +172,32 @@ class TerraformVarsEditor:
 
         Example:
         -------
+        ```python
         if self.validate_terraform():
             print("Validation passed.")
+        ```
         """
-        result = subprocess.run(['terraform', 'validate'], cwd=self.terraform_dir, capture_output=True, text=True)
+        # Step 1: Run `terraform init` to ensure the directory is initialized
+        init_process = subprocess.run(['terraform', 'init'], cwd=self.terraform_dir, capture_output=True, text=True)
         
-        if result.returncode == 0:
+        if init_process.returncode != 0:
+            log.error("Terraform initialization failed.")
+            print(init_process.stdout)
+            print(init_process.stderr)
+            return False
+        
+        log.info("Terraform initialized successfully.")
+
+        # Step 2: Run `terraform validate`
+        validate_process = subprocess.run(['terraform', 'validate'], cwd=self.terraform_dir, capture_output=True, text=True)
+        
+        if validate_process.returncode == 0:
             log.info("Terraform validation passed.")
             return True
         else:
             log.error("Terraform validation failed.")
-            print(result.stdout)
-            print(result.stderr)
+            print(validate_process.stdout)
+            print(validate_process.stderr)
             return False
 
     def update_from_json(self, json_file: str, main_key: str) -> None:
@@ -214,6 +237,48 @@ class TerraformVarsEditor:
             log.info(f"Terraform validation passed, changes saved to {self.tfvars_file}.")
             os.remove(backup_file)  # Remove the backup if validation passes
 
+    def update_from_dict(self, data: Dict[str, Any], main_key: str) -> None:
+        """
+        Updates the .tfvars file based on the content of a Python dictionary and validates the changes.
+
+        Parameters:
+        ----------
+        data : dict
+            The dictionary with the new instance data.
+        main_key : str
+            The top-level key under which the instance is added (e.g., "cloud_run").
+
+        Example:
+        -------
+        editor.update_from_dict(data, 'cloud_run')
+        """
+        # Create an in-memory file-like object from the dictionary by converting it to JSON
+        json_data = json.dumps({main_key: data})
+        json_file = io.StringIO(json_data)
+
+        # Load the JSON data from the StringIO object
+        parsed_data = json.load(json_file)
+
+        # Update the tfvars data in memory
+        for instance_name, instance_data in parsed_data.get(main_key, {}).items():
+            self.update_or_add_instance(main_key, instance_name, instance_data)
+
+        # Now that the data is updated in memory, proceed to validate and write it back to the file
+        # Backup the original .tfvars file
+        backup_file = self._backup_tfvars()
+
+        # Temporarily save the updated data to the original file location
+        self._save_tfvars()
+
+        # Attempt to validate the changes with Terraform
+        if not self.validate_terraform():
+            # If validation fails, restore the original file from the backup
+            self._restore_tfvars(backup_file)
+            console.print(f"Changes aborted, original {self.tfvars_file} restored.")
+        else:
+            console.print(f"Terraform validation passed, changes saved to {self.tfvars_file}.")
+            os.remove(backup_file)  # Remove the backup if validation passes
+
 def tfvars_command(args):
     """
     Executes the tfvars command based on parsed arguments.
@@ -225,11 +290,15 @@ def tfvars_command(args):
     if console is None:
         raise ImportError("Need cli tools to use `sunholo tfvars` - install via `pip install sunholo[cli]`")
     
-    # Parse the JSON string to a dictionary
+    # Load JSON data from the specified file
     try:
-        instance_data: Dict[str, Any] = json.loads(args.json_data)
+        with open(args.json_file, 'r') as f:
+            instance_data = json.load(f)
+    except FileNotFoundError:
+        console.print(f"Error: The JSON file '{args.json_file}' was not found.")
+        return
     except json.JSONDecodeError as e:
-        console.print(f"[bold red]Error parsing JSON data: {e}[/bold red]")
+        console.print(f"Error parsing JSON data: {e}")
         return
 
     # Create an instance of TerraformVarsEditor
@@ -260,7 +329,7 @@ def setup_tfvarseditor_subparser(subparsers):
     add_parser.add_argument('tfvars_file', help='Path to the .tfvars file')
     add_parser.add_argument('main_key', help='The main key under which the instance is added (e.g., "cloud_run")')
     add_parser.add_argument('instance_name', help='The name of the instance to add or update')
-    add_parser.add_argument('json_data', help='JSON string representing the instance data')
+    add_parser.add_argument('--json-file', help='Path to a JSON file with the instance data', required=True)
     add_parser.add_argument('--terraform-dir', default='.', help='The directory where Terraform is initialized')
 
     tfvars_parser.set_defaults(func=tfvars_command)

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

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

{sunholo-0.88.0.dist-info → sunholo-0.88.2.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=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
+sunholo/cli/cli_init.py,sha256=jifczqRd4ATrfUPl-LYCpuhURZiEwqAy1MaAgpSdxQ4,5025
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
 sunholo/cli/embedder.py,sha256=v-FKiSPHaQzB6ctClclYueIf3bf3CqYtC1oRgPfT4dY,5566
@@ -120,7 +120,7 @@ sunholo/streaming/streaming.py,sha256=5dRXo1wHYE0E91gll-939RShYTYxQMeVwAVCqFR13h
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=95A-6PXFGanjona8DvZPnnIHLbzZ2ip5hO0wOAJQhfw,3791
 sunholo/terraform/__init__.py,sha256=yixxEltc3n9UpZaVi05GlgS-YRq_DVGjUc37I9ajeP4,76
-sunholo/terraform/tfvars_editor.py,sha256=cxQaAsLdu_tErDrULsQEsRBhxt3YJe2R3O9cs7HNfjg,9473
+sunholo/terraform/tfvars_editor.py,sha256=iBKyDajnZsDnLWuqGZv9SJKWMfK0J809-I6X0_EnUHU,12395
 sunholo/tools/__init__.py,sha256=5NuYpwwTX81qGUWvgwfItoSLXteNnp7KjgD7IPZUFjI,53
 sunholo/tools/web_browser.py,sha256=8Gdf02F4zCOeSnijnfaL6jzk4oaSI0cj48o-esoWzwE,29086
 sunholo/utils/__init__.py,sha256=Hv02T5L2zYWvCso5hzzwm8FQogwBq0OgtUbN_7Quzqc,89
@@ -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.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.88.0.dist-info/METADATA,sha256=t63wl44wdg-BW_ZuKE0gMoIfwwyVxqpUjNcxVp-p1PA,7706
-sunholo-0.88.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-sunholo-0.88.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.88.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.88.0.dist-info/RECORD,,
+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.0.dist-info → sunholo-0.88.2.dist-info}/WHEEL

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