add new tests

VinciGit00 · vedovati-matteo · VinciGit00 · commit cec5537f2ae7 · 2024-08-11T17:10:55.000+02:00
Co-Authored-By: Matteo Vedovati &lt;68272450+vedovati-matteo@users.noreply.github.com&gt;
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,6 @@ name = "scrapegraphai"
 version = "1.14.0b1"
 
 
-
 description = "A web scraping library based on LangChain which uses LLM and direct graph logic to create scraping pipelines."
 
 authors = [
diff --git a/scrapegraphai/nodes/__init__.py b/scrapegraphai/nodes/__init__.py
@@ -4,7 +4,6 @@
 
 from .base_node import BaseNode
 from .fetch_node import FetchNode
-from .conditional_node import ConditionalNode
 from .get_probable_tags_node import GetProbableTagsNode
 from .generate_answer_node import GenerateAnswerNode
 from .parse_node import ParseNode
diff --git a/tests/graphs/scrape_plain_text_llama3.1_test.py b/tests/graphs/scrape_plain_text_llama3.1_test.py
@@ -26,15 +26,10 @@ def graph_config():
     """
     return {
         "llm": {
-            "model": "ollama/llama3",
+            "model": "ollama/llama3.1",
             "temperature": 0,
             "format": "json",
             "base_url": "http://localhost:11434",
-        },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            "base_url": "http://localhost:11434",
         }
     }
 
diff --git a/tests/graphs/scrape_plain_text_mistral_test.py b/tests/graphs/scrape_plain_text_mistral_test.py
@@ -30,11 +30,6 @@ def graph_config():
             "temperature": 0,
             "format": "json",
             "base_url": "http://localhost:11434",
-        },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            "base_url": "http://localhost:11434",
         }
     }
 
diff --git a/tests/graphs/scrape_xml_ollama_test.py b/tests/graphs/scrape_xml_ollama_test.py
@@ -32,11 +32,6 @@ def graph_config():
             "temperature": 0,
             "format": "json",
             "base_url": "http://localhost:11434",
-        },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            "base_url": "http://localhost:11434",
         }
     }
 
diff --git a/tests/graphs/script_generator_test.py b/tests/graphs/script_generator_test.py
@@ -18,11 +18,6 @@ def graph_config():
            "base_url": "http://localhost:11434",
            "library": "beautifulsoup",
        },
-       "embeddings": {
-           "model": "ollama/nomic-embed-text",
-           "temperature": 0,
-           "base_url": "http://localhost:11434",
-       },
        "library": "beautifulsoup"
    }
 
diff --git a/tests/graphs/search_link_ollama.py b/tests/graphs/search_link_ollama.py
@@ -4,14 +4,10 @@
 def test_smart_scraper_pipeline():
     graph_config = {
         "llm": {
-            "model": "ollama/llama3",
+            "model": "ollama/llama3.1",
             "temperature": 0,
             "format": "json",
         },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-        },
         "verbose": True,
         "headless": False
     }
diff --git a/tests/graphs/smart_scraper_ernie_test.py b/tests/graphs/smart_scraper_ernie_test.py
@@ -16,11 +16,6 @@ def graph_config():
             "ernie_client_id": "<ernie_client_id>",
             "ernie_client_secret": "<ernie_client_secret>",
             "temperature": 0.1
-        },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            "base_url": "http://localhost:11434",
         }
     }
 
diff --git a/tests/graphs/smart_scraper_fireworks_test.py b/tests/graphs/smart_scraper_fireworks_test.py
@@ -20,11 +20,6 @@ def graph_config():
             "api_key": fireworks_api_key,
             "model": "fireworks/accounts/fireworks/models/mixtral-8x7b-instruct"
         },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            # "base_url": "http://localhost:11434",  # set ollama URL arbitrarily
-        },
         "verbose": True,
         "headless": False,
     }
diff --git a/tests/graphs/smart_scraper_ollama_test.py b/tests/graphs/smart_scraper_ollama_test.py
@@ -16,11 +16,6 @@ def graph_config():
             "temperature": 0,
             "format": "json",
             "base_url": "http://localhost:11434",
-        },
-        "embeddings": {
-            "model": "ollama/nomic-embed-text",
-            "temperature": 0,
-            "base_url": "http://localhost:11434",
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,6 @@ def graph_config():`
`30`	`30`	`"temperature": 0,`
`31`	`31`	`"format": "json",`
`32`	`32`	`"base_url": "http://localhost:11434",`
`33`		`- },`
`34`		`- "embeddings": {`
`35`		`- "model": "ollama/nomic-embed-text",`
`36`		`- "temperature": 0,`
`37`		`- "base_url": "http://localhost:11434",`
`38`	`33`	`}`
`39`	`34`	`}`
`40`	`35`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,6 @@ def graph_config():`
`32`	`32`	`"temperature": 0,`
`33`	`33`	`"format": "json",`
`34`	`34`	`"base_url": "http://localhost:11434",`
`35`		`- },`
`36`		`- "embeddings": {`
`37`		`- "model": "ollama/nomic-embed-text",`
`38`		`- "temperature": 0,`
`39`		`- "base_url": "http://localhost:11434",`
`40`	`35`	`}`
`41`	`36`	`}`
`42`	`37`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@ def graph_config():`
`16`	`16`	`"ernie_client_id": "<ernie_client_id>",`
`17`	`17`	`"ernie_client_secret": "<ernie_client_secret>",`
`18`	`18`	`"temperature": 0.1`
`19`		`- },`
`20`		`- "embeddings": {`
`21`		`- "model": "ollama/nomic-embed-text",`
`22`		`- "temperature": 0,`
`23`		`- "base_url": "http://localhost:11434",`
`24`	`19`	`}`
`25`	`20`	`}`
`26`	`21`