Skip to content

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

refactor: to accelerate cli launch speed, refactor openviking_cli dir (#150)

MaojiaShengdb7319f4a2fe
diff --git a/docs/design/server_client/server-cli-design.md b/docs/design/server_client/server-cli-design.md
index 32ce02615..b8aaa9595 100644
--- a/docs/design/server_client/server-cli-design.md
+++ b/docs/design/server_client/server-cli-design.md
@@ -298,7 +298,7 @@ OpenViking 提供三种接口,面向不同使用场景:
支持多租户场景,首先通过 account_id 区分不同的应用租户,然后允许通过 `user` 和 `agent` 实现租户内的身份隔离:
-用户或智能体身份标识详见 `from openviking.session.user_id import UserIdentifier`
+用户或智能体身份标识详见 `from openviking_cli.session.user_id import UserIdentifier`
| 参数 | 说明 | 默认值 |
|------|------|------|
diff --git a/docs/en/concepts/04-viking-uri.md b/docs/en/concepts/04-viking-uri.md
index ecf039557..7b27d3505 100644
--- a/docs/en/concepts/04-viking-uri.md
+++ b/docs/en/concepts/04-viking-uri.md
@@ -139,7 +139,7 @@ viking://
### Parsing
```python
-from openviking.utils.uri import VikingURI
+from openviking_cli.utils.uri import VikingURI
uri = VikingURI("viking://resources/docs/api")
print(uri.scope) # "resources"
diff --git a/docs/zh/concepts/04-viking-uri.md b/docs/zh/concepts/04-viking-uri.md
index ecd264e91..e65f39e95 100644
--- a/docs/zh/concepts/04-viking-uri.md
+++ b/docs/zh/concepts/04-viking-uri.md
@@ -138,7 +138,7 @@ viking://
### 解析
```python
-from openviking.utils.uri import VikingURI
+from openviking_cli.utils.uri import VikingURI
uri = VikingURI("viking://resources/docs/api")
print(uri.scope) # "resources"
diff --git a/examples/chatmem/chatmem.py b/examples/chatmem/chatmem.py
index e4b0c7843..19570537a 100644
--- a/examples/chatmem/chatmem.py
+++ b/examples/chatmem/chatmem.py
@@ -25,7 +25,7 @@ from rich.spinner import Spinner
from openviking import SyncOpenViking
from openviking.message import TextPart
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
console = Console()
PANEL_WIDTH = 78
diff --git a/examples/chatmem/docs/2026-02-03-chatmem-implementation.md b/examples/chatmem/docs/2026-02-03-chatmem-implementation.md
index 64cb00513..3717230b1 100644
--- a/examples/chatmem/docs/2026-02-03-chatmem-implementation.md
+++ b/examples/chatmem/docs/2026-02-03-chatmem-implementation.md
@@ -161,7 +161,7 @@ Add after existing imports at top of `chat.py`:
import json
from openviking import SyncOpenViking
from openviking.message import TextPart
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
```
**Step 2: Remove ChatSession class**
@@ -418,7 +418,7 @@ Create a simple test script `test_messages.py`:
"""Test message recording"""
from openviking import SyncOpenViking
from openviking.message import TextPart
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
import json
# Load config
diff --git a/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-commands-design.md b/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-commands-design.md
index d663206b5..f189ff6b3 100644
--- a/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-commands-design.md
+++ b/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-commands-design.md
@@ -208,7 +208,7 @@ from pathlib import Path
from typing import Optional
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
from rich.console import Console
diff --git a/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-implementation.md b/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-implementation.md
index cd7f65e5f..d93095552 100644
--- a/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-implementation.md
+++ b/examples/chatmem/docs/plans/2026-02-05-time-and-add-resource-implementation.md
@@ -30,7 +30,7 @@ from pathlib import Path
from typing import Optional
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
from rich.console import Console
diff --git a/examples/common/recipe.py b/examples/common/recipe.py
index 1a64fd935..8a1f9b539 100644
--- a/examples/common/recipe.py
+++ b/examples/common/recipe.py
@@ -11,7 +11,7 @@ from typing import Any, Dict, List, Optional
import requests
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
class Recipe:
diff --git a/examples/common/resource_manager.py b/examples/common/resource_manager.py
index 1634d08e7..03bfc2a4f 100644
--- a/examples/common/resource_manager.py
+++ b/examples/common/resource_manager.py
@@ -10,7 +10,7 @@ from typing import Optional
from rich.console import Console
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
def create_client(config_path: str = "./ov.conf", data_path: str = "./data") -> ov.SyncOpenViking:
diff --git a/examples/mcp-query/server.py b/examples/mcp-query/server.py
index 562eefab1..95487f543 100644
--- a/examples/mcp-query/server.py
+++ b/examples/mcp-query/server.py
@@ -27,7 +27,7 @@ from common.recipe import Recipe
from mcp.server.fastmcp import FastMCP
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger("openviking-mcp")
diff --git a/examples/memex/config.py b/examples/memex/config.py
index 5df10e5ab..830e306b6 100644
--- a/examples/memex/config.py
+++ b/examples/memex/config.py
@@ -8,7 +8,7 @@ from dataclasses import dataclass
from pathlib import Path
from typing import Optional
-from openviking.utils.config import OpenVikingConfig
+from openviking_cli.utils.config import OpenVikingConfig
@dataclass
diff --git a/examples/query/add.py b/examples/query/add.py
index bafe37249..68640008e 100644
--- a/examples/query/add.py
+++ b/examples/query/add.py
@@ -9,7 +9,7 @@ import sys
from pathlib import Path
import openviking as ov
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
def add_resource(resource_path: str, config_path: str = "./ov.conf", data_path: str = "./data"):
diff --git a/examples/server_client/client_sync.py b/examples/server_client/client_sync.py
index c0297db70..ba177df3c 100644
--- a/examples/server_client/client_sync.py
+++ b/examples/server_client/client_sync.py
@@ -17,8 +17,6 @@ import argparse
import sys
import threading
-import openviking as ov
-from openviking.utils.async_utils import run_async
from rich import box
from rich.console import Console
from rich.live import Live
@@ -27,6 +25,9 @@ from rich.spinner import Spinner
from rich.table import Table
from rich.text import Text
+import openviking as ov
+from openviking_cli.utils.async_utils import run_async
+
console = Console()
PANEL_WIDTH = 78
@@ -68,10 +69,13 @@ def main():
try:
# ── Connect ──
spin("Connecting...", client.initialize)
- console.print(Panel(
- f"Connected to [bold cyan]{args.url}[/bold cyan]",
- style="green", width=PANEL_WIDTH,
- ))
+ console.print(
+ Panel(
+ f"Connected to [bold cyan]{args.url}[/bold cyan]",
+ style="green",
+ width=PANEL_WIDTH,
+ )
+ )
console.print()
# ── System Status ──
@@ -125,17 +129,23 @@ def main():
if root_uri:
console.print(Panel("Content", style="bold magenta", width=PANEL_WIDTH))
abstract = client.abstract(root_uri)
- console.print(Panel(
- Text(abstract[:300] + ("..." if len(abstract) > 300 else ""),
- style="white"),
- title="Abstract", style="dim", width=PANEL_WIDTH,
- ))
+ console.print(
+ Panel(
+ Text(abstract[:300] + ("..." if len(abstract) > 300 else ""), style="white"),
+ title="Abstract",
+ style="dim",
+ width=PANEL_WIDTH,
+ )
+ )
overview = client.overview(root_uri)
- console.print(Panel(
- Text(overview[:300] + ("..." if len(overview) > 300 else ""),
- style="white"),
- title="Overview", style="dim", width=PANEL_WIDTH,
- ))
+ console.print(
+ Panel(
+ Text(overview[:300] + ("..." if len(overview) > 300 else ""), style="white"),
+ title="Overview",
+ style="dim",
+ width=PANEL_WIDTH,
+ )
+ )
console.print()
# ── Semantic Search (find) ──
@@ -143,7 +153,9 @@ def main():
results = spin("Searching...", client.find, "what is openviking", limit=3)
if hasattr(results, "resources") and results.resources:
search_table = Table(
- box=box.ROUNDED, show_header=True, header_style="bold green",
+ box=box.ROUNDED,
+ show_header=True,
+ header_style="bold green",
)
search_table.add_column("#", style="cyan", width=4)
search_table.add_column("URI", style="white")
@@ -171,25 +183,30 @@ def main():
session = client.session()
console.print(f" Created session: [bold]{session.session_id}[/bold]")
- run_async(session.add_message(
- role="user", content="Tell me about OpenViking",
- ))
- run_async(session.add_message(
- role="assistant",
- content="OpenViking is an agent-native context database.",
- ))
+ run_async(
+ session.add_message(
+ role="user",
+ content="Tell me about OpenViking",
+ )
+ )
+ run_async(
+ session.add_message(
+ role="assistant",
+ content="OpenViking is an agent-native context database.",
+ )
+ )
console.print(" Added [bold]2[/bold] messages")
ctx_results = spin(
"Searching with session context...",
- client.search, "how to use it", session_id=session.session_id, limit=3,
+ client.search,
+ "how to use it",
+ session_id=session.session_id,
+ limit=3,
)
if hasattr(ctx_results, "resources") and ctx_results.resources:
for r in ctx_results.resources:
- console.print(
- f" [cyan]{r.uri}[/cyan]"
- f" (score: [green]{r.score:.4f}[/green])"
- )
+ console.print(f" [cyan]{r.uri}[/cyan] (score: [green]{r.score:.4f}[/green])")
else:
console.print(" [dim]No context search results[/dim]")
@@ -233,16 +250,24 @@ def main():
console.print()
# ── Done ──
- console.print(Panel(
- "[bold green]All operations completed[/bold green]",
- style="green", width=PANEL_WIDTH,
- ))
+ console.print(
+ Panel(
+ "[bold green]All operations completed[/bold green]",
+ style="green",
+ width=PANEL_WIDTH,
+ )
+ )
except Exception as e:
- console.print(Panel(
- f"[bold red]Error:[/bold red] {e}", style="red", width=PANEL_WIDTH,
- ))
+ console.print(
+ Panel(
+ f"[bold red]Error:[/bold red] {e}",
+ style="red",
+ width=PANEL_WIDTH,
+ )
+ )
import traceback
+
traceback.print_exc()
sys.exit(1)
diff --git a/openviking/__init__.py b/openviking/__init__.py
index d324236cb..433f6ad9b 100644
--- a/openviking/__init__.py
+++ b/openviking/__init__.py
@@ -7,11 +7,11 @@ Data in, Context out.
"""
from openviking.async_client import AsyncOpenViking
-from openviking.client.http import AsyncHTTPClient
-from openviking.client.sync_http import SyncHTTPClient
from openviking.session import Session
-from openviking.session.user_id import UserIdentifier
from openviking.sync_client import SyncOpenViking
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.client.sync_http import SyncHTTPClient
+from openviking_cli.session.user_id import UserIdentifier
OpenViking = SyncOpenViking
diff --git a/openviking/__main__.py b/openviking/__main__.py
index 2d3944045..68a6e891f 100644
--- a/openviking/__main__.py
+++ b/openviking/__main__.py
@@ -2,8 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
"""Main entry point for `python -m openviking`."""
-from openviking.cli.main import app
-
+from openviking_cli.cli.main import app
def main() -> None:
diff --git a/openviking/agfs_manager.py b/openviking/agfs_manager.py
index 34806e774..6924fb2fd 100644
--- a/openviking/agfs_manager.py
+++ b/openviking/agfs_manager.py
@@ -12,10 +12,10 @@ from typing import TYPE_CHECKING, Optional
import yaml
-from openviking.utils import get_logger
+from openviking_cli.utils import get_logger
if TYPE_CHECKING:
- from openviking.utils.config.agfs_config import AGFSConfig
+ from openviking_cli.utils.config.agfs_config import AGFSConfig
logger = get_logger(__name__)
@@ -26,7 +26,7 @@ class AGFSManager:
Examples:
# 1. Local backend
- from openviking.utils.config.agfs_config import AGFSConfig
+ from openviking_cli.utils.config.agfs_config import AGFSConfig
config = AGFSConfig(
path="./data",
@@ -38,7 +38,7 @@ class AGFSManager:
manager.start()
# 2. S3 backend
- from openviking.utils.config.agfs_config import AGFSConfig, S3Config
+ from openviking_cli.utils.config.agfs_config import AGFSConfig, S3Config
config = AGFSConfig(
path="./data",
diff --git a/openviking/async_client.py b/openviking/async_client.py
index 3376ab946..9eaa76ce7 100644
--- a/openviking/async_client.py
+++ b/openviking/async_client.py
@@ -10,10 +10,10 @@ import threading
from typing import Any, Dict, List, Optional, Union
from openviking.client import LocalClient, Session
-from openviking.client.base import BaseClient
from openviking.service.debug_service import SystemStatus
-from openviking.session.user_id import UserIdentifier
-from openviking.utils import get_logger
+from openviking_cli.client.base import BaseClient
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/client.py b/openviking/client.py
index 34d5e6737..444607c2a 100644
--- a/openviking/client.py
+++ b/openviking/client.py
@@ -6,8 +6,8 @@ This module provides both synchronous and asynchronous clients.
"""
from openviking.async_client import AsyncOpenViking
-from openviking.client.http import AsyncHTTPClient
-from openviking.client.sync_http import SyncHTTPClient
from openviking.sync_client import SyncOpenViking
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.client.sync_http import SyncHTTPClient
__all__ = ["SyncOpenViking", "AsyncOpenViking", "SyncHTTPClient", "AsyncHTTPClient"]
diff --git a/openviking/client/__init__.py b/openviking/client/__init__.py
index c4ab52cf0..ad76639f1 100644
--- a/openviking/client/__init__.py
+++ b/openviking/client/__init__.py
@@ -5,11 +5,11 @@
Provides client implementations for embedded (LocalClient) and HTTP (AsyncHTTPClient/SyncHTTPClient) modes.
"""
-from openviking.client.base import BaseClient
-from openviking.client.http import AsyncHTTPClient
from openviking.client.local import LocalClient
from openviking.client.session import Session
-from openviking.client.sync_http import SyncHTTPClient
+from openviking_cli.client.base import BaseClient
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.client.sync_http import SyncHTTPClient
__all__ = [
"BaseClient",
diff --git a/openviking/client/local.py b/openviking/client/local.py
index 650a2d5a4..6e84a63ba 100644
--- a/openviking/client/local.py
+++ b/openviking/client/local.py
@@ -7,10 +7,9 @@ Implements BaseClient interface using direct service calls (embedded mode).
from typing import Any, Dict, List, Optional, Union
-from openviking.client.base import BaseClient
from openviking.service import OpenVikingService
-from openviking.session.user_id import UserIdentifier
-from openviking.utils.config import OpenVikingConfig
+from openviking_cli.client.base import BaseClient
+from openviking_cli.session.user_id import UserIdentifier
class LocalClient(BaseClient):
diff --git a/openviking/client/session.py b/openviking/client/session.py
index 39f62e32c..637e51269 100644
--- a/openviking/client/session.py
+++ b/openviking/client/session.py
@@ -7,10 +7,10 @@ Session delegates all operations to the underlying Client (LocalClient or AsyncH
from typing import TYPE_CHECKING, Any, Dict
-from openviking.session.user_id import UserIdentifier
+from openviking_cli.session.user_id import UserIdentifier
if TYPE_CHECKING:
- from openviking.client.base import BaseClient
+ from openviking_cli.client.base import BaseClient
class Session:
diff --git a/openviking/core/context.py b/openviking/core/context.py
index a674d6705..24d836872 100644
--- a/openviking/core/context.py
+++ b/openviking/core/context.py
@@ -7,7 +7,7 @@ from enum import Enum
from typing import Any, Dict, List, Optional
from uuid import uuid4
-from openviking.session.user_id import UserIdentifier
+from openviking_cli.session.user_id import UserIdentifier
class ResourceContentType(str, Enum):
diff --git a/openviking/core/directories.py b/openviking/core/directories.py
index 5f7f246ed..866a944d4 100644
--- a/openviking/core/directories.py
+++ b/openviking/core/directories.py
@@ -153,7 +153,7 @@ class DirectoryInitializer:
async def initialize_all(self) -> int:
"""Initialize all global preset directories (skip user scope)."""
- from openviking.utils.logger import get_logger
+ from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
count = 0
@@ -207,7 +207,7 @@ class DirectoryInitializer:
scope: str,
) -> bool:
"""Ensure directory exists, return whether newly created."""
- from openviking.utils.logger import get_logger
+ from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
created = False
@@ -220,7 +220,7 @@ class DirectoryInitializer:
logger.debug(f"[VikingFS] Directory {uri} already exists")
# 2. Ensure record exists in vector storage
- from openviking.utils.config.vectordb_config import COLLECTION_NAME
+ from openviking_cli.utils.config.vectordb_config import COLLECTION_NAME
existing = await self.vikingdb.filter(
collection=COLLECTION_NAME,
diff --git a/openviking/models/embedder/vikingdb_embedders.py b/openviking/models/embedder/vikingdb_embedders.py
index e7b96be29..74336600b 100644
--- a/openviking/models/embedder/vikingdb_embedders.py
+++ b/openviking/models/embedder/vikingdb_embedders.py
@@ -11,7 +11,7 @@ from openviking.models.embedder.base import (
SparseEmbedderBase,
)
from openviking.storage.vectordb.collection.volcengine_clients import ClientForDataApi
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
class VikingDBClientMixin:
diff --git a/openviking/models/vlm/llm.py b/openviking/models/vlm/llm.py
index f657f0304..07c52179f 100644
--- a/openviking/models/vlm/llm.py
+++ b/openviking/models/vlm/llm.py
@@ -13,7 +13,7 @@ from typing import Any, Dict, Optional, Type, TypeVar
import json_repair
from pydantic import BaseModel
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/converter.py b/openviking/parse/converter.py
index 9893d2bb6..52d65c567 100644
--- a/openviking/parse/converter.py
+++ b/openviking/parse/converter.py
@@ -7,7 +7,7 @@ import tempfile
from pathlib import Path
from typing import Optional
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/directory_scan.py b/openviking/parse/directory_scan.py
index 9aa7de170..2b62b6c19 100644
--- a/openviking/parse/directory_scan.py
+++ b/openviking/parse/directory_scan.py
@@ -14,11 +14,11 @@ from dataclasses import dataclass, field
from pathlib import Path
from typing import List, Optional, Set, Union
-from openviking.exceptions import UnsupportedDirectoryFilesError
from openviking.parse.parsers.constants import IGNORE_DIRS
from openviking.parse.parsers.upload_utils import is_text_file
from openviking.parse.registry import ParserRegistry, get_registry
-from openviking.utils.logger import get_logger
+from openviking_cli.exceptions import UnsupportedDirectoryFilesError
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/parsers/code/code.py b/openviking/parse/parsers/code/code.py
index df8c3382f..8a207802b 100644
--- a/openviking/parse/parsers/code/code.py
+++ b/openviking/parse/parsers/code/code.py
@@ -35,7 +35,7 @@ from openviking.parse.parsers.constants import (
IGNORE_EXTENSIONS,
)
from openviking.parse.parsers.upload_utils import upload_directory
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/parsers/markdown.py b/openviking/parse/parsers/markdown.py
index 6620130ea..fc66f9353 100644
--- a/openviking/parse/parsers/markdown.py
+++ b/openviking/parse/parsers/markdown.py
@@ -24,8 +24,8 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
from openviking.parse.base import NodeType, ParseResult, ResourceNode, create_parse_result
from openviking.parse.parsers.base_parser import BaseParser
-from openviking.utils.config.parser_config import ParserConfig
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.config.parser_config import ParserConfig
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/parsers/media.py b/openviking/parse/parsers/media.py
index 9e2e5dbca..cb25a8036 100644
--- a/openviking/parse/parsers/media.py
+++ b/openviking/parse/parsers/media.py
@@ -17,7 +17,7 @@ from PIL import Image
from openviking.parse.base import NodeType, ParseResult, ResourceNode
from openviking.parse.parsers.base_parser import BaseParser
-from openviking.utils.config.parser_config import AudioConfig, ImageConfig, VideoConfig
+from openviking_cli.utils.config.parser_config import AudioConfig, ImageConfig, VideoConfig
# =============================================================================
# Configuration Classes
diff --git a/openviking/parse/parsers/pdf.py b/openviking/parse/parsers/pdf.py
index 7ada2c784..598455a5b 100644
--- a/openviking/parse/parsers/pdf.py
+++ b/openviking/parse/parsers/pdf.py
@@ -25,7 +25,7 @@ from openviking.parse.base import (
lazy_import,
)
from openviking.parse.parsers.base_parser import BaseParser
-from openviking.utils.config.parser_config import PDFConfig
+from openviking_cli.utils.config.parser_config import PDFConfig
logger = logging.getLogger(__name__)
@@ -207,7 +207,7 @@ class PDFParser(BaseParser):
# Import storage utilities
if storage is None:
- from openviking.utils.storage import get_storage
+ from openviking_cli.utils.storage import get_storage
storage = get_storage()
diff --git a/openviking/parse/parsers/text.py b/openviking/parse/parsers/text.py
index 902614315..7b16165e7 100644
--- a/openviking/parse/parsers/text.py
+++ b/openviking/parse/parsers/text.py
@@ -11,7 +11,7 @@ from typing import List, Optional, Union
from openviking.parse.base import ParseResult
from openviking.parse.parsers.base_parser import BaseParser
-from openviking.utils.config.parser_config import ParserConfig
+from openviking_cli.utils.config.parser_config import ParserConfig
class TextParser(BaseParser):
diff --git a/openviking/parse/parsers/upload_utils.py b/openviking/parse/parsers/upload_utils.py
index 06e28a4cb..b675cd548 100644
--- a/openviking/parse/parsers/upload_utils.py
+++ b/openviking/parse/parsers/upload_utils.py
@@ -16,7 +16,7 @@ from openviking.parse.parsers.constants import (
TEXT_ENCODINGS,
UTF8_VARIANTS,
)
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/parse/tree_builder.py b/openviking/parse/tree_builder.py
index 7bb6d4f9e..353590442 100644
--- a/openviking/parse/tree_builder.py
+++ b/openviking/parse/tree_builder.py
@@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Optional
from openviking.core.building_tree import BuildingTree
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils.uri import VikingURI
+from openviking_cli.utils.uri import VikingURI
if TYPE_CHECKING:
pass
diff --git a/openviking/parse/vlm.py b/openviking/parse/vlm.py
index c410bea89..265223d2c 100644
--- a/openviking/parse/vlm.py
+++ b/openviking/parse/vlm.py
@@ -7,9 +7,9 @@ from pathlib import Path
from typing import Any, Dict, List, Union
from openviking.prompts import render_prompt
-from openviking.utils.extractor import ImageInfo, TableInfo
-from openviking.utils.llm import parse_json_from_response
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.extractor import ImageInfo, TableInfo
+from openviking_cli.utils.llm import parse_json_from_response
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
@@ -52,7 +52,7 @@ class VLMProcessor:
def _get_vlm(self):
"""Get VLM singleton."""
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
return get_openviking_config().vlm
diff --git a/openviking/retrieve/__init__.py b/openviking/retrieve/__init__.py
index 481ad0398..cc82f0f2d 100644
--- a/openviking/retrieve/__init__.py
+++ b/openviking/retrieve/__init__.py
@@ -7,7 +7,7 @@ Provides intent-driven hierarchical context retrieval.
"""
from openviking.retrieve.hierarchical_retriever import HierarchicalRetriever
-from openviking.retrieve.types import (
+from openviking_cli.retrieve.types import (
ContextType,
FindResult,
MatchedContext,
diff --git a/openviking/retrieve/hierarchical_retriever.py b/openviking/retrieve/hierarchical_retriever.py
index 1ea911c99..4f9ff2353 100644
--- a/openviking/retrieve/hierarchical_retriever.py
+++ b/openviking/retrieve/hierarchical_retriever.py
@@ -11,17 +11,17 @@ import heapq
from typing import Any, Dict, List, Optional, Tuple
from openviking.models.embedder.base import EmbedResult
-from openviking.retrieve.types import (
+from openviking.storage import VikingDBInterface
+from openviking.storage.viking_fs import get_viking_fs
+from openviking_cli.retrieve.types import (
ContextType,
MatchedContext,
QueryResult,
RelatedContext,
TypedQuery,
)
-from openviking.storage import VikingDBInterface
-from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils.config import RerankConfig
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.config import RerankConfig
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/retrieve/intent_analyzer.py b/openviking/retrieve/intent_analyzer.py
index 0d5b4725f..61c73a78c 100644
--- a/openviking/retrieve/intent_analyzer.py
+++ b/openviking/retrieve/intent_analyzer.py
@@ -10,10 +10,10 @@ from typing import List, Optional
from openviking.message import Message
from openviking.prompts import render_prompt
-from openviking.retrieve.types import ContextType, QueryPlan, TypedQuery
-from openviking.utils.config import get_openviking_config
-from openviking.utils.llm import parse_json_from_response
-from openviking.utils.logger import get_logger
+from openviking_cli.retrieve.types import ContextType, QueryPlan, TypedQuery
+from openviking_cli.utils.config import get_openviking_config
+from openviking_cli.utils.llm import parse_json_from_response
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/server/app.py b/openviking/server/app.py
index 0ed38a570..c48d3def6 100644
--- a/openviking/server/app.py
+++ b/openviking/server/app.py
@@ -10,7 +10,6 @@ from fastapi import FastAPI, Request
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse
-from openviking.exceptions import OpenVikingError
from openviking.server.config import ServerConfig, load_server_config
from openviking.server.dependencies import set_service
from openviking.server.models import ERROR_CODE_TO_HTTP_STATUS, ErrorInfo, Response
@@ -27,7 +26,8 @@ from openviking.server.routers import (
system_router,
)
from openviking.service.core import OpenVikingService
-from openviking.utils import get_logger
+from openviking_cli.exceptions import OpenVikingError
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/server/auth.py b/openviking/server/auth.py
index a54d6ab1f..637bb5fa7 100644
--- a/openviking/server/auth.py
+++ b/openviking/server/auth.py
@@ -7,7 +7,7 @@ from typing import Optional
from fastapi import Header, Request
-from openviking.exceptions import UnauthenticatedError
+from openviking_cli.exceptions import UnauthenticatedError
async def verify_api_key(
diff --git a/openviking/server/config.py b/openviking/server/config.py
index d15718dbc..18c438cb6 100644
--- a/openviking/server/config.py
+++ b/openviking/server/config.py
@@ -5,7 +5,7 @@
from dataclasses import dataclass, field
from typing import List, Optional
-from openviking.utils.config.config_loader import (
+from openviking_cli.utils.config.config_loader import (
DEFAULT_OV_CONF,
OPENVIKING_CONFIG_ENV,
load_json_config,
@@ -46,7 +46,8 @@ def load_server_config(config_path: Optional[str] = None) -> ServerConfig:
"""
path = resolve_config_path(config_path, OPENVIKING_CONFIG_ENV, DEFAULT_OV_CONF)
if path is None:
- from openviking.utils.config.config_loader import DEFAULT_CONFIG_DIR
+ from openviking_cli.utils.config.config_loader import DEFAULT_CONFIG_DIR
+
default_path = DEFAULT_CONFIG_DIR / DEFAULT_OV_CONF
raise FileNotFoundError(
f"OpenViking configuration file not found.\n"
diff --git a/openviking/server/routers/filesystem.py b/openviking/server/routers/filesystem.py
index 5508aa058..8fe121c87 100644
--- a/openviking/server/routers/filesystem.py
+++ b/openviking/server/routers/filesystem.py
@@ -3,13 +3,13 @@
"""Filesystem endpoints for OpenViking HTTP Server."""
from fastapi import APIRouter, Depends, Query
-from pydantic import BaseModel
from pyagfs.exceptions import AGFSClientError
+from pydantic import BaseModel
-from openviking.exceptions import NotFoundError
from openviking.server.auth import verify_api_key
from openviking.server.dependencies import get_service
from openviking.server.models import Response
+from openviking_cli.exceptions import NotFoundError
router = APIRouter(prefix="/api/v1/fs", tags=["filesystem"])
diff --git a/openviking/service/core.py b/openviking/service/core.py
index 7c525ef8d..9062e7073 100644
--- a/openviking/service/core.py
+++ b/openviking/service/core.py
@@ -10,7 +10,6 @@ from typing import Any, Optional
from openviking.agfs_manager import AGFSManager
from openviking.core.directories import DirectoryInitializer
-from openviking.exceptions import NotInitializedError
from openviking.service.debug_service import DebugService
from openviking.service.fs_service import FSService
from openviking.service.pack_service import PackService
@@ -19,18 +18,19 @@ from openviking.service.resource_service import ResourceService
from openviking.service.search_service import SearchService
from openviking.service.session_service import SessionService
from openviking.session.compressor import SessionCompressor
-from openviking.session.user_id import UserIdentifier
from openviking.storage import VikingDBManager
from openviking.storage.collection_schemas import init_context_collection
from openviking.storage.queuefs.queue_manager import QueueManager, init_queue_manager
from openviking.storage.transaction import TransactionManager, init_transaction_manager
from openviking.storage.viking_fs import VikingFS, init_viking_fs
-from openviking.utils import get_logger
-from openviking.utils.config import get_openviking_config
-from openviking.utils.config.open_viking_config import initialize_openviking_config
-from openviking.utils.config.storage_config import StorageConfig
from openviking.utils.resource_processor import ResourceProcessor
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.open_viking_config import initialize_openviking_config
+from openviking_cli.utils.config.storage_config import StorageConfig
logger = get_logger(__name__)
diff --git a/openviking/service/debug_service.py b/openviking/service/debug_service.py
index 467063eae..eeada55f5 100644
--- a/openviking/service/debug_service.py
+++ b/openviking/service/debug_service.py
@@ -16,7 +16,7 @@ from openviking.storage.observers import (
)
from openviking.storage.queuefs import get_queue_manager
from openviking.storage.transaction import get_transaction_manager
-from openviking.utils.config import OpenVikingConfig
+from openviking_cli.utils.config import OpenVikingConfig
@dataclass
diff --git a/openviking/service/fs_service.py b/openviking/service/fs_service.py
index d7f0ebddd..52f6d4a6e 100644
--- a/openviking/service/fs_service.py
+++ b/openviking/service/fs_service.py
@@ -8,9 +8,9 @@ Provides file system operations: ls, mkdir, rm, mv, tree, stat, read, abstract,
from typing import Any, Dict, List, Optional
-from openviking.exceptions import NotInitializedError
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
+from openviking_cli.exceptions import NotInitializedError
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/service/pack_service.py b/openviking/service/pack_service.py
index 54095145f..fb8a87963 100644
--- a/openviking/service/pack_service.py
+++ b/openviking/service/pack_service.py
@@ -8,11 +8,11 @@ Provides ovpack export/import operations.
from typing import Optional
-from openviking.exceptions import NotInitializedError
from openviking.storage.local_fs import export_ovpack as local_export_ovpack
from openviking.storage.local_fs import import_ovpack as local_import_ovpack
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
+from openviking_cli.exceptions import NotInitializedError
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
@@ -61,4 +61,6 @@ class PackService:
Imported root resource URI
"""
viking_fs = self._ensure_initialized()
- return await local_import_ovpack(viking_fs, file_path, parent, force=force, vectorize=vectorize)
+ return await local_import_ovpack(
+ viking_fs, file_path, parent, force=force, vectorize=vectorize
+ )
diff --git a/openviking/service/relation_service.py b/openviking/service/relation_service.py
index 6dd0fb5a4..22ab9bb49 100644
--- a/openviking/service/relation_service.py
+++ b/openviking/service/relation_service.py
@@ -8,9 +8,9 @@ Provides relation management operations: relations, link, unlink.
from typing import Any, Dict, List, Optional, Union
-from openviking.exceptions import NotInitializedError
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
+from openviking_cli.exceptions import NotInitializedError
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/service/resource_service.py b/openviking/service/resource_service.py
index 119823283..dd6e5dcbf 100644
--- a/openviking/service/resource_service.py
+++ b/openviking/service/resource_service.py
@@ -8,15 +8,19 @@ Provides resource management operations: add_resource, add_skill, wait_processed
from typing import Any, Dict, Optional
-from openviking.exceptions import DeadlineExceededError, InvalidArgumentError, NotInitializedError
-from openviking.session.user_id import UserIdentifier
from openviking.storage import VikingDBManager
from openviking.storage.queuefs import get_queue_manager
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
from openviking.utils.resource_processor import ResourceProcessor
from openviking.utils.skill_processor import SkillProcessor
-from openviking.utils.uri import VikingURI
+from openviking_cli.exceptions import (
+ DeadlineExceededError,
+ InvalidArgumentError,
+ NotInitializedError,
+)
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.uri import VikingURI
logger = get_logger(__name__)
diff --git a/openviking/service/search_service.py b/openviking/service/search_service.py
index 6f88204d9..fd6b47a37 100644
--- a/openviking/service/search_service.py
+++ b/openviking/service/search_service.py
@@ -8,9 +8,9 @@ Provides semantic search operations: search, find.
from typing import TYPE_CHECKING, Any, Dict, Optional
-from openviking.exceptions import NotInitializedError
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
+from openviking_cli.exceptions import NotInitializedError
+from openviking_cli.utils import get_logger
if TYPE_CHECKING:
from openviking.session import Session
diff --git a/openviking/service/session_service.py b/openviking/service/session_service.py
index a905fedfd..209385040 100644
--- a/openviking/service/session_service.py
+++ b/openviking/service/session_service.py
@@ -8,13 +8,13 @@ Provides session management operations: session, sessions, add_message, commit,
from typing import Any, Dict, List, Optional
-from openviking.exceptions import NotFoundError, NotInitializedError
from openviking.session import Session
from openviking.session.compressor import SessionCompressor
-from openviking.session.user_id import UserIdentifier
from openviking.storage import VikingDBManager
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
+from openviking_cli.exceptions import NotFoundError, NotInitializedError
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/session/compressor.py b/openviking/session/compressor.py
index 5ff944476..59bc34dc6 100644
--- a/openviking/session/compressor.py
+++ b/openviking/session/compressor.py
@@ -12,10 +12,10 @@ from typing import Dict, List, Optional
from openviking.core.context import Context, Vectorize
from openviking.message import Message
-from openviking.session.user_id import UserIdentifier
from openviking.storage import VikingDBManager
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils import get_logger
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
from .memory_deduplicator import DedupDecision, MemoryDeduplicator
from .memory_extractor import MemoryCategory, MemoryExtractor
diff --git a/openviking/session/memory_deduplicator.py b/openviking/session/memory_deduplicator.py
index 1ecbdd809..83121de25 100644
--- a/openviking/session/memory_deduplicator.py
+++ b/openviking/session/memory_deduplicator.py
@@ -14,8 +14,8 @@ from openviking.core.context import Context
from openviking.models.embedder.base import EmbedResult
from openviking.prompts import render_prompt
from openviking.storage import VikingDBManager
-from openviking.utils import get_logger
-from openviking.utils.config import get_openviking_config
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config import get_openviking_config
from .memory_extractor import CandidateMemory
@@ -105,7 +105,13 @@ class MemoryDeduplicator:
collection=collection,
query_vector=query_vector,
limit=5,
- filter= {"op": "and", "conds": [{"field": "category", "op": "must", "conds": [category_value]}, {"field": "is_leaf", "op": "must", "conds": [True]}]},
+ filter={
+ "op": "and",
+ "conds": [
+ {"field": "category", "op": "must", "conds": [category_value]},
+ {"field": "is_leaf", "op": "must", "conds": [True]},
+ ],
+ },
)
# Filter by similarity threshold
@@ -150,7 +156,7 @@ class MemoryDeduplicator:
)
try:
- from openviking.utils.llm import parse_json_from_response
+ from openviking_cli.utils.llm import parse_json_from_response
response = await vlm.get_completion_async(prompt)
data = parse_json_from_response(response) or {}
diff --git a/openviking/session/memory_extractor.py b/openviking/session/memory_extractor.py
index 32379387f..3f7907086 100644
--- a/openviking/session/memory_extractor.py
+++ b/openviking/session/memory_extractor.py
@@ -16,10 +16,9 @@ from uuid import uuid4
from openviking.core.context import Context, ContextType, Vectorize
from openviking.prompts import render_prompt
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils import get_logger
-from openviking.utils.config import get_openviking_config
-from openviking.session.user_id import UserIdentifier
-
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config import get_openviking_config
logger = get_logger(__name__)
@@ -99,7 +98,7 @@ class MemoryExtractor:
)
try:
- from openviking.utils.llm import parse_json_from_response
+ from openviking_cli.utils.llm import parse_json_from_response
response = await vlm.get_completion_async(prompt)
data = parse_json_from_response(response) or {}
@@ -156,7 +155,9 @@ class MemoryExtractor:
session_id=session_id,
user=user,
)
- logger.info(f"uri {memory_uri} abstract: {candidate.abstract} content: {candidate.content}")
+ logger.info(
+ f"uri {memory_uri} abstract: {candidate.abstract} content: {candidate.content}"
+ )
memory.set_vectorize(Vectorize(text=candidate.content))
return memory
diff --git a/openviking/session/session.py b/openviking/session/session.py
index c4701c76f..6dcbe6759 100644
--- a/openviking/session/session.py
+++ b/openviking/session/session.py
@@ -13,9 +13,9 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional
from uuid import uuid4
from openviking.message import Message, Part
-from openviking.session.user_id import UserIdentifier
-from openviking.utils import get_logger, run_async
-from openviking.utils.config import get_openviking_config
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger, run_async
+from openviking_cli.utils.config import get_openviking_config
if TYPE_CHECKING:
from openviking.session.compressor import SessionCompressor
diff --git a/openviking/storage/collection_schemas.py b/openviking/storage/collection_schemas.py
index 1226c8517..0ee61069b 100644
--- a/openviking/storage/collection_schemas.py
+++ b/openviking/storage/collection_schemas.py
@@ -14,8 +14,8 @@ from openviking.models.embedder.base import EmbedResult
from openviking.storage.queuefs.embedding_msg import EmbeddingMsg
from openviking.storage.queuefs.named_queue import DequeueHandlerBase
from openviking.storage.vikingdb_interface import CollectionNotFoundError, VikingDBInterface
-from openviking.utils import get_logger
-from openviking.utils.config.open_viking_config import OpenVikingConfig
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config.open_viking_config import OpenVikingConfig
logger = get_logger(__name__)
@@ -70,7 +70,7 @@ async def init_context_collection(storage) -> bool:
Returns:
True if collection was created, False if already exists
"""
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
config = get_openviking_config()
name = config.storage.vectordb.name
@@ -97,7 +97,7 @@ class TextEmbeddingHandler(DequeueHandlerBase):
Args:
vikingdb: VikingDBInterface instance for writing to vector database
"""
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
self._vikingdb = vikingdb
self._embedder = None
@@ -129,7 +129,7 @@ class TextEmbeddingHandler(DequeueHandlerBase):
# Initialize embedder if not already initialized
if not self._embedder:
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
config = get_openviking_config()
self._initialize_embedder(config)
diff --git a/openviking/storage/local_fs.py b/openviking/storage/local_fs.py
index 808e06401..58dd70190 100644
--- a/openviking/storage/local_fs.py
+++ b/openviking/storage/local_fs.py
@@ -9,8 +9,8 @@ from typing import cast
from openviking.core.context import Context
from openviking.storage.queuefs import EmbeddingQueue, get_queue_manager
from openviking.storage.queuefs.embedding_msg_converter import EmbeddingMsgConverter
-from openviking.utils.logger import get_logger
-from openviking.utils.uri import VikingURI
+from openviking_cli.utils.logger import get_logger
+from openviking_cli.utils.uri import VikingURI
logger = get_logger(__name__)
diff --git a/openviking/storage/observers/queue_observer.py b/openviking/storage/observers/queue_observer.py
index 7b6713bb3..4d544f9ee 100644
--- a/openviking/storage/observers/queue_observer.py
+++ b/openviking/storage/observers/queue_observer.py
@@ -11,8 +11,8 @@ from typing import Dict, Optional
from openviking.storage.observers.base_observer import BaseObserver
from openviking.storage.queuefs.named_queue import QueueStatus
from openviking.storage.queuefs.queue_manager import QueueManager
-from openviking.utils import run_async
-from openviking.utils.logger import get_logger
+from openviking_cli.utils import run_async
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/observers/transaction_observer.py b/openviking/storage/observers/transaction_observer.py
index 7791ef892..dce4555d5 100644
--- a/openviking/storage/observers/transaction_observer.py
+++ b/openviking/storage/observers/transaction_observer.py
@@ -12,8 +12,8 @@ from typing import Any, Dict
from openviking.storage.observers.base_observer import BaseObserver
from openviking.storage.transaction import TransactionManager
from openviking.storage.transaction.transaction_record import TransactionStatus
-from openviking.utils import run_async
-from openviking.utils.logger import get_logger
+from openviking_cli.utils import run_async
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/observers/vikingdb_observer.py b/openviking/storage/observers/vikingdb_observer.py
index 4803c6554..dc8f6e35e 100644
--- a/openviking/storage/observers/vikingdb_observer.py
+++ b/openviking/storage/observers/vikingdb_observer.py
@@ -10,8 +10,8 @@ from typing import Dict
from openviking.storage.observers.base_observer import BaseObserver
from openviking.storage.vikingdb_manager import VikingDBManager
-from openviking.utils import run_async
-from openviking.utils.logger import get_logger
+from openviking_cli.utils import run_async
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/observers/vlm_observer.py b/openviking/storage/observers/vlm_observer.py
index dc48911f3..8957caec9 100644
--- a/openviking/storage/observers/vlm_observer.py
+++ b/openviking/storage/observers/vlm_observer.py
@@ -8,7 +8,7 @@ Provides methods to observe and report token usage across VLM models and backend
from openviking.models.vlm.base import VLMBase
from openviking.storage.observers.base_observer import BaseObserver
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/queuefs/embedding_msg_converter.py b/openviking/storage/queuefs/embedding_msg_converter.py
index 2d1cac16e..f0980bf35 100644
--- a/openviking/storage/queuefs/embedding_msg_converter.py
+++ b/openviking/storage/queuefs/embedding_msg_converter.py
@@ -9,7 +9,7 @@ to EmbeddingMsg objects for asynchronous vector processing.
from openviking.core.context import Context
from openviking.storage.queuefs.embedding_msg import EmbeddingMsg
-from openviking.utils import get_logger
+from openviking_cli.utils import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/queuefs/embedding_queue.py b/openviking/storage/queuefs/embedding_queue.py
index b6dc771ae..d44595e8f 100644
--- a/openviking/storage/queuefs/embedding_queue.py
+++ b/openviking/storage/queuefs/embedding_queue.py
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
from typing import Optional
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
from .embedding_msg import EmbeddingMsg
from .named_queue import NamedQueue
diff --git a/openviking/storage/queuefs/named_queue.py b/openviking/storage/queuefs/named_queue.py
index ff4c56e19..6baeb3986 100644
--- a/openviking/storage/queuefs/named_queue.py
+++ b/openviking/storage/queuefs/named_queue.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass, field
from datetime import datetime
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
if TYPE_CHECKING:
from pyagfs import AGFSClient
diff --git a/openviking/storage/queuefs/queue_manager.py b/openviking/storage/queuefs/queue_manager.py
index 5e98dc66c..8832f8b05 100644
--- a/openviking/storage/queuefs/queue_manager.py
+++ b/openviking/storage/queuefs/queue_manager.py
@@ -13,7 +13,7 @@ from typing import Any, Dict, Optional, Union
from pyagfs import AGFSClient
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
from .embedding_queue import EmbeddingQueue
from .named_queue import DequeueHandlerBase, EnqueueHookBase, NamedQueue, QueueStatus
diff --git a/openviking/storage/queuefs/semantic_dag.py b/openviking/storage/queuefs/semantic_dag.py
index 5954841d5..699670564 100644
--- a/openviking/storage/queuefs/semantic_dag.py
+++ b/openviking/storage/queuefs/semantic_dag.py
@@ -7,8 +7,8 @@ from dataclasses import dataclass, field
from typing import Dict, List, Optional
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils import VikingURI
-from openviking.utils.logger import get_logger
+from openviking_cli.utils import VikingURI
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/queuefs/semantic_processor.py b/openviking/storage/queuefs/semantic_processor.py
index 2e5d1aac8..38da777a2 100644
--- a/openviking/storage/queuefs/semantic_processor.py
+++ b/openviking/storage/queuefs/semantic_processor.py
@@ -18,9 +18,9 @@ from openviking.storage.queuefs.named_queue import DequeueHandlerBase
from openviking.storage.queuefs.semantic_dag import DagStats, SemanticDagExecutor
from openviking.storage.queuefs.semantic_msg import SemanticMsg
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils import VikingURI
-from openviking.utils.config import get_openviking_config
-from openviking.utils.logger import get_logger
+from openviking_cli.utils import VikingURI
+from openviking_cli.utils.config import get_openviking_config
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/queuefs/semantic_queue.py b/openviking/storage/queuefs/semantic_queue.py
index d758f3bee..4f412d9cc 100644
--- a/openviking/storage/queuefs/semantic_queue.py
+++ b/openviking/storage/queuefs/semantic_queue.py
@@ -4,7 +4,7 @@
from typing import Optional
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
from .named_queue import NamedQueue
from .semantic_msg import SemanticMsg
diff --git a/openviking/storage/transaction/path_lock.py b/openviking/storage/transaction/path_lock.py
index 4c1f878af..c4f959b67 100644
--- a/openviking/storage/transaction/path_lock.py
+++ b/openviking/storage/transaction/path_lock.py
@@ -13,7 +13,7 @@ from typing import List, Optional
from pyagfs import AGFSClient
from openviking.storage.transaction.transaction_record import TransactionRecord
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/transaction/transaction_manager.py b/openviking/storage/transaction/transaction_manager.py
index 950305197..32a24c449 100644
--- a/openviking/storage/transaction/transaction_manager.py
+++ b/openviking/storage/transaction/transaction_manager.py
@@ -18,7 +18,7 @@ from openviking.storage.transaction.transaction_record import (
TransactionRecord,
TransactionStatus,
)
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/storage/vectordb/collection/local_collection.py b/openviking/storage/vectordb/collection/local_collection.py
index eaeea3c0b..60b451255 100644
--- a/openviking/storage/vectordb/collection/local_collection.py
+++ b/openviking/storage/vectordb/collection/local_collection.py
@@ -45,7 +45,7 @@ from openviking.storage.vectordb.utils.str_to_uint64 import str_to_uint64
from openviking.storage.vectordb.vectorize.base import BaseVectorizer
from openviking.storage.vectordb.vectorize.vectorizer import VectorizerAdapter
from openviking.storage.vectordb.vectorize.vectorizer_factory import VectorizerFactory
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
# Use imported constants, no longer defined here
AUTO_ID_KEY = SpecialFields.AUTO_ID.value
diff --git a/openviking/storage/vectordb/collection/vikingdb_clients.py b/openviking/storage/vectordb/collection/vikingdb_clients.py
index 287d039aa..192bad22e 100644
--- a/openviking/storage/vectordb/collection/vikingdb_clients.py
+++ b/openviking/storage/vectordb/collection/vikingdb_clients.py
@@ -5,7 +5,7 @@ from typing import Any, Dict, Optional
import requests
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
# Default request timeout (seconds)
DEFAULT_TIMEOUT = 30
diff --git a/openviking/storage/vectordb/collection/vikingdb_collection.py b/openviking/storage/vectordb/collection/vikingdb_collection.py
index 5a877edb0..cd799e035 100644
--- a/openviking/storage/vectordb/collection/vikingdb_collection.py
+++ b/openviking/storage/vectordb/collection/vikingdb_collection.py
@@ -15,7 +15,7 @@ from openviking.storage.vectordb.collection.vikingdb_clients import (
VIKINGDB_APIS,
VikingDBClient,
)
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
class VikingDBCollection(ICollection):
diff --git a/openviking/storage/vectordb/collection/volcengine_collection.py b/openviking/storage/vectordb/collection/volcengine_collection.py
index 7ddfa309e..41a67ffd6 100644
--- a/openviking/storage/vectordb/collection/volcengine_collection.py
+++ b/openviking/storage/vectordb/collection/volcengine_collection.py
@@ -17,7 +17,7 @@ from openviking.storage.vectordb.collection.volcengine_clients import (
ClientForConsoleApi,
ClientForDataApi,
)
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_volcengine_collection(config: Dict[str, Any], meta_data: Dict[str, Any]):
diff --git a/openviking/storage/vectordb/index/local_index.py b/openviking/storage/vectordb/index/local_index.py
index 9b9c36f47..eadd17c5e 100644
--- a/openviking/storage/vectordb/index/local_index.py
+++ b/openviking/storage/vectordb/index/local_index.py
@@ -13,7 +13,7 @@ from openviking.storage.vectordb.index.index import IIndex
from openviking.storage.vectordb.store.data import CandidateData, DeltaRecord
from openviking.storage.vectordb.utils.constants import IndexFileMarkers
from openviking.storage.vectordb.utils.data_processor import DataProcessor
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def normalize_vector(vector: List[float]) -> List[float]:
diff --git a/openviking/storage/vectordb/project/http_project.py b/openviking/storage/vectordb/project/http_project.py
index de34b3b75..b439661e6 100644
--- a/openviking/storage/vectordb/project/http_project.py
+++ b/openviking/storage/vectordb/project/http_project.py
@@ -9,7 +9,7 @@ from openviking.storage.vectordb.collection.http_collection import (
list_vikingdb_collections,
)
from openviking.storage.vectordb.utils.dict_utils import ThreadSafeDictManager
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_http_project(
diff --git a/openviking/storage/vectordb/project/local_project.py b/openviking/storage/vectordb/project/local_project.py
index 9cbb5ada1..035a10094 100644
--- a/openviking/storage/vectordb/project/local_project.py
+++ b/openviking/storage/vectordb/project/local_project.py
@@ -7,7 +7,7 @@ from typing import Any, Dict, Optional
from openviking.storage.vectordb.collection.collection import Collection
from openviking.storage.vectordb.collection.local_collection import get_or_create_local_collection
from openviking.storage.vectordb.utils.dict_utils import ThreadSafeDictManager
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_local_project(path: str = ""):
diff --git a/openviking/storage/vectordb/project/project_group.py b/openviking/storage/vectordb/project/project_group.py
index b7c978fd6..847b314fa 100644
--- a/openviking/storage/vectordb/project/project_group.py
+++ b/openviking/storage/vectordb/project/project_group.py
@@ -8,7 +8,7 @@ from openviking.storage.vectordb.project.local_project import (
get_or_create_local_project,
)
from openviking.storage.vectordb.utils.dict_utils import ThreadSafeDictManager
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_project_group(path: str = ""):
diff --git a/openviking/storage/vectordb/project/vikingdb_project.py b/openviking/storage/vectordb/project/vikingdb_project.py
index bfb42d545..50a67acf5 100644
--- a/openviking/storage/vectordb/project/vikingdb_project.py
+++ b/openviking/storage/vectordb/project/vikingdb_project.py
@@ -8,7 +8,7 @@ from openviking.storage.vectordb.collection.vikingdb_clients import (
VikingDBClient,
)
from openviking.storage.vectordb.collection.vikingdb_collection import VikingDBCollection
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_vikingdb_project(
diff --git a/openviking/storage/vectordb/project/volcengine_project.py b/openviking/storage/vectordb/project/volcengine_project.py
index 883072c1b..d30fac08f 100644
--- a/openviking/storage/vectordb/project/volcengine_project.py
+++ b/openviking/storage/vectordb/project/volcengine_project.py
@@ -7,7 +7,7 @@ from openviking.storage.vectordb.collection.volcengine_collection import (
get_or_create_volcengine_collection,
)
from openviking.storage.vectordb.utils.dict_utils import ThreadSafeDictManager
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
def get_or_create_volcengine_project(
diff --git a/openviking/storage/vectordb/service/api_fastapi.py b/openviking/storage/vectordb/service/api_fastapi.py
index 52230b93e..17c4445d7 100644
--- a/openviking/storage/vectordb/service/api_fastapi.py
+++ b/openviking/storage/vectordb/service/api_fastapi.py
@@ -27,7 +27,7 @@ from openviking.storage.vectordb.service.app_models import (
)
from openviking.storage.vectordb.service.code import ErrorCode
from openviking.storage.vectordb.utils import data_utils
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
# Helper functions for responses
diff --git a/openviking/storage/vectordb/service/server_fastapi.py b/openviking/storage/vectordb/service/server_fastapi.py
index d63914974..f737ef3af 100644
--- a/openviking/storage/vectordb/service/server_fastapi.py
+++ b/openviking/storage/vectordb/service/server_fastapi.py
@@ -11,7 +11,7 @@ from fastapi.responses import JSONResponse
from openviking.storage.vectordb.service import api_fastapi
from openviking.storage.vectordb.service.api_fastapi import VikingDBException, error_response
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
# Active requests counter
active_requests = 0
diff --git a/openviking/storage/vectordb/store/file_store.py b/openviking/storage/vectordb/store/file_store.py
index 4db5cab62..95bd88432 100644
--- a/openviking/storage/vectordb/store/file_store.py
+++ b/openviking/storage/vectordb/store/file_store.py
@@ -5,7 +5,7 @@ from pathlib import Path
from typing import Optional
from openviking.storage.vectordb.store.store import IKVStore
-from openviking.utils.logger import default_logger as logger
+from openviking_cli.utils.logger import default_logger as logger
class FileStore(IKVStore):
diff --git a/openviking/storage/vectordb/utils/logging_init.py b/openviking/storage/vectordb/utils/logging_init.py
index 75333e595..3285b3666 100644
--- a/openviking/storage/vectordb/utils/logging_init.py
+++ b/openviking/storage/vectordb/utils/logging_init.py
@@ -51,7 +51,7 @@ def init_cpp_logging():
try:
from openviking.storage.vectordb.engine import init_logging
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
config = get_openviking_config()
diff --git a/openviking/storage/viking_fs.py b/openviking/storage/viking_fs.py
index af948871d..e10130f4f 100644
--- a/openviking/storage/viking_fs.py
+++ b/openviking/storage/viking_fs.py
@@ -22,10 +22,10 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
from pyagfs import AGFSClient
from openviking.storage.vikingdb_interface import VikingDBInterface
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
if TYPE_CHECKING:
- from openviking.utils.config import RerankConfig
+ from openviking_cli.utils.config import RerankConfig
logger = get_logger(__name__)
@@ -292,7 +292,12 @@ class VikingFS:
Returns:
FindResult
"""
- from openviking.retrieve import ContextType, FindResult, HierarchicalRetriever, TypedQuery
+ from openviking_cli.retrieve import (
+ ContextType,
+ FindResult,
+ HierarchicalRetriever,
+ TypedQuery,
+ )
if not self.rerank_config:
raise RuntimeError("rerank_config is required for find")
@@ -365,14 +370,15 @@ class VikingFS:
Returns:
FindResult
"""
- from openviking.retrieve import (
+ from openviking_cli.retrieve.intent_analyzer import IntentAnalyzer
+
+ from openviking_cli.retrieve import (
ContextType,
FindResult,
HierarchicalRetriever,
QueryPlan,
TypedQuery,
)
- from openviking.retrieve.intent_analyzer import IntentAnalyzer
session_summary = session_info.get("summary") if session_info else None
recent_messages = session_info.get("recent_messages") if session_info else None
@@ -529,7 +535,7 @@ class VikingFS:
def _uri_to_path(self, uri: str) -> str:
"""viking://user/memories/preferences/test -> /local/user/memories/preferences/test"""
- remainder = uri[len("viking://"):].strip("/")
+ remainder = uri[len("viking://") :].strip("/")
if not remainder:
return "/local"
return f"/local/{remainder}"
@@ -577,7 +583,7 @@ class VikingFS:
def _infer_context_type(self, uri: str):
"""Infer context_type from URI."""
- from openviking.retrieve import ContextType
+ from openviking_cli.retrieve import ContextType
if "/memories" in uri:
return ContextType.MEMORY
diff --git a/openviking/storage/viking_vector_index_backend.py b/openviking/storage/viking_vector_index_backend.py
index 439b61cfe..5854b3e10 100644
--- a/openviking/storage/viking_vector_index_backend.py
+++ b/openviking/storage/viking_vector_index_backend.py
@@ -15,8 +15,8 @@ from openviking.storage.vectordb.collection.collection import Collection
from openviking.storage.vectordb.collection.result import FetchDataInCollectionResult
from openviking.storage.vectordb.utils.logging_init import init_cpp_logging
from openviking.storage.vikingdb_interface import CollectionNotFoundError, VikingDBInterface
-from openviking.utils import get_logger
-from openviking.utils.config.vectordb_config import VectorDBBackendConfig
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config.vectordb_config import VectorDBBackendConfig
logger = get_logger(__name__)
@@ -64,7 +64,7 @@ class VikingVectorIndexBackend(VikingDBInterface):
backend = VikingVectorIndexBackend(config=config)
# 3. Volcengine VikingDB
- from openviking.utils.config.storage_config import VolcengineConfig
+ from openviking_cli.utils.config.storage_config import VolcengineConfig
config = VectorDBBackendConfig(
backend="volcengine",
volcengine=VolcengineConfig(
diff --git a/openviking/storage/vikingdb_manager.py b/openviking/storage/vikingdb_manager.py
index c814eda66..1321756e1 100644
--- a/openviking/storage/vikingdb_manager.py
+++ b/openviking/storage/vikingdb_manager.py
@@ -10,8 +10,9 @@ from openviking.storage.queuefs.embedding_msg import EmbeddingMsg
from openviking.storage.queuefs.embedding_queue import EmbeddingQueue
from openviking.storage.queuefs.queue_manager import QueueManager
from openviking.storage.viking_vector_index_backend import VikingVectorIndexBackend
-from openviking.utils import get_logger
-from openviking.utils.config.vectordb_config import VectorDBBackendConfig
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config.agfs_config import AGFSConfig
+from openviking_cli.utils.config.vectordb_config import VectorDBBackendConfig
logger = get_logger(__name__)
@@ -149,7 +150,7 @@ class VikingDBManager(VikingVectorIndexBackend):
Embedder instance or None if not configured
"""
try:
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
config = get_openviking_config()
return config.embedding.get_embedder()
diff --git a/openviking/sync_client.py b/openviking/sync_client.py
index 756a5f263..b8f0aa098 100644
--- a/openviking/sync_client.py
+++ b/openviking/sync_client.py
@@ -10,7 +10,7 @@ if TYPE_CHECKING:
from openviking.session import Session
from openviking.async_client import AsyncOpenViking
-from openviking.utils import run_async
+from openviking_cli.utils import run_async
class SyncOpenViking:
diff --git a/openviking/utils/__init__.py b/openviking/utils/__init__.py
index 939b8fd10..c2ecc203b 100644
--- a/openviking/utils/__init__.py
+++ b/openviking/utils/__init__.py
@@ -2,10 +2,10 @@
# SPDX-License-Identifier: Apache-2.0
"""Utility functions and helpers."""
-from openviking.utils.async_utils import run_async
-from openviking.utils.llm import StructuredLLM, parse_json_from_response, parse_json_to_model
-from openviking.utils.logger import default_logger, get_logger
-from openviking.utils.uri import VikingURI
+from openviking_cli.utils.async_utils import run_async
+from openviking_cli.utils.llm import StructuredLLM, parse_json_from_response, parse_json_to_model
+from openviking_cli.utils.logger import default_logger, get_logger
+from openviking_cli.utils.uri import VikingURI
__all__ = [
"VikingURI",
diff --git a/openviking/utils/media_processor.py b/openviking/utils/media_processor.py
index 39de9ae2a..5fa06ca6c 100644
--- a/openviking/utils/media_processor.py
+++ b/openviking/utils/media_processor.py
@@ -7,11 +7,11 @@ from typing import TYPE_CHECKING, Optional
from openviking.parse import DocumentConverter, parse
from openviking.parse.base import ParseResult
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
if TYPE_CHECKING:
from openviking.parse.vlm import VLMProcessor
- from openviking.utils.storage import StoragePath
+ from openviking_cli.utils.storage import StoragePath
logger = get_logger(__name__)
diff --git a/openviking/utils/resource_processor.py b/openviking/utils/resource_processor.py
index 24e28cc53..ed946f55f 100644
--- a/openviking/utils/resource_processor.py
+++ b/openviking/utils/resource_processor.py
@@ -12,8 +12,8 @@ from typing import TYPE_CHECKING, Any, Dict, Optional
from openviking.parse.tree_builder import TreeBuilder
from openviking.storage import VikingDBManager
from openviking.storage.viking_fs import get_viking_fs
-from openviking.utils import get_logger
-from openviking.utils.storage import StoragePath
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.storage import StoragePath
if TYPE_CHECKING:
from openviking.parse.vlm import VLMProcessor
diff --git a/openviking/utils/skill_processor.py b/openviking/utils/skill_processor.py
index f340a925f..5017fe1bb 100644
--- a/openviking/utils/skill_processor.py
+++ b/openviking/utils/skill_processor.py
@@ -12,12 +12,12 @@ from typing import Any, Dict, List, Optional
from openviking.core.context import Context, ContextType, Vectorize
from openviking.core.mcp_converter import is_mcp_format, mcp_to_skill
from openviking.core.skill_loader import SkillLoader
-from openviking.session.user_id import UserIdentifier
from openviking.storage import VikingDBManager
from openviking.storage.queuefs.embedding_msg_converter import EmbeddingMsgConverter
from openviking.storage.viking_fs import VikingFS
-from openviking.utils import get_logger
-from openviking.utils.config import get_openviking_config
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import get_logger
+from openviking_cli.utils.config import get_openviking_config
logger = get_logger(__name__)
diff --git a/openviking_cli/__init__.py b/openviking_cli/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/openviking/cli/__init__.py b/openviking_cli/cli/__init__.py
similarity index 79%
rename from openviking/cli/__init__.py
rename to openviking_cli/cli/__init__.py
index b90ea3d0f..ab2b537a0 100644
--- a/openviking/cli/__init__.py
+++ b/openviking_cli/cli/__init__.py
@@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
"""OpenViking CLI package."""
-from openviking.cli.main import app
+from openviking_cli.cli.main import app
__all__ = ["app"]
diff --git a/openviking/cli/commands/__init__.py b/openviking_cli/cli/commands/__init__.py
similarity index 94%
rename from openviking/cli/commands/__init__.py
rename to openviking_cli/cli/commands/__init__.py
index 551a69412..bf709041e 100644
--- a/openviking/cli/commands/__init__.py
+++ b/openviking_cli/cli/commands/__init__.py
@@ -4,7 +4,7 @@
import typer
-from openviking.cli.commands import (
+from openviking_cli.cli.commands import (
content,
debug,
filesystem,
diff --git a/openviking/cli/commands/content.py b/openviking_cli/cli/commands/content.py
similarity index 95%
rename from openviking/cli/commands/content.py
rename to openviking_cli/cli/commands/content.py
index dee309730..d20462e89 100644
--- a/openviking/cli/commands/content.py
+++ b/openviking_cli/cli/commands/content.py
@@ -4,8 +4,7 @@
import typer
-from openviking.cli.errors import run
-
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/debug.py b/openviking_cli/cli/commands/debug.py
similarity index 81%
rename from openviking/cli/commands/debug.py
rename to openviking_cli/cli/commands/debug.py
index 62bca6cee..e821c0768 100644
--- a/openviking/cli/commands/debug.py
+++ b/openviking_cli/cli/commands/debug.py
@@ -4,9 +4,9 @@
import typer
-from openviking.cli.context import get_cli_context
-from openviking.cli.errors import execute_client_command, run
-from openviking.cli.output import output_success
+from openviking_cli.cli.context import get_cli_context
+from openviking_cli.cli.errors import execute_client_command, run
+from openviking_cli.cli.output import output_success
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/filesystem.py b/openviking_cli/cli/commands/filesystem.py
similarity index 98%
rename from openviking/cli/commands/filesystem.py
rename to openviking_cli/cli/commands/filesystem.py
index c6a2093d1..309deebf4 100644
--- a/openviking/cli/commands/filesystem.py
+++ b/openviking_cli/cli/commands/filesystem.py
@@ -4,7 +4,7 @@
import typer
-from openviking.cli.errors import run
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/observer.py b/openviking_cli/cli/commands/observer.py
similarity index 96%
rename from openviking/cli/commands/observer.py
rename to openviking_cli/cli/commands/observer.py
index a825b6d70..1de1c52a5 100644
--- a/openviking/cli/commands/observer.py
+++ b/openviking_cli/cli/commands/observer.py
@@ -4,7 +4,7 @@
import typer
-from openviking.cli.errors import run
+from openviking_cli.cli.errors import run
observer_app = typer.Typer(help="Observer status commands")
diff --git a/openviking/cli/commands/pack.py b/openviking_cli/cli/commands/pack.py
similarity index 97%
rename from openviking/cli/commands/pack.py
rename to openviking_cli/cli/commands/pack.py
index 011b84f7f..2f8d900eb 100644
--- a/openviking/cli/commands/pack.py
+++ b/openviking_cli/cli/commands/pack.py
@@ -4,7 +4,7 @@
import typer
-from openviking.cli.errors import run
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/relations.py b/openviking_cli/cli/commands/relations.py
similarity index 91%
rename from openviking/cli/commands/relations.py
rename to openviking_cli/cli/commands/relations.py
index 3cd33f306..aa066f80c 100644
--- a/openviking/cli/commands/relations.py
+++ b/openviking_cli/cli/commands/relations.py
@@ -6,9 +6,9 @@ from typing import List
import typer
-from openviking.cli.context import get_cli_context
-from openviking.cli.errors import execute_client_command, run
-from openviking.cli.output import output_success
+from openviking_cli.cli.context import get_cli_context
+from openviking_cli.cli.errors import execute_client_command, run
+from openviking_cli.cli.output import output_success
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/resources.py b/openviking_cli/cli/commands/resources.py
similarity index 97%
rename from openviking/cli/commands/resources.py
rename to openviking_cli/cli/commands/resources.py
index efa75effc..7c9ba94e6 100644
--- a/openviking/cli/commands/resources.py
+++ b/openviking_cli/cli/commands/resources.py
@@ -6,8 +6,7 @@ from typing import Optional
import typer
-from openviking.cli.errors import run
-
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/search.py b/openviking_cli/cli/commands/search.py
similarity index 98%
rename from openviking/cli/commands/search.py
rename to openviking_cli/cli/commands/search.py
index a752af56c..cf3b956e8 100644
--- a/openviking/cli/commands/search.py
+++ b/openviking_cli/cli/commands/search.py
@@ -6,7 +6,7 @@ from typing import Optional
import typer
-from openviking.cli.errors import run
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/serve.py b/openviking_cli/cli/commands/serve.py
similarity index 92%
rename from openviking/cli/commands/serve.py
rename to openviking_cli/cli/commands/serve.py
index d80f29ade..302a76ae7 100644
--- a/openviking/cli/commands/serve.py
+++ b/openviking_cli/cli/commands/serve.py
@@ -7,8 +7,8 @@ from typing import Optional
import typer
-from openviking.cli.context import get_cli_context
-from openviking.cli.errors import handle_command_error
+from openviking_cli.cli.context import get_cli_context
+from openviking_cli.cli.errors import handle_command_error
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/commands/session.py b/openviking_cli/cli/commands/session.py
similarity index 92%
rename from openviking/cli/commands/session.py
rename to openviking_cli/cli/commands/session.py
index 355e96a8e..592f0bd81 100644
--- a/openviking/cli/commands/session.py
+++ b/openviking_cli/cli/commands/session.py
@@ -4,9 +4,9 @@
import typer
-from openviking.cli.context import get_cli_context
-from openviking.cli.errors import execute_client_command, run
-from openviking.cli.output import output_success
+from openviking_cli.cli.context import get_cli_context
+from openviking_cli.cli.errors import execute_client_command, run
+from openviking_cli.cli.output import output_success
session_app = typer.Typer(help="Session management commands")
@@ -65,7 +65,6 @@ def session_commit_command(
run(ctx, lambda client: client.commit_session(session_id))
-
def register(app: typer.Typer) -> None:
"""Register session command group."""
app.add_typer(session_app, name="session")
diff --git a/openviking/cli/commands/system.py b/openviking_cli/cli/commands/system.py
similarity index 93%
rename from openviking/cli/commands/system.py
rename to openviking_cli/cli/commands/system.py
index 636726722..4ee328793 100644
--- a/openviking/cli/commands/system.py
+++ b/openviking_cli/cli/commands/system.py
@@ -6,7 +6,7 @@ from typing import Optional
import typer
-from openviking.cli.errors import run
+from openviking_cli.cli.errors import run
def register(app: typer.Typer) -> None:
diff --git a/openviking/cli/context.py b/openviking_cli/cli/context.py
similarity index 91%
rename from openviking/cli/context.py
rename to openviking_cli/cli/context.py
index a389a0671..ec8ff7b44 100644
--- a/openviking/cli/context.py
+++ b/openviking_cli/cli/context.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Optional
import typer
if TYPE_CHECKING:
- from openviking.client.sync_http import SyncHTTPClient
+ from openviking_cli.client.sync_http import SyncHTTPClient
class CliConfigError(ValueError):
@@ -28,7 +28,7 @@ class CLIContext:
if self._client is not None:
return self._client
- from openviking.client.sync_http import SyncHTTPClient
+ from openviking_cli.client.sync_http import SyncHTTPClient
try:
self._client = SyncHTTPClient()
diff --git a/openviking/cli/errors.py b/openviking_cli/cli/errors.py
similarity index 91%
rename from openviking/cli/errors.py
rename to openviking_cli/cli/errors.py
index 4b701fba6..808d8762b 100644
--- a/openviking/cli/errors.py
+++ b/openviking_cli/cli/errors.py
@@ -7,9 +7,9 @@ from typing import Any, Callable
import httpx
import typer
-from openviking.cli.context import CLIContext, CliConfigError, get_cli_context
-from openviking.cli.output import output_error, output_success
-from openviking.exceptions import OpenVikingError
+from openviking_cli.cli.context import CliConfigError, CLIContext, get_cli_context
+from openviking_cli.cli.output import output_error, output_success
+from openviking_cli.exceptions import OpenVikingError
def handle_command_error(ctx: CLIContext, exc: Exception) -> None:
diff --git a/openviking/cli/main.py b/openviking_cli/cli/main.py
similarity index 91%
rename from openviking/cli/main.py
rename to openviking_cli/cli/main.py
index 2f74cc433..9e35370f5 100644
--- a/openviking/cli/main.py
+++ b/openviking_cli/cli/main.py
@@ -6,13 +6,13 @@ from typing import Optional
import typer
-from openviking.cli.commands import register_commands
-from openviking.cli.context import CLIContext
-from openviking.utils.config.config_loader import (
+from openviking_cli.cli.commands import register_commands
+from openviking_cli.cli.context import CLIContext
+from openviking_cli.utils.config.config_loader import (
DEFAULT_OVCLI_CONF,
OPENVIKING_CLI_CONFIG_ENV,
- resolve_config_path,
load_json_config,
+ resolve_config_path,
)
app = typer.Typer(
diff --git a/openviking/cli/output.py b/openviking_cli/cli/output.py
similarity index 99%
rename from openviking/cli/output.py
rename to openviking_cli/cli/output.py
index b93193d70..f48cd01c7 100644
--- a/openviking/cli/output.py
+++ b/openviking_cli/cli/output.py
@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional
import typer
from tabulate import tabulate
-from openviking.cli.context import CLIContext
+from openviking_cli.cli.context import CLIContext
_MAX_COL_WIDTH = 80
diff --git a/openviking_cli/client/__init__.py b/openviking_cli/client/__init__.py
new file mode 100644
index 000000000..e12673db8
--- /dev/null
+++ b/openviking_cli/client/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2026 Beijing Volcano Engine Technology Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+"""OpenViking Client module.
+
+Provides client implementations for embedded (LocalClient) and HTTP (AsyncHTTPClient/SyncHTTPClient) modes.
+"""
+
+from openviking_cli.client.base import BaseClient
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.client.sync_http import SyncHTTPClient
+
+__all__ = [
+ "BaseClient",
+ "AsyncHTTPClient",
+ "SyncHTTPClient",
+]
diff --git a/openviking/client/base.py b/openviking_cli/client/base.py
similarity index 93%
rename from openviking/client/base.py
rename to openviking_cli/client/base.py
index b5cc80610..131832243 100644
--- a/openviking/client/base.py
+++ b/openviking_cli/client/base.py
@@ -60,9 +60,7 @@ class BaseClient(ABC):
# ============= File System =============
@abstractmethod
- async def ls(
- self, uri: str, simple: bool = False, recursive: bool = False
- ) -> List[Any]:
+ async def ls(self, uri: str, simple: bool = False, recursive: bool = False) -> List[Any]:
"""List directory contents."""
...
@@ -136,9 +134,7 @@ class BaseClient(ABC):
...
@abstractmethod
- async def grep(
- self, uri: str, pattern: str, case_insensitive: bool = False
- ) -> Dict[str, Any]:
+ async def grep(self, uri: str, pattern: str, case_insensitive: bool = False) -> Dict[str, Any]:
"""Content search with pattern."""
...
@@ -155,9 +151,7 @@ class BaseClient(ABC):
...
@abstractmethod
- async def link(
- self, from_uri: str, to_uris: Union[str, List[str]], reason: str = ""
- ) -> None:
+ async def link(self, from_uri: str, to_uris: Union[str, List[str]], reason: str = "") -> None:
"""Create link between resources."""
...
@@ -194,9 +188,7 @@ class BaseClient(ABC):
...
@abstractmethod
- async def add_message(
- self, session_id: str, role: str, content: str
- ) -> Dict[str, Any]:
+ async def add_message(self, session_id: str, role: str, content: str) -> Dict[str, Any]:
"""Add a message to a session."""
...
diff --git a/openviking/client/http.py b/openviking_cli/client/http.py
similarity index 98%
rename from openviking/client/http.py
rename to openviking_cli/client/http.py
index 2f201633b..d1a33b94a 100644
--- a/openviking/client/http.py
+++ b/openviking_cli/client/http.py
@@ -9,14 +9,8 @@ from typing import Any, Dict, List, Optional, Union
import httpx
-from openviking.client.base import BaseClient
-from openviking.utils.config.config_loader import (
- DEFAULT_OVCLI_CONF,
- OPENVIKING_CLI_CONFIG_ENV,
- load_json_config,
- resolve_config_path,
-)
-from openviking.exceptions import (
+from openviking_cli.client.base import BaseClient
+from openviking_cli.exceptions import (
AlreadyExistsError,
DeadlineExceededError,
EmbeddingFailedError,
@@ -33,9 +27,15 @@ from openviking.exceptions import (
UnavailableError,
VLMFailedError,
)
-from openviking.retrieve.types import FindResult
-from openviking.session.user_id import UserIdentifier
-from openviking.utils import run_async
+from openviking_cli.retrieve.types import FindResult
+from openviking_cli.session.user_id import UserIdentifier
+from openviking_cli.utils import run_async
+from openviking_cli.utils.config.config_loader import (
+ DEFAULT_OVCLI_CONF,
+ OPENVIKING_CLI_CONFIG_ENV,
+ load_json_config,
+ resolve_config_path,
+)
# Error code to exception class mapping
ERROR_CODE_TO_EXCEPTION = {
@@ -142,7 +142,7 @@ class AsyncHTTPClient(BaseClient):
if not url:
raise ValueError(
"url is required. Pass it explicitly or configure in "
- "~/.openviking/ovcli.conf (key: \"url\")."
+ '~/.openviking/ovcli.conf (key: "url").'
)
self._url = url.rstrip("/")
self._api_key = api_key
diff --git a/openviking/client/sync_http.py b/openviking_cli/client/sync_http.py
similarity index 93%
rename from openviking/client/sync_http.py
rename to openviking_cli/client/sync_http.py
index 5a69ad62b..63617cbc7 100644
--- a/openviking/client/sync_http.py
+++ b/openviking_cli/client/sync_http.py
@@ -5,13 +5,10 @@
Wraps AsyncHTTPClient with synchronous methods.
"""
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
-if TYPE_CHECKING:
- from openviking.client.session import Session
-
-from openviking.client.http import AsyncHTTPClient
-from openviking.utils import run_async
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.utils import run_async
class SyncHTTPClient:
@@ -50,9 +47,9 @@ class SyncHTTPClient:
run_async(self._async_client.close())
self._initialized = False
- # ============= Session =============
+ # ============= session =============
- def session(self, session_id: Optional[str] = None) -> "Session":
+ def session(self, session_id: Optional[str] = None) -> Any:
"""Create new session or load existing session."""
return self._async_client.session(session_id)
@@ -115,7 +112,7 @@ class SyncHTTPClient:
self,
query: str,
target_uri: str = "",
- session: Optional[Union["Session", Any]] = None,
+ session: Optional[Any] = None,
session_id: Optional[str] = None,
limit: int = 10,
score_threshold: Optional[float] = None,
@@ -143,9 +140,7 @@ class SyncHTTPClient:
filter: Optional[Dict] = None,
):
"""Semantic search without session context."""
- return run_async(
- self._async_client.find(query, target_uri, limit, score_threshold, filter)
- )
+ return run_async(self._async_client.find(query, target_uri, limit, score_threshold, filter))
def grep(self, uri: str, pattern: str, case_insensitive: bool = False) -> Dict:
"""Content search with pattern."""
diff --git a/openviking/exceptions.py b/openviking_cli/exceptions.py
similarity index 100%
rename from openviking/exceptions.py
rename to openviking_cli/exceptions.py
diff --git a/openviking_cli/retrieve/__init__.py b/openviking_cli/retrieve/__init__.py
new file mode 100644
index 000000000..923d3c50b
--- /dev/null
+++ b/openviking_cli/retrieve/__init__.py
@@ -0,0 +1,20 @@
+from openviking_cli.retrieve.types import (
+ ContextType,
+ FindResult,
+ MatchedContext,
+ QueryPlan,
+ QueryResult,
+ RelatedContext,
+ TypedQuery,
+)
+
+__all__ = [
+ # Types
+ "ContextType",
+ "TypedQuery",
+ "QueryPlan",
+ "RelatedContext",
+ "MatchedContext",
+ "QueryResult",
+ "FindResult",
+]
diff --git a/openviking/retrieve/types.py b/openviking_cli/retrieve/types.py
similarity index 100%
rename from openviking/retrieve/types.py
rename to openviking_cli/retrieve/types.py
diff --git a/openviking_cli/session/__init__.py b/openviking_cli/session/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/openviking/session/user_id.py b/openviking_cli/session/user_id.py
similarity index 100%
rename from openviking/session/user_id.py
rename to openviking_cli/session/user_id.py
diff --git a/openviking_cli/utils/__init__.py b/openviking_cli/utils/__init__.py
new file mode 100644
index 000000000..c2ecc203b
--- /dev/null
+++ b/openviking_cli/utils/__init__.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2026 Beijing Volcano Engine Technology Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+"""Utility functions and helpers."""
+
+from openviking_cli.utils.async_utils import run_async
+from openviking_cli.utils.llm import StructuredLLM, parse_json_from_response, parse_json_to_model
+from openviking_cli.utils.logger import default_logger, get_logger
+from openviking_cli.utils.uri import VikingURI
+
+__all__ = [
+ "VikingURI",
+ "get_logger",
+ "default_logger",
+ "StructuredLLM",
+ "parse_json_from_response",
+ "parse_json_to_model",
+ "run_async",
+]
diff --git a/openviking/utils/async_utils.py b/openviking_cli/utils/async_utils.py
similarity index 100%
rename from openviking/utils/async_utils.py
rename to openviking_cli/utils/async_utils.py
diff --git a/openviking/utils/config/__init__.py b/openviking_cli/utils/config/__init__.py
similarity index 100%
rename from openviking/utils/config/__init__.py
rename to openviking_cli/utils/config/__init__.py
diff --git a/openviking/utils/config/agfs_config.py b/openviking_cli/utils/config/agfs_config.py
similarity index 100%
rename from openviking/utils/config/agfs_config.py
rename to openviking_cli/utils/config/agfs_config.py
diff --git a/openviking/utils/config/config_loader.py b/openviking_cli/utils/config/config_loader.py
similarity index 100%
rename from openviking/utils/config/config_loader.py
rename to openviking_cli/utils/config/config_loader.py
diff --git a/openviking/utils/config/embedding_config.py b/openviking_cli/utils/config/embedding_config.py
similarity index 100%
rename from openviking/utils/config/embedding_config.py
rename to openviking_cli/utils/config/embedding_config.py
diff --git a/openviking/utils/config/open_viking_config.py b/openviking_cli/utils/config/open_viking_config.py
similarity index 99%
rename from openviking/utils/config/open_viking_config.py
rename to openviking_cli/utils/config/open_viking_config.py
index 7acb56a9b..6e41e0cb2 100644
--- a/openviking/utils/config/open_viking_config.py
+++ b/openviking_cli/utils/config/open_viking_config.py
@@ -7,13 +7,13 @@ from typing import Any, Dict, Optional
from pydantic import BaseModel, Field
+from openviking_cli.session.user_id import UserIdentifier
+
from .config_loader import (
DEFAULT_OV_CONF,
OPENVIKING_CONFIG_ENV,
resolve_config_path,
- load_json_config,
)
-from openviking.session.user_id import UserIdentifier
from .embedding_config import EmbeddingConfig
from .parser_config import (
AudioConfig,
@@ -181,6 +181,7 @@ class OpenVikingConfigSingleton:
cls._instance = cls._load_from_file(str(config_path))
else:
from .config_loader import DEFAULT_CONFIG_DIR
+
default_path = DEFAULT_CONFIG_DIR / DEFAULT_OV_CONF
raise FileNotFoundError(
f"OpenViking configuration file not found.\n"
@@ -210,6 +211,7 @@ class OpenVikingConfigSingleton:
cls._instance = cls._load_from_file(str(path))
else:
from .config_loader import DEFAULT_CONFIG_DIR
+
default_path = DEFAULT_CONFIG_DIR / DEFAULT_OV_CONF
raise FileNotFoundError(
f"OpenViking configuration file not found.\n"
diff --git a/openviking/utils/config/parser_config.py b/openviking_cli/utils/config/parser_config.py
similarity index 100%
rename from openviking/utils/config/parser_config.py
rename to openviking_cli/utils/config/parser_config.py
diff --git a/openviking/utils/config/rerank_config.py b/openviking_cli/utils/config/rerank_config.py
similarity index 100%
rename from openviking/utils/config/rerank_config.py
rename to openviking_cli/utils/config/rerank_config.py
diff --git a/openviking/utils/config/storage_config.py b/openviking_cli/utils/config/storage_config.py
similarity index 100%
rename from openviking/utils/config/storage_config.py
rename to openviking_cli/utils/config/storage_config.py
diff --git a/openviking/utils/config/vectordb_config.py b/openviking_cli/utils/config/vectordb_config.py
similarity index 100%
rename from openviking/utils/config/vectordb_config.py
rename to openviking_cli/utils/config/vectordb_config.py
diff --git a/openviking/utils/config/vlm_config.py b/openviking_cli/utils/config/vlm_config.py
similarity index 95%
rename from openviking/utils/config/vlm_config.py
rename to openviking_cli/utils/config/vlm_config.py
index 8b1d84fba..2f95d5e73 100644
--- a/openviking/utils/config/vlm_config.py
+++ b/openviking_cli/utils/config/vlm_config.py
@@ -4,8 +4,6 @@ from typing import Any, Literal, Optional
from pydantic import BaseModel, Field, model_validator
-from openviking.models.vlm import VLMBase, VLMFactory
-
class VLMConfig(BaseModel):
"""VLM configuration, supports multiple backends (openai, volcengine)."""
@@ -22,7 +20,7 @@ class VLMConfig(BaseModel):
default="volcengine", description="Backend provider (Deprecated, use 'provider' instead)"
)
- _vlm_instance: Optional[VLMBase] = None
+ _vlm_instance: Optional[Any] = None
class Config:
arbitrary_types_allowed = True
@@ -53,7 +51,9 @@ class VLMConfig(BaseModel):
raise ValueError("VLM configuration requires 'api_key' to be set")
return self
- def get_vlm_instance(self) -> VLMBase:
+ def get_vlm_instance(self) -> Any:
+ from openviking.models.vlm import VLMFactory
+
"""Get VLM instance"""
if self._vlm_instance is None:
config_dict = self.model_dump()
diff --git a/openviking/utils/downloader.py b/openviking_cli/utils/downloader.py
similarity index 96%
rename from openviking/utils/downloader.py
rename to openviking_cli/utils/downloader.py
index 182b2d2d4..ff263f813 100644
--- a/openviking/utils/downloader.py
+++ b/openviking_cli/utils/downloader.py
@@ -11,8 +11,8 @@ import re
from pathlib import Path
from typing import Optional, Tuple
-from openviking.utils.logger import get_logger
-from openviking.utils.storage import StoragePath, get_storage
+from openviking_cli.utils.logger import get_logger
+from openviking_cli.utils.storage import StoragePath, get_storage
logger = get_logger(__name__)
diff --git a/openviking/utils/extractor.py b/openviking_cli/utils/extractor.py
similarity index 100%
rename from openviking/utils/extractor.py
rename to openviking_cli/utils/extractor.py
diff --git a/openviking/utils/llm.py b/openviking_cli/utils/llm.py
similarity index 98%
rename from openviking/utils/llm.py
rename to openviking_cli/utils/llm.py
index d865a9d8e..f82cda41e 100644
--- a/openviking/utils/llm.py
+++ b/openviking_cli/utils/llm.py
@@ -13,7 +13,7 @@ from typing import Any, Dict, Optional, Type, TypeVar
import json_repair
from pydantic import BaseModel
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
@@ -171,7 +171,7 @@ class StructuredLLM:
def _get_vlm(self):
"""Get VLM singleton."""
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
return get_openviking_config().vlm
diff --git a/openviking/utils/logger.py b/openviking_cli/utils/logger.py
similarity index 95%
rename from openviking/utils/logger.py
rename to openviking_cli/utils/logger.py
index ea679ff5f..4d6cc66c9 100644
--- a/openviking/utils/logger.py
+++ b/openviking_cli/utils/logger.py
@@ -27,7 +27,7 @@ def get_logger(
if not logger.handlers:
try:
- from openviking.utils.config import get_openviking_config
+ from openviking_cli.utils.config import get_openviking_config
config = get_openviking_config()
log_level_str = config.log_level.upper()
diff --git a/openviking/utils/rerank.py b/openviking_cli/utils/rerank.py
similarity index 98%
rename from openviking/utils/rerank.py
rename to openviking_cli/utils/rerank.py
index adc67f46b..fc0058caf 100644
--- a/openviking/utils/rerank.py
+++ b/openviking_cli/utils/rerank.py
@@ -14,7 +14,7 @@ from volcengine.auth.SignerV4 import SignerV4
from volcengine.base.Request import Request
from volcengine.Credentials import Credentials
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/utils/storage.py b/openviking_cli/utils/storage.py
similarity index 99%
rename from openviking/utils/storage.py
rename to openviking_cli/utils/storage.py
index 58c9ccf6b..b612fd61b 100644
--- a/openviking/utils/storage.py
+++ b/openviking_cli/utils/storage.py
@@ -11,7 +11,7 @@ from pathlib import Path
from typing import Optional
from uuid import uuid4
-from openviking.utils.logger import get_logger
+from openviking_cli.utils.logger import get_logger
logger = get_logger(__name__)
diff --git a/openviking/utils/uri.py b/openviking_cli/utils/uri.py
similarity index 100%
rename from openviking/utils/uri.py
rename to openviking_cli/utils/uri.py
diff --git a/pyproject.toml b/pyproject.toml
index 5556a74c2..adb70ab47 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -79,7 +79,7 @@ Repository = "https://github.com/volcengine/openviking"
Issues = "https://github.com/volcengine/openviking/issues"
[project.scripts]
-openviking = "openviking.cli.main:app"
+openviking = "openviking_cli.cli.main:app"
openviking-server = "openviking.server.bootstrap:main"
[tool.setuptools_scm]
diff --git a/tests/agfs/test_fs_local.py b/tests/agfs/test_fs_local.py
index ea728da35..d9e2e1cb8 100644
--- a/tests/agfs/test_fs_local.py
+++ b/tests/agfs/test_fs_local.py
@@ -12,7 +12,7 @@ import pytest
from openviking.agfs_manager import AGFSManager
from openviking.storage.viking_fs import init_viking_fs
-from openviking.utils.config.agfs_config import AGFSConfig
+from openviking_cli.utils.config.agfs_config import AGFSConfig
# 1. Config loading logic
# Try to load from environment variable or default ov.conf
@@ -23,6 +23,7 @@ if not CONFIG_FILE:
if default_conf.exists():
CONFIG_FILE = str(default_conf)
+
def load_agfs_config() -> AGFSConfig:
"""Load only AGFS configuration from the config file."""
if not CONFIG_FILE or not Path(CONFIG_FILE).exists():
@@ -41,14 +42,16 @@ def load_agfs_config() -> AGFSConfig:
except Exception:
return None
+
AGFS_CONF = load_agfs_config()
# 2. Skip tests if no local config found or backend is not local
pytestmark = pytest.mark.skipif(
AGFS_CONF is None or AGFS_CONF.backend != "local",
- reason="AGFS local configuration not found in ov.conf or backend is not local"
+ reason="AGFS local configuration not found in ov.conf or backend is not local",
)
+
@pytest.fixture(scope="module")
async def viking_fs_instance():
"""Initialize AGFS Manager and VikingFS singleton."""
@@ -63,6 +66,7 @@ async def viking_fs_instance():
# AGFSManager.stop is synchronous
manager.stop()
+
@pytest.mark.asyncio
class TestVikingFSLocal:
"""Test VikingFS operations with local backend."""
diff --git a/tests/agfs/test_fs_s3.py b/tests/agfs/test_fs_s3.py
index 5b950caaa..62a6f8f03 100644
--- a/tests/agfs/test_fs_s3.py
+++ b/tests/agfs/test_fs_s3.py
@@ -8,13 +8,13 @@ import os
import uuid
from pathlib import Path
-import botocore
import boto3
+import botocore
import pytest
from openviking.agfs_manager import AGFSManager
from openviking.storage.viking_fs import VikingFS, init_viking_fs
-from openviking.utils.config.agfs_config import AGFSConfig
+from openviking_cli.utils.config.agfs_config import AGFSConfig
# 1. Simplified Config loading logic
# Only extract the AGFS part for focused testing
@@ -25,6 +25,7 @@ if not CONFIG_FILE:
if default_conf.exists():
CONFIG_FILE = str(default_conf)
+
def load_agfs_config() -> AGFSConfig:
"""Load only AGFS configuration from the config file."""
if not CONFIG_FILE or not Path(CONFIG_FILE).exists():
@@ -43,28 +44,31 @@ def load_agfs_config() -> AGFSConfig:
except Exception:
return None
+
AGFS_CONF = load_agfs_config()
# 2. Skip tests if no S3 config found or backend is not S3
pytestmark = pytest.mark.skipif(
AGFS_CONF is None or AGFS_CONF.backend != "s3",
- reason="AGFS S3 configuration not found in ov.conf"
+ reason="AGFS S3 configuration not found in ov.conf",
)
+
@pytest.fixture(scope="module")
def s3_client():
"""Boto3 client for S3 verification."""
s3_conf = AGFS_CONF.s3
return boto3.client(
- 's3',
+ "s3",
aws_access_key_id=s3_conf.access_key,
aws_secret_access_key=s3_conf.secret_key,
region_name=s3_conf.region,
endpoint_url=s3_conf.endpoint,
- use_ssl=s3_conf.use_ssl
+ use_ssl=s3_conf.use_ssl,
)
+
@pytest.fixture(scope="module")
async def viking_fs_instance():
"""Initialize AGFS Manager and VikingFS singleton."""
@@ -79,6 +83,7 @@ async def viking_fs_instance():
# AGFSManager.stop is synchronous
manager.stop()
+
@pytest.mark.asyncio
class TestVikingFSS3:
"""Test VikingFS operations with S3 backend and verify via S3 client."""
@@ -100,7 +105,7 @@ class TestVikingFSS3:
# 2. Verify existence and content via S3 client
s3_key = f"{prefix}{test_filename}"
response = s3_client.get_object(Bucket=bucket, Key=s3_key)
- s3_content = response['Body'].read().decode('utf-8')
+ s3_content = response["Body"].read().decode("utf-8")
assert s3_content == test_content
# 3. Stat via VikingFS
@@ -122,7 +127,7 @@ class TestVikingFSS3:
# 7. Verify deletion via S3 client
with pytest.raises(botocore.exceptions.ClientError) as excinfo:
s3_client.get_object(Bucket=bucket, Key=s3_key)
- assert excinfo.value.response['Error']['Code'] in ['NoSuchKey', '404']
+ assert excinfo.value.response["Error"]["Code"] in ["NoSuchKey", "404"]
async def test_directory_operations(self, viking_fs_instance, s3_client):
"""Test VikingFS directory operations and verify with S3 client."""
@@ -144,7 +149,7 @@ class TestVikingFSS3:
s3_key = f"{prefix}{test_dir}/inner.txt"
response = s3_client.get_object(Bucket=bucket, Key=s3_key)
- assert response['Body'].read().decode('utf-8') == file_content
+ assert response["Body"].read().decode("utf-8") == file_content
# 3. List via VikingFS
root_entries = await vfs.ls("viking://")
diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py
index daa2d2d0b..8c92c3c8d 100644
--- a/tests/cli/test_cli.py
+++ b/tests/cli/test_cli.py
@@ -5,12 +5,10 @@
import json
import os
import tempfile
-from pathlib import Path
-import pytest
from typer.testing import CliRunner
-from openviking.cli.main import app
+from openviking_cli.cli.main import app
runner = CliRunner()
@@ -130,9 +128,7 @@ def test_cli_help_smoke():
for args in commands:
result = runner.invoke(app, args, env={})
- assert result.exit_code == 0, "command failed: {}\n{}".format(
- " ".join(args), result.output
- )
+ assert result.exit_code == 0, "command failed: {}\n{}".format(" ".join(args), result.output)
def test_cli_connection_refused():
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index bebed0694..f3dc65d43 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -15,15 +15,12 @@ from pathlib import Path
import httpx
import pytest
-import pytest_asyncio
import uvicorn
-from openviking import AsyncOpenViking
from openviking.server.app import create_app
from openviking.server.config import ServerConfig
from openviking.service.core import OpenVikingService
-from openviking.session.user_id import UserIdentifier
-
+from openviking_cli.session.user_id import UserIdentifier
TEST_ROOT = Path(__file__).parent
TEST_TMP_DIR = TEST_ROOT / ".tmp_integration"
@@ -62,9 +59,7 @@ def server_url(temp_dir):
s.bind(("127.0.0.1", 0))
port = s.getsockname()[1]
- uvi_config = uvicorn.Config(
- fastapi_app, host="127.0.0.1", port=port, log_level="warning"
- )
+ uvi_config = uvicorn.Config(fastapi_app, host="127.0.0.1", port=port, log_level="warning")
server = uvicorn.Server(uvi_config)
thread = threading.Thread(target=server.run, daemon=True)
thread.start()
diff --git a/tests/integration/test_http_integration.py b/tests/integration/test_http_integration.py
index a152f5085..96f41dc6f 100644
--- a/tests/integration/test_http_integration.py
+++ b/tests/integration/test_http_integration.py
@@ -9,8 +9,8 @@ defined in ``conftest.py``.
import pytest
import pytest_asyncio
-from openviking.client.http import AsyncHTTPClient
-from openviking.exceptions import NotFoundError
+from openviking_cli.client.http import AsyncHTTPClient
+from openviking_cli.exceptions import NotFoundError
class TestHTTPClientIntegration:
diff --git a/tests/integration/test_quick_start_lite.py b/tests/integration/test_quick_start_lite.py
index bc0be11ed..4fe81c105 100644
--- a/tests/integration/test_quick_start_lite.py
+++ b/tests/integration/test_quick_start_lite.py
@@ -60,7 +60,7 @@ class TestQuickStartLite(unittest.TestCase):
shutil.rmtree(self.config_dir)
# Reset OpenVikingConfig singleton to avoid side effects
- from openviking.utils.config.open_viking_config import OpenVikingConfigSingleton
+ from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
OpenVikingConfigSingleton.reset_instance()
@@ -220,7 +220,7 @@ class TestQuickStartLite(unittest.TestCase):
patch("openviking.utils.config.VLMConfig.get_vlm_instance", return_value=mock_vlm),
):
# Reset the singleton again inside the patched environment just in case
- from openviking.utils.config.open_viking_config import OpenVikingConfigSingleton
+ from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
OpenVikingConfigSingleton.reset_instance()
diff --git a/tests/misc/test_config_validation.py b/tests/misc/test_config_validation.py
index 0e5686e7e..665c6e15a 100644
--- a/tests/misc/test_config_validation.py
+++ b/tests/misc/test_config_validation.py
@@ -5,10 +5,10 @@
import sys
-from openviking.utils.config.agfs_config import AGFSConfig, S3Config
-from openviking.utils.config.embedding_config import EmbeddingConfig, EmbeddingModelConfig
-from openviking.utils.config.vectordb_config import VectorDBBackendConfig
-from openviking.utils.config.vlm_config import VLMConfig
+from openviking_cli.utils.config.agfs_config import AGFSConfig, S3Config
+from openviking_cli.utils.config.embedding_config import EmbeddingConfig, EmbeddingModelConfig
+from openviking_cli.utils.config.vectordb_config import VectorDBBackendConfig
+from openviking_cli.utils.config.vlm_config import VLMConfig
def test_agfs_validation():
@@ -51,7 +51,7 @@ def test_agfs_validation():
region="us-west-1",
access_key="fake-access-key-for-testing",
secret_key="fake-secret-key-for-testing-12345",
- endpoint="https://s3.amazonaws.com"
+ endpoint="https://s3.amazonaws.com",
),
)
print(" Pass")
diff --git a/tests/parse/test_directory_scan.py b/tests/parse/test_directory_scan.py
index 52ddf72d8..0a3166957 100644
--- a/tests/parse/test_directory_scan.py
+++ b/tests/parse/test_directory_scan.py
@@ -6,7 +6,6 @@ from pathlib import Path
import pytest
-from openviking.exceptions import UnsupportedDirectoryFilesError
from openviking.parse.directory_scan import (
CLASS_PROCESSABLE,
ClassifiedFile,
@@ -14,6 +13,7 @@ from openviking.parse.directory_scan import (
scan_directory,
)
from openviking.parse.registry import ParserRegistry
+from openviking_cli.exceptions import UnsupportedDirectoryFilesError
# ---------------------------------------------------------------------------
# Fixtures
diff --git a/tests/server/conftest.py b/tests/server/conftest.py
index 5eddf1e22..956d7ed71 100644
--- a/tests/server/conftest.py
+++ b/tests/server/conftest.py
@@ -18,7 +18,7 @@ from openviking import AsyncOpenViking
from openviking.server.app import create_app
from openviking.server.config import ServerConfig
from openviking.service.core import OpenVikingService
-from openviking.session.user_id import UserIdentifier
+from openviking_cli.session.user_id import UserIdentifier
# ---------------------------------------------------------------------------
# Paths
@@ -68,7 +68,9 @@ def sample_markdown_file(temp_dir: Path) -> Path:
@pytest_asyncio.fixture(scope="function")
async def service(temp_dir: Path):
"""Create and initialize an OpenVikingService in embedded mode."""
- svc = OpenVikingService(path=str(temp_dir / "data"), user=UserIdentifier.the_default_user("test_user"))
+ svc = OpenVikingService(
+ path=str(temp_dir / "data"), user=UserIdentifier.the_default_user("test_user")
+ )
await svc.initialize()
yield svc
await svc.close()
@@ -90,9 +92,7 @@ async def app(service: OpenVikingService):
async def client(app):
"""httpx AsyncClient bound to the ASGI app (no real network)."""
transport = httpx.ASGITransport(app=app)
- async with httpx.AsyncClient(
- transport=transport, base_url="http://testserver"
- ) as c:
+ async with httpx.AsyncClient(transport=transport, base_url="http://testserver") as c:
yield c
@@ -130,9 +130,7 @@ async def running_server(temp_dir: Path):
s.bind(("127.0.0.1", 0))
port = s.getsockname()[1]
- uvi_config = uvicorn.Config(
- fastapi_app, host="127.0.0.1", port=port, log_level="warning"
- )
+ uvi_config = uvicorn.Config(fastapi_app, host="127.0.0.1", port=port, log_level="warning")
server = uvicorn.Server(uvi_config)
thread = threading.Thread(target=server.run, daemon=True)
thread.start()
@@ -140,9 +138,7 @@ async def running_server(temp_dir: Path):
# Wait for server ready
for _ in range(50):
try:
- r = httpx.get(
- f"http://127.0.0.1:{port}/health", timeout=1
- )
+ r = httpx.get(f"http://127.0.0.1:{port}/health", timeout=1)
if r.status_code == 200:
break
except Exception:
diff --git a/tests/server/test_auth.py b/tests/server/test_auth.py
index a8b6f0309..4e93a044f 100644
--- a/tests/server/test_auth.py
+++ b/tests/server/test_auth.py
@@ -4,15 +4,13 @@
"""Tests for API key authentication (openviking/server/auth.py)."""
import httpx
-import pytest
import pytest_asyncio
from openviking.server.app import create_app
from openviking.server.config import ServerConfig
from openviking.server.dependencies import set_service
from openviking.service.core import OpenVikingService
-from openviking.session.user_id import UserIdentifier
-
+from openviking_cli.session.user_id import UserIdentifier
TEST_API_KEY = "test-secret-key-12345"
@@ -20,7 +18,9 @@ TEST_API_KEY = "test-secret-key-12345"
@pytest_asyncio.fixture(scope="function")
async def auth_service(temp_dir):
"""Service for auth tests."""
- svc = OpenVikingService(path=str(temp_dir / "auth_data"), user=UserIdentifier.the_default_user("auth_user"))
+ svc = OpenVikingService(
+ path=str(temp_dir / "auth_data"), user=UserIdentifier.the_default_user("auth_user")
+ )
await svc.initialize()
yield svc
await svc.close()
@@ -39,9 +39,7 @@ async def auth_app(auth_service):
async def auth_client(auth_app):
"""Client bound to auth-enabled app."""
transport = httpx.ASGITransport(app=auth_app)
- async with httpx.AsyncClient(
- transport=transport, base_url="http://testserver"
- ) as c:
+ async with httpx.AsyncClient(transport=transport, base_url="http://testserver") as c:
yield c
@@ -120,7 +118,5 @@ async def test_auth_on_protected_endpoints(auth_client: httpx.AsyncClient):
# Same endpoints with valid key should work
for method, url in endpoints:
- resp = await auth_client.request(
- method, url, headers={"X-API-Key": TEST_API_KEY}
- )
+ resp = await auth_client.request(method, url, headers={"X-API-Key": TEST_API_KEY})
assert resp.status_code == 200, f"{method} {url} should succeed with key"
diff --git a/tests/server/test_http_client_sdk.py b/tests/server/test_http_client_sdk.py
index a10080586..3fb88cdd1 100644
--- a/tests/server/test_http_client_sdk.py
+++ b/tests/server/test_http_client_sdk.py
@@ -3,11 +3,9 @@
"""SDK tests using AsyncHTTPClient against a real uvicorn server."""
-from pathlib import Path
-
import pytest_asyncio
-from openviking.client.http import AsyncHTTPClient
+from openviking_cli.client.http import AsyncHTTPClient
from tests.server.conftest import SAMPLE_MD_CONTENT, TEST_TMP_DIR
@@ -44,9 +42,7 @@ async def test_sdk_add_resource(http_client):
f.parent.mkdir(parents=True, exist_ok=True)
f.write_text(SAMPLE_MD_CONTENT)
- result = await client.add_resource(
- path=str(f), reason="sdk test", wait=True
- )
+ result = await client.add_resource(path=str(f), reason="sdk test", wait=True)
assert "root_uri" in result
assert result["root_uri"].startswith("viking://")
@@ -95,9 +91,7 @@ async def test_sdk_session_lifecycle(http_client):
assert session_id
# Add message
- msg_result = await client.add_message(
- session_id, "user", "Hello from SDK"
- )
+ msg_result = await client.add_message(session_id, "user", "Hello from SDK")
assert msg_result["message_count"] == 1
# Get
@@ -140,9 +134,7 @@ async def test_sdk_full_workflow(http_client):
f = TEST_TMP_DIR / "sdk_e2e.md"
f.parent.mkdir(parents=True, exist_ok=True)
f.write_text(SAMPLE_MD_CONTENT)
- result = await client.add_resource(
- path=str(f), reason="e2e test", wait=True
- )
+ result = await client.add_resource(path=str(f), reason="e2e test", wait=True)
uri = result["root_uri"]
# Search
diff --git a/tests/test_config_loader.py b/tests/test_config_loader.py
index 83e0646b8..702659266 100644
--- a/tests/test_config_loader.py
+++ b/tests/test_config_loader.py
@@ -2,12 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
"""Tests for config_loader utilities."""
-import json
-import os
-
import pytest
-from openviking.utils.config.config_loader import (
+from openviking_cli.utils.config.config_loader import (
load_json_config,
require_config,
resolve_config_path,