fix(models): better DeepSeek and OneApi integration

Author: f-aguzzi

examples/deepseek/csv_scraper_deepseek.py

@@ -28,8 +28,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/csv_scraper_graph_multi_deepseek.py

@@ -28,8 +28,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/json_scraper_deepseek.py

@@ -27,8 +27,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/json_scraper_multi_deepseek.py

@@ -13,8 +13,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/pdf_scraper_graph_deepseek.py

@@ -18,8 +18,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/pdf_scraper_multi_deepseek.py

@@ -13,8 +13,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/scrape_plain_text_deepseek.py

@@ -29,8 +29,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/script_generator_deepseek.py

@@ -18,8 +18,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key, 
     },
     "library": "beautifulsoup"
 }

examples/deepseek/script_multi_generator_deepseek.py

@@ -18,8 +18,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key, 
     },
     "library": "beautifulsoup"
 }

examples/deepseek/search_graph_deepseek.py

@@ -16,8 +16,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "max_results": 2,
     "verbose": True,

examples/deepseek/search_graph_schema_deepseek.py

@@ -32,8 +32,7 @@ class Dishes(BaseModel):
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/search_link_graph_deepseek.py

@@ -17,8 +17,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/smart_scraper_deepseek.py

@@ -19,8 +19,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/smart_scraper_multi_deepseek.py

@@ -17,8 +17,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/smart_scraper_schema_deepseek.py

@@ -31,8 +31,7 @@ class Projects(BaseModel):
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/xml_scraper_deepseek.py

@@ -29,8 +29,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/deepseek/xml_scraper_graph_multi_deepseek.py

@@ -28,8 +28,7 @@
 graph_config = {
     "llm": {
         "model": "deepseek/deepseek-chat",
-        "openai_api_key": deepseek_key,
-        "openai_api_base": 'https://api.deepseek.com/v1',
+        "api_key": deepseek_key,
     },
     "verbose": True,
 }

examples/oneapi/custom_graph_oneapi.py

@@ -22,7 +22,7 @@
 # Define the graph nodes
 # ************************************************
 
-llm_model = OpenAI(graph_config["llm"])
+llm_model = ChatOpenAI(graph_config["llm"])
 embedder = OpenAIEmbeddings(api_key=llm_model.openai_api_key)
 
 # define the nodes for the graph

scrapegraphai/models/deepseek.py

@@ -14,5 +14,9 @@ class DeepSeek(ChatOpenAI):
         llm_config (dict): Configuration parameters for the language model.
     """
 
-    def __init__(self, llm_config: dict):
+    def __init__(self, **llm_config):
+        if 'api_key' in llm_config:
+            llm_config['openai_api_key'] = llm_config.pop('api_key')
+        llm_config['openai_api_base'] = 'https://api.deepseek.com/v1'
+        
         super().__init__(**llm_config)

scrapegraphai/models/oneapi.py

@@ -13,5 +13,7 @@ class OneApi(ChatOpenAI):
         llm_config (dict): Configuration parameters for the language model.
     """
 
-    def __init__(self, llm_config: dict):
+    def __init__(self, **llm_config):
+        if 'api_key' in llm_config:
+            llm_config['openai_api_key'] = llm_config.pop('api_key') 
         super().__init__(**llm_config)

tests/graphs/abstract_graph_test.py

@@ -68,8 +68,8 @@ class TestAbstractGraph:
             AzureChatOpenAI),
         ({"model": "google_genai/gemini-pro", "google_api_key": "google-key-test"}, ChatGoogleGenerativeAI),
         ({"model": "ollama/llama2"}, ChatOllama),
-        ({"model": "oneapi/qwen-turbo"}, OneApi),
-        ({"model": "deepseek/deepseek-coder"}, DeepSeek),
+        ({"model": "oneapi/qwen-turbo", "api_key": "oneapi-api-key"}, OneApi),
+        ({"model": "deepseek/deepseek-coder", "api_key": "deepseek-api-key"}, DeepSeek),
     ])
 
     def test_create_llm(self, llm_config, expected_model):