From afa9aa3fe78ffdf82c9faad82ae5a25375f1674d Mon Sep 17 00:00:00 2001 From: Matteo Vedovati Date: Thu, 26 Sep 2024 18:37:40 +0200 Subject: [PATCH] import refactoring --- scrapegraphai/nodes/generate_code_node.py | 9 +++------ scrapegraphai/nodes/html_analyzer_node.py | 3 --- scrapegraphai/nodes/prompt_refiner_node.py | 5 ----- scrapegraphai/nodes/reasoning_node.py | 5 ----- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/scrapegraphai/nodes/generate_code_node.py b/scrapegraphai/nodes/generate_code_node.py index 1174a4aa..bcb7ea74 100644 --- a/scrapegraphai/nodes/generate_code_node.py +++ b/scrapegraphai/nodes/generate_code_node.py @@ -5,17 +5,16 @@ from typing import Any, Dict, List, Optional from langchain.prompts import PromptTemplate from langchain.output_parsers import ResponseSchema, StructuredOutputParser from langchain_core.output_parsers import StrOutputParser -from langchain_core.runnables import RunnableParallel -from langchain_core.utils.pydantic import is_basemodel_subclass from langchain_community.chat_models import ChatOllama import ast import sys from io import StringIO from bs4 import BeautifulSoup import re -from tqdm import tqdm -from .base_node import BaseNode +import json +from jsonschema import validate, ValidationError from pydantic import ValidationError +from .base_node import BaseNode from ..utils import (transform_schema, extract_code, syntax_focused_analysis, syntax_focused_code_generation, @@ -23,8 +22,6 @@ from ..utils import (transform_schema, validation_focused_analysis, validation_focused_code_generation, semantic_focused_analysis, semantic_focused_code_generation, are_content_equal) -from jsonschema import validate, ValidationError -import json from ..prompts import ( TEMPLATE_INIT_CODE_GENERATION, TEMPLATE_SEMANTIC_COMPARISON ) diff --git a/scrapegraphai/nodes/html_analyzer_node.py b/scrapegraphai/nodes/html_analyzer_node.py index b07c4040..26304dcd 100644 --- a/scrapegraphai/nodes/html_analyzer_node.py +++ b/scrapegraphai/nodes/html_analyzer_node.py @@ -4,10 +4,7 @@ HtmlAnalyzerNode Module from typing import List, Optional from langchain.prompts import PromptTemplate from langchain_core.output_parsers import StrOutputParser -from langchain_core.runnables import RunnableParallel -from langchain_core.utils.pydantic import is_basemodel_subclass from langchain_community.chat_models import ChatOllama -from tqdm import tqdm from .base_node import BaseNode from ..utils import reduce_html from ..prompts import ( diff --git a/scrapegraphai/nodes/prompt_refiner_node.py b/scrapegraphai/nodes/prompt_refiner_node.py index dfb62eb6..7cc53020 100644 --- a/scrapegraphai/nodes/prompt_refiner_node.py +++ b/scrapegraphai/nodes/prompt_refiner_node.py @@ -4,12 +4,7 @@ PromptRefinerNode Module from typing import List, Optional from langchain.prompts import PromptTemplate from langchain_core.output_parsers import StrOutputParser -from langchain_core.runnables import RunnableParallel -from langchain_core.utils.pydantic import is_basemodel_subclass -from langchain_openai import ChatOpenAI, AzureChatOpenAI -from langchain_mistralai import ChatMistralAI from langchain_community.chat_models import ChatOllama -from tqdm import tqdm from .base_node import BaseNode from ..utils import transform_schema from ..prompts import ( diff --git a/scrapegraphai/nodes/reasoning_node.py b/scrapegraphai/nodes/reasoning_node.py index 3c65bbc4..431d8ab1 100644 --- a/scrapegraphai/nodes/reasoning_node.py +++ b/scrapegraphai/nodes/reasoning_node.py @@ -4,12 +4,7 @@ PromptRefinerNode Module from typing import List, Optional from langchain.prompts import PromptTemplate from langchain_core.output_parsers import StrOutputParser -from langchain_core.runnables import RunnableParallel -from langchain_core.utils.pydantic import is_basemodel_subclass -from langchain_openai import ChatOpenAI, AzureChatOpenAI -from langchain_mistralai import ChatMistralAI from langchain_community.chat_models import ChatOllama -from tqdm import tqdm from .base_node import BaseNode from ..utils import transform_schema from ..prompts import (