Merge pull request #115 from Cloud-Code-AI/114-update-how-the-config-data-is-passed

fix: updated how config data is managed

Author: sauravpanda

github_app/github_helper/constants.py

@@ -7,7 +7,7 @@
     process_pr_desc,
 )
 from github_app.github_helper.utils import is_github_signature_valid
-from kaizen.utils.config import CONFIG_DATA
+from kaizen.utils.config import ConfigData
 import logging
 
 # from cloudcode.generator.ui import UITester
@@ -26,6 +26,7 @@ async def handle_webhook(request: Request, background_tasks: BackgroundTasks):
     body = await request.body()
     event = request.headers.get("X-GitHub-Event")
     # Check if the Signature is valid
+    CONFIG_DATA = ConfigData()
     if CONFIG_DATA["github_app"]["check_signature"] and not is_github_signature_valid(
         request.headers, body
     ):

github_app/main.py

@@ -1,6 +1,6 @@
 import litellm
 from kaizen.llms.prompts import BASIC_SYSTEM_PROMPT
-from kaizen.utils.config import CONFIG_DATA
+from kaizen.utils.config import ConfigData
 
 
 class LLMProvider:
@@ -19,6 +19,8 @@ def __init__(
         self.model = model
         self.max_tokens = max_tokens
         self.temperature = temperature
+        CONFIG_DATA = ConfigData()
+        self.config = CONFIG_DATA
         if CONFIG_DATA.get("language_model", {}).get(
             "enable_observability_logging", False
         ):

kaizen/llms/provider.py

@@ -3,47 +3,59 @@
 from pathlib import Path
 
 
-def get_config():
-    # Get the directory of the calling function
-    caller_dir = Path(os.path.dirname(os.path.abspath(__file__)))
-    config_file = f"{caller_dir}/config.json"
-    if Path(config_file).is_file():
-        with open(config_file, "r") as f:
-            config_data = json.loads(f.read())
-    else:
-        config_data = {
-            "language_model": {
-                "provider": "litellm",
-                "enable_observability_logging": False,
-            },
-            "github_app": {
-                "check_signature": False,
-                "auto_pr_review": False,
-                "edit_pr_desc": False,
-            },
-        }
-    return config_data
-
-
-def validate_config_settings(config):
-    "Make sure relvant enviorment variables are set"
-    if config.get("github_app", {}).get("check_signature", False):
-        if not os.environ.get("GITHUB_APP_WEBHOOK_SECRET"):
-            raise EnvironmentError(
-                "The environment variable 'GITHUB_APP_WEBHOOK_SECRET' is not set."
-            )
-
-    if config.get("language_model", {}).get("provider", {}) == "litellm":
-        if config.get("language_model", {}).get("enable_observability_logging", False):
-            if not os.environ.get("SUPABASE_URL"):
-                raise EnvironmentError(
-                    "The environment variable 'SUPABASE_URL' is not set."
-                )
-            if not os.environ.get("SUPABASE_KEY"):
+class ConfigData:
+    def __init__(self, config_data=None):
+        config_file = "config.json"
+        if Path(config_file).is_file():
+            with open(config_file, "r") as f:
+                self.config_data = json.loads(f.read())
+        else:
+            print(f"Couldnt find config at {config_file} loading default vals")
+            self.config_data = {
+                "language_model": {
+                    "provider": "litellm",
+                    "enable_observability_logging": False,
+                },
+                "github_app": {
+                    "check_signature": False,
+                    "auto_pr_review": False,
+                    "edit_pr_desc": False,
+                },
+            }
+
+        if config_data:
+            self.update_config_data(config_data)
+
+    def update_config_data(self, new_config_data):
+        self.config_data.update(new_config_data)
+        self.validate_config_settings(self.config_data)
+
+    def get_config_data(self):
+        return self.config_data
+
+    def get_language_model_config(self):
+        return self.config_data["language_model"]
+
+    def get_github_app_config(self):
+        return self.config_data["github_app"]
+
+    def validate_config_settings(self):
+        "Make sure relvant enviorment variables are set"
+        if self.config_data.get("github_app", {}).get("check_signature", False):
+            if not os.environ.get("GITHUB_APP_WEBHOOK_SECRET"):
                 raise EnvironmentError(
-                    "The environment variable 'SUPABASE_KEY' is not set."
+                    "The environment variable 'GITHUB_APP_WEBHOOK_SECRET' is not set."
                 )
-    return config
-
 
-CONFIG_DATA = validate_config_settings(get_config())
+        if self.config_data.get("language_model", {}).get("provider", {}) == "litellm":
+            if self.config_data.get("language_model", {}).get(
+                "enable_observability_logging", False
+            ):
+                if not os.environ.get("SUPABASE_URL"):
+                    raise EnvironmentError(
+                        "The environment variable 'SUPABASE_URL' is not set."
+                    )
+                if not os.environ.get("SUPABASE_KEY"):
+                    raise EnvironmentError(
+                        "The environment variable 'SUPABASE_KEY' is not set."
+                    )