Move recommend query

src/marqo/api/models/recommend_query.py

@@ -0,0 +1,22 @@
+from typing import Dict, List, Union, Optional
+
+from marqo.core.models.interpolation_method import InterpolationMethod
+from marqo.tensor_search.models.api_models import BaseMarqoModel
+from marqo.tensor_search.models.score_modifiers_object import ScoreModifier
+
+
+class RecommendQuery(BaseMarqoModel):
+    documents: Union[List[str], Dict[str, float]]
+    tensorFields: Optional[List[str]] = None
+    interpolationMethod: Optional[InterpolationMethod] = None
+    excludeInputDocuments: bool = True
+    limit: int = 10
+    offset: int = 0
+    efSearch: Optional[int] = None
+    approximate: Optional[bool] = None
+    searchableAttributes: Optional[List[str]] = None
+    showHighlights: bool = True
+    reRanker: str = None
+    filter: str = None
+    attributesToRetrieve: Union[None, List[str]] = None
+    scoreModifiers: Optional[ScoreModifier] = None

src/marqo/tensor_search/api.py

@@ -15,6 +15,7 @@
 from marqo.api.exceptions import InvalidArgError
 from marqo.api.models.embed_request import EmbedRequest
 from marqo.api.models.health_response import HealthResponse
+from marqo.api.models.recommend_query import RecommendQuery
 from marqo.api.models.rollback_request import RollbackRequest
 from marqo.api.models.update_documents import UpdateDocumentsBodyParams
 from marqo.api.route import MarqoCustomRoute
@@ -24,7 +25,7 @@
 from marqo.tensor_search import tensor_search, utils
 from marqo.tensor_search.enums import RequestType, EnvVars
 from marqo.tensor_search.models.add_docs_objects import (AddDocsBodyParams)
-from marqo.tensor_search.models.api_models import SearchQuery, RecommendQuery
+from marqo.tensor_search.models.api_models import SearchQuery
 from marqo.tensor_search.models.index_settings import IndexSettings, IndexSettingsWithName
 from marqo.tensor_search.on_start_script import on_start
 from marqo.tensor_search.telemetry import RequestMetricsStore, TelemetryMiddleware

src/marqo/tensor_search/models/api_models.py

@@ -9,7 +9,6 @@
 import pydantic
 from pydantic import BaseModel, root_validator
 
-from marqo.core.models.interpolation_method import InterpolationMethod
 from marqo.core.models.marqo_index import MarqoIndex
 from marqo.tensor_search import validation
 from marqo.tensor_search.enums import SearchMethod
@@ -76,23 +75,6 @@ def get_context_tensor(self) -> Optional[List[SearchContextTensor]]:
         return self.context.tensor if self.context is not None else None
 
 
-class RecommendQuery(BaseMarqoModel):
-    documents: Union[List[str], Dict[str, float]]
-    tensorFields: Optional[List[str]] = None
-    interpolationMethod: Optional[InterpolationMethod] = None
-    excludeInputDocuments: bool = True
-    limit: int = 10
-    offset: int = 0
-    efSearch: Optional[int] = None
-    approximate: Optional[bool] = None
-    searchableAttributes: Optional[List[str]] = None
-    showHighlights: bool = True
-    reRanker: str = None
-    filter: str = None
-    attributesToRetrieve: Union[None, List[str]] = None
-    scoreModifiers: Optional[ScoreModifier] = None
-
-
 class BulkSearchQueryEntity(SearchQuery):
     index: MarqoIndex