genlayer-test 0.10.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

gltest/validators/validator_factory.py

@@ -1,4 +1,4 @@
-from gltest.types import MockedLLMResponse
+from gltest.types import MockedLLMResponse, MockedWebResponse
 from dataclasses import dataclass
 from typing import Dict, Any, Optional, List
 from copy import deepcopy
@@ -16,6 +16,7 @@ class Validator:
     # Mock configuration
     mock_enabled: bool
     mock_llm_response: Optional[MockedLLMResponse]
+    mock_web_response: Optional[MockedWebResponse]
 
     def to_dict(self) -> Dict[str, Any]:
         normal_config = {
@@ -29,21 +30,27 @@ class Validator:
         if not self.mock_enabled:
             return normal_config
 
-        mock = self.mock_llm_response or {}
-        mock_config = {
-            "response": mock.get("nondet_exec_prompt", {}),
-            "eq_principle_prompt_comparative": mock.get(
+        # Mock llm response
+        mock_llm = self.mock_llm_response or {}
+        mock_llm_config = {
+            "response": mock_llm.get("nondet_exec_prompt", {}),
+            "eq_principle_prompt_comparative": mock_llm.get(
                 "eq_principle_prompt_comparative", {}
             ),
-            "eq_principle_prompt_non_comparative": mock.get(
+            "eq_principle_prompt_non_comparative": mock_llm.get(
                 "eq_principle_prompt_non_comparative", {}
             ),
         }
+        mock_web = self.mock_web_response or {}
+        mock_web_config = {
+            "nondet_web_request": mock_web.get("nondet_web_request", {}),
+        }
         return {
             **normal_config,
             "plugin_config": {
                 **self.plugin_config,
-                "mock_response": mock_config,
+                "mock_response": mock_llm_config,
+                "mock_web_response": mock_web_config,
             },
         }
 
@@ -60,6 +67,7 @@ class Validator:
             plugin_config=deepcopy(self.plugin_config),
             mock_enabled=self.mock_enabled,
             mock_llm_response=deepcopy(self.mock_llm_response),
+            mock_web_response=deepcopy(self.mock_web_response),
         )
 
 
@@ -85,6 +93,7 @@ class ValidatorFactory:
             plugin_config=deepcopy(plugin_config),
             mock_enabled=False,
             mock_llm_response=None,
+            mock_web_response=None,
         )
 
     def batch_create_validators(
@@ -109,7 +118,15 @@ class ValidatorFactory:
             for _ in range(count)
         ]
 
-    def create_mock_validator(self, mock_llm_response: MockedLLMResponse) -> Validator:
+    def create_mock_validator(
+        self,
+        mock_llm_response: Optional[MockedLLMResponse] = None,
+        mock_web_response: Optional[MockedWebResponse] = None,
+    ) -> Validator:
+        if mock_llm_response is None and mock_web_response is None:
+            raise ValueError(
+                "mock_llm_response and mock_web_response cannot both be None"
+            )
         return Validator(
             stake=8,
             provider="openai",
@@ -121,15 +138,24 @@ class ValidatorFactory:
                 "api_url": "https://api.openai.com",
             },
             mock_enabled=True,
-            mock_llm_response=deepcopy(mock_llm_response),
+            mock_llm_response=(
+                deepcopy(mock_llm_response) if mock_llm_response is not None else None
+            ),
+            mock_web_response=(
+                deepcopy(mock_web_response) if mock_web_response is not None else None
+            ),
         )
 
     def batch_create_mock_validators(
         self,
         count: int,
-        mock_llm_response: MockedLLMResponse,
+        mock_llm_response: Optional[MockedLLMResponse] = None,
+        mock_web_response: Optional[MockedWebResponse] = None,
     ) -> List[Validator]:
-        return [self.create_mock_validator(mock_llm_response) for _ in range(count)]
+        return [
+            self.create_mock_validator(mock_llm_response, mock_web_response)
+            for _ in range(count)
+        ]
 
 
 def get_validator_factory() -> ValidatorFactory:

gltest_cli/config/plugin.py

@@ -13,8 +13,6 @@ from gltest_cli.config.general import (
 from gltest_cli.config.types import PluginConfig
 from gltest_cli.config.pytest_context import _pytest_context
 from gltest_cli.config.constants import (
-    DEFAULT_WAIT_INTERVAL,
-    DEFAULT_WAIT_RETRIES,
     DEFAULT_LEADER_ONLY,
     CHAINS,
 )
@@ -39,14 +37,14 @@ def pytest_addoption(parser):
     group.addoption(
         "--default-wait-interval",
         action="store",
-        default=DEFAULT_WAIT_INTERVAL,
+        default=None,
         help="Default interval (ms) between transaction receipt checks",
     )
 
     group.addoption(
         "--default-wait-retries",
         action="store",
-        default=DEFAULT_WAIT_RETRIES,
+        default=None,
         help="Default number of retries for transaction receipt checks",
     )
 
@@ -122,8 +120,12 @@ def pytest_configure(config):
         plugin_config.artifacts_dir = (
             Path(artifacts_dir) if artifacts_dir is not None else None
         )
-        plugin_config.default_wait_interval = int(default_wait_interval)
-        plugin_config.default_wait_retries = int(default_wait_retries)
+        plugin_config.default_wait_interval = (
+            int(default_wait_interval) if default_wait_interval is not None else None
+        )
+        plugin_config.default_wait_retries = (
+            int(default_wait_retries) if default_wait_retries is not None else None
+        )
         plugin_config.rpc_url = rpc_url
         plugin_config.network_name = network
         plugin_config.leader_only = leader_only