Skip to content

Commit d45064b

Browse files
VinciGit00VinciGit00
authored
Merge pull request #597 from ScrapeGraphAI/593-abstract-graph-fix-round-4
Abbstract graph fix, round 4
2 parents d33b347 + 229d74d commit d45064b

File tree

102 files changed

+262
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+262
-352
lines changed

‎examples/anthropic/csv_scraper_graph_multi_haiku.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
graph_config = {
2727
"llm": {
2828
"api_key": os.getenv("ANTHROPIC_API_KEY"),
29-
"model": "claude-3-haiku-20240307",
30-
"max_tokens": 4000},
29+
"model": "anthropic/claude-3-haiku-20240307",
30+
},
3131
}
3232

3333
# ************************************************

‎examples/anthropic/csv_scraper_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
graph_config = {
3333
"llm": {
3434
"api_key": os.getenv("ANTHROPIC_API_KEY"),
35-
"model": "claude-3-haiku-20240307",
36-
"max_tokens": 4000
37-
},
35+
"model": "anthropic/claude-3-haiku-20240307",
36+
},
3837
}
3938

4039
# ************************************************

‎examples/anthropic/custom_graph_haiku.py‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
import os
66
from dotenv import load_dotenv
77

8-
from langchain_openai import OpenAIEmbeddings
9-
from langchain_openai import ChatOpenAI
8+
from langchain_anthropic import ChatAnthropic
109
from scrapegraphai.graphs import BaseGraph
11-
from scrapegraphai.nodes import FetchNode, ParseNode, RAGNode, GenerateAnswerNode, RobotsNode
10+
from scrapegraphai.nodes import FetchNode, ParseNode, GenerateAnswerNode, RobotsNode
1211
load_dotenv()
1312

1413
# ************************************************
@@ -19,16 +18,14 @@
1918
"llm": {
2019
"api_key": os.getenv("ANTHROPIC_API_KEY"),
2120
"model": "claude-3-haiku-20240307",
22-
"max_tokens": 4000
23-
},
21+
},
2422
}
2523

2624
# ************************************************
2725
# Define the graph nodes
2826
# ************************************************
2927

30-
llm_model = OpenAI(graph_config["llm"])
31-
embedder = OpenAIEmbeddings(api_key=llm_model.openai_api_key)
28+
llm_model = ChatAnthropic(graph_config["llm"])
3229

3330
# define the nodes for the graph
3431
robot_node = RobotsNode(
@@ -57,15 +54,6 @@
5754
"verbose": True,
5855
}
5956
)
60-
rag_node = RAGNode(
61-
input="user_prompt & (parsed_doc | doc)",
62-
output=["relevant_chunks"],
63-
node_config={
64-
"llm_model": llm_model,
65-
"embedder_model": embedder,
66-
"verbose": True,
67-
}
68-
)
6957
generate_answer_node = GenerateAnswerNode(
7058
input="user_prompt & (relevant_chunks | parsed_doc | doc)",
7159
output=["answer"],
@@ -84,14 +72,12 @@
8472
robot_node,
8573
fetch_node,
8674
parse_node,
87-
rag_node,
8875
generate_answer_node,
8976
],
9077
edges=[
9178
(robot_node, fetch_node),
9279
(fetch_node, parse_node),
93-
(parse_node, rag_node),
94-
(rag_node, generate_answer_node)
80+
(parse_node, generate_answer_node)
9581
],
9682
entry_point=robot_node
9783
)

‎examples/anthropic/json_scraper_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
graph_config = {
2727
"llm": {
2828
"api_key": os.getenv("ANTHROPIC_API_KEY"),
29-
"model": "claude-3-haiku-20240307",
30-
"max_tokens": 4000
31-
},
29+
"model": "anthropic/claude-3-haiku-20240307",
30+
},
3231
}
3332

3433
# ************************************************

‎examples/anthropic/json_scraper_multi_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
graph_config = {
1212
"llm": {
1313
"api_key": os.getenv("ANTHROPIC_API_KEY"),
14-
"model": "claude-3-haiku-20240307",
15-
"max_tokens": 4000
16-
},
14+
"model": "anthropic/claude-3-haiku-20240307",
15+
},
1716
}
1817

1918
FILE_NAME = "inputs/example.json"

‎examples/anthropic/pdf_scraper_graph_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
graph_config = {
1515
"llm": {
1616
"api_key": os.getenv("ANTHROPIC_API_KEY"),
17-
"model": "claude-3-haiku-20240307",
18-
"max_tokens": 4000
19-
},
17+
"model": "anthropic/claude-3-haiku-20240307",
18+
},
2019
}
2120

2221
source = """

‎examples/anthropic/pdf_scraper_multi_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
graph_config = {
1212
"llm": {
1313
"api_key": os.getenv("ANTHROPIC_API_KEY"),
14-
"model": "claude-3-haiku-20240307",
15-
"max_tokens": 4000
16-
},
14+
"model": "anthropic/claude-3-haiku-20240307",
15+
},
1716
}
1817

1918
# ***************

‎examples/anthropic/scrape_plain_text_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
graph_config = {
2929
"llm": {
3030
"api_key": os.getenv("ANTHROPIC_API_KEY"),
31-
"model": "claude-3-haiku-20240307",
32-
"max_tokens": 4000
33-
},
31+
"model": "anthropic/claude-3-haiku-20240307",
32+
},
3433
}
3534

3635
# ************************************************

‎examples/anthropic/script_generator_haiku.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
graph_config = {
1717
"llm": {
1818
"api_key": os.getenv("ANTHROPIC_API_KEY"),
19-
"model": "claude-3-haiku-20240307",
20-
"max_tokens": 4000
21-
},
19+
"model": "anthropic/claude-3-haiku-20240307",
20+
},
2221
}
2322

2423
# ************************************************

‎examples/anthropic/script_multi_generator_haiku.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
graph_config = {
1717
"llm": {
1818
"api_key": os.getenv("ANTHROPIC_API_KEY"),
19-
"model": "claude-3-haiku-20240307",
20-
"max_tokens": 4000
21-
},
22-
"library": "beautifulsoup"
19+
"model": "anthropic/claude-3-haiku-20240307",
20+
},
21+
"library": "beautifulsoup"
2322
}
2423

2524
# ************************************************

0 commit comments

Comments
 (0)