ibm-watsonx-orchestrate-evaluation-framework 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

wxo_agentic_evaluation/service_instance.py

@@ -2,6 +2,9 @@ import logging
 import os
 
 import requests
+import shutil
+from pathlib import Path
+from typing import Optional, Any, Dict, Iterable, Tuple
 import yaml
 
 from wxo_agentic_evaluation.utils.utils import is_ibm_cloud_url, is_saas_url
@@ -156,8 +159,51 @@ class ServiceInstance:
 
         return default_tenant["id"]
 
+def get_env_settings(
+    tenant_name: str,
+    env_config_path: Optional[str] = None
+) -> Dict[str, Any]:
+    if env_config_path is None:
+        env_config_path = f"{os.path.expanduser('~')}/.config/orchestrate/config.yaml"
 
-def tenant_setup(service_url: str, tenant_name: str):
+    try:
+        with open(env_config_path, "r", encoding="utf-8") as f:
+            cfg = yaml.safe_load(f) or {}
+    except FileNotFoundError:
+        return {}
+
+    tenant_env = (cfg.get("environments") or {}).get(tenant_name) or {}
+    cached_user_env = cfg.get("cached_user_env") or {}
+
+    merged = cached_user_env | tenant_env
+
+    return dict(merged)
+
+
+
+def apply_env_overrides(
+    base: Dict[str, Any],
+    tenant_name: str,
+    keys: Optional[Iterable[str]] = None,
+    env_config_path: Optional[str] = None
+) -> Dict[str, Any]:
+    """
+    Returns a new dict where base is overridden by tenant-defined values.
+    - If keys is None, tries to override any keys present in tenant env.
+    - Only overrides when the tenant value is present and not None.
+    """
+    env = get_env_settings(tenant_name, env_config_path=env_config_path)
+    merged = dict(base)
+    keys_to_consider = keys if keys is not None else env.keys()
+
+    for k in keys_to_consider:
+        if k in env and env[k] is not None:
+            merged[k] = env[k]
+    return merged
+
+
+
+def tenant_setup(service_url: Optional[str], tenant_name: str) -> Tuple[Optional[str], Optional[str], Dict[str, Any]]:
     # service_instance = ServiceInstance(
     #     service_url=service_url,
     #     tenant_name=tenant_name
@@ -175,18 +221,41 @@ def tenant_setup(service_url: str, tenant_name: str):
         f"{os.path.expanduser('~')}/.config/orchestrate/config.yaml"
     )
 
-    # TO-DO: update SDK and use SDK to manage this
-    with open(auth_config_path, "r") as f:
-        auth_config = yaml.safe_load(f)
-    # auth_config["auth"][tenant_name] = {"wxo_mcsp_token": tenant_token}
+    try:
+        with open(auth_config_path, "r", encoding="utf-8") as f:
+            auth_config = yaml.safe_load(f) or {}
+    except FileNotFoundError:
+        auth_config = {}
 
-    with open(env_config_path, "r") as f:
-        env_config = yaml.safe_load(f)
-    env_config["environments"][tenant_name] = {"wxo_url": service_url}
-    env_config["context"]["active_environment"] = tenant_name
+    try:
+        with open(env_config_path, "r", encoding="utf-8") as f:
+            env_config = yaml.safe_load(f) or {}
+    except FileNotFoundError:
+        env_config = {}
+
+    environments = env_config.setdefault("environments", {})
+    context = env_config.setdefault("context", {})
+
+    tenant_env = environments.setdefault(tenant_name, {})
+
+    if service_url and str(service_url).strip():
+        tenant_env["wxo_url"] = service_url
+
+    resolved_service_url = tenant_env.get("wxo_url")
+
+    context["active_environment"] = tenant_name
 
     with open(auth_config_path, "w") as f:
         yaml.dump(auth_config, f)
     with open(env_config_path, "w") as f:
         yaml.dump(env_config, f)
-    return auth_config["auth"][tenant_name]["wxo_mcsp_token"]
+
+    token = (
+        auth_config.get("auth", {})
+        .get(tenant_name, {})
+        .get("wxo_mcsp_token")
+    )
+
+    env_merged = get_env_settings(tenant_name, env_config_path=env_config_path)
+
+    return token, resolved_service_url, env_merged

wxo_agentic_evaluation/service_provider/__init__.py

@@ -55,7 +55,7 @@ def get_provider(
     if "WO_INSTANCE" in os.environ:
         config = ProviderConfig(provider="model_proxy", model_id=model_id)
         return _instantiate_provider(config, referenceless_eval, **kwargs)
-    
+
     if config:
         return _instantiate_provider(config, **kwargs)
 

wxo_agentic_evaluation/service_provider/model_proxy_provider.py

@@ -1,15 +1,23 @@
 import os
-import requests
 import time
-from typing import List, Tuple
 from threading import Lock
+from typing import List, Tuple
+
+import requests
 
 from wxo_agentic_evaluation.service_provider.provider import Provider
 from wxo_agentic_evaluation.utils.utils import is_ibm_cloud_url
 
-AUTH_ENDPOINT_AWS = "https://iam.platform.saas.ibm.com/siusermgr/api/1.0/apikeys/token"
+AUTH_ENDPOINT_AWS = (
+    "https://iam.platform.saas.ibm.com/siusermgr/api/1.0/apikeys/token"
+)
 AUTH_ENDPOINT_IBM_CLOUD = "https://iam.cloud.ibm.com/identity/token"
-DEFAULT_PARAM = {"min_new_tokens": 1, "decoding_method": "greedy", "max_new_tokens": 400}
+DEFAULT_PARAM = {
+    "min_new_tokens": 1,
+    "decoding_method": "greedy",
+    "max_new_tokens": 400,
+}
+
 
 def _infer_cpd_auth_url(instance_url: str) -> str:
     inst = (instance_url or "").rstrip("/")
@@ -36,49 +44,71 @@ class ModelProxyProvider(Provider):
         instance_url=None,
         timeout=300,
         embedding_model_id=None,
-        params=None
+        params=None,
     ):
         super().__init__()
 
         instance_url = os.environ.get("WO_INSTANCE", instance_url)
         if not instance_url:
-            raise RuntimeError("instance url must be specified to use WO model proxy")
+            raise RuntimeError(
+                "instance url must be specified to use WO model proxy"
+            )
 
         self.timeout = timeout
-        self.model_id = os.environ.get("MODEL_OVERRIDE",model_id)
+        self.model_id = os.environ.get("MODEL_OVERRIDE", model_id)
         self.embedding_model_id = embedding_model_id
 
         self.api_key = os.environ.get("WO_API_KEY", api_key)
         self.username = os.environ.get("WO_USERNAME", None)
         self.password = os.environ.get("WO_PASSWORD", None)
-        self.auth_type = os.environ.get("WO_AUTH_TYPE", "").lower()  # explicit override if set, otherwise inferred- match ADK values
+        self.auth_type = os.environ.get(
+            "WO_AUTH_TYPE", ""
+        ).lower()  # explicit override if set, otherwise inferred- match ADK values
         explicit_auth_url = os.environ.get("AUTHORIZATION_URL", None)
 
         self.is_ibm_cloud = is_ibm_cloud_url(instance_url)
         self.instance_url = instance_url.rstrip("/")
 
-        self.auth_mode, self.auth_url = self._resolve_auth_mode_and_url(explicit_auth_url=explicit_auth_url)
-        self._wo_ssl_verify = os.environ.get("WO_SSL_VERIFY", "true").lower() != "false"
+        self.auth_mode, self.auth_url = self._resolve_auth_mode_and_url(
+            explicit_auth_url=explicit_auth_url
+        )
+        self._wo_ssl_verify = (
+            os.environ.get("WO_SSL_VERIFY", "true").lower() != "false"
+        )
         env_space_id = os.environ.get("WATSONX_SPACE_ID", None)
         if self.auth_mode == "cpd":
             if not env_space_id or not env_space_id.strip():
-                raise RuntimeError("CPD mode requires WATSONX_SPACE_ID environment variable to be set")
+                raise RuntimeError(
+                    "CPD mode requires WATSONX_SPACE_ID environment variable to be set"
+                )
             self.space_id = env_space_id.strip()
         else:
-            self.space_id = (env_space_id.strip() if env_space_id and env_space_id.strip() else "1")
+            self.space_id = (
+                env_space_id.strip()
+                if env_space_id and env_space_id.strip()
+                else "1"
+            )
 
         if self.auth_mode == "cpd":
             if "/orchestrate" in self.instance_url:
-                self.instance_url = self.instance_url.split("/orchestrate", 1)[0].rstrip("/")
+                self.instance_url = self.instance_url.split("/orchestrate", 1)[
+                    0
+                ].rstrip("/")
             if not self.username:
                 raise RuntimeError("CPD auth requires WO_USERNAME to be set")
             if not (self.password or self.api_key):
-                raise RuntimeError("CPD auth requires either WO_PASSWORD or WO_API_KEY to be set (with WO_USERNAME)")
+                raise RuntimeError(
+                    "CPD auth requires either WO_PASSWORD or WO_API_KEY to be set (with WO_USERNAME)"
+                )
         else:
             if not self.api_key:
-                raise RuntimeError("WO_API_KEY must be specified for SaaS or IBM IAM auth")
+                raise RuntimeError(
+                    "WO_API_KEY must be specified for SaaS or IBM IAM auth"
+                )
 
-        self.url = self.instance_url + "/ml/v1/text/generation?version=2024-05-01"
+        self.url = (
+            self.instance_url + "/ml/v1/text/generation?version=2024-05-01"
+        )
         self.embedding_url = self.instance_url + "/ml/v1/text/embeddings"
 
         self.lock = Lock()
@@ -86,8 +116,7 @@ class ModelProxyProvider(Provider):
         self.params = params if params else DEFAULT_PARAM
 
     def _resolve_auth_mode_and_url(
-        self,
-        explicit_auth_url: str | None
+        self, explicit_auth_url: str | None
     ) -> Tuple[str, str]:
         """
         Returns (auth_mode, auth_url)
@@ -128,32 +157,61 @@ class ModelProxyProvider(Provider):
         exchange_url = self.auth_url
 
         if self.auth_mode == "ibm_iam":
-            headers = {"Accept": "application/json", "Content-Type": "application/x-www-form-urlencoded"}
+            headers = {
+                "Accept": "application/json",
+                "Content-Type": "application/x-www-form-urlencoded",
+            }
             form_data = {
                 "grant_type": "urn:ibm:params:oauth:grant-type:apikey",
-                "apikey": self.api_key
+                "apikey": self.api_key,
             }
             post_args = {"data": form_data}
-            resp = requests.post(exchange_url, headers=headers, timeout=timeout, verify=self._wo_ssl_verify, **post_args)
+            resp = requests.post(
+                exchange_url,
+                headers=headers,
+                timeout=timeout,
+                verify=self._wo_ssl_verify,
+                **post_args,
+            )
         elif self.auth_mode == "cpd":
-            headers = {"Accept": "application/json", "Content-Type": "application/json"}
+            headers = {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+            }
             body = {"username": self.username}
             if self.password:
                 body["password"] = self.password
             else:
                 body["api_key"] = self.api_key
             timeout = self.timeout
-            resp = requests.post(exchange_url, headers=headers, json=body, timeout=timeout, verify=self._wo_ssl_verify)
+            resp = requests.post(
+                exchange_url,
+                headers=headers,
+                json=body,
+                timeout=timeout,
+                verify=self._wo_ssl_verify,
+            )
         else:
-            headers = {"Accept": "application/json", "Content-Type": "application/json"}
+            headers = {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+            }
             post_args = {"json": {"apikey": self.api_key}}
-            resp = requests.post(exchange_url, headers=headers, timeout=timeout, verify=self._wo_ssl_verify, **post_args)
+            resp = requests.post(
+                exchange_url,
+                headers=headers,
+                timeout=timeout,
+                verify=self._wo_ssl_verify,
+                **post_args,
+            )
 
         if resp.status_code == 200:
             json_obj = resp.json()
             token = json_obj.get("access_token") or json_obj.get("token")
             if not token:
-                raise RuntimeError(f"No token field found in response: {json_obj!r}")
+                raise RuntimeError(
+                    f"No token field found in response: {json_obj!r}"
+                )
 
             expires_in = json_obj.get("expires_in")
             try:
@@ -179,13 +237,24 @@ class ModelProxyProvider(Provider):
 
     def encode(self, sentences: List[str]) -> List[list]:
         if self.embedding_model_id is None:
-            raise Exception("embedding model id must be specified for text generation")
+            raise Exception(
+                "embedding model id must be specified for text generation"
+            )
 
         self.refresh_token_if_expires()
         headers = self.get_header()
-        payload = {"inputs": sentences, "model_id": self.embedding_model_id, "space_id": self.space_id}
-                   #"timeout": self.timeout}
-        resp = requests.post(self.embedding_url, json=payload, headers=headers, verify=self._wo_ssl_verify)
+        payload = {
+            "inputs": sentences,
+            "model_id": self.embedding_model_id,
+            "space_id": self.space_id,
+        }
+        # "timeout": self.timeout}
+        resp = requests.post(
+            self.embedding_url,
+            json=payload,
+            headers=headers,
+            verify=self._wo_ssl_verify,
+        )
 
         if resp.status_code == 200:
             json_obj = resp.json()
@@ -198,9 +267,16 @@ class ModelProxyProvider(Provider):
             raise Exception("model id must be specified for text generation")
         self.refresh_token_if_expires()
         headers = self.get_header()
-        payload = {"input": sentence, "model_id": self.model_id, "space_id": self.space_id,
-                   "timeout": self.timeout, "parameters": self.params}
-        resp = requests.post(self.url, json=payload, headers=headers, verify=self._wo_ssl_verify)
+        payload = {
+            "input": sentence,
+            "model_id": self.model_id,
+            "space_id": self.space_id,
+            "timeout": self.timeout,
+            "parameters": self.params,
+        }
+        resp = requests.post(
+            self.url, json=payload, headers=headers, verify=self._wo_ssl_verify
+        )
         if resp.status_code == 200:
             return resp.json()["results"][0]["generated_text"]
 
@@ -208,5 +284,8 @@ class ModelProxyProvider(Provider):
 
 
 if __name__ == "__main__":
-    provider = ModelProxyProvider(model_id="meta-llama/llama-3-3-70b-instruct", embedding_model_id="ibm/slate-30m-english-rtrvr")
-    print(provider.query("ok"))
+    provider = ModelProxyProvider(
+        model_id="meta-llama/llama-3-3-70b-instruct",
+        embedding_model_id="ibm/slate-30m-english-rtrvr",
+    )
+    print(provider.query("ok"))