Skip to content

new release #764

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 51 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e76a68a
fix: remove variable "max_result" not being used in the code
shenghongtw Oct 13, 2024
deb7c2d
Merge pull request #750 from ScrapeGraphAI/main
VinciGit00 Oct 14, 2024
39c7352
Merge pull request #751 from shenghongtw/pre/beta
VinciGit00 Oct 14, 2024
e0fc457
ci(release): 1.26.6-beta.1 [skip ci]
semantic-release-bot Oct 14, 2024
cacd9cd
feat: add conditional node structure to the smart_scraper_graph and i…
ekinsenler Oct 15, 2024
038d2ef
refactor cond node structure to fit with the new implementation
ekinsenler Oct 15, 2024
612c644
feat: implement ScrapeGraph class for only web scraping automation
shenghongtw Oct 16, 2024
3e3e1b2
feat: Implement SmartScraperMultiParseMergeFirstGraph class that scra…
shenghongtw Oct 16, 2024
cdb3c11
test: Add scrape_graph test
shenghongtw Oct 16, 2024
464b8b0
test: Add smart_scraper_multi_parse_merge_first_graph test
shenghongtw Oct 16, 2024
eaa83ed
update project requirement and add example
ekinsenler Oct 16, 2024
aaa011c
Merge pull request #754 from ekinsenler/cond_node_refactor
VinciGit00 Oct 16, 2024
9266a36
ci(release): 1.27.0-beta.1 [skip ci]
semantic-release-bot Oct 16, 2024
9b78e2d
Merge branch 'pre/beta' of https://github.com/shenghongtw/Scrapegraph…
shenghongtw Oct 16, 2024
2512262
Rename smart_scraper_multi_parse_merge_first_graph_test.py to smart_s…
shenghongtw Oct 16, 2024
69ff649
fix: fix the example variable name
shenghongtw Oct 17, 2024
94d8042
rename smart_scraper_multi_graph to smart_scraper_multi_abstract_graph
shenghongtw Oct 17, 2024
dfc67c6
rename the smart_scraper_multi_parse_merge_first_graph to smart_scrap…
shenghongtw Oct 17, 2024
78bd40c
modify the graph name
shenghongtw Oct 17, 2024
6dbac93
rename the SmartScraperMultiParseMergeFirstGraph to SmartScraperMulti…
shenghongtw Oct 17, 2024
974f88a
rename SmartScraperMultiGraph to SmartScraperMultiLiteGraph
shenghongtw Oct 17, 2024
3e8f047
Renamed smart_scraper_multi_abstract_graph back to smart_scraper_mult…
shenghongtw Oct 17, 2024
28dda2b
rename graph name
shenghongtw Oct 17, 2024
da2a3c8
add smart_scraper_multi_lite_graph example
shenghongtw Oct 17, 2024
8cb9646
Merge branch 'main' into pre/beta
f-aguzzi Oct 18, 2024
d84d295
ci(release): 1.27.0-beta.2 [skip ci]
semantic-release-bot Oct 18, 2024
9cd9a87
chore: fix example
f-aguzzi Oct 18, 2024
b912904
Merge pull request #758 from ScrapeGraphAI/fix-together-ai
VinciGit00 Oct 19, 2024
ffa1067
Merge pull request #756 from shenghongtw/pre/beta
VinciGit00 Oct 20, 2024
f576afa
ci(release): 1.27.0-beta.3 [skip ci]
semantic-release-bot Oct 20, 2024
2991ca8
add examples smart scraper lite
VinciGit00 Oct 21, 2024
b84883b
add smartscraper lite
VinciGit00 Oct 21, 2024
52b6bf5
feat: refactoring of ScrapeGraph to SmartScraperLiteGraph
VinciGit00 Oct 21, 2024
3d6bbcd
ci(release): 1.27.0-beta.4 [skip ci]
semantic-release-bot Oct 21, 2024
0ea00c0
feat: refactoring of export functions
VinciGit00 Oct 21, 2024
34d2964
Merge pull request #761 from ScrapeGraphAI/refactoring-export-functions
VinciGit00 Oct 22, 2024
5002c71
ci(release): 1.27.0-beta.5 [skip ci]
semantic-release-bot Oct 22, 2024
ae275ec
feat: add integration with scrape.do
VinciGit00 Oct 23, 2024
94b9836
ci(release): 1.27.0-beta.6 [skip ci]
semantic-release-bot Oct 23, 2024
f658092
feat: refactoring of get_probable_tags node
VinciGit00 Oct 23, 2024
a1bd05d
Merge pull request #763 from ScrapeGraphAI/refactoring-get-probable-tags
VinciGit00 Oct 24, 2024
407f1ce
ci(release): 1.27.0-beta.7 [skip ci]
semantic-release-bot Oct 24, 2024
066e77d
Merge branch 'main' into pre/beta
VinciGit00 Oct 24, 2024
4f1ed93
ci(release): 1.27.0-beta.8 [skip ci]
semantic-release-bot Oct 24, 2024
51c55eb
feat: add model integration gpt4
VinciGit00 Oct 24, 2024
c8a000f
fix: fix export function
VinciGit00 Oct 24, 2024
6179ab9
Update data_export.py
VinciGit00 Oct 24, 2024
9e5e76a
Merge pull request #765 from ScrapeGraphAI/add-model-integration-for-…
VinciGit00 Oct 24, 2024
fd57cc7
ci(release): 1.27.0-beta.9 [skip ci]
semantic-release-bot Oct 24, 2024
f9c1432
Merge pull request #767 from ScrapeGraphAI/fix-export-function
VinciGit00 Oct 25, 2024
eee131e
ci(release): 1.27.0-beta.10 [skip ci]
semantic-release-bot Oct 25, 2024
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
98 changes: 98 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,113 @@
## [1.27.0-beta.10](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.9...v1.27.0-beta.10) (2024-10-25)


### Bug Fixes

* fix export function ([c8a000f](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/c8a000f1d943734a921b34e91498b2f29c8c9422))

## [1.27.0-beta.9](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.8...v1.27.0-beta.9) (2024-10-24)


### Features

* add model integration gpt4 ([51c55eb](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/51c55eb3a2984ba60572edbcdea4c30620e18d76))

## [1.27.0-beta.8](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.7...v1.27.0-beta.8) (2024-10-24)


### Bug Fixes

* removed tokenizer ([a184716](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/a18471688f0b79f06fb7078b01b68eeddc88eae4))


### CI

* **release:** 1.26.7 [skip ci] ([ec9ef2b](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/ec9ef2bcda9aa81f66b943829fcdb22fe265976e))

## [1.27.0-beta.7](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.6...v1.27.0-beta.7) (2024-10-24)


### Features

* refactoring of get_probable_tags node ([f658092](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/f658092dffb20ea111cc00950f617057482788f4))

## [1.27.0-beta.6](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.5...v1.27.0-beta.6) (2024-10-23)


### Features

* add integration with scrape.do ([ae275ec](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/ae275ec5e86c0bb8fdbeadc2e5f69816d1dea635))

## [1.27.0-beta.5](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.4...v1.27.0-beta.5) (2024-10-22)


### Features

* refactoring of export functions ([0ea00c0](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/0ea00c078f2811f0d1b356bd84cafde80763c703))

## [1.27.0-beta.4](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.3...v1.27.0-beta.4) (2024-10-21)


### Features

* refactoring of ScrapeGraph to SmartScraperLiteGraph ([52b6bf5](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/52b6bf5fb8c570aa8ef026916230c5d52996f887))

## [1.27.0-beta.3](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.2...v1.27.0-beta.3) (2024-10-20)


### Features

* implement ScrapeGraph class for only web scraping automation ([612c644](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/612c644623fa6f4fe77a64a5f1a6a4d6cd5f4254))
* Implement SmartScraperMultiParseMergeFirstGraph class that scrapes a list of URLs and merge the content first and finally generates answers to a given prompt. ([3e3e1b2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/3e3e1b2f3ae8ed803d03b3b44b199e139baa68d4))
=======
## [1.26.7](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.26.6...v1.26.7) (2024-10-19)


### Bug Fixes

* fix the example variable name ([69ff649](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/69ff6495564a5c670b89c0f802ebb1602f0e7cfa))


### chore

* fix example ([9cd9a87](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/9cd9a874f91bbbb2990444818e8ab2d0855cc361))


### Test

* Add scrape_graph test ([cdb3c11](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/cdb3c1100ee1117afedbc70437317acaf7c7c1d3))
* Add smart_scraper_multi_parse_merge_first_graph test ([464b8b0](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/464b8b04ea0d51280849173d5eda92d4d4db8612))

## [1.27.0-beta.2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.27.0-beta.1...v1.27.0-beta.2) (2024-10-18)


### Bug Fixes

* refactoring of gpt2 tokenizer ([44c3f9c](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/44c3f9c98939c44caa86dc582242819a7c6a0f80))


### CI

* **release:** 1.26.6 [skip ci] ([a4634c7](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/a4634c73312b5c08581a8d670d53b7eebe8dadc1))

## [1.27.0-beta.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.26.6-beta.1...v1.27.0-beta.1) (2024-10-16)


### Features

* add conditional node structure to the smart_scraper_graph and implemented a structured way to check condition ([cacd9cd](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/cacd9cde004dace1a7dcc27981245632a78b95f3))


* removed tokenizer ([a184716](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/a18471688f0b79f06fb7078b01b68eeddc88eae4))

## [1.26.6](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.26.5...v1.26.6) (2024-10-18)

## [1.26.6-beta.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.26.5...v1.26.6-beta.1) (2024-10-14)

### Bug Fixes

* remove variable "max_result" not being used in the code ([e76a68a](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/e76a68a782e5bce48d421cb620d0b7bffa412918))

* refactoring of gpt2 tokenizer ([44c3f9c](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/44c3f9c98939c44caa86dc582242819a7c6a0f80))

## [1.26.5](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.26.4...v1.26.5) (2024-10-13)
Expand Down
32 changes: 32 additions & 0 deletions examples/anthropic/smart_scraper_lite_anthropic.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "anthropic/claude-3-haiku-20240307",
},
"verbose": True,
"headless": False,
}

smart_scraper_lite_graph = SmartScraperLiteGraph(
prompt="Who is Marco Perini?",
source="https://perinim.github.io/",
config=graph_config
)

result = smart_scraper_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))

35 changes: 35 additions & 0 deletions examples/anthropic/smart_scraper_multi_lite_anthropic.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperMultiLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.getenv("ANTHROPIC_API_KEY"),
"model": "anthropic/claude-3-haiku-20240307",
},
"verbose": True,
"headless": False,
}

smart_scraper_multi_lite_graph = SmartScraperMultiLiteGraph(
prompt="Who is Marco Perini?",
source= [
"https://perinim.github.io/",
"https://perinim.github.io/cv/"
],
config=graph_config
)

result = smart_scraper_multi_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_multi_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))

31 changes: 31 additions & 0 deletions examples/azure/smart_scraper_lite_azure.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.environ["AZURE_OPENAI_KEY"],
"model": "azure_openai/gpt-4o"
},
"verbose": True,
"headless": False
}

smart_scraper_lite_graph = SmartScraperLiteGraph(
prompt="Who is Marco Perini?",
source="https://perinim.github.io/",
config=graph_config
)

result = smart_scraper_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))
35 changes: 35 additions & 0 deletions examples/azure/smart_scraper_multi_lite_azure.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperMultiLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.environ["AZURE_OPENAI_KEY"],
"model": "azure_openai/gpt-4o"
},
"verbose": True,
"headless": False
}

smart_scraper_multi_lite_graph = SmartScraperMultiLiteGraph(
prompt="Who is Marco Perini?",
source= [
"https://perinim.github.io/",
"https://perinim.github.io/cv/"
],
config=graph_config
)

result = smart_scraper_multi_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_multi_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))

26 changes: 26 additions & 0 deletions examples/bedrock/smart_scraper_lite_bedrock.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import json
from scrapegraphai.graphs import SmartScraperLiteGraph
from scrapegraphai.utils import prettify_exec_info

graph_config = {
"llm": {
"client": "client_name",
"model": "bedrock/anthropic.claude-3-sonnet-20240229-v1:0",
"temperature": 0.0
}
}

smart_scraper_lite_graph = SmartScraperLiteGraph(
prompt="Who is Marco Perini?",
source="https://perinim.github.io/",
config=graph_config
)

result = smart_scraper_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))
29 changes: 29 additions & 0 deletions examples/bedrock/smart_scraper_multi_lite_bedrock.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import json
from scrapegraphai.graphs import SmartScraperMultiLiteGraph
from scrapegraphai.utils import prettify_exec_info

graph_config = {
"llm": {
"client": "client_name",
"model": "bedrock/anthropic.claude-3-sonnet-20240229-v1:0",
"temperature": 0.0
}
}

smart_scraper_multi_lite_graph = SmartScraperMultiLiteGraph(
prompt="Who is Marco Perini?",
source= [
"https://perinim.github.io/",
"https://perinim.github.io/cv/"
],
config=graph_config
)

result = smart_scraper_multi_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_multi_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))
31 changes: 31 additions & 0 deletions examples/deepseek/smart_scraper_lite_deepseek.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.getenv("DEEPSEEK_API_KEY"),
"model": "deepseek/deepseek-coder-33b-instruct",
},
"verbose": True,
"headless": False,
}

smart_scraper_lite_graph = SmartScraperLiteGraph(
prompt="Who is Marco Perini?",
source="https://perinim.github.io/",
config=graph_config
)

result = smart_scraper_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))
35 changes: 35 additions & 0 deletions examples/deepseek/smart_scraper_multi_lite_deepseek.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""
Basic example of scraping pipeline using SmartScraper
"""
import os
import json
from dotenv import load_dotenv
from scrapegraphai.graphs import SmartScraperMultiLiteGraph
from scrapegraphai.utils import prettify_exec_info

load_dotenv()

graph_config = {
"llm": {
"api_key": os.getenv("DEEPSEEK_API_KEY"),
"model": "deepseek/deepseek-coder-33b-instruct",
},
"verbose": True,
"headless": False,
}

smart_scraper_multi_lite_graph = SmartScraperMultiLiteGraph(
prompt="Who is Marco Perini?",
source= [
"https://perinim.github.io/",
"https://perinim.github.io/cv/"
],
config=graph_config
)

result = smart_scraper_multi_lite_graph.run()
print(json.dumps(result, indent=4))

graph_exec_info = smart_scraper_multi_lite_graph.get_execution_info()
print(prettify_exec_info(graph_exec_info))

Loading