From 21d151d4a63691616f0512796a3517081f9c9764 Mon Sep 17 00:00:00 2001
From: YILING0013 <xielingqing123@gmail.com>
Date: Thu, 6 Feb 2025 22:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 embedding_adapters.py |  3 +--
 embedding_ollama.py   | 59 -------------------------------------------
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 embedding_ollama.py

diff --git a/embedding_adapters.py b/embedding_adapters.py
index a17bb7a..9b0d7a8 100644
--- a/embedding_adapters.py
+++ b/embedding_adapters.py
@@ -48,8 +48,7 @@ class OpenAIEmbeddingAdapter(BaseEmbeddingAdapter):
 
 class OllamaEmbeddingAdapter(BaseEmbeddingAdapter):
     """
-    Ollama Embedding，示例中和之前的 embedding_ollama.py 类似
-    其接口路径往往为 /api/embeddings
+    其接口路径为 /api/embeddings
     """
     def __init__(self, model_name: str, base_url: str):
         self.model_name = model_name
diff --git a/embedding_ollama.py b/embedding_ollama.py
deleted file mode 100644
index 749a462..0000000
--- a/embedding_ollama.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# embedding_ollama.py
-import requests
-import traceback
-from typing import List
-
-class OllamaEmbeddings:
-    def __init__(self, model_name: str, base_url: str):
-        self.model_name = model_name
-        self.base_url = base_url
-
-    def embed(self, texts: List[str]) -> List[List[float]]:
-        """
-        批量将多段文本转换为embedding向量
-        """
-        embeddings = []
-        for text in texts:
-            embeddings.append(self.embed_single_document(text))
-        return embeddings
-    
-    def embed_documents(self, texts: List[str]) -> List[List[float]]:
-        """
-        兼容langchain的接口写法
-        """
-        return self.embed(texts)
-
-    def embed_query(self, query: str) -> List[float]:
-        """
-        将单条 query 转换为 embedding 向量
-        """
-        return self.embed_single_document(query)
-
-    def embed_single_document(self, text: str) -> List[float]:
-        """
-        调用 Ollama 本地服务接口，获取文本的 embedding。
-        """
-        if self.base_url.endswith("/"):
-            self.base_url = self.base_url.rstrip("/")
-        if "api/embeddings" in self.base_url:
-            # 如果 base_url 已经包含 'api/embeddings'，则保持不变
-            url = f"{self.base_url.rstrip('/')}/api/embeddings"
-        else:
-            if "/v1" in self.base_url:
-                self.base_url = self.base_url.split("/v1")[0]
-            if "/api" in self.base_url:
-                self.base_url = self.base_url.split("/api")[0]
-            url = f"{self.base_url}/api/embeddings"
-        data = {
-            "model": self.model_name,
-            "prompt": text
-        }
-        try:
-            response = requests.post(url, json=data)
-            response.raise_for_status()
-            result = response.json()
-            if "embedding" not in result:
-                raise ValueError("No 'embedding' field in Ollama response.")
-            return result["embedding"]
-        except requests.exceptions.RequestException as e:
-            raise Exception(f"Ollama embeddings request error: {e}\n{traceback.format_exc()}")