Skip to content

Commit 1bbd25a

Browse files
authored
Merge pull request #407 from ScrapeGraphAI/404-split-unit-testing-from-src
Merge #404 (split unit testing from src)
2 parents 8f4a13b + 3a537ee commit 1bbd25a

File tree

4 files changed

+27
-25
lines changed

4 files changed

+27
-25
lines changed

scrapegraphai/graphs/abstract_graph.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ def _create_embedder(self, embedder_config: dict) -> object:
327327
raise KeyError("Model not supported") from exc
328328
return OllamaEmbeddings(**embedder_params)
329329
elif "hugging_face" in embedder_params["model"]:
330+
embedder_params["model"] = "/".join(embedder_params["model"].split("/")[1:])
330331
try:
331332
models_tokens["hugging_face"][embedder_params["model"]]
332333
except KeyError as exc:

scrapegraphai/helpers/models_tokens.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
"""
2-
Models token
3-
"""
4-
51
models_tokens = {
62
"openai": {
73
"gpt-3.5-turbo-0125": 16385,
@@ -31,8 +27,8 @@
3127
},
3228
"gemini": {
3329
"gemini-pro": 128000,
34-
"gemini-1.5-flash-latest":128000,
35-
"gemini-1.5-pro-latest":128000,
30+
"gemini-1.5-flash-latest": 128000,
31+
"gemini-1.5-pro-latest": 128000,
3632
"models/embedding-001": 2048
3733
},
3834
"ollama": { "command-r": 12800,
@@ -102,9 +98,8 @@
10298
"mistral.mistral-7b-instruct-v0:2": 32768,
10399
"mistral.mixtral-8x7b-instruct-v0:1": 32768,
104100
"mistral.mistral-large-2402-v1:0": 32768,
105-
# Embedding models
106-
"amazon.titan-embed-text-v1": 8000,
107-
"amazon.titan-embed-text-v2:0": 8000,
101+
"amazon.titan-embed-text-v1": 8000,
102+
"amazon.titan-embed-text-v2:0": 8000,
108103
"cohere.embed-english-v3": 512,
109104
"cohere.embed-multilingual-v3": 512
110105
},
@@ -156,6 +151,6 @@
156151
"ernie-bot-2-base-zh": 4096,
157152
"ernie-bot-2-base-en": 4096,
158153
"ernie-bot-2-base-en-zh": 4096,
159-
"ernie-bot-2-base-zh-en": 4096,
154+
"ernie-bot-2-base-zh-en": 4096
160155
}
161156
}

scrapegraphai/utils/parse_state_keys.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,3 @@ def evaluate_expression(expression):
101101
final_result.append(key)
102102

103103
return final_result
104-
105-
106-
EXPRESSION = "user_input & (relevant_chunks | parsed_document | document)"
107-
state = {
108-
"user_input": None,
109-
"document": None,
110-
"parsed_document": None,
111-
"relevant_chunks": None,
112-
}
113-
114-
try:
115-
result = parse_expression(EXPRESSION, state)
116-
print("Matched keys:", result)
117-
except ValueError as e:
118-
print("Error:", e)

tests/utils/parse_state_keys_test.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
"""
2+
Parse_state_key test module
3+
"""
4+
import pytest
5+
from scrapegraphai.utils.parse_state_keys import parse_expression
6+
7+
8+
def test_parse_expression():
9+
"""Test parse_expression function."""
10+
EXPRESSION = "user_input & (relevant_chunks | parsed_document | document)"
11+
state = {
12+
"user_input": None,
13+
"document": None,
14+
"parsed_document": None,
15+
"relevant_chunks": None,
16+
}
17+
try:
18+
result = parse_expression(EXPRESSION, state)
19+
assert result != []
20+
except ValueError as e:
21+
assert "Error" in str(e)

0 commit comments

Comments
 (0)