bisheng-langchain 1.0.1__py3-none-any.whl → 1.2.0.dev1__py3-none-any.whl

bisheng_langchain/gpts/tools/api_tools/jina.py

@@ -20,10 +20,12 @@ class JinaTool(BaseModel):
         """get url from jina api"""
         url = "https://r.jina.ai/" + target_url
 
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": "Bearer " + self.jina_api_key,
-        }
+        headers = None
+        if self.jina_api_key and len(self.jina_api_key)>0 :
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": "Bearer " + self.jina_api_key,
+            }
 
         response = requests.get(url, headers=headers)
 

bisheng_langchain/gpts/tools/api_tools/macro_data.py

@@ -4,15 +4,15 @@ from typing import Any
 
 import pandas as pd
 import requests
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_core.tools import BaseTool
 
 from .base import MultArgsSchemaTool
 
 
 class QueryArg(BaseModel):
-    start_date: str = Field(default='', description='开始月份, 使用YYYY-MM-DD 方式表示', example='2023-01-01')
-    end_date: str = Field(default='', description='结束月份，使用YYYY-MM-DD 方式表示', example='2023-05-01')
+    start_date: str = Field(default='', description='开始月份, 使用YYYY-MM-DD 方式表示', examples=['2023-01-01'])
+    end_date: str = Field(default='', description='结束月份，使用YYYY-MM-DD 方式表示', examples=['2023-05-01'])
 
 
 class MacroData(BaseModel):

bisheng_langchain/gpts/tools/api_tools/openapi.py

@@ -9,11 +9,11 @@ from .base import APIToolBase, Field, MultArgsSchemaTool
 
 class OpenApiTools(APIToolBase):
 
-    api_key: Optional[str]
-    api_location: Optional[str]
-    parameter_name: Optional[str]
+    api_key: Optional[str] = None
+    api_location: Optional[str] = None
+    parameter_name: Optional[str] = None
 
-    def get_real_path(self, path_params: dict|None):
+    def get_real_path(self, path_params: dict | None):
         path = self.params['path']
         if path_params:
             path = path.format(**path_params)
@@ -47,8 +47,10 @@ class OpenApiTools(APIToolBase):
         #     elif self.params['parameter_name']:
         #         params.update({self.params['parameter_name']:self.api_key})
         api_location = self.params.get('api_location')
-        if (api_location == "query") or (hasattr(self, 'api_location') and self.api_location == "query"):
-            parameter_name = getattr(self, 'parameter_name', None) or self.params.get('parameter_name')
+        if (api_location == 'query') or (hasattr(self, 'api_location')
+                                         and self.api_location == 'query'):
+            parameter_name = getattr(self, 'parameter_name',
+                                     None) or self.params.get('parameter_name')
             if parameter_name:
                 params.update({parameter_name: self.api_key})
         return params, json_data, path_params

bisheng_langchain/gpts/tools/api_tools/sina.py

@@ -7,7 +7,7 @@ import re
 from datetime import datetime
 from typing import List, Type
 
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from loguru import logger
 
 from .base import APIToolBase

bisheng_langchain/gpts/tools/api_tools/tianyancha.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 
 from typing import Any, Dict, Type
 
+from pydantic import model_validator, BaseModel, Field
+
 from bisheng_langchain.utils.requests import Requests, RequestsWrapper
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 
 from .base import APIToolBase
 
@@ -19,7 +20,8 @@ class CompanyInfo(APIToolBase):
     api_key: str = None
     args_schema: Type[BaseModel] = InputArgs
 
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def build_header(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """Build headers that were passed in."""
         if not values.get('api_key'):
@@ -30,7 +32,8 @@ class CompanyInfo(APIToolBase):
         values['headers'] = headers
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         timeout = values.get('request_timeout', 30)

bisheng_langchain/gpts/tools/bing_search/tool.py

@@ -2,7 +2,7 @@
 
 from typing import Optional, Type
 
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_community.utilities.bing_search import BingSearchAPIWrapper
 from langchain_core.callbacks import CallbackManagerForToolRun
 from langchain_core.tools import BaseTool
@@ -43,7 +43,7 @@ class BingSearchResults(BaseTool):
         "Input should be a search query. Output is a JSON array of the query results"
     )
     num_results: int = 5
-    args_schema = BingSearchInput
+    args_schema: Type[BaseModel] = BingSearchInput
     api_wrapper: BingSearchAPIWrapper
 
     def _run(

bisheng_langchain/gpts/tools/calculator/tool.py

@@ -2,7 +2,7 @@ import math
 from math import *
 
 import sympy
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain.tools import tool
 from sympy import *
 
@@ -10,7 +10,7 @@ from sympy import *
 class CalculatorInput(BaseModel):
     expression: str = Field(
         description="The input to this tool should be a mathematical expression using only Python's built-in mathematical operators.",
-        example='200*7',
+        examples=['200*7'],
     )
 
 

bisheng_langchain/gpts/tools/code_interpreter/tool.py

@@ -15,7 +15,7 @@ from uuid import uuid4
 
 import matplotlib
 from langchain_community.tools import Tool
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from loguru import logger
 
 CODE_BLOCK_PATTERN = r"```(\w*)\n(.*?)\n```"
@@ -239,7 +239,7 @@ class CodeInterpreterToolArguments(BaseModel):
 
     python_code: str = Field(
         ...,
-        example="print('Hello World')",
+        examples=["print('Hello World')"],
         description=(
             'The pure python script to be evaluated. '
             'The contents will be in main.py. '

bisheng_langchain/gpts/tools/dalle_image_generator/tool.py

@@ -2,13 +2,11 @@ import logging
 import os
 from typing import Any, Dict, Mapping, Optional, Tuple, Type, Union
 
-from langchain.pydantic_v1 import BaseModel, Field
-from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
 from langchain_community.utils.openai import is_openai_v1
 from langchain_core.callbacks import CallbackManagerForToolRun
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field, root_validator
 from langchain_core.tools import BaseTool
 from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
+from pydantic import ConfigDict, model_validator, BaseModel, Field
 
 from bisheng_langchain.utils.azure_dalle_image_generator import AzureDallEWrapper
 
@@ -26,7 +24,7 @@ class DallEAPIWrapper(BaseModel):
     2. save your OPENAI_API_KEY in an environment variable
     """
 
-    client: Any  #: :meta private:
+    client: Any = None  #: :meta private:
     async_client: Any = Field(default=None, exclude=True)  #: :meta private:
     model_name: str = Field(default="dall-e-2", alias="model")
     model_kwargs: Dict[str, Any] = Field(default_factory=dict)
@@ -59,13 +57,10 @@ class DallEAPIWrapper(BaseModel):
     http_async_client: Union[Any, None] = None
     """Optional httpx.AsyncClient. Only used for async invocations. Must specify 
         http_client as well if you'd like a custom client for sync invocations."""
+    model_config = ConfigDict(extra='forbid')
 
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def build_extra(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """Build extra kwargs from additional params that were passed in."""
         all_required_field_names = get_pydantic_field_names(cls)
@@ -91,7 +86,8 @@ class DallEAPIWrapper(BaseModel):
         values["model_kwargs"] = extra
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values["openai_api_key"] = get_from_dict_or_env(values, "openai_api_key", "OPENAI_API_KEY")

bisheng_langchain/gpts/tools/get_current_time/tool.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 import pytz
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain.tools import tool
 
 

bisheng_langchain/gpts/tools/message/dingding.py

@@ -1,8 +1,7 @@
 from typing import Any, Optional, Type
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)

bisheng_langchain/gpts/tools/message/email.py

@@ -1,11 +1,9 @@
-import os
 import smtplib
-from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Any, Optional
+from typing import Any
 
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)

bisheng_langchain/gpts/tools/message/feishu.py

@@ -1,29 +1,28 @@
 from typing import Any, Optional, Type
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
 
 
 class InputArgs(BaseModel):
-    message: Optional[str] = Field(description="需要发送的钉钉消息")
-    receive_id: Optional[str] = Field(description="接收的ID")
-    receive_id_type: Optional[str] = Field(description="接收的ID类型")
-    container_id: Optional[str] = Field(description="container_id")
-    start_time: Optional[str] = Field(description="start_time")
-    end_time: Optional[str] = Field(description="end_time")
+    message: Optional[str] = Field(None, description="需要发送的钉钉消息")
+    receive_id: Optional[str] = Field(None, description="接收的ID")
+    receive_id_type: Optional[str] = Field(None, description="接收的ID类型")
+    container_id: Optional[str] = Field(None, description="container_id")
+    start_time: Optional[str] = Field(None, description="start_time")
+    end_time: Optional[str] = Field(None, description="end_time")
     # page_token: Optional[str] = Field(description="page_token")
-    container_id_type: Optional[str] = Field(description="container_id_type")
+    container_id_type: Optional[str] = Field(None, description="container_id_type")
     page_size: Optional[int] = Field(default=20,description="page_size")
-    page_token: Optional[str] = Field(description="page_token")
+    page_token: Optional[str] = Field(None, description="page_token")
     sort_type: Optional[str] = Field(description="sort_type",default="ByCreateTimeAsc")
 
 
 class FeishuMessageTool(BaseModel):
-    API_BASE_URL = "https://open.feishu.cn/open-apis"
+    API_BASE_URL: str = "https://open.feishu.cn/open-apis"
     app_id: str = Field(description="app_id")
     app_secret: str = Field(description="app_secret")
 

bisheng_langchain/gpts/tools/message/wechat.py

@@ -1,8 +1,7 @@
-from typing import Any, Optional, Type
+from typing import Any
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)

bisheng_langchain/gpts/tools/sql_agent/tool.py

@@ -11,7 +11,7 @@ from langchain_core.tools import BaseTool, tool
 from langgraph.constants import END, START
 from langgraph.graph import add_messages, StateGraph
 from langgraph.prebuilt import ToolNode
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 
 
 class State(TypedDict):
@@ -47,8 +47,8 @@ class SubmitFinalAnswer(BaseModel):
     final_answer: str = Field(..., description="The final answer to the user")
 
 class QueryDBTool(BaseTool):
-    name = "db_query_tool"
-    description = """Execute a SQL query against the database and get back the result.
+    name: str = "db_query_tool"
+    description: str = """Execute a SQL query against the database and get back the result.
         If the query is not correct, an error message will be returned.
         If an error is returned, rewrite the query, check the query, and try again."""
 
@@ -64,20 +64,18 @@ class SqlAgentAPIWrapper(BaseModel):
     llm: BaseLanguageModel = Field(description="llm to use for sql agent")
     sql_address: str = Field(description="sql database address for SQLDatabase uri")
 
-    db: Optional[SQLDatabase]
-    list_tables_tool: Optional[BaseTool]
-    get_schema_tool: Optional[BaseTool]
-    db_query_tool: Optional[BaseTool]
-    query_check: Optional[Any]
-    query_gen: Optional[Any]
-    workflow: Optional[StateGraph]
-    app: Optional[Any]
-    schema_llm: Optional[Any]
-    query_check_llm: Optional[Any]
-    query_gen_llm: Optional[Any]
-
-    class Config:
-        arbitrary_types_allowed = True
+    db: Optional[SQLDatabase] = None
+    list_tables_tool: Optional[BaseTool] = None
+    get_schema_tool: Optional[BaseTool] = None
+    db_query_tool: Optional[BaseTool] = None
+    query_check: Optional[Any] = None
+    query_gen: Optional[Any] = None
+    workflow: Optional[StateGraph] = None
+    app: Optional[Any] = None
+    schema_llm: Optional[Any] = None
+    query_check_llm: Optional[Any] = None
+    query_gen_llm: Optional[Any] = None
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -241,8 +239,8 @@ class SqlAgentInput(BaseModel):
 
 
 class SqlAgentTool(BaseTool):
-    name = "sql_agent"
-    description = "回答与 SQL 数据库有关的问题。给定用户问题，将从数据库中获取可用的表以及对应 DDL，生成 SQL 查询语句并进行执行，最终得到执行结果。"
+    name: str = "sql_agent"
+    description: str = "回答与 SQL 数据库有关的问题。给定用户问题，将从数据库中获取可用的表以及对应 DDL，生成 SQL 查询语句并进行执行，最终得到执行结果。"
     args_schema: Type[BaseModel] = SqlAgentInput
     api_wrapper: SqlAgentAPIWrapper
 
@@ -252,7 +250,12 @@ class SqlAgentTool(BaseTool):
             run_manager: Optional[CallbackManagerForToolRun] = None,
     ) -> str:
         """Use the tool."""
-        return self.api_wrapper.run(query)
+        try:
+            res = self.api_wrapper.run(query)
+        finally:
+            if self.api_wrapper and self.api_wrapper.db:
+                self.api_wrapper.db._engine.dispose()
+        return res
 
 
 if __name__ == '__main__':

bisheng_langchain/input_output/input.py

@@ -1,12 +1,12 @@
 
 from typing import List, Optional
 
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 
 class InputNode(BaseModel):
     """Input组件，用来控制输入"""
-    input: Optional[List[str]]
+    input: Optional[List[str]] = None
 
     def text(self):
         return self.input
@@ -15,14 +15,10 @@ class InputNode(BaseModel):
 class VariableNode(BaseModel):
     """用来设置变量"""
     # key
-    variables: Optional[List[str]]
+    variables: Optional[List[str]] = None
     # vaulues
     variable_value: Optional[List[str]] = []
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
+    model_config = ConfigDict(extra="forbid")
 
     def text(self):
         if self.variable_value:
@@ -36,9 +32,9 @@ class VariableNode(BaseModel):
 
 
 class InputFileNode(BaseModel):
-    file_path: Optional[str]
-    file_name: Optional[str]
-    file_type: Optional[str]  # tips for file
+    file_path: Optional[str] = None
+    file_name: Optional[str] = None
+    file_type: Optional[str] = None  # tips for file
     """Output组件，用来控制输出"""
 
     def text(self):

bisheng_langchain/input_output/output.py

@@ -5,7 +5,7 @@ from venv import logger
 from bisheng_langchain.chains import LoaderOutputChain
 from langchain.callbacks.manager import AsyncCallbackManagerForChainRun, CallbackManagerForChainRun
 from langchain.chains.base import Chain
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 _TEXT_COLOR_MAPPING = {
     'blue': '36;1',
@@ -52,11 +52,7 @@ class Report(Chain):
 
     input_key: str = 'report_name'  #: :meta private:
     output_key: str = 'text'  #: :meta private:
-
-    class Config:
-        """Configuration for this pydantic object."""
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     @property
     def input_keys(self) -> List[str]:

bisheng_langchain/memory/redis.py

@@ -5,8 +5,7 @@ import redis
 from langchain.memory.chat_memory import BaseChatMemory
 from langchain_core.messages import (AIMessage, BaseMessage, HumanMessage, get_buffer_string,
                                      message_to_dict, messages_from_dict)
-from langchain_core.pydantic_v1 import root_validator
-from pydantic import Field
+from pydantic import Field, model_validator
 
 
 class ConversationRedisMemory(BaseChatMemory):
@@ -20,7 +19,8 @@ class ConversationRedisMemory(BaseChatMemory):
     redis_prefix: str = 'redis_buffer_'
     ttl: Optional[int] = None
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         redis_url = values.get('redis_url')
         if not redis_url:

bisheng_langchain/rag/bisheng_rag_chain.py

@@ -10,7 +10,7 @@ from langchain_core.callbacks import (AsyncCallbackManagerForChainRun, CallbackM
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import (ChatPromptTemplate, HumanMessagePromptTemplate,
                                     SystemMessagePromptTemplate)
-from langchain_core.pydantic_v1 import Extra, Field
+from pydantic import ConfigDict, Field
 
 from .bisheng_rag_tool import BishengRAGTool
 
@@ -52,13 +52,7 @@ class BishengRetrievalQA(Chain):
     """Return the source documents or not."""
     bisheng_rag_tool: BishengRAGTool = Field(default_factory=BishengRAGTool,
                                              description='RAG tool')
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
-        allow_population_by_field_name = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, validate_by_name=True)
 
     @property
     def input_keys(self) -> List[str]:

bisheng_langchain/rag/bisheng_rag_tool.py

@@ -15,7 +15,7 @@ from langchain.chains.combine_documents import create_stuff_documents_chain
 from langchain_core.callbacks import CallbackManagerForChainRun
 from langchain_core.language_models.base import LanguageModelLike
 from langchain_core.prompts import ChatPromptTemplate
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_core.runnables import RunnableConfig
 from langchain_core.tools import BaseTool, Tool
 from langchain_core.vectorstores import VectorStoreRetriever

bisheng_langchain/rag/init_retrievers/baseline_vector_retriever.py

@@ -2,7 +2,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 from loguru import logger
 

bisheng_langchain/rag/init_retrievers/keyword_retriever.py

@@ -2,7 +2,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 from loguru import logger
 

bisheng_langchain/rag/init_retrievers/mix_retriever.py

@@ -3,7 +3,7 @@ from typing import Any, List, Optional
 from bisheng_langchain.vectorstores import ElasticKeywordsSearch
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 
 

bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py

@@ -3,7 +3,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 
 
@@ -15,7 +15,7 @@ class SmallerChunksVectorRetriever(BaseRetriever):
     parent_splitter: Optional[TextSplitter] = None
     """The text splitter to use to create parent documents.
     If none, then the parent documents will be the raw documents passed in."""
-    id_key = 'doc_id'
+    id_key: str = 'doc_id'
 
     def add_documents(
         self,

bisheng_langchain/retrievers/ensemble.py

@@ -6,13 +6,13 @@ multiple retrievers by using weighted  Reciprocal Rank Fusion
 from typing import Any, Dict, List
 
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.retrievers import BaseRetriever
 
 from langchain.callbacks.manager import (
     AsyncCallbackManagerForRetrieverRun,
     CallbackManagerForRetrieverRun,
 )
+from pydantic import model_validator
 
 
 class EnsembleRetriever(BaseRetriever):
@@ -33,7 +33,8 @@ class EnsembleRetriever(BaseRetriever):
     weights: List[float]
     c: int = 60
 
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def set_weights(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         if not values.get("weights"):
             n_retrievers = len(values["retrievers"])

bisheng_langchain/utils/azure_dalle_image_generator.py

@@ -3,7 +3,7 @@ from typing import Callable, Dict, Optional, Union
 
 import openai
 from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
-from langchain_core.pydantic_v1 import Field, SecretStr, root_validator
+from pydantic import Field, SecretStr, model_validator
 from langchain_core.utils import convert_to_secret_str, get_from_dict_or_env
 
 
@@ -56,7 +56,8 @@ class AzureDallEWrapper(DallEAPIWrapper):
     chunk_size: int = 2048
     """Maximum number of texts to embed in each batch"""
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         # Check OPENAI_KEY for backwards compatibility.

bisheng_langchain/utils/requests.py

@@ -5,7 +5,7 @@ from typing import Any, AsyncGenerator, Dict, Optional, Tuple, Union
 import aiohttp
 import requests
 from loguru import logger
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 
 class Requests(BaseModel):
@@ -19,12 +19,7 @@ class Requests(BaseModel):
     aiosession: Optional[aiohttp.ClientSession] = None
     auth: Optional[Any] = None
     request_timeout: Union[float, Tuple[float, float]] = 120
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     def get(self, url: str, **kwargs: Any) -> requests.Response:
         """GET the URL and return the text."""
@@ -87,12 +82,13 @@ class Requests(BaseModel):
                                            **kwargs) as response:
                     yield response
         else:
-            async with self.aiosession.request(method,
-                                               url,
-                                               headers=self.headers,
-                                               auth=self.auth,
-                                               **kwargs) as response:
-                yield response
+            async with self.aiosession:
+                async with self.aiosession.request(method,
+                                                   url,
+                                                   headers=self.headers,
+                                                   auth=self.auth,
+                                                   **kwargs) as response:
+                    yield response
 
     @asynccontextmanager
     async def aget(self, url: str, **kwargs: Any) -> AsyncGenerator[aiohttp.ClientResponse, None]:
@@ -139,12 +135,7 @@ class TextRequestsWrapper(BaseModel):
     aiosession: Optional[aiohttp.ClientSession] = None
     auth: Optional[Any] = None
     request_timeout: Union[float, Tuple[float, float]] = 120
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     @property
     def requests(self) -> Requests: