Merge branch 'dev' of https://git.97id.com/ly/zjdataai-app into dev

2024-09-05 10:11:10 +08:00
parent aba6475c5a 03c4eb1af1
commit 75fde3598b
13 changed files with 5275 additions and 788 deletions
@@ -67,16 +67,15 @@ class ModelPlatform:
@register(ModelPlateCategory,'ollama')
 class OllamaPlatform(ModelPlatform):
    def model(self):
-        #from llama_index.embeddings.ollama import OllamaEmbedding
-        #from llama_index.llms.ollama.base import DEFAULT_REQUEST_TIMEOUT, Ollama
-        #
-        # base_url = os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434"
-        # request_timeout = float(
-        #     os.getenv("OLLAMA_REQUEST_TIMEOUT", DEFAULT_REQUEST_TIMEOUT)
-        # )
-        # Settings.llm = Ollama(
-        #     base_url=base_url, model=os.getenv("MODEL"), request_timeout=request_timeout
-        # )
+        from llama_index.llms.ollama.base import DEFAULT_REQUEST_TIMEOUT, Ollama
+
+        base_url = os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434"
+        request_timeout = float(
+            os.getenv("OLLAMA_REQUEST_TIMEOUT", DEFAULT_REQUEST_TIMEOUT)
+        )
+        Settings.llm = Ollama(
+            base_url=base_url, model=os.getenv("MODEL"), request_timeout=request_timeout
+        )
        pass

    def embedding(self):