Merge branch 'main' into log_dedup

Author: gaganso

aiopslab/orchestrator/actions/base.py

@@ -70,9 +70,9 @@ def get_logs(namespace: str, service: str) -> str:
             except Exception as e:
                 return "Error: Your service/namespace does not exist. Use kubectl to check."
 
-        logs = "\n".join(logs.split("\n"))
         logs = greedy_compress_lines(logs) 
         print(logs)
+
         return logs
 
     @staticmethod

aiopslab/service/helm.py

@@ -4,7 +4,6 @@
 """Interface for helm operations"""
 
 import subprocess
-import time
 
 from aiopslab.service.kubectl import KubeCtl
 
@@ -190,6 +189,36 @@ def add_repo(name: str, url: str):
         else:
             print(f"Helm repo {name} added successfully: {output.decode('utf-8')}")
 
+    @staticmethod
+    def status(release_name: str, namespace: str) -> str:
+        """Get the status of a Helm release.
+        
+        Args:
+            release_name (str): Name of the release.
+            namespace (str): Namespace of the release.
+        
+        Returns:
+            str: Status output from Helm.
+        
+        Raises:
+            ValueError: If either parameter is missing.
+            Exception: If the helm status command fails.
+        """
+
+        if not release_name or not namespace:
+            raise ValueError("Both release_name and namespace must be provided")
+
+        command = f"helm status {release_name} -n {namespace}"
+        process = subprocess.Popen(
+            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        output, error = process.communicate()
+
+        if process.returncode != 0:
+            # helm status failed
+            raise RuntimeError(f"Failed to get status for release {release_name}: {error.decode('utf-8')}")
+
+        return output.decode("utf-8").strip()
 
 # Example usage
 if __name__ == "__main__":

aiopslab/service/telemetry/prometheus.py

@@ -4,7 +4,7 @@
 import os
 import json
 import yaml
-import time
+import logging
 from subprocess import CalledProcessError
 from aiopslab.service.helm import Helm
 from aiopslab.service.kubectl import KubeCtl
@@ -121,18 +121,19 @@ def _pvc_exists(self, pvc_name: str) -> bool:
             if "No resources found" in result or "Error" in result:
                 return False
         except CalledProcessError as e:
+            logging.exception(f"Unexpected error while checking if the PersistentVolumeClaim exists: {e}")
             return False
         return True
 
     def _is_prometheus_running(self) -> bool:
-        """Check if Prometheus is already running in the cluster."""
-        command = (
-            f"kubectl get pods -n {self.namespace} -l app.kubernetes.io/name=prometheus"
-        )
+        """Check if Prometheus Helm release is deployed."""
         try:
-            result = KubeCtl().exec_command(command)
-            if "Running" in result:
-                return True
-        except CalledProcessError:
+            status_output = Helm.status(**self.helm_configs)
+            for line in status_output.splitlines():
+                if line.strip().startswith("STATUS:"):
+                    status_value = line.split(":", 1)[1].strip().lower()
+                    return status_value == "deployed"
+            return False
+        except Exception as e:
+            logging.exception(f"Unexpected error while checking Prometheus status: {e}")
             return False
-        return False

clients/gpt.py

@@ -15,7 +15,7 @@
 from clients.utils.llm import GPTClient
 from dotenv import load_dotenv
 
-from parse_result import DOCS_SHELL_ONLY
+from clients.utils.templates import DOCS_SHELL_ONLY
 
 # Load environment variables from the .env file
 load_dotenv()