"linter fix"

Author: Hendrixx-RE

sdks/python/sdk/src/moss/__init__.py

@@ -24,13 +24,13 @@
     IndexInfo,
     IndexStatus,
     IndexStatusValues,
-    ModelRef,
-    MutationOptions,
-    MutationResult,
-    JobStatus,
     JobPhase,
     JobProgress,
+    JobStatus,
     JobStatusResponse,
+    ModelRef,
+    MutationOptions,
+    MutationResult,
     QueryResultDocumentInfo,
     SearchResult,
 )

sdks/python/sdk/src/moss/__init__.pyi

@@ -2,89 +2,73 @@ from __future__ import annotations
 
 from typing import ClassVar, Dict, List, Optional, Sequence
 
-
 class MossClient:
     """Semantic search client for vector similarity operations."""
 
     DEFAULT_MODEL_ID: ClassVar[str]
 
     def __init__(self, project_id: str, project_key: str) -> None: ...
-
     async def create_index(
         self,
         name: str,
         docs: List[DocumentInfo],
         model_id: Optional[str] = ...,
     ) -> MutationResult: ...
-
     async def add_docs(
         self,
         name: str,
         docs: List[DocumentInfo],
         options: Optional[MutationOptions] = None,
     ) -> MutationResult: ...
-
     async def delete_docs(
         self,
         name: str,
         doc_ids: List[str],
     ) -> MutationResult: ...
-
     async def get_job_status(self, job_id: str) -> JobStatusResponse: ...
-
     async def get_index(self, name: str) -> IndexInfo: ...
-
     async def list_indexes(self) -> List[IndexInfo]: ...
-
     async def delete_index(self, name: str) -> bool: ...
-
     async def get_docs(
         self,
         name: str,
         options: Optional[GetDocumentsOptions] = None,
     ) -> List[DocumentInfo]: ...
-
     async def load_index(
         self,
         name: str,
         auto_refresh: bool = False,
         polling_interval_in_seconds: int = 600,
     ) -> str: ...
-
     async def unload_index(self, name: str) -> None: ...
-
     async def query(
         self,
         name: str,
         query: str,
         options: Optional[QueryOptions] = None,
     ) -> SearchResult: ...
 
-
 class MutationResult:
     """Return value from create_index/add_docs/delete_docs."""
 
     job_id: str
     index_name: str
     doc_count: int
 
-
 class MutationOptions:
     """Options for add_docs (e.g. upsert behavior)."""
 
     upsert: Optional[bool]
 
     def __init__(self, upsert: Optional[bool] = None) -> None: ...
 
-
 class GetDocumentsOptions:
     """Options for get_docs (e.g. filter by document IDs)."""
 
     doc_ids: Optional[List[str]]
 
     def __init__(self, doc_ids: Optional[List[str]] = None) -> None: ...
 
-
 class JobStatus:
     """Enum-like class for job status values."""
 
@@ -96,7 +80,6 @@ class JobStatus:
 
     value: str
 
-
 class JobPhase:
     """Enum-like class for job phase values."""
 
@@ -109,7 +92,6 @@ class JobPhase:
 
     value: str
 
-
 class JobProgress:
     """Progress update for a job."""
 
@@ -118,7 +100,6 @@ class JobProgress:
     progress: float
     current_phase: Optional[JobPhase]
 
-
 class JobStatusResponse:
     """Full status response from get_job_status."""
 
@@ -131,13 +112,11 @@ class JobStatusResponse:
     updated_at: str
     completed_at: Optional[str]
 
-
 class ModelRef:
     id: str
     version: str
     def __init__(self, id: str, version: str) -> None: ...
 
-
 class QueryResultDocumentInfo:
     id: str
     text: str
@@ -151,7 +130,6 @@ class QueryResultDocumentInfo:
         score: float = ...,
     ) -> None: ...
 
-
 class DocumentInfo:
     id: str
     text: str
@@ -165,7 +143,6 @@ class DocumentInfo:
         embedding: Optional[Sequence[float]] = ...,
     ) -> None: ...
 
-
 class QueryOptions:
     embedding: Optional[Sequence[float]]
     top_k: Optional[int]
@@ -185,7 +162,6 @@ class QueryOptions:
         rerank_model: Optional[str] = ...,
     ) -> None: ...
 
-
 class IndexInfo:
     id: str
     name: str
@@ -207,7 +183,6 @@ class IndexInfo:
         model: ModelRef,
     ) -> None: ...
 
-
 class SearchResult:
     docs: List[QueryResultDocumentInfo]
     query: str
@@ -221,15 +196,13 @@ class SearchResult:
         time_taken_ms: Optional[int] = None,
     ) -> None: ...
 
-
 class IndexStatus:
     NotStarted: ClassVar[str]
     Building: ClassVar[str]
     Ready: ClassVar[str]
     Failed: ClassVar[str]
     def __init__(self, value: str) -> None: ...
 
-
 IndexStatusValues: Dict[str, str]
 
 __version__: str

sdks/python/sdk/src/moss/client/moss_client.py

@@ -4,29 +4,29 @@
 import logging
 import os
 import uuid
-from typing import Any, Dict, List, Optional
+from typing import Any, ClassVar, Dict, List, Optional, Sequence
 
 import httpx
 from moss_core import (
     CLOUD_API_MANAGE_URL,
-    ManageClient,
     DocumentInfo,
     GetDocumentsOptions,
     IndexInfo,
     IndexManager,
+    JobStatusResponse,
+    ManageClient,
     MutationOptions,
     MutationResult,
-    JobStatusResponse,
     QueryResultDocumentInfo,
     SearchResult,
 )
 
 logger = logging.getLogger(__name__)
 
-from typing import Sequence
 
 class QueryOptions:
     """Options for search queries."""
+
     def __init__(
         self,
         embedding: Optional[Sequence[float]] = None,
@@ -37,16 +37,31 @@ def __init__(
         rerank_top_k: Optional[int] = None,
         rerank_model: Optional[str] = None,
     ):
+        if top_k is not None and (not isinstance(top_k, int) or top_k < 1):
+            raise ValueError("top_k must be an integer >= 1")
+        if alpha is not None and (
+            not isinstance(alpha, (int, float)) or not (0.0 <= alpha <= 1.0)
+        ):
+            raise ValueError("alpha must be a float between 0.0 and 1.0")
+        if embedding is not None:
+            try:
+                embedding = [float(x) for x in embedding]
+            except (TypeError, ValueError):
+                raise ValueError("embedding must be a sequence of numbers")
+        if rerank_top_k is not None and (
+            not isinstance(rerank_top_k, int) or rerank_top_k < 1
+        ):
+            raise ValueError("rerank_top_k must be an integer >= 1")
+
         self.embedding = embedding
         self.top_k = top_k
-        self.alpha = alpha
+        self.alpha = float(alpha) if alpha is not None else None
         self.filter = filter
-        self.rerank = rerank
+        self.rerank = bool(rerank)
         self.rerank_top_k = rerank_top_k
         self.rerank_model = rerank_model
 
 
-
 def _get_manage_url() -> str:
     """Manage URL, overridable via env for local development."""
     return os.getenv("MOSS_CLOUD_API_MANAGE_URL", CLOUD_API_MANAGE_URL)
@@ -83,6 +98,7 @@ class MossClient:
     """
 
     DEFAULT_MODEL_ID = "moss-minilm"
+    _cross_encoder_cache: ClassVar[Dict[str, Any]] = {}
 
     def __init__(self, project_id: str, project_key: str) -> None:
         self._project_id = project_id
@@ -215,8 +231,10 @@ async def query(
         """
         is_loaded = await asyncio.to_thread(self._manager.has_index, name)
 
-        rerank = getattr(options, "rerank", False)
-        override_top_k = getattr(options, "rerank_top_k", 50) if rerank else None
+        rerank = getattr(options, "rerank", False) is True
+        override_top_k = (
+            (getattr(options, "rerank_top_k", None) or 50) if rerank else None
+        )
 
         if is_loaded:
             result = await self._query_local(name, query, options, override_top_k)
@@ -228,10 +246,10 @@ async def query(
                     name,
                 )
             result = await self._query_cloud(name, query, options, override_top_k)
-            
+
         if rerank:
             result = await self._rerank_results(query, result, options)
-            
+
         return result
 
     # -- Internal ---------------------------------------------------
@@ -243,7 +261,11 @@ async def _query_local(
         options: Optional[QueryOptions],
         override_top_k: Optional[int] = None,
     ) -> SearchResult:
-        top_k = override_top_k if override_top_k is not None else (getattr(options, "top_k", None) or 5)
+        top_k = (
+            override_top_k
+            if override_top_k is not None
+            else (getattr(options, "top_k", None) or 5)
+        )
         alpha = getattr(options, "alpha", None)
         if alpha is None:
             alpha = 0.8
@@ -286,7 +308,11 @@ async def _query_cloud(
         override_top_k: Optional[int] = None,
     ) -> SearchResult:
         """Fallback: query via the cloud API when the index is not loaded locally."""
-        top_k = override_top_k if override_top_k is not None else (getattr(options, "top_k", None) or 10)
+        top_k = (
+            override_top_k
+            if override_top_k is not None
+            else (getattr(options, "top_k", None) or 10)
+        )
         query_embedding = getattr(options, "embedding", None)
 
         request_body: Dict[str, Any] = {
@@ -346,32 +372,37 @@ async def _rerank_results(
                 "Install it with: pip install 'moss[rerank]'"
             )
 
-        model_name = getattr(options, "rerank_model", None) or "cross-encoder/ms-marco-MiniLM-L-6-v2"
+        model_name = (
+            getattr(options, "rerank_model", None)
+            or "cross-encoder/ms-marco-MiniLM-L-6-v2"
+        )
 
-        def do_rerank():
+        def do_rerank() -> SearchResult:
             if not hasattr(self.__class__, "_cross_encoder_cache"):
                 self.__class__._cross_encoder_cache = {}
 
             if model_name not in self.__class__._cross_encoder_cache:
-                self.__class__._cross_encoder_cache[model_name] = CrossEncoder(model_name)
+                self.__class__._cross_encoder_cache[model_name] = CrossEncoder(
+                    model_name
+                )
 
             model = self.__class__._cross_encoder_cache[model_name]
 
-            pairs = [[query, doc.text] for doc in search_result.docs]
+            local_docs = search_result.docs
+            pairs = [[query, doc.text] for doc in local_docs]
             scores = model.predict(pairs)
 
-            for doc, score in zip(search_result.docs, scores):
+            for doc, score in zip(local_docs, scores):
                 doc.score = float(score)
 
-            search_result.docs.sort(key=lambda d: d.score, reverse=True)
+            local_docs.sort(key=lambda d: d.score, reverse=True)
 
             original_top_k = getattr(options, "top_k", None) or 5
-            search_result.docs = search_result.docs[:original_top_k]
+            search_result.docs = local_docs[:original_top_k]
             return search_result
 
         return await asyncio.to_thread(do_rerank)
 
-
     def _resolve_model_id(
         self,
         docs: List[DocumentInfo],

sdks/python/sdk/tests/conftest.py

@@ -6,14 +6,13 @@
 import os
 import warnings
 from pathlib import Path
-
 from unittest.mock import MagicMock, patch
 
-from moss import MossClient
-
 import pytest
 from dotenv import load_dotenv
 
+from moss import MossClient
+
 # Load .env from project root.
 project_env_path = Path(__file__).parent.parent / ".env"
 load_dotenv(project_env_path)