Skip to content

allginement #686

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.

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 3 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.21.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.21.0...v1.21.1) (2024-09-21)


### Bug Fixes

* removed faiss ([86f6877](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/86f68770e920d800fb14d14ee34bf0d1a9cefd51))

## [1.21.0](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.20.1...v1.21.0) (2024-09-19)


Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Additional dependecies can be added while installing the library:
This group allows you to use additional language models like Fireworks, Groq, Anthropic, Together AI, Hugging Face, and Nvidia AI Endpoints.
```bash
pip install scrapegraphai[other-language-models]

```
- <b>Semantic Options</b>: this group includes tools for advanced semantic processing, such as Graphviz.

```bash
Expand All @@ -55,6 +55,12 @@ pip install scrapegraphai[other-language-models]
pip install scrapegraphai[more-browser-options]
```

- <b>faiss Options</b>: this group includes faiss integration

```bash
pip install scrapegraphai[faiss-cpu]
```

</details>


Expand Down
1 change: 1 addition & 0 deletions examples/openai/script_generator_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"api_key": os.getenv("OPENAI_API_KEY"),
"model": "openai/gpt-4o",
},
"library": "beautifulsoup",
"verbose": True,
"headless": False,
}
Expand Down
2 changes: 1 addition & 1 deletion examples/openai/script_generator_schema_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Projects(BaseModel):
graph_config = {
"llm": {
"api_key": openai_key,
"model": "openai/gpt-3.5-turbo",
"model": "openai/gpt-4o"
},
"library": "beautifulsoup",
"verbose": True,
Expand Down
2 changes: 1 addition & 1 deletion examples/openai/search_graph_schema_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Dishes(BaseModel):
graph_config = {
"llm": {
"api_key": openai_key,
"model": "openai/gpt-3.5-turbo",
"model": "openai/gpt-4o"
},
"max_results": 2,
"verbose": True,
Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "scrapegraphai"

version = "1.21.0"
version = "1.21.1"

description = "A web scraping library based on LangChain which uses LLM and direct graph logic to create scraping pipelines."
authors = [
Expand All @@ -19,7 +19,6 @@ dependencies = [
"langchain-aws>=0.1.3",
"mistral-common>=1.4.0",
"html2text>=2024.2.26",
"faiss-cpu>=1.8.0",
"beautifulsoup4>=4.12.3",
"pandas>=2.2.2",
"python-dotenv>=1.0.1",
Expand Down Expand Up @@ -100,6 +99,11 @@ screenshot_scraper = [
"pillow>=10.4.0",
]

# Group 5: Faiss CPU
faiss-cpu = [
"faiss-cpu>=1.8.0",
]

[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"
Expand Down
4 changes: 0 additions & 4 deletions requirements-dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ docutils==0.19
exceptiongroup==1.2.2
# via anyio
# via pytest
faiss-cpu==1.8.0.post1
# via scrapegraphai
fastapi==0.112.0
# via burr
fastapi-pagination==0.12.26
Expand Down Expand Up @@ -251,7 +249,6 @@ narwhals==1.3.0
# via altair
numpy==1.26.4
# via contourpy
# via faiss-cpu
# via langchain
# via langchain-aws
# via langchain-community
Expand All @@ -274,7 +271,6 @@ orjson==3.10.7
# via langsmith
packaging==24.1
# via altair
# via faiss-cpu
# via huggingface-hub
# via langchain-core
# via marshmallow
Expand Down
4 changes: 0 additions & 4 deletions requirements.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ distro==1.9.0
# via openai
exceptiongroup==1.2.2
# via anyio
faiss-cpu==1.8.0.post1
# via scrapegraphai
filelock==3.15.4
# via huggingface-hub
# via transformers
Expand Down Expand Up @@ -176,7 +174,6 @@ multiprocess==0.70.16
mypy-extensions==1.0.0
# via typing-inspect
numpy==1.26.4
# via faiss-cpu
# via langchain
# via langchain-aws
# via langchain-community
Expand All @@ -192,7 +189,6 @@ opencv-python-headless==4.10.0.84
orjson==3.10.6
# via langsmith
packaging==24.1
# via faiss-cpu
# via huggingface-hub
# via langchain-core
# via marshmallow
Expand Down
2 changes: 1 addition & 1 deletion scrapegraphai/nodes/generate_answer_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def execute(self, state: dict) -> dict:

if isinstance(self.llm_model, (ChatOpenAI, ChatMistralAI)):
self.llm_model = self.llm_model.with_structured_output(
schema = self.node_config["schema"])
schema = self.node_config["schema"])
output_parser = get_structured_output_parser(self.node_config["schema"])
format_instructions = "NA"
else:
Expand Down