Merge branch 'main' into ollama_integration

Author: VinciGit00

.gitignore

@@ -28,6 +28,6 @@ venv/
 *.sqlite
 *.google-cookie
 examples/graph_examples/ScrapeGraphAI_generated_graph
-examples/*.csv
-examples/*.json
+examples/**/*.csv
+examples/**/*.json
 main.py

Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.11-slim
+
+RUN apt-get update && apt-get upgrade -y && \
+useradd -m -s /bin/bash app
+
+USER app
+
+RUN pip install scrapegraphai

examples/gemini/custom_graph_gemini.py

@@ -74,7 +74,7 @@
 # Execute the graph
 # ************************************************
 
-result = graph.execute({
+result, execution_info = graph.execute({
     "user_prompt": "List me the projects with their description",
     "url": "https://perinim.github.io/projects/"
 })

examples/local_models/Docker/scrape_plain_text_docker.py

@@ -40,7 +40,7 @@
 # ************************************************
 
 smart_scraper_graph = SmartScraperGraph(
-    prompt="List me all the news with their description.",
+    prompt="List me all the projects with their description.",
     source=text,
     config=graph_config
 )

examples/local_models/Docker/smart_scraper_docker.py

@@ -23,7 +23,7 @@
 smart_scraper_graph = SmartScraperGraph(
     prompt="List me all the news with their description.",
     # also accepts a string with the already downloaded HTML code
-    source="https://perinim.github.io/projects",
+    source="https://www.wired.com/category/science/",
     config=graph_config
 )
 

examples/mixed_models/search_graph_mixed.py

@@ -5,7 +5,7 @@
 import os
 from dotenv import load_dotenv
 from scrapegraphai.graphs import SearchGraph
-from scrapegraphai.utils import convert_to_csv, convert_to_json
+from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
 load_dotenv()
 
 # ************************************************
@@ -38,6 +38,13 @@
 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")

examples/openai/custom_graph_openai.py

@@ -74,7 +74,7 @@
 # Execute the graph
 # ************************************************
 
-result = graph.execute({
+result, execution_info = graph.execute({
     "user_prompt": "List me the projects with their description",
     "url": "https://perinim.github.io/projects/"
 })

examples/openai/scrape_plain_text_openai.py

@@ -5,7 +5,7 @@
 import os
 from dotenv import load_dotenv
 from scrapegraphai.graphs import SmartScraperGraph
-from scrapegraphai.utils import convert_to_csv, convert_to_json
+from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
 load_dotenv()
 
 # ************************************************
@@ -46,6 +46,13 @@
 result = smart_scraper_graph.run()
 print(result)
 
+# ************************************************
+# Get graph execution info
+# ************************************************
+
+graph_exec_info = smart_scraper_graph.get_execution_info()
+print(prettify_exec_info(graph_exec_info))
+
 # Save to json or csv
 convert_to_csv(result, "result")
 convert_to_json(result, "result")

examples/openai/scrape_xml_openai.py

@@ -5,7 +5,7 @@
 import os
 from dotenv import load_dotenv
 from scrapegraphai.graphs import SmartScraperGraph
-from scrapegraphai.utils import convert_to_csv, convert_to_json
+from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
 load_dotenv()
 
 # ************************************************
@@ -45,6 +45,13 @@
 result = smart_scraper_graph.run()
 print(result)
 
+# ************************************************
+# Get graph execution info
+# ************************************************
+
+graph_exec_info = smart_scraper_graph.get_execution_info()
+print(prettify_exec_info(graph_exec_info))
+
 # Save to json or csv
 convert_to_csv(result, "result")
 convert_to_json(result, "result")

examples/openai/search_graph_openai.py

@@ -5,7 +5,7 @@
 import os
 from dotenv import load_dotenv
 from scrapegraphai.graphs import SearchGraph
-from scrapegraphai.utils import convert_to_csv, convert_to_json
+from scrapegraphai.utils import convert_to_csv, convert_to_json, prettify_exec_info
 load_dotenv()
 
 # ************************************************
@@ -26,13 +26,20 @@
 # ************************************************
 
 search_graph = SearchGraph(
-    prompt="List me all the regions of Italy.",
+    prompt="List me top 5 eyeliner products for a gift.",
     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")