refactoring of the openai examples

VinciGit00 · vedovati-matteo · VinciGit00 · commit 66a29bc5cc2e · 2024-08-05T20:54:53.000+02:00
Co-Authored-By: Matteo Vedovati &lt;68272450+vedovati-matteo@users.noreply.github.com&gt;
diff --git a/examples/openai/csv_scraper_graph_multi_openai.py b/examples/openai/csv_scraper_graph_multi_openai.py
@@ -27,7 +27,7 @@
 graph_config = {
      "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/csv_scraper_openai.py b/examples/openai/csv_scraper_openai.py
@@ -28,7 +28,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/custom_graph_openai.py b/examples/openai/custom_graph_openai.py
@@ -19,7 +19,7 @@
 graph_config = {
      "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/deep_scraper_openai.py b/examples/openai/deep_scraper_openai.py
@@ -18,7 +18,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-4",
+        "model": "gpt-4o",
     },
     "verbose": True,
     "max_depth": 1
diff --git a/examples/openai/json_scraper_multi_openai.py b/examples/openai/json_scraper_multi_openai.py
@@ -13,7 +13,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     }
 }
 
diff --git a/examples/openai/json_scraper_openai.py b/examples/openai/json_scraper_openai.py
@@ -28,7 +28,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/md_scraper_openai.py b/examples/openai/md_scraper_openai.py
@@ -28,7 +28,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/pdf_scraper_multi_openai.py b/examples/openai/pdf_scraper_multi_openai.py
@@ -3,11 +3,10 @@
 """
 import os
 import json
+from typing import List
 from dotenv import load_dotenv
-from scrapegraphai.graphs import PdfScraperMultiGraph
-
 from pydantic import BaseModel, Field
-from typing import List
+from scrapegraphai.graphs import PdfScraperMultiGraph
 
 load_dotenv()
 
@@ -20,7 +19,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "verbose": True,
 }
diff --git a/examples/openai/pdf_scraper_openai.py b/examples/openai/pdf_scraper_openai.py
@@ -14,7 +14,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "verbose": True,
 }
diff --git a/examples/openai/scrape_plain_text_openai.py b/examples/openai/scrape_plain_text_openai.py
@@ -30,7 +30,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
 }
 
diff --git a/examples/openai/script_generator_openai.py b/examples/openai/script_generator_openai.py
@@ -18,7 +18,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "library": "beautifulsoup"
 }
diff --git a/examples/openai/search_graph_schema_openai.py b/examples/openai/search_graph_schema_openai.py
@@ -3,14 +3,13 @@
 """
 
 import os
+from typing import List
 from dotenv import load_dotenv
-load_dotenv()
-
+from pydantic import BaseModel, Field
 from scrapegraphai.graphs import SearchGraph
 from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
 
-from pydantic import BaseModel, Field
-from typing import List
+load_dotenv()
 
 # ************************************************
 # Define the output schema for the graph
diff --git a/examples/openai/search_link_graph_openai.py b/examples/openai/search_link_graph_openai.py
@@ -1,16 +1,23 @@
 """ 
 Basic example of scraping pipeline using SmartScraper
 """
+
+import os
+from dotenv import load_dotenv
 from scrapegraphai.graphs import SearchLinkGraph
 from scrapegraphai.utils import prettify_exec_info
+
+load_dotenv()
 # ************************************************
 # Define the configuration for the graph
 # ************************************************
 
+openai_key = os.getenv("OPENAI_APIKEY")
+
 graph_config = {
     "llm": {
-        "api_key": "s",
-        "model": "gpt-3.5-turbo",
+        "api_key": openai_key,
+        "model": "gpt-4o",
     },
     "verbose": True,
     "headless": False,
diff --git a/examples/openai/smart_scraper_schema_openai.py b/examples/openai/smart_scraper_schema_openai.py
@@ -30,7 +30,7 @@ class Projects(BaseModel):
 graph_config = {
     "llm": {
         "api_key":openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "verbose": True,
     "headless": False,
diff --git a/examples/openai/speech_graph_openai.py b/examples/openai/speech_graph_openai.py
@@ -25,7 +25,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
         "temperature": 0.7,
     },
     "tts_model": {
diff --git a/examples/openai/xml_scraper_graph_multi_openai.py b/examples/openai/xml_scraper_graph_multi_openai.py
@@ -29,7 +29,7 @@
 graph_config = {
     "llm": {
         "api_key":openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "verbose": True,
     "headless": False,
diff --git a/examples/openai/xml_scraper_openai.py b/examples/openai/xml_scraper_openai.py
@@ -28,7 +28,7 @@
 graph_config = {
     "llm": {
         "api_key": openai_key,
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-4o",
     },
     "verbose":False,
 }
diff --git a/scrapegraphai/graphs/search_graph.py b/scrapegraphai/graphs/search_graph.py
@@ -53,7 +53,6 @@ def __init__(self, prompt: str, config: dict, schema: Optional[BaseModel] = None
             self.copy_config = copy(config)
         else:
             self.copy_config = deepcopy(config)
-        
         self.copy_schema = deepcopy(schema)
         self.considered_urls = []  # New attribute to store URLs
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`graph_config = {`
`28`	`28`	`"llm": {`
`29`	`29`	`"api_key": openai_key,`
`30`		`- "model": "gpt-3.5-turbo",`
	`30`	`+ "model": "gpt-4o",`
`31`	`31`	`},`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`graph_config = {`
`29`	`29`	`"llm": {`
`30`	`30`	`"api_key": openai_key,`
`31`		`- "model": "gpt-3.5-turbo",`
	`31`	`+ "model": "gpt-4o",`
`32`	`32`	`},`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`graph_config = {`
`20`	`20`	`"llm": {`
`21`	`21`	`"api_key": openai_key,`
`22`		`- "model": "gpt-3.5-turbo",`
	`22`	`+ "model": "gpt-4o",`
`23`	`23`	`},`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`graph_config = {`
`14`	`14`	`"llm": {`
`15`	`15`	`"api_key": openai_key,`
`16`		`- "model": "gpt-3.5-turbo",`
	`16`	`+ "model": "gpt-4o",`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`graph_config = {`
`15`	`15`	`"llm": {`
`16`	`16`	`"api_key": openai_key,`
`17`		`- "model": "gpt-3.5-turbo",`
	`17`	`+ "model": "gpt-4o",`
`18`	`18`	`},`
`19`	`19`	`"verbose": True,`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`graph_config = {`
`31`	`31`	`"llm": {`
`32`	`32`	`"api_key": openai_key,`
`33`		`- "model": "gpt-3.5-turbo",`
	`33`	`+ "model": "gpt-4o",`
`34`	`34`	`},`
`35`	`35`	`}`
`36`	`36`