CodeCow/Scrapegraph-ai
1
0
Fork 0
mirror of https://github.com/VinciGit00/Scrapegraph-ai.git synced 2026-07-01 21:00:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(models): better DeepSeek and OneApi integration

Browse Source
This commit is contained in:
Federico Aguzzi 2024-08-28 12:51:50 +02:00
parent 4f120e29c5
commit f7a85c266a
21 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/deepseek/csv_scraper_deepseek.py
View File

@ -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,
}

3
examples/deepseek/csv_scraper_graph_multi_deepseek.py
View File

@ -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,
}

3
examples/deepseek/json_scraper_deepseek.py
View File

@ -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,
}

3
examples/deepseek/json_scraper_multi_deepseek.py
View File

@ -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,
}

3
examples/deepseek/pdf_scraper_graph_deepseek.py
View File

@ -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,
}

3
examples/deepseek/pdf_scraper_multi_deepseek.py
View File

@ -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,
}

3
examples/deepseek/scrape_plain_text_deepseek.py
View File

@ -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,
}

3
examples/deepseek/script_generator_deepseek.py
View File

@ -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"
}

3
examples/deepseek/script_multi_generator_deepseek.py
View File

@ -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"
}

3
examples/deepseek/search_graph_deepseek.py
View File

@ -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,

3
examples/deepseek/search_graph_schema_deepseek.py
View File

@ -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,
}

3
examples/deepseek/search_link_graph_deepseek.py
View File

@ -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,
}

3
examples/deepseek/smart_scraper_deepseek.py
View File

@ -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,
}

3
examples/deepseek/smart_scraper_multi_deepseek.py
View File

@ -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,
}

3
examples/deepseek/smart_scraper_schema_deepseek.py
View File

@ -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,
}

3
examples/deepseek/xml_scraper_deepseek.py
View File

@ -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,
}

3
examples/deepseek/xml_scraper_graph_multi_deepseek.py
View File

@ -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,
}

2
examples/oneapi/custom_graph_oneapi.py
View File

@ -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

6
scrapegraphai/models/deepseek.py
View File

@ -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)

4
scrapegraphai/models/oneapi.py
View File

@ -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)

4
tests/graphs/abstract_graph_test.py
View File

@ -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):