Merge pull request #621 from ScrapeGraphAI/609-fix-deepseek-instancing

Fix deepseek and ollama instancing

Author: VinciGit00

pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "undetected-playwright>=0.3.0",
     "google>=3.0.0",
     "semchunk>=1.0.1",
+    "langchain-ollama>=0.1.3",
 ]
 
 license = "MIT"

requirements-dev.lock

@@ -130,6 +130,7 @@ graphviz==0.20.3
     # via burr
 greenlet==3.0.3
     # via playwright
+    # via sqlalchemy
 grpcio==1.65.4
     # via google-api-core
     # via grpcio-status
@@ -147,6 +148,7 @@ httplib2==0.22.0
     # via google-auth-httplib2
 httpx==0.27.0
     # via langchain-mistralai
+    # via ollama
     # via openai
 httpx-sse==0.4.0
     # via langchain-mistralai
@@ -190,18 +192,21 @@ langchain-aws==0.1.16
     # via scrapegraphai
 langchain-community==0.2.11
     # via scrapegraphai
-langchain-core==0.2.33
+langchain-core==0.2.37
     # via langchain
     # via langchain-aws
     # via langchain-community
     # via langchain-google-genai
     # via langchain-mistralai
+    # via langchain-ollama
     # via langchain-openai
     # via langchain-text-splitters
 langchain-google-genai==1.0.8
     # via scrapegraphai
 langchain-mistralai==0.1.12
     # via scrapegraphai
+langchain-ollama==0.1.3
+    # via scrapegraphai
 langchain-openai==0.1.22
     # via scrapegraphai
 langchain-text-splitters==0.2.2
@@ -251,6 +256,8 @@ numpy==1.26.4
     # via pydeck
     # via sf-hamilton
     # via streamlit
+ollama==0.3.2
+    # via langchain-ollama
 openai==1.40.3
     # via burr
     # via langchain-openai

requirements.lock

@@ -83,6 +83,7 @@ googleapis-common-protos==1.63.2
     # via grpcio-status
 greenlet==3.0.3
     # via playwright
+    # via sqlalchemy
 grpcio==1.65.1
     # via google-api-core
     # via grpcio-status
@@ -99,6 +100,7 @@ httplib2==0.22.0
     # via google-auth-httplib2
 httpx==0.27.0
     # via langchain-mistralai
+    # via ollama
     # via openai
 httpx-sse==0.4.0
     # via langchain-mistralai
@@ -125,18 +127,21 @@ langchain-aws==0.1.12
     # via scrapegraphai
 langchain-community==0.2.10
     # via scrapegraphai
-langchain-core==0.2.33
+langchain-core==0.2.37
     # via langchain
     # via langchain-aws
     # via langchain-community
     # via langchain-google-genai
     # via langchain-mistralai
+    # via langchain-ollama
     # via langchain-openai
     # via langchain-text-splitters
 langchain-google-genai==1.0.8
     # via scrapegraphai
 langchain-mistralai==0.1.12
     # via scrapegraphai
+langchain-ollama==0.1.3
+    # via scrapegraphai
 langchain-openai==0.1.22
     # via scrapegraphai
 langchain-text-splitters==0.2.2
@@ -166,6 +171,8 @@ numpy==1.26.4
     # via langchain-aws
     # via langchain-community
     # via pandas
+ollama==0.3.2
+    # via langchain-ollama
 openai==1.41.0
     # via langchain-openai
 orjson==3.10.6

requirements.txt

@@ -17,3 +17,4 @@ playwright>=1.43.0
 undetected-playwright>=0.3.0
 google>=3.0.0
 semchunk>=1.0.1
+langchain-ollama>=0.1.3

scrapegraphai/graphs/abstract_graph.py

@@ -150,24 +150,26 @@ def _create_llm(self, llm_config: dict) -> object:
                     warnings.simplefilter("ignore")
                     return init_chat_model(**llm_params)
             else:
-                if llm_params["model_provider"] == "deepseek":
+                model_provider = llm_params.pop("model_provider")
+
+                if model_provider == "deepseek":
                     return DeepSeek(**llm_params)
 
-                if llm_params["model_provider"] == "ernie":
+                if model_provider == "ernie":
                     from langchain_community.chat_models import ErnieBotChat
                     return ErnieBotChat(**llm_params)
 
-                elif llm_params["model_provider"] == "oneapi":
+                elif model_provider == "oneapi":
                     return OneApi(**llm_params)
 
-                elif llm_params["model_provider"] == "togehterai":
+                elif model_provider == "togehterai":
                     try:
                         from langchain_together import ChatTogether
                     except ImportError:
                         raise ImportError("The langchain_together module is not installed. Please install it using `pip install scrapegraphai[other-language-models]`.")
                     return ChatTogether(**llm_params)
 
-                elif llm_params["model_provider"] == "nvidia":
+                elif model_provider == "nvidia":
                     try:
                         from langchain_nvidia_ai_endpoints import ChatNVIDIA
                     except ImportError:

tests/graphs/abstract_graph_test.py

@@ -10,7 +10,7 @@
 )
 from scrapegraphai.models import OneApi, DeepSeek
 from langchain_openai import ChatOpenAI, AzureChatOpenAI
-from langchain_community.chat_models import ChatOllama
+from langchain_ollama import ChatOllama
 from langchain_google_genai import ChatGoogleGenerativeAI
 
 
@@ -35,6 +35,7 @@ def _create_graph(self) -> BaseGraph:
             input="doc",
             output=["parsed_doc"],
             node_config={
+                "llm_model": self.llm_model,
                 "chunk_size": self.model_token
             }
         )