Skip to content

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

fix(import): avoid runtime storage package lazy imports for VikingDB managers (#3616)

baojun-zhanga1b662655819
diff --git a/openviking/retrieve/hierarchical_retriever.py b/openviking/retrieve/hierarchical_retriever.py
index 2c8c96a5c..945650b84 100644
--- a/openviking/retrieve/hierarchical_retriever.py
+++ b/openviking/retrieve/hierarchical_retriever.py
@@ -21,7 +21,7 @@ from openviking.models.rerank import RerankClient
from openviking.retrieve.memory_lifecycle import hotness_score
from openviking.retrieve.retrieval_stats import get_stats_collector
from openviking.server.identity import RequestContext
-from openviking.storage import VikingDBManager, VikingDBManagerProxy
+from openviking.storage.vikingdb_manager import VikingDBManager, VikingDBManagerProxy
from openviking.storage.expr import FilterExpr
from openviking.telemetry import get_current_telemetry
from openviking.utils.time_utils import parse_iso_datetime
diff --git a/openviking/server/routers/debug.py b/openviking/server/routers/debug.py
index d406576cc..71cb34fcb 100644
--- a/openviking/server/routers/debug.py
+++ b/openviking/server/routers/debug.py
@@ -17,7 +17,7 @@ from openviking.server.auth import get_request_context
from openviking.server.dependencies import get_service
from openviking.server.identity import RequestContext
from openviking.server.models import ErrorInfo, Response
-from openviking.storage import VikingDBManagerProxy
+from openviking.storage.vikingdb_manager import VikingDBManagerProxy
router = APIRouter(prefix="/api/v1/debug", tags=["debug"])
diff --git a/openviking/server/routers/filesystem.py b/openviking/server/routers/filesystem.py
index 3fd869cdb..a0c415e85 100644
--- a/openviking/server/routers/filesystem.py
+++ b/openviking/server/routers/filesystem.py
@@ -17,7 +17,7 @@ from openviking.server.identity import RequestContext
from openviking.server.models import Response
from openviking.server.routers.content import SetTagsRequest
from openviking.server.routers.content import set_tags as content_set_tags
-from openviking.storage import VikingDBManagerProxy
+from openviking.storage.vikingdb_manager import VikingDBManagerProxy
from openviking_cli.exceptions import InvalidArgumentError, NotFoundError
router = APIRouter(prefix="/api/v1/fs", tags=["filesystem"])
diff --git a/openviking/service/core.py b/openviking/service/core.py
index ca3964804..3bac8ba76 100644
--- a/openviking/service/core.py
+++ b/openviking/service/core.py
@@ -25,7 +25,7 @@ from openviking.service.search_service import SearchService
from openviking.service.session_service import SessionService
from openviking.service.task_tracker import set_task_tracker
from openviking.session import create_session_compressor
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.collection_schemas import init_context_collection
from openviking.storage.index_consistency import check_index_consistency
from openviking.storage.queuefs.add_resource_processor import AddResourceProcessor
diff --git a/openviking/service/debug_service.py b/openviking/service/debug_service.py
index eccde2ee2..47d696895 100644
--- a/openviking/service/debug_service.py
+++ b/openviking/service/debug_service.py
@@ -8,7 +8,7 @@ from dataclasses import dataclass
from typing import Any, Dict, List, Optional
from openviking.server.identity import RequestContext
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.observers import (
FilesystemObserver,
ModelsObserver,
diff --git a/openviking/service/resource_memory_link_service.py b/openviking/service/resource_memory_link_service.py
index 89efed9b9..b460da0b7 100644
--- a/openviking/service/resource_memory_link_service.py
+++ b/openviking/service/resource_memory_link_service.py
@@ -33,7 +33,7 @@ from openviking.session.memory.utils.resource_refs import (
resource_ref_matches,
unlink_resource_references_from_memory,
)
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.viking_fs import VikingFS, get_viking_fs
from openviking_cli.exceptions import NotFoundError
from openviking_cli.utils import get_logger
diff --git a/openviking/service/resource_service.py b/openviking/service/resource_service.py
index 7be5ef7d7..535a42812 100644
--- a/openviking/service/resource_service.py
+++ b/openviking/service/resource_service.py
@@ -40,7 +40,7 @@ from openviking.server.user_config import (
effective_resource_add_target,
effective_skill_add_target,
)
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.queuefs import QueueManager, get_queue_manager
from openviking.storage.viking_fs import VikingFS
from openviking.telemetry import get_current_telemetry
diff --git a/openviking/service/session_service.py b/openviking/service/session_service.py
index 14f225d04..f3ff3200a 100644
--- a/openviking/service/session_service.py
+++ b/openviking/service/session_service.py
@@ -16,7 +16,7 @@ from openviking.service.task_tracker import get_task_tracker
from openviking.session import Session
from openviking.session.memory.memory_type_registry import MemoryTypeRegistry
from openviking.session.memory_policy import MemoryPolicy
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.viking_fs import VikingFS
from openviking_cli.exceptions import (
AlreadyExistsError,
diff --git a/openviking/session/__init__.py b/openviking/session/__init__.py
index 9ee6c16be..7e0aff65c 100644
--- a/openviking/session/__init__.py
+++ b/openviking/session/__init__.py
@@ -5,7 +5,7 @@
from typing import TYPE_CHECKING, Optional
from openviking.session.session import Session, SessionCompression, SessionMeta, SessionStats
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/session/compressor_v2.py b/openviking/session/compressor_v2.py
index 8b19a3705..d85219bd0 100644
--- a/openviking/session/compressor_v2.py
+++ b/openviking/session/compressor_v2.py
@@ -28,7 +28,7 @@ from openviking.session.memory.utils.memory_file_utils import MemoryFileUtils
from openviking.session.memory.utils.uri import render_template
from openviking.session.skill import SkillOperationUpdater, dedup_session_skill_operations
from openviking.session.skill.session_skill_context_provider import SESSION_SKILL_MEMORY_TYPE
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.viking_fs import VikingFS, get_viking_fs
from openviking.telemetry import get_current_telemetry, tracer
from openviking.utils.skill_processor import SkillProcessor
diff --git a/openviking/utils/resource_processor.py b/openviking/utils/resource_processor.py
index 3e3ccaba4..27b45b13b 100644
--- a/openviking/utils/resource_processor.py
+++ b/openviking/utils/resource_processor.py
@@ -24,7 +24,7 @@ from openviking.resource.processing_mode import (
normalize_processing_mode,
)
from openviking.server.identity import RequestContext
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.errors import LockAcquisitionError
from openviking.storage.expr import And, Eq, PathScope
from openviking.storage.internal_names import STORAGE_INTERNAL_ENTRY_NAMES
diff --git a/openviking/utils/skill_processor.py b/openviking/utils/skill_processor.py
index 8a163bbfd..9e0c67f49 100644
--- a/openviking/utils/skill_processor.py
+++ b/openviking/utils/skill_processor.py
@@ -27,7 +27,7 @@ from openviking.privacy import (
)
from openviking.server.identity import RequestContext
from openviking.server.local_input_guard import deny_direct_local_skill_input
-from openviking.storage import VikingDBManager
+from openviking.storage.vikingdb_manager import VikingDBManager
from openviking.storage.queuefs.embedding_msg_converter import EmbeddingMsgConverter
from openviking.storage.viking_fs import VikingFS
from openviking.telemetry import get_current_telemetry