Skip to content

Anthropic refactoring #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2024
Merged

Anthropic refactoring #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/anthropic/csv_scraper_haiku.py → examples/anthropic/csv_scraper_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...nthropic/csv_scraper_graph_multi_haiku.py → ...opic/csv_scraper_graph_multi_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000},
}

Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/custom_graph_haiku.py → examples/anthropic/custom_graph_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/json_scraper_haiku.py → examples/anthropic/json_scraper_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...les/anthropic/json_scraper_multi_haiku.py → ...anthropic/json_scraper_multi_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...ples/anthropic/pdf_scraper_graph_haiku.py → .../anthropic/pdf_scraper_graph_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...ples/anthropic/pdf_scraper_multi_haiku.py → .../anthropic/pdf_scraper_multi_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...ples/anthropic/scrape_plain_text_haiku.py → .../anthropic/scrape_plain_text_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/script_generator_haiku.py → ...s/anthropic/script_generator_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...anthropic/script_multi_generator_haiku.py → ...ropic/script_multi_generator_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
"library": "beautifulsoup"
Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/search_graph_haiku.py → examples/anthropic/search_graph_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
5 changes: 3 additions & 2 deletions ...es/anthropic/search_graph_schema_haiku.py → ...nthropic/search_graph_schema_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ class Dishes(BaseModel):
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"max_tokens": 4000},
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}

# ************************************************
Expand Down
7 changes: 5 additions & 2 deletions ...ples/anthropic/search_link_graph_haiku.py → .../anthropic/search_link_graph_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@
# ************************************************

graph_config = {
"llm": {"model_instance": llm_model_instance},
"embeddings": {"model_instance": embedder_model_instance}
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}

# ************************************************
Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/smart_scraper_haiku.py → ...ples/anthropic/smart_scraper_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...es/anthropic/smart_scraper_multi_haiku.py → ...nthropic/smart_scraper_multi_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/anthropic/smart_scraper_schema_haiku.py → ...thropic/smart_scraper_schema_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Projects(BaseModel):
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000},
}

Expand Down
2 changes: 1 addition & 1 deletion examples/anthropic/xml_scraper_haiku.py → examples/anthropic/xml_scraper_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000
},
}
Expand Down
2 changes: 1 addition & 1 deletion ...nthropic/xml_scraper_graph_multi_haiku.py → ...opic/xml_scraper_graph_multi_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "claude-3-haiku-20240307",
"model": "anthropic/claude-3-haiku-20240307",
"max_tokens": 4000},
}

Expand Down
7 changes: 4 additions & 3 deletions scrapegraphai/graphs/abstract_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def handle_model(model_name, provider, token_key, default_token=8192):
known_models = {"chatgpt","gpt","openai", "azure_openai", "google_genai",
"ollama", "oneapi", "nvidia", "groq", "google_vertexai",
"bedrock", "mistralai", "hugging_face", "deepseek", "ernie",
"fireworks", "claude-3-"}
"fireworks", "anthropic"}

if llm_params["model"].split("/")[0] not in known_models and llm_params["model"].split("-")[0] not in known_models:
raise ValueError(f"Model '{llm_params['model']}' is not supported")
Expand Down Expand Up @@ -172,8 +172,9 @@ def handle_model(model_name, provider, token_key, default_token=8192):
token_key = model_name if "model_tokens" not in llm_params else llm_params["model_tokens"]
return handle_model(model_name, "ollama", token_key)

elif "claude-3-" in llm_params["model"]:
return handle_model(llm_params["model"], "anthropic", "claude3")
elif "anthropic" in llm_params["model"]:
model_name = llm_params["model"].split("anthropic/")[-1]
return handle_model(model_name, "anthropic", model_name)

elif llm_params["model"].startswith("mistral"):
model_name = llm_params["model"].split("/")[-1]
Expand Down
Loading