diff --git a/libs/ollama_functions.py b/libs/ollama_functions.py index 673daf6..cd0f0f7 100644 --- a/libs/ollama_functions.py +++ b/libs/ollama_functions.py @@ -22,7 +22,7 @@ from langchain_core.outputs import ChatGeneration, ChatResult from langchain_core.prompts import SystemMessagePromptTemplate from langchain_core.pydantic_v1 import BaseModel from langchain_core.runnables import Runnable -from langchain_core.tools import BaseTool, Tool +from langchain_core.tools import BaseTool from langchain_core.utils.pydantic import is_basemodel_instance, is_basemodel_subclass from libs.functions import nxhash diff --git a/libs/run_tests.py b/libs/run_tests.py index 7622842..b8ffaf1 100644 --- a/libs/run_tests.py +++ b/libs/run_tests.py @@ -1,4 +1,3 @@ -from os import name from libs.classes import Technique, Test, Model from libs.functions import nxhash from typing import Union diff --git a/libs/runnables.py b/libs/runnables.py index d8ca335..06b363e 100644 --- a/libs/runnables.py +++ b/libs/runnables.py @@ -1,17 +1,18 @@ +import json from types import NoneType -from langchain_ollama.chat_models import ChatOllama -from libs.ollama_functions import OllamaFunctionsLSM, OllamaFunctionsT2S -from langchain_core.messages import AIMessage, SystemMessage, HumanMessage, ToolMessage -from libs.classes import Technique, Test, Model -from langchain.tools import Tool from typing import Literal -from langgraph.graph import StateGraph, MessagesState -import json +from langchain.tools import Tool +from langchain_core.messages import AIMessage, HumanMessage, SystemMessage, ToolMessage +from langchain_ollama.chat_models import ChatOllama +from langgraph.graph import MessagesState, StateGraph from pydantic import ValidationError +from libs.classes import Model, Technique, Test +from libs.ollama_functions import OllamaFunctionsLSM, OllamaFunctionsT2S from suite_settings.techniques import techniques + def _get_llm(model: Model, base_url: str, seed: int, technique: Technique, tools: list[Tool]|NoneType = None): if technique == techniques[1]: # Native llm = ChatOllama( diff --git a/libs/tools.py b/libs/tools.py index f217ac6..1773c84 100644 --- a/libs/tools.py +++ b/libs/tools.py @@ -1,11 +1,9 @@ from langchain.tools import tool -from datetime import datetime, timedelta +from datetime import datetime from re import search from dataclasses import dataclass from typing import Union -import logging -from langchain_core.tools import Tool from langchain_experimental.utilities import PythonREPL @tool diff --git a/suite_settings/tests.py b/suite_settings/tests.py index 5f6edb3..8968789 100644 --- a/suite_settings/tests.py +++ b/suite_settings/tests.py @@ -3,7 +3,7 @@ from libs.runnables import basic_prompt, one_tool_call_answer, agent_with_tools from libs.validators import regex_match_any, system_human_answer_match from libs.tools import add, multiply, get_current_date_and_time, get_notes_in_timespan, get_notes_containing, write_note, save_python_repl from textwrap import dedent -from langchain_core.messages import HumanMessage, SystemMessage, ToolMessage, AIMessage +from langchain_core.messages import HumanMessage, ToolMessage, AIMessage tests = { # 607: Test( diff --git a/test_suite.py b/test_suite.py index 9c400f9..b71e01a 100644 --- a/test_suite.py +++ b/test_suite.py @@ -1,4 +1,3 @@ -from libs.classes import Technique from libs.run_tests import run_tests from suite_settings.models import models from suite_settings.seeds import seeds