fix envs get

Author: yaozheng-fang

veadk/evaluation/deepeval_evaluator/deepeval_evaluator.py

@@ -21,18 +21,15 @@
 from deepeval.models import LocalModel
 from deepeval.test_case import LLMTestCase
 from deepeval.test_case.llm_test_case import ToolCall
+from pydantic import Field
 from typing_extensions import override
 
 from veadk.config import getenv
+from veadk.evaluation.types import EvalResultCaseData, EvalResultMetadata
 from veadk.utils.logger import get_logger
 
 from ..base_evaluator import BaseEvaluator, EvalResultData, MetricResult
-from ..utils.prometheus import (
-    EvalResultCaseData,
-    EvalResultMetadata,
-    PrometheusPushgatewayConfig,
-    push_to_prometheus,
-)
+from ..utils.prometheus import PrometheusPushgatewayConfig, push_to_prometheus
 
 logger = get_logger(__name__)
 
@@ -46,14 +43,23 @@ class DeepevalEvaluator(BaseEvaluator):
     def __init__(
         self,
         agent,
-        judge_model_api_key: str = getenv("MODEL_JUDGE_API_KEY"),
-        judge_model_name: str = getenv(
-            "MODEL_JUDGE_NAME",
-            "doubao-seed-1-6-250615",
+        judge_model_api_key: str = Field(
+            ...,
+            default_factory=lambda: getenv("MODEL_JUDGE_API_KEY"),
         ),
-        judge_model_api_base: str = getenv(
-            "MODEL_JUDGE_API_BASE",
-            "https://ark.cn-beijing.volces.com/api/v3/",
+        judge_model_name: str = Field(
+            ...,
+            default_factory=lambda: getenv(
+                "MODEL_JUDGE_NAME",
+                "doubao-seed-1-6-250615",
+            ),
+        ),
+        judge_model_api_base: str = Field(
+            ...,
+            default_factory=lambda: getenv(
+                "MODEL_JUDGE_API_BASE",
+                "https://ark.cn-beijing.volces.com/api/v3/",
+            ),
         ),
         name: str = "veadk_deepeval_evaluator",
         prometheus_config: PrometheusPushgatewayConfig = None,

veadk/evaluation/types.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class EvalResultCaseData:
+    id: str
+    input: str
+    actual_output: str
+    expected_output: str
+    score: str
+    reason: str
+    status: str  # `PASSED` or `FAILURE`
+    latency: str
+
+
+@dataclass
+class EvalResultMetadata:
+    tested_model: str
+    judge_model: str

veadk/evaluation/utils/prometheus.py

@@ -12,38 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from dataclasses import dataclass
 
 from prometheus_client import CollectorRegistry, Gauge, push_to_gateway
 from prometheus_client.exposition import basic_auth_handler
+from pydantic import Field
 
 from veadk.config import getenv
-
-
-@dataclass
-class EvalResultCaseData:
-    id: str
-    input: str
-    actual_output: str
-    expected_output: str
-    score: str
-    reason: str
-    status: str  # `PASSED` or `FAILURE`
-    latency: str
-
-
-@dataclass
-class EvalResultMetadata:
-    tested_model: str
-    judge_model: str
+from veadk.evaluation.types import EvalResultCaseData, EvalResultMetadata
 
 
 class PrometheusPushgatewayConfig:
-    url: str = getenv(
-        "OBSERVABILITY_PROMETHEUS_PUSHGATEWAY_URL",
+    url: str = Field(
+        ...,
+        default_factory=lambda: getenv(
+            "OBSERVABILITY_PROMETHEUS_PUSHGATEWAY_URL",
+        ),
+    )
+    username: str = Field(
+        ...,
+        default_factory=lambda: getenv(
+            "OBSERVABILITY_PROMETHEUS_USERNAME",
+        ),
+    )
+    password: str = Field(
+        ...,
+        default_factory=lambda: getenv(
+            "OBSERVABILITY_PROMETHEUS_PASSWORD",
+        ),
     )
-    username: str = getenv("OBSERVABILITY_PROMETHEUS_USERNAME")
-    password: str = getenv("OBSERVABILITY_PROMETHEUS_PASSWORD")
 
 
 registry = CollectorRegistry()