Skip to content

big update #478

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 52 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
d3e63d9
ci(release): 1.9.0-beta.3 [skip ci]
semantic-release-bot Jul 12, 2024
a724968
removed rag node
VinciGit00 Jul 14, 2024
cf3ab55
fix: search link node
VinciGit00 Jul 14, 2024
7e5789b
Update research_web.py
VinciGit00 Jul 14, 2024
5c92186
feat: add searchngx integration
VinciGit00 Jul 14, 2024
fd1b7cb
chore: remove unused import
f-aguzzi Jul 14, 2024
7ba2f6a
chore: correct search engine name
f-aguzzi Jul 14, 2024
eaf3e98
Merge pull request #454 from ScrapeGraphAI/removing-rag-node
f-aguzzi Jul 14, 2024
789c16f
Merge pull request #458 from ScrapeGraphAI/searchngx_integration
f-aguzzi Jul 14, 2024
2fa04b5
ci(release): 1.9.0-beta.4 [skip ci]
semantic-release-bot Jul 14, 2024
57fdaf9
create search_link_graph
VinciGit00 Jul 15, 2024
f42d47e
add examples
VinciGit00 Jul 15, 2024
da0b744
add test
VinciGit00 Jul 15, 2024
830daee
Update search_link_node.py
VinciGit00 Jul 15, 2024
dccb893
Merge pull request #456 from ScrapeGraphAI/refactoring-of-search_link…
f-aguzzi Jul 15, 2024
bb62439
ci(release): 1.9.0-beta.5 [skip ci]
semantic-release-bot Jul 15, 2024
602dd00
feat: refactoring_to_md function
VinciGit00 Jul 16, 2024
cc97c7e
Merge pull request #461 from ScrapeGraphAI/refactoring_convert_to_md
f-aguzzi Jul 17, 2024
54a69de
ci(release): 1.9.0-beta.6 [skip ci]
semantic-release-bot Jul 17, 2024
68f58cc
refactoring of generate answer node
VinciGit00 Jul 17, 2024
07f1e23
fix: parse_node
VinciGit00 Jul 17, 2024
032a491
Update parse_node.py
VinciGit00 Jul 17, 2024
e2ca41e
add example
VinciGit00 Jul 18, 2024
7314bc3
chore: upgrade tiktoken
f-aguzzi Jul 18, 2024
dfa759e
style(models): fix module docstrings
f-aguzzi Jul 18, 2024
c7b05a4
chore(ci): upgrade lockfiles
f-aguzzi Jul 18, 2024
a3d0aac
update env
VinciGit00 Jul 18, 2024
b91020c
Update models_tokens.py with gpt-4o-mini
Kernick Jul 18, 2024
4f079cf
Fixed a typo in the model name
Kernick Jul 18, 2024
3a9d556
Merge branch 'pre/beta' into add-openai-supported-model-gpt-4o-mini
VinciGit00 Jul 19, 2024
ca453da
Merge pull request #469 from Kernick/add-openai-supported-model-gpt-4…
VinciGit00 Jul 19, 2024
8f619de
ci(release): 1.10.0-beta.1 [skip ci]
semantic-release-bot Jul 19, 2024
431edb7
feat: add gpt4o omni
VinciGit00 Jul 19, 2024
8007247
Merge branch 'pre/beta' of https://github.com/ScrapeGraphAI/Scrapegra…
VinciGit00 Jul 19, 2024
aa7d4f0
ci(release): 1.10.0-beta.2 [skip ci]
semantic-release-bot Jul 19, 2024
77777c8
fix: add gpt o mini for azure
VinciGit00 Jul 20, 2024
bf0a2f3
ci(release): 1.10.0-beta.3 [skip ci]
semantic-release-bot Jul 20, 2024
3cf7089
Merge branch 'pre/beta' into temp
VinciGit00 Jul 20, 2024
6e56e47
Merge pull request #472 from ScrapeGraphAI/temp
VinciGit00 Jul 20, 2024
a91807a
ci(release): 1.10.0-beta.4 [skip ci]
semantic-release-bot Jul 20, 2024
0b15393
Update smart_scraper_openai.py
DragonelRoland Jul 20, 2024
de20f30
Merge pull request #474 from DragonelRoland/main
PeriniM Jul 20, 2024
e9ecf5f
Update typo in conditional_node.py
DragonelRoland Jul 20, 2024
4b83606
Update models_tokens.py
DragonelRoland Jul 20, 2024
19af78c
Merge branch 'pre/beta' into main
VinciGit00 Jul 20, 2024
b6cc3e3
Merge pull request #475 from DragonelRoland/main
VinciGit00 Jul 20, 2024
cb02740
refactoring of the examples
VinciGit00 Jul 20, 2024
61a51d4
Merge pull request #466 from ScrapeGraphAI/refactoring_convert_to_md
PeriniM Jul 20, 2024
0d5f925
ci(release): 1.10.0-beta.5 [skip ci]
semantic-release-bot Jul 20, 2024
6a92059
Merge branch 'pre/beta' into temp
VinciGit00 Jul 20, 2024
1b7ac7c
Merge pull request #477 from ScrapeGraphAI/temp
VinciGit00 Jul 20, 2024
7a3c21b
Update generate_answer_node.py
VinciGit00 Jul 20, 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
60 changes: 40 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## [1.10.0-beta.5](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.10.0-beta.4...v1.10.0-beta.5) (2024-07-20)


### Bug Fixes

* parse_node ([07f1e23](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/07f1e23d235db1a0db2cb155f10b73b0bf882269))

## [1.10.0-beta.4](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.10.0-beta.3...v1.10.0-beta.4) (2024-07-20)


### Bug Fixes

* azure models ([03f4a3a](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/03f4a3aa29c42a9a312c4afb6818de3450e7cedf))


### CI

* **release:** 1.9.2 [skip ci] ([b4b90b3](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/b4b90b3c121911de68a860640419907ca7674953))

## [1.9.2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.9.1...v1.9.2) (2024-07-20)


Expand All @@ -13,46 +32,47 @@
## [1.9.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.9.0...v1.9.1) (2024-07-12)



### Bug Fixes

* solve a burr integration ([881290b](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/881290b5066b39c505532656671fbf65f8fc312c))
* add gpt o mini for azure ([77777c8](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/77777c898d1fad40f340b06c5b36d35b65409ea6))

## [1.9.0](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.8.0...v1.9.0) (2024-07-09)
## [1.10.0-beta.2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.10.0-beta.1...v1.10.0-beta.2) (2024-07-19)


### Features

* add fireworks integration ([df0e310](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/df0e3108299071b849d7e055bd11d72764d24f08))
* add integration for infos ([3bf5f57](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/3bf5f570a8f8e1b037a7ad3c9f583261a1536421))
* add integrations for markdown files ([2804434](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/2804434a9ee12c52ae8956a88b1778a4dd3ec32f))
* add vertexai integration ([119514b](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/119514bdfc2a16dfb8918b0c34ae7cc43a01384c))
* improve md prompt recognition ([5fe694b](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/5fe694b6b4545a5091d16110318b992acfca4f58))
* add gpt4o omni ([431edb7](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/431edb7bb2504f4c1335c3ae3ce2f91867fa7222))

## [1.10.0-beta.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.9.1...v1.10.0-beta.1) (2024-07-19)

### Bug Fixes

* add test ([3a537ee](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/3a537eec6fef1743924a9aa5cef0ba2f8d44bf11))
* fix pyproject.toml ([7570bf8](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/7570bf8294e49bc54ec9e296aaadb763873390ca))
### Features

* add searchngx integration ([5c92186](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/5c9218608140bf694fbfd96aa90276bc438bb475))
* refactoring_to_md function ([602dd00](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/602dd00209ee1d72a1223fc4793759450921fcf9))

### chore

* **Docker:** fix port number ([afeb81f](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/afeb81f77a884799192d79dcac85666190fb1c9d))
* **CI:** fix pylint workflow ([583c321](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/583c32106e827f50235d8fc69511652fd4b07a35))
* **rye:** rebuild lockfiles ([27c2dd2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/27c2dd23517a7e4b14fafd00320a8b81f73145dc))
### Bug Fixes

* search link node ([cf3ab55](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/cf3ab5564ae5c415c63d1771b32ea68f5169ca82))

### Docs

* **roadmap:** fix urls ([14faba4](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/14faba4f00dd9f947f8dc5e0b51be49ea684179f))
* **roadmap:** next steps ([3e644f4](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/3e644f498f05eb505fbd4e94b144c81567569aaa))
### chore

* correct search engine name ([7ba2f6a](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/7ba2f6ae0b9d2e9336e973e1f57ab8355c739e27))
* remove unused import ([fd1b7cb](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/fd1b7cb24a7c252277607abde35826e3c58e34ef))
* remove unused workflow ([5c6dd8d](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/5c6dd8de4da08f09b5dd93c525d14b44778c9659))
* **ci:** upgrade lockfiles ([c7b05a4](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/c7b05a4993df14d6ed4848121a3cd209571232f7))
* upgrade tiktoken ([7314bc3](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/7314bc383068db590662bf7e512f799529308991))


### CI

* **release:** 1.8.1-beta.1 [skip ci] ([8f9f96f](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/8f9f96f7e7ff41d2fff5bbbf18bf4fc85d4f98b3))
* **release:** 1.9.0-beta.1 [skip ci] ([146432d](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/146432d476f775510441b062935adc47190141e2))
* **release:** 1.9.0-beta.2 [skip ci] ([5cb5fbf](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/5cb5fbf5503eec9b34a6691eb993716cc9a821d6))
* **release:** 1.9.0-beta.3 [skip ci] ([d3e63d9](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/d3e63d91be79f74e8a3fdb00e692d546c24cead5))
* **release:** 1.9.0-beta.4 [skip ci] ([2fa04b5](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/2fa04b58159abf7af890ebc0768fe23d51bf177f))
* **release:** 1.9.0-beta.5 [skip ci] ([bb62439](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/bb624399cfc3924825892dd48697fc298ad3b002))
* **release:** 1.9.0-beta.6 [skip ci] ([54a69de](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/54a69de69e8077e02fd5584783ca62cc2e0ec5bb))

## [1.9.0-beta.2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.9.0-beta.1...v1.9.0-beta.2) (2024-07-05)

Expand Down
57 changes: 57 additions & 0 deletions examples/anthropic/search_link_graph_haiku.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
"""
Example of Search Graph
"""
import os
from dotenv import load_dotenv
from scrapegraphai.graphs import SearchGraph
from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
from langchain_openai import AzureChatOpenAI
from langchain_openai import AzureOpenAIEmbeddings

# ************************************************
# Define the configuration for the graph
# ************************************************

load_dotenv()

llm_model_instance = AzureChatOpenAI(
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
azure_deployment=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT_NAME"]
)

embedder_model_instance = AzureOpenAIEmbeddings(
azure_deployment=os.environ["AZURE_OPENAI_EMBEDDINGS_DEPLOYMENT_NAME"],
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
)

# ************************************************
# Create the SmartScraperGraph instance and run it
# ************************************************

graph_config = {
"llm": {"model_instance": llm_model_instance},
"embeddings": {"model_instance": embedder_model_instance}
}

# ************************************************
# Create the SearchGraph instance and run it
# ************************************************

search_graph = SearchGraph(
prompt="List me the best escursions near Trento",
config=graph_config
)

result = search_graph.run()
print(result)

# ************************************************
# Get graph execution info
# ************************************************

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

# Save to json and csv
convert_to_csv(result, "result")
convert_to_json(result, "result")
26 changes: 7 additions & 19 deletions examples/azure/csv_scraper_azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import os
from dotenv import load_dotenv
import pandas as pd
from langchain_openai import AzureChatOpenAI
from langchain_openai import AzureOpenAIEmbeddings
from scrapegraphai.graphs import CSVScraperGraph
from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
load_dotenv()
Expand All @@ -24,25 +22,15 @@
# ************************************************
# Define the configuration for the graph
# ************************************************

llm_model_instance = AzureChatOpenAI(
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
azure_deployment=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT_NAME"]
)

embedder_model_instance = AzureOpenAIEmbeddings(
azure_deployment=os.environ["AZURE_OPENAI_EMBEDDINGS_DEPLOYMENT_NAME"],
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
)

# ************************************************
# Create the JSONScraperGraph instance and run it
# ************************************************

graph_config = {
"llm": {"model_instance": llm_model_instance},
"embeddings": {"model_instance": embedder_model_instance}
"llm": {
"api_key": os.environ["AZURE_OPENAI_KEY"],
"model": "azure/gpt-3.5-turbo",
},
"verbose": True,
"headless": False
}

# ************************************************
# Create the CSVScraperGraph instance and run it
# ************************************************
Expand Down
20 changes: 7 additions & 13 deletions examples/azure/csv_scraper_graph_multi_azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from dotenv import load_dotenv
import pandas as pd
from scrapegraphai.graphs import CSVScraperMultiGraph
from langchain_openai import AzureChatOpenAI
from langchain_openai import AzureOpenAIEmbeddings
from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info

load_dotenv()
Expand All @@ -24,19 +22,15 @@
# ************************************************
# Define the configuration for the graph
# ************************************************
llm_model_instance = AzureChatOpenAI(
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
azure_deployment=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT_NAME"]
)

embedder_model_instance = AzureOpenAIEmbeddings(
azure_deployment=os.environ["AZURE_OPENAI_EMBEDDINGS_DEPLOYMENT_NAME"],
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
)
graph_config = {
"llm": {"model_instance": llm_model_instance},
"embeddings": {"model_instance": embedder_model_instance}
"llm": {
"api_key": os.environ["AZURE_OPENAI_KEY"],
"model": "azure/gpt-3.5-turbo",
},
"verbose": True,
"headless": False
}

# ************************************************
# Create the CSVScraperMultiGraph instance and run it
# ************************************************
Expand Down
117 changes: 0 additions & 117 deletions examples/azure/custom_graph_azure.py

This file was deleted.

34 changes: 6 additions & 28 deletions examples/azure/json_scraper_azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,11 @@

import os
from dotenv import load_dotenv
from langchain_openai import AzureChatOpenAI
from langchain_openai import AzureOpenAIEmbeddings
from scrapegraphai.graphs import JSONScraperGraph
from scrapegraphai.utils import prettify_exec_info


# required environment variable in .env
# AZURE_OPENAI_ENDPOINT
# AZURE_OPENAI_CHAT_DEPLOYMENT_NAME
# MODEL_NAME
# AZURE_OPENAI_API_KEY
# OPENAI_API_TYPE
# AZURE_OPENAI_API_VERSION
# AZURE_OPENAI_EMBEDDINGS_DEPLOYMENT_NAME
load_dotenv()


FILE_NAME = "inputs/example.json"
curr_dir = os.path.dirname(os.path.realpath(__file__))
file_path = os.path.join(curr_dir, FILE_NAME)
Expand All @@ -32,23 +20,13 @@
# Initialize the model instances
# ************************************************

llm_model_instance = AzureChatOpenAI(
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
azure_deployment=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT_NAME"]
)

embedder_model_instance = AzureOpenAIEmbeddings(
azure_deployment=os.environ["AZURE_OPENAI_EMBEDDINGS_DEPLOYMENT_NAME"],
openai_api_version=os.environ["AZURE_OPENAI_API_VERSION"],
)

# ************************************************
# Create the JSONScraperGraph instance and run it
# ************************************************

graph_config = {
"llm": {"model_instance": llm_model_instance},
"embeddings": {"model_instance": embedder_model_instance}
"llm": {
"api_key": os.environ["AZURE_OPENAI_KEY"],
"model": "azure/gpt-3.5-turbo",
},
"verbose": True,
"headless": False
}

smart_scraper_graph = JSONScraperGraph(
Expand Down
Loading
Loading