Merge remote-tracking branch 'upstream/v2' into variable_aggregation_support_dict

Author: wangliang181230

apps/models_provider/impl/ollama_model_provider/model/embedding.py

@@ -31,9 +31,9 @@ def embed_documents(self, texts: List[str]) -> List[List[float]]:
         Returns:
             List of embeddings, one for each text.
         """
-        instruction_pairs = [f"{text}" for text in texts]
-        embeddings = self._embed(instruction_pairs)
-        return embeddings
+        return self._client.embed(
+            self.model, texts, options=self._default_params, keep_alive=self.keep_alive
+        )["embeddings"]
 
     def embed_query(self, text: str) -> List[float]:
         """Embed a query using a Ollama deployed embedding model.
@@ -44,6 +44,4 @@ def embed_query(self, text: str) -> List[float]:
         Returns:
             Embeddings for the text.
         """
-        instruction_pair = f"{text}"
-        embedding = self._embed([instruction_pair])[0]
-        return embedding
+        return self.embed_documents([text])[0]