diff --git a/examples/deepseek/csv_scraper_deepseek.py b/examples/deepseek/csv_scraper_deepseek.py index 60b1c394..26ff26ee 100644 --- a/examples/deepseek/csv_scraper_deepseek.py +++ b/examples/deepseek/csv_scraper_deepseek.py @@ -28,8 +28,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/csv_scraper_graph_multi_deepseek.py b/examples/deepseek/csv_scraper_graph_multi_deepseek.py index 0a08f83f..88056648 100644 --- a/examples/deepseek/csv_scraper_graph_multi_deepseek.py +++ b/examples/deepseek/csv_scraper_graph_multi_deepseek.py @@ -28,8 +28,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/json_scraper_deepseek.py b/examples/deepseek/json_scraper_deepseek.py index 02991c0d..5d8bf152 100644 --- a/examples/deepseek/json_scraper_deepseek.py +++ b/examples/deepseek/json_scraper_deepseek.py @@ -27,8 +27,7 @@ with open(file_path, 'r', encoding="utf-8") as file: 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, } diff --git a/examples/deepseek/json_scraper_multi_deepseek.py b/examples/deepseek/json_scraper_multi_deepseek.py index 4f9ca32d..893937cd 100644 --- a/examples/deepseek/json_scraper_multi_deepseek.py +++ b/examples/deepseek/json_scraper_multi_deepseek.py @@ -13,8 +13,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/pdf_scraper_graph_deepseek.py b/examples/deepseek/pdf_scraper_graph_deepseek.py index c9c5e0b2..990e7369 100644 --- a/examples/deepseek/pdf_scraper_graph_deepseek.py +++ b/examples/deepseek/pdf_scraper_graph_deepseek.py @@ -18,8 +18,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/pdf_scraper_multi_deepseek.py b/examples/deepseek/pdf_scraper_multi_deepseek.py index e43dd10a..59727a62 100644 --- a/examples/deepseek/pdf_scraper_multi_deepseek.py +++ b/examples/deepseek/pdf_scraper_multi_deepseek.py @@ -13,8 +13,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/scrape_plain_text_deepseek.py b/examples/deepseek/scrape_plain_text_deepseek.py index a7834a8f..52128737 100644 --- a/examples/deepseek/scrape_plain_text_deepseek.py +++ b/examples/deepseek/scrape_plain_text_deepseek.py @@ -29,8 +29,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/script_generator_deepseek.py b/examples/deepseek/script_generator_deepseek.py index 3de06f25..eaec5232 100644 --- a/examples/deepseek/script_generator_deepseek.py +++ b/examples/deepseek/script_generator_deepseek.py @@ -18,8 +18,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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" } diff --git a/examples/deepseek/script_multi_generator_deepseek.py b/examples/deepseek/script_multi_generator_deepseek.py index cc577ecd..150298ed 100644 --- a/examples/deepseek/script_multi_generator_deepseek.py +++ b/examples/deepseek/script_multi_generator_deepseek.py @@ -18,8 +18,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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" } diff --git a/examples/deepseek/search_graph_deepseek.py b/examples/deepseek/search_graph_deepseek.py index 54d2e9fa..e7c2483c 100644 --- a/examples/deepseek/search_graph_deepseek.py +++ b/examples/deepseek/search_graph_deepseek.py @@ -16,8 +16,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, diff --git a/examples/deepseek/search_graph_schema_deepseek.py b/examples/deepseek/search_graph_schema_deepseek.py index bcebe76d..1471ede1 100644 --- a/examples/deepseek/search_graph_schema_deepseek.py +++ b/examples/deepseek/search_graph_schema_deepseek.py @@ -32,8 +32,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/search_link_graph_deepseek.py b/examples/deepseek/search_link_graph_deepseek.py index 96f886a9..dac13737 100644 --- a/examples/deepseek/search_link_graph_deepseek.py +++ b/examples/deepseek/search_link_graph_deepseek.py @@ -17,8 +17,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/smart_scraper_deepseek.py b/examples/deepseek/smart_scraper_deepseek.py index 50314819..4c49b160 100644 --- a/examples/deepseek/smart_scraper_deepseek.py +++ b/examples/deepseek/smart_scraper_deepseek.py @@ -19,8 +19,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/smart_scraper_multi_deepseek.py b/examples/deepseek/smart_scraper_multi_deepseek.py index 374cc6e2..2ef062de 100644 --- a/examples/deepseek/smart_scraper_multi_deepseek.py +++ b/examples/deepseek/smart_scraper_multi_deepseek.py @@ -17,8 +17,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/smart_scraper_schema_deepseek.py b/examples/deepseek/smart_scraper_schema_deepseek.py index 6d164eb1..722e02bf 100644 --- a/examples/deepseek/smart_scraper_schema_deepseek.py +++ b/examples/deepseek/smart_scraper_schema_deepseek.py @@ -31,8 +31,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/xml_scraper_deepseek.py b/examples/deepseek/xml_scraper_deepseek.py index d69665f4..02178c4b 100644 --- a/examples/deepseek/xml_scraper_deepseek.py +++ b/examples/deepseek/xml_scraper_deepseek.py @@ -29,8 +29,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/deepseek/xml_scraper_graph_multi_deepseek.py b/examples/deepseek/xml_scraper_graph_multi_deepseek.py index 5098c9fd..ae74ba21 100644 --- a/examples/deepseek/xml_scraper_graph_multi_deepseek.py +++ b/examples/deepseek/xml_scraper_graph_multi_deepseek.py @@ -28,8 +28,7 @@ deepseek_key = os.getenv("DEEPSEEK_APIKEY") 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, } diff --git a/examples/oneapi/custom_graph_oneapi.py b/examples/oneapi/custom_graph_oneapi.py index 5777ab33..be58d1d1 100644 --- a/examples/oneapi/custom_graph_oneapi.py +++ b/examples/oneapi/custom_graph_oneapi.py @@ -22,7 +22,7 @@ graph_config = { # 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 diff --git a/scrapegraphai/models/deepseek.py b/scrapegraphai/models/deepseek.py index 523fe667..31b2bd5d 100644 --- a/scrapegraphai/models/deepseek.py +++ b/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) diff --git a/scrapegraphai/models/oneapi.py b/scrapegraphai/models/oneapi.py index 54e846d9..9b20621b 100644 --- a/scrapegraphai/models/oneapi.py +++ b/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) diff --git a/tests/graphs/abstract_graph_test.py b/tests/graphs/abstract_graph_test.py index f52c9b32..60c8ab4c 100644 --- a/tests/graphs/abstract_graph_test.py +++ b/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):