Make holmesgpt work with WatsonX

holmes/core/llm.py

@@ -71,13 +71,45 @@ def check_llm(self, model:str, api_key:Optional[str]):
         if not lookup:
             raise Exception(f"Unknown provider for model {model}")
         provider = lookup[1]
-        api_key_env_var = f"{provider.upper()}_API_KEY"
-        if api_key:
-            os.environ[api_key_env_var] = api_key
-        model_requirements = litellm.validate_environment(model=model)
+        if provider == "watsonx":
+            # NOTE: LiteLLM's validate_environment does not currently include checks for IBM WatsonX.
+            # The following WatsonX-specific variables are set based on documentation from:
+            # https://docs.litellm.ai/docs/providers/watsonx
+            # Required variables for WatsonX:
+            # - WATSONX_URL: Base URL of your WatsonX instance (required)
+            # - WATSONX_APIKEY or WATSONX_TOKEN: IBM Cloud API key or IAM auth token (one is required)
+            model_requirements = {'missing_keys': [], 'keys_in_environment': True}
+            if api_key:
+                os.environ["WATSONX_APIKEY"] = api_key
+            if not "WATSONX_URL" in os.environ:
+                model_requirements['missing_keys'].append("WATSONX_URL")
+                model_requirements['keys_in_environment'] = False
+            if not "WATSONX_APIKEY" in os.environ and not "WATSONX_TOKEN" in os.environ:
+                model_requirements['missing_keys'].extend(["WATSONX_APIKEY", "WATSONX_TOKEN"])
+                model_requirements['keys_in_environment'] = False
+            # WATSONX_PROJECT_ID is required because we don't let user pass it to completion call directly
+            if not "WATSONX_PROJECT_ID" in os.environ:
+                model_requirements['missing_keys'].append("WATSONX_PROJECT_ID")
+                model_requirements['keys_in_environment'] = False
+            # https://docs.litellm.ai/docs/providers/watsonx#usage---models-in-deployment-spaces
+            # using custom watsonx deployments might require to set WATSONX_DEPLOYMENT_SPACE_ID env
+            if "watsonx/deployment/" in self.model:
+                logging.warning(
+                            "Custom WatsonX deployment detected. You may need to set the WATSONX_DEPLOYMENT_SPACE_ID "
+                            "environment variable for proper functionality. For more information, refer to the documentation: "
+                            "https://docs.litellm.ai/docs/providers/watsonx#usage---models-in-deployment-spaces"
+                )
+        else:
+            # 
+            api_key_env_var = f"{provider.upper()}_API_KEY"
+            if api_key:
+                os.environ[api_key_env_var] = api_key
+            model_requirements = litellm.validate_environment(model=model)
+
         if not model_requirements["keys_in_environment"]:
             raise Exception(f"model {model} requires the following environment variables: {model_requirements['missing_keys']}")
 
+
     def _strip_model_prefix(self) -> str:
         """
         Helper function to strip 'openai/' prefix from model name if it exists.

pyproject.toml

@@ -28,7 +28,7 @@ supabase = "^2.5"
 colorlog = "^6.8.2"
 strenum = "^0.4.15"
 markdown = "^3.6"
-litellm = "^1.50.2"
+litellm = "^1.52.6"
 certifi = "^2024.7.4"
 urllib3 = "^1.26.19"
 boto3 = "^1.34.145"