Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

reorg: collect all envs from everywhere, and defined in consts.py (#1490)

MaojiaShenge15f95eb461d
diff --git a/openviking/eval/ragas/playback.py b/openviking/eval/ragas/playback.py
index b3be04c3b..06b0542f8 100644
--- a/openviking/eval/ragas/playback.py
+++ b/openviking/eval/ragas/playback.py
@@ -13,6 +13,7 @@ from dataclasses import dataclass
from typing import Any, Dict, List, Optional
from openviking.eval.recorder import IORecord, IOType
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
@@ -210,7 +211,7 @@ class IOPlayback:
if self.config_file:
import os
- os.environ["OPENVIKING_CONFIG_FILE"] = self.config_file
+ os.environ[OPENVIKING_CONFIG_ENV] = self.config_file
from openviking.storage.viking_fs import init_viking_fs
from openviking.storage.viking_vector_index_backend import VikingVectorIndexBackend
diff --git a/openviking/eval/ragas/rag_eval.py b/openviking/eval/ragas/rag_eval.py
index 997773022..3af2c829e 100644
--- a/openviking/eval/ragas/rag_eval.py
+++ b/openviking/eval/ragas/rag_eval.py
@@ -19,6 +19,8 @@ import time
from pathlib import Path
from typing import Any, Dict, List
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV, OPENVIKING_ENABLE_RECORDER_ENV
+
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
@@ -98,11 +100,11 @@ class RAGEvaluator:
config_path = Path(self.config_path).expanduser()
if config_path.exists():
- os.environ["OPENVIKING_CONFIG_FILE"] = str(config_path)
+ os.environ[OPENVIKING_CONFIG_ENV] = str(config_path)
logger.info(f"Using config file: {config_path}")
if self.enable_recorder:
- os.environ["OPENVIKING_ENABLE_RECORDER"] = "true"
+ os.environ[OPENVIKING_ENABLE_RECORDER_ENV] = "true"
self._client = OpenViking(path=self.data_path)
except Exception as e:
diff --git a/openviking/server/bootstrap.py b/openviking/server/bootstrap.py
index 3c8fc6b65..c773fc630 100644
--- a/openviking/server/bootstrap.py
+++ b/openviking/server/bootstrap.py
@@ -15,6 +15,7 @@ import uvicorn
from openviking.server.app import create_app
from openviking.server.config import load_server_config
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.logger import configure_uvicorn_logging
@@ -119,7 +120,7 @@ def main():
# Set OPENVIKING_CONFIG_FILE environment variable if --config is provided
# This allows OpenVikingConfigSingleton to load from the specified config file
if args.config is not None:
- os.environ["OPENVIKING_CONFIG_FILE"] = args.config
+ os.environ[OPENVIKING_CONFIG_ENV] = args.config
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
diff --git a/openviking/service/core.py b/openviking/service/core.py
index 778890ad7..771cdb609 100644
--- a/openviking/service/core.py
+++ b/openviking/service/core.py
@@ -31,7 +31,7 @@ from openviking.utils.skill_processor import SkillProcessor
from openviking_cli.exceptions import NotInitializedError
from openviking_cli.session.user_id import UserIdentifier
from openviking_cli.utils import get_logger
-from openviking_cli.utils.config import get_openviking_config
+from openviking_cli.utils.config import OPENVIKING_ENABLE_RECORDER_ENV, get_openviking_config
from openviking_cli.utils.config.open_viking_config import initialize_openviking_config
from openviking_cli.utils.config.storage_config import StorageConfig
@@ -250,7 +250,7 @@ class OpenVikingService:
logger.info("Encryption module not enabled")
# Initialize VikingFS and VikingDB with recorder if enabled
- enable_recorder = os.environ.get("OPENVIKING_ENABLE_RECORDER", "").lower() == "true"
+ enable_recorder = os.environ.get(OPENVIKING_ENABLE_RECORDER_ENV, "").lower() == "true"
# Create context collection
if self._vikingdb_manager is None:
diff --git a/openviking_cli/server_bootstrap.py b/openviking_cli/server_bootstrap.py
index 3fd3374f0..36bbe86af 100644
--- a/openviking_cli/server_bootstrap.py
+++ b/openviking_cli/server_bootstrap.py
@@ -17,6 +17,8 @@ need a running server).
import os
import sys
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
+
def main():
# Intercept subcommands that don't need the server.
@@ -34,10 +36,10 @@ def main():
# so the env var is visible when the config singleton first initialises.
for i, arg in enumerate(sys.argv):
if arg == "--config" and i + 1 < len(sys.argv):
- os.environ["OPENVIKING_CONFIG_FILE"] = sys.argv[i + 1]
+ os.environ[OPENVIKING_CONFIG_ENV] = sys.argv[i + 1]
break
if arg.startswith("--config="):
- os.environ["OPENVIKING_CONFIG_FILE"] = arg.split("=", 1)[1]
+ os.environ[OPENVIKING_CONFIG_ENV] = arg.split("=", 1)[1]
break
from openviking.server.bootstrap import main as _real_main
diff --git a/openviking_cli/utils/config/__init__.py b/openviking_cli/utils/config/__init__.py
index fcec617cc..e600004cf 100644
--- a/openviking_cli/utils/config/__init__.py
+++ b/openviking_cli/utils/config/__init__.py
@@ -10,9 +10,44 @@ from .consts import (
DEFAULT_CONFIG_DIR,
DEFAULT_OV_CONF,
DEFAULT_OVCLI_CONF,
+ OPENVIKING_ACCOUNT_ENV,
+ OPENVIKING_AGENT_ID_ENV,
+ OPENVIKING_ALLOW_BREAK_SYSTEM_PACKAGES_ENV,
+ OPENVIKING_API_KEY_ENV,
+ OPENVIKING_ARK_API_KEY_ENV,
+ OPENVIKING_BASE_URL_ENV,
OPENVIKING_CLI_CONFIG_ENV,
OPENVIKING_CONFIG_ENV,
+ OPENVIKING_CONSOLE_HOST_ENV,
+ OPENVIKING_CONSOLE_PORT_ENV,
+ OPENVIKING_DEBUG_ENV,
+ OPENVIKING_DEBUG_LOG_ENV,
+ OPENVIKING_EMBEDDING_API_KEY_ENV,
+ OPENVIKING_ENABLE_RECORDER_ENV,
+ OPENVIKING_GO_PATH_ENV,
+ OPENVIKING_GOPATH_ENV,
+ OPENVIKING_GOPROXY_ENV,
+ OPENVIKING_INSTALL_LEGACY_HINT_ENV,
+ OPENVIKING_INSTALL_YES_ENV,
+ OPENVIKING_LOG_ROUTING_ENV,
OPENVIKING_PROMPT_TEMPLATES_DIR_ENV,
+ OPENVIKING_PYTHON_ENV,
+ OPENVIKING_RECALL_LIMIT_ENV,
+ OPENVIKING_REPO_ENV,
+ OPENVIKING_ROLLBACK_LAST_UPGRADE_ENV,
+ OPENVIKING_ROOT_API_KEY_ENV,
+ OPENVIKING_SCORE_THRESHOLD_ENV,
+ OPENVIKING_START_CONFIG_ENV,
+ OPENVIKING_START_HOST_ENV,
+ OPENVIKING_START_PORT_ENV,
+ OPENVIKING_TIMEOUT_MS_ENV,
+ OPENVIKING_UPGRADE_PLUGIN_ONLY_ENV,
+ OPENVIKING_URL_ENV,
+ OPENVIKING_USER_ENV,
+ OPENVIKING_VERSION_ENV,
+ OPENVIKING_VLM_API_KEY_ENV,
+ OPENVIKING_WITH_BOT_ENV,
+ OPENVIKING_WRITE_CHECK_URI_ENV,
SYSTEM_CONFIG_DIR,
)
from .embedding_config import EmbeddingConfig
@@ -57,6 +92,41 @@ __all__ = [
"OPENVIKING_CLI_CONFIG_ENV",
"OPENVIKING_CONFIG_ENV",
"OPENVIKING_PROMPT_TEMPLATES_DIR_ENV",
+ "OPENVIKING_ENABLE_RECORDER_ENV",
+ "OPENVIKING_ROOT_API_KEY_ENV",
+ "OPENVIKING_API_KEY_ENV",
+ "OPENVIKING_ACCOUNT_ENV",
+ "OPENVIKING_USER_ENV",
+ "OPENVIKING_AGENT_ID_ENV",
+ "OPENVIKING_EMBEDDING_API_KEY_ENV",
+ "OPENVIKING_VLM_API_KEY_ENV",
+ "OPENVIKING_ARK_API_KEY_ENV",
+ "OPENVIKING_URL_ENV",
+ "OPENVIKING_BASE_URL_ENV",
+ "OPENVIKING_WITH_BOT_ENV",
+ "OPENVIKING_CONSOLE_PORT_ENV",
+ "OPENVIKING_CONSOLE_HOST_ENV",
+ "OPENVIKING_START_CONFIG_ENV",
+ "OPENVIKING_START_HOST_ENV",
+ "OPENVIKING_START_PORT_ENV",
+ "OPENVIKING_PYTHON_ENV",
+ "OPENVIKING_VERSION_ENV",
+ "OPENVIKING_DEBUG_ENV",
+ "OPENVIKING_DEBUG_LOG_ENV",
+ "OPENVIKING_TIMEOUT_MS_ENV",
+ "OPENVIKING_RECALL_LIMIT_ENV",
+ "OPENVIKING_SCORE_THRESHOLD_ENV",
+ "OPENVIKING_LOG_ROUTING_ENV",
+ "OPENVIKING_WRITE_CHECK_URI_ENV",
+ "OPENVIKING_INSTALL_YES_ENV",
+ "OPENVIKING_UPGRADE_PLUGIN_ONLY_ENV",
+ "OPENVIKING_ROLLBACK_LAST_UPGRADE_ENV",
+ "OPENVIKING_ALLOW_BREAK_SYSTEM_PACKAGES_ENV",
+ "OPENVIKING_INSTALL_LEGACY_HINT_ENV",
+ "OPENVIKING_REPO_ENV",
+ "OPENVIKING_GO_PATH_ENV",
+ "OPENVIKING_GOPATH_ENV",
+ "OPENVIKING_GOPROXY_ENV",
"OpenVikingConfig",
"OpenVikingConfigSingleton",
"OVCLIConfig",
diff --git a/openviking_cli/utils/config/consts.py b/openviking_cli/utils/config/consts.py
index 5584fdcd0..67a3cfa12 100644
--- a/openviking_cli/utils/config/consts.py
+++ b/openviking_cli/utils/config/consts.py
@@ -7,9 +7,77 @@ from pathlib import Path
DEFAULT_CONFIG_DIR = Path.home() / ".openviking"
SYSTEM_CONFIG_DIR = Path("/etc/openviking")
+# =============================================================================
+# All OpenViking Environment Variables
+# =============================================================================
+
+# Configuration file paths
OPENVIKING_CONFIG_ENV = "OPENVIKING_CONFIG_FILE"
OPENVIKING_CLI_CONFIG_ENV = "OPENVIKING_CLI_CONFIG_FILE"
+
+# Prompt templates
OPENVIKING_PROMPT_TEMPLATES_DIR_ENV = "OPENVIKING_PROMPT_TEMPLATES_DIR"
+# Server & Authentication & Identity
+OPENVIKING_ENABLE_RECORDER_ENV = "OPENVIKING_ENABLE_RECORDER"
+OPENVIKING_ROOT_API_KEY_ENV = "OPENVIKING_ROOT_API_KEY"
+OPENVIKING_API_KEY_ENV = "OPENVIKING_API_KEY"
+OPENVIKING_ACCOUNT_ENV = "OPENVIKING_ACCOUNT"
+OPENVIKING_USER_ENV = "OPENVIKING_USER"
+OPENVIKING_AGENT_ID_ENV = "OPENVIKING_AGENT_ID"
+
+# Embedding & VLM
+OPENVIKING_EMBEDDING_API_KEY_ENV = "OPENVIKING_EMBEDDING_API_KEY"
+OPENVIKING_VLM_API_KEY_ENV = "OPENVIKING_VLM_API_KEY"
+OPENVIKING_ARK_API_KEY_ENV = "OPENVIKING_ARK_API_KEY"
+
+# Docker / Deployment
+OPENVIKING_URL_ENV = "OPENVIKING_URL"
+OPENVIKING_BASE_URL_ENV = "OPENVIKING_BASE_URL"
+OPENVIKING_WITH_BOT_ENV = "OPENVIKING_WITH_BOT"
+OPENVIKING_CONSOLE_PORT_ENV = "OPENVIKING_CONSOLE_PORT"
+OPENVIKING_CONSOLE_HOST_ENV = "OPENVIKING_CONSOLE_HOST"
+
+# Local server startup (for plugins)
+OPENVIKING_START_CONFIG_ENV = "OPENVIKING_START_CONFIG"
+OPENVIKING_START_HOST_ENV = "OPENVIKING_START_HOST"
+OPENVIKING_START_PORT_ENV = "OPENVIKING_START_PORT"
+
+# Python environment (for plugins)
+OPENVIKING_PYTHON_ENV = "OPENVIKING_PYTHON"
+
+# Build / Version
+OPENVIKING_VERSION_ENV = "OPENVIKING_VERSION"
+
+# =============================================================================
+# Plugin-only Environment Variables
+# (used by Claude Code Memory Plugin, OpenClaw Plugin, etc.)
+# =============================================================================
+
+OPENVIKING_DEBUG_ENV = "OPENVIKING_DEBUG"
+OPENVIKING_DEBUG_LOG_ENV = "OPENVIKING_DEBUG_LOG"
+OPENVIKING_TIMEOUT_MS_ENV = "OPENVIKING_TIMEOUT_MS"
+OPENVIKING_RECALL_LIMIT_ENV = "OPENVIKING_RECALL_LIMIT"
+OPENVIKING_SCORE_THRESHOLD_ENV = "OPENVIKING_SCORE_THRESHOLD"
+OPENVIKING_LOG_ROUTING_ENV = "OPENVIKING_LOG_ROUTING"
+OPENVIKING_WRITE_CHECK_URI_ENV = "OPENVIKING_WRITE_CHECK_URI"
+
+# Plugin install environment variables
+OPENVIKING_INSTALL_YES_ENV = "OPENVIKING_INSTALL_YES"
+OPENVIKING_UPGRADE_PLUGIN_ONLY_ENV = "OPENVIKING_UPGRADE_PLUGIN_ONLY"
+OPENVIKING_ROLLBACK_LAST_UPGRADE_ENV = "OPENVIKING_ROLLBACK_LAST_UPGRADE"
+OPENVIKING_ALLOW_BREAK_SYSTEM_PACKAGES_ENV = "OPENVIKING_ALLOW_BREAK_SYSTEM_PACKAGES"
+OPENVIKING_INSTALL_LEGACY_HINT_ENV = "OPENVIKING_INSTALL_LEGACY_HINT"
+OPENVIKING_REPO_ENV = "OPENVIKING_REPO"
+
+# Go environment variables (for plugins)
+OPENVIKING_GO_PATH_ENV = "OPENVIKING_GO_PATH"
+OPENVIKING_GOPATH_ENV = "OPENVIKING_GOPATH"
+OPENVIKING_GOPROXY_ENV = "OPENVIKING_GOPROXY"
+
+# =============================================================================
+# Default filenames
+# =============================================================================
+
DEFAULT_OV_CONF = "ov.conf"
DEFAULT_OVCLI_CONF = "ovcli.conf"
diff --git a/tests/agfs/test_fs_binding_s3.py b/tests/agfs/test_fs_binding_s3.py
index d199501d7..85aa4fc1a 100644
--- a/tests/agfs/test_fs_binding_s3.py
+++ b/tests/agfs/test_fs_binding_s3.py
@@ -15,9 +15,10 @@ import pytest
from openviking.storage.transaction import init_lock_manager, reset_lock_manager
from openviking.storage.viking_fs import init_viking_fs
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.config.agfs_config import AGFSConfig
-CONFIG_FILE = os.getenv("OPENVIKING_CONFIG_FILE")
+CONFIG_FILE = os.getenv(OPENVIKING_CONFIG_ENV)
if not CONFIG_FILE:
default_conf = Path(__file__).parent / "ov.conf"
if default_conf.exists():
diff --git a/tests/cli/conftest.py b/tests/cli/conftest.py
index 3958616dd..9019ff3bb 100644
--- a/tests/cli/conftest.py
+++ b/tests/cli/conftest.py
@@ -14,6 +14,8 @@ from typing import Generator
import httpx
import pytest
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
+
def _get_free_port() -> int:
"""Reserve a free port for the test server."""
@@ -67,7 +69,7 @@ def openviking_server(tmp_path_factory: pytest.TempPathFactory) -> Generator[str
json.dump(conf_data, f)
env = os.environ.copy()
- env["OPENVIKING_CONFIG_FILE"] = str(tmp_conf)
+ env[OPENVIKING_CONFIG_ENV] = str(tmp_conf)
cmd = [
sys.executable,
diff --git a/tests/client/test_http_client_config.py b/tests/client/test_http_client_config.py
index 9b86a2293..7d6204be6 100644
--- a/tests/client/test_http_client_config.py
+++ b/tests/client/test_http_client_config.py
@@ -6,6 +6,7 @@ import json
import pytest
from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.utils.config import OPENVIKING_CLI_CONFIG_ENV
def test_async_http_client_loads_missing_fields_from_ovcli_config(tmp_path, monkeypatch):
@@ -22,7 +23,7 @@ def test_async_http_client_loads_missing_fields_from_ovcli_config(tmp_path, monk
}
)
)
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
client = AsyncHTTPClient(url="http://explicit-host:1933")
@@ -46,7 +47,7 @@ def test_async_http_client_explicit_values_override_ovcli_config(tmp_path, monke
}
)
)
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
client = AsyncHTTPClient(
url="http://explicit-host:1933",
@@ -64,7 +65,7 @@ def test_async_http_client_explicit_values_override_ovcli_config(tmp_path, monke
def test_async_http_client_rejects_unknown_ovcli_field(tmp_path, monkeypatch):
config_path = tmp_path / "ovcli.conf"
config_path.write_text(json.dumps({"ur": "http://localhost:1933"}))
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
with pytest.raises(ValueError, match=r"ovcli\.ur'.*ovcli\.url"):
AsyncHTTPClient()
@@ -73,7 +74,7 @@ def test_async_http_client_rejects_unknown_ovcli_field(tmp_path, monkeypatch):
def test_async_http_client_reports_invalid_ovcli_value_path(tmp_path, monkeypatch):
config_path = tmp_path / "ovcli.conf"
config_path.write_text(json.dumps({"url": "http://localhost:1933", "timeout": "fast"}))
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
with pytest.raises(ValueError, match=r"Invalid value for 'ovcli\.timeout'"):
AsyncHTTPClient()
@@ -94,7 +95,7 @@ def test_async_http_client_accepts_ovcli_upload_section(tmp_path, monkeypatch):
}
)
)
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
client = AsyncHTTPClient()
@@ -114,7 +115,7 @@ def test_async_http_client_rejects_unknown_ovcli_upload_field(tmp_path, monkeypa
}
)
)
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
with pytest.raises(ValueError, match=r"ovcli\.upload\.unknown"):
AsyncHTTPClient()
diff --git a/tests/client/test_http_client_local_upload.py b/tests/client/test_http_client_local_upload.py
index 006f8086b..2cde22ee4 100644
--- a/tests/client/test_http_client_local_upload.py
+++ b/tests/client/test_http_client_local_upload.py
@@ -8,6 +8,7 @@ import json
import pytest
from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.utils.config import OPENVIKING_CLI_CONFIG_ENV
class _FakeHTTPClient:
@@ -23,7 +24,7 @@ class _FakeHTTPClient:
def isolated_ovcli_config(tmp_path, monkeypatch):
config_path = tmp_path / "ovcli.conf"
config_path.write_text(json.dumps({"url": "http://localhost:1933"}))
- monkeypatch.setenv("OPENVIKING_CLI_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CLI_CONFIG_ENV, str(config_path))
@pytest.mark.asyncio
diff --git a/tests/integration/test_add_resource_index.py b/tests/integration/test_add_resource_index.py
index eb911123a..be2386aeb 100644
--- a/tests/integration/test_add_resource_index.py
+++ b/tests/integration/test_add_resource_index.py
@@ -5,6 +5,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from openviking.async_client import AsyncOpenViking
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
from tests.utils.mock_agfs import MockLocalAGFS
@@ -36,7 +37,7 @@ async def client(test_config, tmp_path):
"""Initialize AsyncOpenViking client with mocks."""
# Set config env var
- os.environ["OPENVIKING_CONFIG_FILE"] = str(test_config)
+ os.environ[OPENVIKING_CONFIG_ENV] = str(test_config)
# Reset Singletons
OpenVikingConfigSingleton._instance = None
@@ -63,8 +64,8 @@ async def client(test_config, tmp_path):
# Cleanup
OpenVikingConfigSingleton._instance = None
- if "OPENVIKING_CONFIG_FILE" in os.environ:
- del os.environ["OPENVIKING_CONFIG_FILE"]
+ if OPENVIKING_CONFIG_ENV in os.environ:
+ del os.environ[OPENVIKING_CONFIG_ENV]
@pytest.mark.asyncio
@@ -74,7 +75,7 @@ async def test_add_resource_indexing_logic(test_config, tmp_path):
Uses Mock AGFS but tests the client logic.
"""
# Set config env var
- os.environ["OPENVIKING_CONFIG_FILE"] = str(test_config)
+ os.environ[OPENVIKING_CONFIG_ENV] = str(test_config)
OpenVikingConfigSingleton._instance = None
await AsyncOpenViking.reset()
@@ -154,5 +155,5 @@ async def test_add_resource_indexing_logic(test_config, tmp_path):
finally:
await client.close()
OpenVikingConfigSingleton._instance = None
- if "OPENVIKING_CONFIG_FILE" in os.environ:
- del os.environ["OPENVIKING_CONFIG_FILE"]
+ if OPENVIKING_CONFIG_ENV in os.environ:
+ del os.environ[OPENVIKING_CONFIG_ENV]
diff --git a/tests/integration/test_quick_start_lite.py b/tests/integration/test_quick_start_lite.py
index 1317bf2e2..4fd9b769d 100644
--- a/tests/integration/test_quick_start_lite.py
+++ b/tests/integration/test_quick_start_lite.py
@@ -12,6 +12,7 @@ if PROJECT_ROOT not in sys.path:
sys.path.insert(0, PROJECT_ROOT)
from openviking.models.embedder.base import EmbedResult # noqa: E402
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV # noqa: E402
class _FakeEmbedder:
@@ -208,7 +209,7 @@ class TestQuickStartLite(unittest.TestCase):
# NOTE: We do NOT use patch.dict(os.environ, env_vars) here anymore.
# Instead, we rely on OPENVIKING_CONFIG_FILE pointing to our file.
- env_override = {"OPENVIKING_CONFIG_FILE": self.config_file}
+ env_override = {OPENVIKING_CONFIG_ENV: self.config_file}
# IMPORTANT: We need to ensure that when `initialize_openviking_config` is called,
# it reads our file. We can set the env var for the subprocess/exec context.
diff --git a/tests/server/test_api_sessions.py b/tests/server/test_api_sessions.py
index c15a476d3..d4070b463 100644
--- a/tests/server/test_api_sessions.py
+++ b/tests/server/test_api_sessions.py
@@ -13,6 +13,7 @@ import pytest
from openviking.message import Message
from openviking.server.identity import RequestContext, Role
from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
from tests.utils.mock_agfs import MockLocalAGFS
@@ -44,7 +45,7 @@ def _configure_test_env(monkeypatch, tmp_path):
mock_agfs = MockLocalAGFS(root_path=tmp_path / "mock_agfs_root")
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, str(config_path))
OpenVikingConfigSingleton.reset_instance()
with patch("openviking.utils.agfs_utils.create_agfs_client", return_value=mock_agfs):
diff --git a/tests/session/test_session_context.py b/tests/session/test_session_context.py
index 878270c64..2dbb7f71d 100644
--- a/tests/session/test_session_context.py
+++ b/tests/session/test_session_context.py
@@ -15,6 +15,7 @@ from openviking.message import Message, TextPart
from openviking.models.embedder.base import DenseEmbedderBase, EmbedResult
from openviking.service.task_tracker import get_task_tracker
from openviking.session import Session
+from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.config.embedding_config import EmbeddingConfig
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
from openviking_cli.utils.config.vlm_config import VLMConfig
@@ -83,7 +84,7 @@ async def client(test_data_dir, monkeypatch, tmp_path):
OpenVikingConfigSingleton.reset_instance()
await AsyncOpenViking.reset()
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", str(config_path))
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, str(config_path))
_install_fake_embedder(monkeypatch)
_install_fake_vlm(monkeypatch)
diff --git a/tests/test_config_loader.py b/tests/test_config_loader.py
index 993d1efc8..bcb470d0c 100644
--- a/tests/test_config_loader.py
+++ b/tests/test_config_loader.py
@@ -4,6 +4,9 @@
import pytest
+from openviking_cli.utils.config import (
+ OPENVIKING_CONFIG_ENV,
+)
from openviking_cli.utils.config.config_loader import (
load_json_config,
require_config,
@@ -110,7 +113,7 @@ class TestRequireConfig:
def test_openviking_config_rejects_unknown_nested_parser_section(monkeypatch):
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", "/tmp/codex-no-config.json")
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, "/tmp/codex-no-config.json")
from openviking_cli.utils.config.open_viking_config import (
OpenVikingConfig,
@@ -135,7 +138,7 @@ def test_openviking_config_rejects_unknown_nested_parser_section(monkeypatch):
def test_openviking_config_rejects_unknown_top_level_section_with_suggestion(monkeypatch):
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", "/tmp/codex-no-config.json")
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, "/tmp/codex-no-config.json")
from openviking_cli.utils.config.open_viking_config import (
OpenVikingConfig,
@@ -167,7 +170,7 @@ def test_openviking_config_rejects_unknown_top_level_section_with_suggestion(mon
def test_openviking_config_singleton_preserves_value_error_for_bad_config(tmp_path, monkeypatch):
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", "/tmp/codex-no-config.json")
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, "/tmp/codex-no-config.json")
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
@@ -196,7 +199,7 @@ def test_require_config_missing_message_uses_openviking_ai_docs(tmp_path, monkey
def test_load_server_config_missing_message_uses_openviking_ai_docs(tmp_path, monkeypatch):
import openviking.server.config as server_config
- monkeypatch.delenv("OPENVIKING_CONFIG_FILE", raising=False)
+ monkeypatch.delenv(OPENVIKING_CONFIG_ENV, raising=False)
monkeypatch.setattr(server_config, "DEFAULT_CONFIG_DIR", tmp_path / "user")
monkeypatch.setattr(server_config, "SYSTEM_CONFIG_DIR", tmp_path / "system")
@@ -208,7 +211,7 @@ def test_openviking_config_singleton_missing_message_uses_openviking_ai_docs(tmp
import openviking_cli.utils.config.open_viking_config as config_module
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
- monkeypatch.delenv("OPENVIKING_CONFIG_FILE", raising=False)
+ monkeypatch.delenv(OPENVIKING_CONFIG_ENV, raising=False)
monkeypatch.setattr(config_module, "DEFAULT_CONFIG_DIR", tmp_path / "user")
monkeypatch.setattr(config_module, "SYSTEM_CONFIG_DIR", tmp_path / "system")
@@ -220,11 +223,13 @@ def test_openviking_config_singleton_missing_message_uses_openviking_ai_docs(tmp
OpenVikingConfigSingleton.reset_instance()
-def test_openviking_config_singleton_initialize_missing_message_uses_openviking_ai_docs(tmp_path, monkeypatch):
+def test_openviking_config_singleton_initialize_missing_message_uses_openviking_ai_docs(
+ tmp_path, monkeypatch
+):
import openviking_cli.utils.config.open_viking_config as config_module
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
- monkeypatch.delenv("OPENVIKING_CONFIG_FILE", raising=False)
+ monkeypatch.delenv(OPENVIKING_CONFIG_ENV, raising=False)
monkeypatch.setattr(config_module, "DEFAULT_CONFIG_DIR", tmp_path / "user")
monkeypatch.setattr(config_module, "SYSTEM_CONFIG_DIR", tmp_path / "system")
diff --git a/tests/test_prompt_manager.py b/tests/test_prompt_manager.py
index fca4f07b1..26d695987 100644
--- a/tests/test_prompt_manager.py
+++ b/tests/test_prompt_manager.py
@@ -5,10 +5,12 @@ import json
from pathlib import Path
from openviking.prompts.manager import PromptManager
+from openviking_cli.utils.config import (
+ OPENVIKING_CONFIG_ENV,
+ OPENVIKING_PROMPT_TEMPLATES_DIR_ENV,
+)
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
-PROMPT_TEMPLATES_ENV = "OPENVIKING_PROMPT_TEMPLATES_DIR"
-
def _write_template(templates_dir: Path, content: str) -> None:
template_path = templates_dir / "memory" / "profile.yaml"
@@ -70,8 +72,8 @@ def test_prompt_manager_prefers_environment_templates_dir(tmp_path, monkeypatch)
_write_config(config_path, config_dir)
OpenVikingConfigSingleton.reset_instance()
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", str(config_path))
- monkeypatch.setenv(PROMPT_TEMPLATES_ENV, str(env_dir))
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, str(config_path))
+ monkeypatch.setenv(OPENVIKING_PROMPT_TEMPLATES_DIR_ENV, str(env_dir))
manager = PromptManager(enable_caching=False)
@@ -87,8 +89,8 @@ def test_prompt_manager_uses_ov_conf_templates_dir_when_env_is_unset(tmp_path, m
_write_config(config_path, config_dir)
OpenVikingConfigSingleton.reset_instance()
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", str(config_path))
- monkeypatch.delenv(PROMPT_TEMPLATES_ENV, raising=False)
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, str(config_path))
+ monkeypatch.delenv(OPENVIKING_PROMPT_TEMPLATES_DIR_ENV, raising=False)
manager = PromptManager(enable_caching=False)
@@ -98,8 +100,8 @@ def test_prompt_manager_uses_ov_conf_templates_dir_when_env_is_unset(tmp_path, m
def test_prompt_manager_falls_back_to_bundled_templates_dir(monkeypatch):
OpenVikingConfigSingleton.reset_instance()
- monkeypatch.delenv("OPENVIKING_CONFIG_FILE", raising=False)
- monkeypatch.delenv(PROMPT_TEMPLATES_ENV, raising=False)
+ monkeypatch.delenv(OPENVIKING_CONFIG_ENV, raising=False)
+ monkeypatch.delenv(OPENVIKING_PROMPT_TEMPLATES_DIR_ENV, raising=False)
manager = PromptManager(enable_caching=False)
@@ -116,8 +118,8 @@ def test_prompt_manager_falls_back_to_bundled_template_when_custom_dir_is_partia
_write_config(config_path, custom_dir)
OpenVikingConfigSingleton.reset_instance()
- monkeypatch.setenv("OPENVIKING_CONFIG_FILE", str(config_path))
- monkeypatch.delenv(PROMPT_TEMPLATES_ENV, raising=False)
+ monkeypatch.setenv(OPENVIKING_CONFIG_ENV, str(config_path))
+ monkeypatch.delenv(OPENVIKING_PROMPT_TEMPLATES_DIR_ENV, raising=False)
manager = PromptManager(enable_caching=False)