bisheng-langchain 0.4.1.2__py3-none-any.whl → 1.0.0__py3-none-any.whl

bisheng_langchain/chat_models/sensetime.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import ast
 import json
 import logging
 import time
@@ -390,7 +391,7 @@ class SenseChat(BaseChatModel):
 
         def _norm_text(text):
             if text[0] == '"' and text[-1] == '"':
-                out = eval(text)
+                out = ast.literal_eval(text)
             else:
                 out = text
             return out

bisheng_langchain/chat_models/zhipuai.py

@@ -1,6 +1,7 @@
 """ZhipuAI chat wrapper."""
 from __future__ import annotations
 
+import ast
 import logging
 import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
@@ -274,7 +275,7 @@ class ChatZhipuAI(BaseChatModel):
         # print('response', response)
         def _norm_text(text):
             if text[0] == '"' and text[-1] == '"':
-                out = eval(text)
+                out = ast.literal_eval(text)
             else:
                 out = text
             return out

bisheng_langchain/gpts/load_tools.py

@@ -17,7 +17,8 @@ from langchain_core.tools import BaseTool, Tool
 from mypy_extensions import Arg, KwArg
 
 from bisheng_langchain.gpts.tools.api_tools import ALL_API_TOOLS
-from bisheng_langchain.gpts.tools.bing_search.tool import BingSearchRun
+from bisheng_langchain.gpts.tools.bing_search.self_arxiv import ArxivAPIWrapperSelf
+from bisheng_langchain.gpts.tools.bing_search.tool import BingSearchResults, BingSearchRun
 from bisheng_langchain.gpts.tools.calculator.tool import calculator
 from bisheng_langchain.gpts.tools.code_interpreter.tool import CodeInterpreterTool
 # from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
@@ -40,7 +41,7 @@ def _get_calculator() -> BaseTool:
 
 
 def _get_arxiv() -> BaseTool:
-    return ArxivQueryRun(api_wrapper=ArxivAPIWrapper())
+    return ArxivQueryRun(api_wrapper=ArxivAPIWrapperSelf(top_k_results=5,load_max_docs=5,load_all_available_meta=True))
 
 
 _BASE_TOOLS: Dict[str, Callable[[], BaseTool]] = {
@@ -57,7 +58,7 @@ _EXTRA_LLM_TOOLS: Dict[
 
 
 def _get_bing_search(**kwargs: Any) -> BaseTool:
-    return BingSearchRun(api_wrapper=BingSearchAPIWrapper(**kwargs))
+    return BingSearchResults(api_wrapper=BingSearchAPIWrapper(**kwargs))
 
 
 def _get_dalle_image_generator(**kwargs: Any) -> Tool:

bisheng_langchain/gpts/tools/api_tools/__init__.py

@@ -1,6 +1,13 @@
 from typing import Any, Callable, Dict, List, Tuple
 
 # from .eastmoney import
+from bisheng_langchain.gpts.tools.api_tools.firecrawl import FireCrawl
+from bisheng_langchain.gpts.tools.api_tools.jina import JinaTool
+from bisheng_langchain.gpts.tools.api_tools.silicon_flow import SiliconFlow
+from bisheng_langchain.gpts.tools.message.dingding import DingdingMessageTool
+from bisheng_langchain.gpts.tools.message.email import EmailMessageTool
+from bisheng_langchain.gpts.tools.message.feishu import FeishuMessageTool
+from bisheng_langchain.gpts.tools.message.wechat import WechatMessageTool
 from langchain_core.tools import BaseTool
 from mypy_extensions import KwArg
 
@@ -43,8 +50,78 @@ _TMP_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
     f'flow_{name}': (FlowTools.get_api_tool, ['collection_id', 'description'])
     for name in _tmp_flow
 }
+firecrawl_class_methods = [
+    method for method in FireCrawl.__dict__
+    if isinstance(FireCrawl.__dict__[method], classmethod)
+]
+
+_FIRE_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'fire_search_crawl': (FireCrawl.get_api_tool, ['api_key','maxdepth', 'limit', 'timeout','base_url']),
+    'fire_search_scrape': (FireCrawl.get_api_tool, ['api_key','maxdepth', 'limit', 'timeout','base_url'])
+}
+jina_class_methods = [
+    method for method in JinaTool.__dict__
+    if isinstance(JinaTool.__dict__[method], classmethod)
+]
+_JINA_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'jina_get_markdown': (JinaTool.get_api_tool, ['jina_api_key'])
+}
+silicon_class_methods = [
+    method for method in SiliconFlow.__dict__
+    if isinstance(SiliconFlow.__dict__[method], classmethod)
+]
+_SILICON_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'silicon_stable_diffusion': (SiliconFlow.get_api_tool, ['siliconflow_api_key']),
+    'silicon_flux': (SiliconFlow.get_api_tool, ['siliconflow_api_key'])
+}
+dingding_class_methods = [
+    method for method in DingdingMessageTool.__dict__
+    if isinstance(DingdingMessageTool.__dict__[method], classmethod)
+]
+
+_DING_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'ding_send_message': (DingdingMessageTool.get_api_tool, [])
+}
+
+
+email_class_methods = [
+    method for method in EmailMessageTool.__dict__
+    if isinstance(EmailMessageTool.__dict__[method], classmethod)
+]
+
+_EMAIL_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'email_send_email': (EmailMessageTool.get_api_tool, ['email_account','email_password','smtp_server','smtp_port','encrypt_method']),
+}
+
+feishu_class_methods = [
+    method for method in FeishuMessageTool.__dict__
+    if isinstance(FeishuMessageTool.__dict__[method], classmethod)
+]
+
+_FEISHU_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'feishu_send_message': (FeishuMessageTool.get_api_tool, ['app_id', 'app_secret']),
+    'feishu_get_chat_messages': (FeishuMessageTool.get_api_tool, ['app_id', 'app_secret']),
+}
+
+wechat_class_methods = [
+    method for method in WechatMessageTool.__dict__
+    if isinstance(WechatMessageTool.__dict__[method], classmethod)
+]
+
+_WECHAT_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {
+    'wechat_send_message': (WechatMessageTool.get_api_tool, [])
+}
+
+
 ALL_API_TOOLS = {}
 ALL_API_TOOLS.update(_TIAN_YAN_CHA_TOOLS)
 ALL_API_TOOLS.update(_SINA_TOOLS)
 ALL_API_TOOLS.update(_MACRO_TOOLS)
 ALL_API_TOOLS.update(_TMP_TOOLS)
+ALL_API_TOOLS.update(_FIRE_TOOLS)
+ALL_API_TOOLS.update(_JINA_TOOLS)
+ALL_API_TOOLS.update(_SILICON_TOOLS)
+ALL_API_TOOLS.update(_DING_TOOLS)
+ALL_API_TOOLS.update(_EMAIL_TOOLS)
+ALL_API_TOOLS.update(_FEISHU_TOOLS)
+ALL_API_TOOLS.update(_WECHAT_TOOLS)

bisheng_langchain/gpts/tools/api_tools/firecrawl.py

@@ -0,0 +1,86 @@
+import time
+from typing import Any, Dict, Type
+
+import requests
+
+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    target_url: str = Field(description="params target_url")
+
+
+class FireCrawl(BaseModel):
+
+    api_key: str = Field(description="apikey")
+    base_url: str = Field(description="params base_url")
+    maxdepth: int = Field(description="params maxDepth")
+    limit: int = Field(description="params limit")
+    timeout: int = Field(description="params timeout")
+
+
+    def search_crawl(self,  target_url: str) -> str:
+        """crawl from firecrawl"""
+        url = "https://api.firecrawl.dev/v1/crawl"
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + self.api_key,
+        }
+        params = {
+            "url": target_url,
+            "maxDepth": self.maxdepth,
+            "limit": self.limit,
+            "scrapeOptions": {
+                "formats": ["markdown"],
+            },
+        }
+        response = requests.post(url, json=params, headers=headers)
+        status_url = response.json()["url"]
+        start_time = time.time()
+        while True:
+            response = requests.get(status_url,headers=headers)
+            print("wating for completion " + status_url)
+            data = response.json()
+            if time.time() - start_time > self.timeout:
+                return "timeout"
+            if data["status"] == "completed":
+                return response.text
+            elif data["status"] == "failed":
+                return "failed"
+            else:
+                time.sleep(5)
+
+
+
+    def search_scrape(self, target_url: str) -> str:
+        """scrape from firecrawl"""
+        url = "https://api.firecrawl.dev/v1/scrape"
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + self.api_key,
+        }
+        params = {
+            "url": target_url,
+            "formats": ["markdown"],
+            "timeout": self.timeout,
+        }
+
+        response = requests.post(url, json=params, headers=headers)
+        return response.text
+
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "FireCrawl":
+        attr_name = name.split("_", 1)[-1]
+        c = FireCrawl(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/api_tools/jina.py

@@ -0,0 +1,45 @@
+from typing import Any, Optional
+
+import requests
+from pydantic import BaseModel, Field
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    # jina_api_key: Optional[str] = Field(default=None,description="jina api key")
+    target_url: Optional[str] = Field(default=None,description="params target_url")
+
+
+class JinaTool(BaseModel):
+
+    jina_api_key: str = Field(default=None,description="jina api key")
+
+    def get_markdown(self, target_url: str) -> Any:
+        """get url from jina api"""
+        url = "https://r.jina.ai/" + target_url
+
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + self.jina_api_key,
+        }
+
+        response = requests.get(url, headers=headers)
+
+        return response.text
+        
+
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "JinaTool":
+        attr_name = name.split("_", 1)[-1]
+        c = JinaTool(jina_api_key=kwargs.get('jina_api_key'))
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/api_tools/openapi.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from langchain_core.tools import BaseTool
 from loguru import logger
@@ -9,6 +9,10 @@ from .base import APIToolBase, Field, MultArgsSchemaTool
 
 class OpenApiTools(APIToolBase):
 
+    api_key: Optional[str]
+    api_location: Optional[str]
+    parameter_name: Optional[str]
+
     def get_real_path(self, path_params: dict|None):
         path = self.params['path']
         if path_params:
@@ -36,6 +40,17 @@ class OpenApiTools(APIToolBase):
                     json_data[k] = v
             else:
                 params[k] = v
+        # if ('api_location' in self.params and self.params['api_location'] == "query") or \
+        #     (hasattr(self, 'api_location') and self.api_location == "query"):
+        #     if self.parameter_name:
+        #         params.update({self.parameter_name:self.api_key})
+        #     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 parameter_name:
+                params.update({parameter_name: self.api_key})
         return params, json_data, path_params
 
     def parse_args_schema(self):
@@ -88,6 +103,7 @@ class OpenApiTools(APIToolBase):
         extra = {}
         if 'proxy' in kwargs:
             extra['proxy'] = kwargs.pop('proxy')
+
         params, json_data, path_params = self.get_params_json(**kwargs)
         path = self.get_real_path(path_params)
         logger.info('api_call url={}', path)
@@ -116,7 +132,7 @@ class OpenApiTools(APIToolBase):
 
         params, json_data, path_params = self.get_params_json(**kwargs)
         path = self.get_real_path(path_params)
-        logger.info('api_call url={}', path)
+        logger.info('api_call url={} params={}', path, params)
         method = self.get_request_method()
 
         if method == 'get':

bisheng_langchain/gpts/tools/api_tools/silicon_flow.py

@@ -0,0 +1,62 @@
+from typing import Any, Optional
+
+import requests
+from loguru import logger
+from pydantic import BaseModel, Field
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    prompt: str = Field(description="text to image prompt ")
+    negative_prompt: Optional[str] = Field(default=None,description="text to image negative_prompt")
+
+
+class SiliconFlow(APIToolBase):
+
+    siliconflow_api_key: str = Field(description="params api key")
+
+    def stable_diffusion(self, negative_prompt: str, prompt: str) -> str:
+        """silicon stable diffusion api"""
+        url = "https://api.siliconflow.cn/v1/images/generations"
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + self.siliconflow_api_key,
+        }
+        params = {
+            "model": "stabilityai/stable-diffusion-3-5-large",
+            "prompt": prompt,
+            "negative_prompt": negative_prompt,
+        }
+
+        response = requests.post(url, json=params, headers=headers)
+        return response.text
+
+    def flux(self, prompt: str) -> str:
+        """silicon flux api"""
+        url = "https://api.siliconflow.cn/v1/images/generations"
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + self.siliconflow_api_key,
+        }
+        params = {
+            "model": "black-forest-labs/FLUX.1-pro",
+            "prompt": prompt,
+        }
+
+        response = requests.post(url, json=params, headers=headers)
+        return response.text
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "SiliconFlow":
+        attr_name = name.split("_", 1)[-1]
+        c = SiliconFlow(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/bing_search/self_arxiv.py

@@ -0,0 +1,47 @@
+"""Util that calls Arxiv."""
+
+import logging
+
+from langchain_community.utilities.arxiv import ArxivAPIWrapper
+
+logger = logging.getLogger(__name__)
+
+
+class ArxivAPIWrapperSelf(ArxivAPIWrapper):
+    def run(self, query: str) -> str:
+        """
+        Performs an arxiv search and A single string
+        with the publish date, title, authors, and summary
+        for each article separated by two newlines.
+
+        If an error occurs or no documents found, error text
+        is returned instead. Wrapper for
+        https://lukasschwab.me/arxiv.py/index.html#Search
+
+        Args:
+            query: a plaintext search query
+        """
+        try:
+            if self.is_arxiv_identifier(query):
+                results = self.arxiv_search(
+                    id_list=query.split(),
+                    max_results=self.top_k_results,
+                ).results()
+            else:
+                results = self.arxiv_search(  # type: ignore
+                    query[: self.ARXIV_MAX_QUERY_LENGTH], max_results=self.top_k_results
+                ).results()
+        except self.arxiv_exceptions as ex:
+            return f"Arxiv exception: {ex}"
+        docs = [
+            f"Published: {result.updated.date()}\n"
+            f"Title: {result.title}\n"
+            f"Authors: {', '.join(a.name for a in result.authors)}\n"
+            f"Summary: {result.summary}\n"
+            f"pdf_url: {result.pdf_url}"
+            for result in results
+        ]
+        if docs:
+            return "\n\n".join(docs)[: self.doc_content_chars_max]
+        else:
+            return "No good Arxiv Result was found"

bisheng_langchain/gpts/tools/bing_search/tool.py

@@ -42,7 +42,7 @@ class BingSearchResults(BaseTool):
         "Useful for when you need to answer questions about current events. "
         "Input should be a search query. Output is a JSON array of the query results"
     )
-    num_results: int = 4
+    num_results: int = 5
     args_schema = BingSearchInput
     api_wrapper: BingSearchAPIWrapper
 

bisheng_langchain/gpts/tools/message/dingding.py

@@ -0,0 +1,57 @@
+from typing import Any, Optional, Type
+
+import requests
+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from loguru import logger
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    url: str = Field(description="钉钉机器人的URL地址")
+    message: str = Field(description="需要发送的钉钉消息")
+
+
+class DingdingMessageTool(BaseModel):
+
+    def send_message(self, message: str, url: str) -> str:
+        """
+        发送钉钉机器人消息
+        
+        Args:
+            webhook_url: 钉钉机器人的 webhook 地址
+            message: 要发送的消息内容
+        
+        Returns:
+            dict: 钉钉接口的响应结果
+        """
+        # 构建请求头
+        headers = {"Content-Type": "application/json"}
+        # 构建请求体
+        data = {"msgtype": "text", "text": {"content": message}}
+
+        try:
+            # 发送 POST 请求
+            response = requests.post(url=url, headers=headers, json=data)
+
+            # 检查响应状态
+            response.raise_for_status()
+            return response.json()
+
+        except requests.exceptions.RequestException as e:
+            return f"发送消息失败: {str(e)}"
+
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "DingdingMessageTool":
+        attr_name = name.split("_", 1)[-1]
+        c = DingdingMessageTool(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/message/email.py

@@ -0,0 +1,103 @@
+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 langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    receiver: str = Field(description="收件人）")
+    subject: str = Field(description="邮件主题")
+    content: str = Field(description="邮件正文内容")
+
+
+class EmailMessageTool(APIToolBase):
+
+    email_account: str = Field(description="发件人邮箱")
+    email_password: str = Field(description="邮箱授权码/密码")
+    smtp_server: str = Field(description="SMTP服务器地址")
+    encrypt_method: str = Field(description="encrypt_method")
+    smtp_port: int = Field(default=465, description=" 端口号（SSL一般465，TLS用587）")
+
+    def send_email(
+        self,
+        receiver,
+        subject,
+        content,
+    ):
+        """
+        发送电子邮件函数
+
+        参数：
+        sender : str - 发件人邮箱
+        password : str - 邮箱授权码/密码
+        receiver : str/list - 收件人（多个用逗号）
+        subject : str - 邮件主题
+        content : str - 邮件正文内容
+        content_type : str - 内容类型（plain/html）
+        attachments : list - 附件路径列表
+        smtp_server : str - SMTP服务器地址
+        port : int - 端口号（SSL一般465，TLS用587）
+        """
+
+        try:
+            content_type = "plain"
+            # 创建邮件对象
+            msg = MIMEMultipart()
+            msg["From"] = self.email_account
+            msg["To"] = receiver
+            msg["Subject"] = subject
+
+            # 添加正文
+            body = MIMEText(content, content_type, "utf-8")
+            msg.attach(body)
+
+            # 添加附件
+            # if attachments:
+            #     for file_path in attachments:
+            #         with open(file_path, "rb") as f:
+            #             part = MIMEApplication(f.read())
+            #             part.add_header(
+            #                 "Content-Disposition",
+            #                 "attachment",
+            #                 filename=os.path.basename(file_path),
+            #             )
+            #             msg.attach(part)
+
+                # 创建SMTP连接
+            if self.smtp_port == 465:
+                # SSL连接
+                server = smtplib.SMTP_SSL(self.smtp_server, self.smtp_port)
+            else:
+                # TLS连接
+                server = smtplib.SMTP(self.smtp_server, self.smtp_port)
+                server.starttls()
+
+            # 登录邮箱
+            server.login(self.email_account, self.email_password)
+
+            # 发送邮件
+            server.sendmail(self.email_account, receiver.split(","), msg.as_string())
+        except Exception as e:
+            raise Exception(f"邮件发送失败：{e}")
+
+        return "发送成功"
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "EmailMessageTool":
+        attr_name = name.split("_", 1)[-1]
+        c = EmailMessageTool(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/message/feishu.py

@@ -0,0 +1,121 @@
+from typing import Any, Optional, Type
+
+import requests
+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from loguru import logger
+
+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")
+    # page_token: Optional[str] = Field(description="page_token")
+    container_id_type: Optional[str] = Field(description="container_id_type")
+    page_size: Optional[int] = Field(default=20,description="page_size")
+    page_token: Optional[str] = Field(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"
+    app_id: str = Field(description="app_id")
+    app_secret: str = Field(description="app_secret")
+
+    def send_message(self, message: str, receive_id: str, receive_id_type: str) -> str:
+        """
+        发送钉钉机器人消息
+
+        Args:
+            webhook_url: 钉钉机器人的 webhook 地址
+            message: 要发送的消息内容
+
+        Returns:
+            dict: 钉钉接口的响应结果
+        """
+        # 构建请求头
+        headers = {"Content-Type": "application/json","Authorization":f"Bearer {self.get_access_token()}"}
+        # 构建请求体
+        url = f"{self.API_BASE_URL}/im/v1/messages?receive_id_type={receive_id_type}"
+        payload = {
+            "receive_id": receive_id,
+            "msg_type": "text",
+            "content": '{\"text\":\"' + message + '\"}',
+            # "content": message.strip('"').replace(r"\"", '"').replace(r"\\", "\\"),
+        }
+        try:
+            # 发送 POST 请求
+            response = requests.post(url=url, headers=headers, json=payload)
+
+            # 检查响应状态
+            response.raise_for_status()
+            return response.json()
+
+        except requests.exceptions.RequestException as e:
+            return f"发送消息失败: {str(e)}"
+
+
+    def get_chat_messages(
+        self,
+        container_id: str,
+        container_id_type: str,
+        start_time: Optional[str],
+        end_time: Optional[str],
+        page_size: Optional[int] ,
+        page_token: Optional[str],
+        sort_type: Optional[str],
+    ) -> str:
+        """获取聊天记录"""
+        url = f"{self.API_BASE_URL}/im/v1/messages"
+        headers = {"Content-Type": "application/json","Authorization":f"Bearer {self.get_access_token()}"}
+        params={
+            "container_id": container_id,
+            "container_id_type": container_id_type,
+            "start_time": start_time,
+            "end_time": end_time,
+            "page_token": page_token,
+        }
+        if page_size:
+            params["page_size"] = page_size
+        if sort_type:
+            params["sort_type"] = sort_type 
+        try:
+            response = requests.get(
+                url=url,
+                headers=headers,
+                params=params
+            )
+        except requests.exceptions.RequestException as e:
+            return f"获取消息失败: {str(e)}"
+
+        if response.json()["code"] != 0:
+            return f"获取消息失败: {response.json()}"
+
+        return response.json()["data"]
+
+    def get_access_token(self) -> str:
+        url = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal"
+        params = {"app_id":self.app_id , "app_secret": self.app_secret}
+        response = requests.post(url,json=params)
+        if response.json()["code"] != 0:
+            raise Exception("app_id or app_secret error")
+        return response.json()["tenant_access_token"]
+
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "FeishuMessageTool":
+        attr_name = name.split("_", 1)[-1]
+        c = FeishuMessageTool(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/message/wechat.py

@@ -0,0 +1,52 @@
+from typing import Any, Optional, Type
+
+import requests
+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from loguru import logger
+
+from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
+                                                         MultArgsSchemaTool)
+
+
+class InputArgs(BaseModel):
+    url: str = Field(description="企业微信机器人的webhook地址")
+    message: str = Field(description="需要发送的消息")
+
+
+class WechatMessageTool(BaseModel):
+
+    def send_message(self, message: str, url: str) -> str:
+        """
+        发送企业微信机器人消息
+        
+        Args:
+            webhook_url: 机器人的 webhook 地址
+            message: 要发送的消息内容
+        
+        Returns:
+            dict: 钉钉接口的响应结果
+        """
+        # 构建请求头
+        headers = {"Content-Type": "application/json"}
+        # 构建请求体
+        data = {"msgtype": "text", "text": {"content": message}}
+
+        try:
+            # 发送 POST 请求
+            response = requests.post(url=url, headers=headers, json=data)
+            return response.json()
+        except requests.exceptions.RequestException as e:
+            return f"发送消息失败: {str(e)}"
+
+    @classmethod
+    def get_api_tool(cls, name: str, **kwargs: Any) -> "WechatMessageTool":
+        attr_name = name.split("_", 1)[-1]
+        c = WechatMessageTool(**kwargs)
+        class_method = getattr(c, attr_name)
+
+        return MultArgsSchemaTool(
+            name=name,
+            description=class_method.__doc__,
+            func=class_method,
+            args_schema=InputArgs,
+        )

bisheng_langchain/gpts/tools/sql_agent/tool.py

@@ -72,6 +72,9 @@ class SqlAgentAPIWrapper(BaseModel):
     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
@@ -79,6 +82,11 @@ class SqlAgentAPIWrapper(BaseModel):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.llm = kwargs.get('llm')
+
+        # todo 修改sql agent实现逻辑。此处逻辑只支持bishengLLM组件。原因是因为目前的实现必须实例化多个llm对象，每个llm对象绑定不同的tool
+        self.schema_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
+        self.query_check_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
+        self.query_gen_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
         self.sql_address = kwargs.get('sql_address')
 
         self.db = SQLDatabase.from_uri(self.sql_address)
@@ -94,7 +102,7 @@ class SqlAgentAPIWrapper(BaseModel):
         # Define a new graph
         self.workflow = StateGraph(State)
         self.init_workflow()
-        self.app = self.workflow.compile(checkpointer=False)
+        self.app = self.workflow.compile(checkpointer=False, debug=True)
 
     def init_workflow(self):
         self.workflow.add_node("first_tool_call", self.first_tool_call)
@@ -104,7 +112,7 @@ class SqlAgentAPIWrapper(BaseModel):
 
         self.workflow.add_node("get_schema_tool", create_tool_node_with_fallback([self.get_schema_tool]))
 
-        model_get_schema = self.llm.bind_tools(
+        model_get_schema = self.schema_llm.bind_tools(
             [self.get_schema_tool]
         )
         self.workflow.add_node(
@@ -162,8 +170,8 @@ class SqlAgentAPIWrapper(BaseModel):
         query_check_prompt = ChatPromptTemplate.from_messages(
             [("system", query_check_system), ("placeholder", "{messages}")]
         )
-        query_check = query_check_prompt | self.llm.bind_tools(
-            [self.db_query_tool], tool_choice="required"
+        query_check = query_check_prompt | self.query_check_llm.bind_tools(
+            [self.db_query_tool]
         )
         return query_check
 
@@ -195,7 +203,7 @@ class SqlAgentAPIWrapper(BaseModel):
         query_gen_prompt = ChatPromptTemplate.from_messages(
             [("system", query_gen_system), ("placeholder", "{messages}")]
         )
-        query_gen = query_gen_prompt | self.llm.bind_tools(
+        query_gen = query_gen_prompt | self.query_gen_llm.bind_tools(
             [SubmitFinalAnswer]
         )
         return query_gen

bisheng_langchain/vectorstores/elastic_keywords_search.py

@@ -1,6 +1,7 @@
 """Wrapper around Elasticsearch vector database."""
 from __future__ import annotations
 
+import ast
 import uuid
 from abc import ABC
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Tuple
@@ -233,7 +234,7 @@ class ElasticKeywordsSearch(VectorStore, ABC):
             keywords_str = self.llm_chain.run(query)
             print('llm search keywords:', keywords_str)
             try:
-                keywords = eval(keywords_str)
+                keywords = ast.literal_eval(keywords_str)
                 if not isinstance(keywords, list):
                     raise ValueError('Keywords extracted by llm is not list.')
             except Exception as e:

{bisheng_langchain-0.4.1.2.dist-info → bisheng_langchain-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bisheng-langchain
-Version: 0.4.1.2
+Version: 1.0.0
 Summary: bisheng langchain modules
 Home-page: https://github.com/dataelement/bisheng
 Author: DataElem

{bisheng_langchain-0.4.1.2.dist-info → bisheng_langchain-1.0.0.dist-info}/RECORD

@@ -37,10 +37,10 @@ bisheng_langchain/chat_models/host_llm.py,sha256=35_jTdUm85mk-t2MARZYGC8dIPVtf5X
 bisheng_langchain/chat_models/minimax.py,sha256=JLs_f6vWD9beZYUtjD4FG28G8tZHrGUAWOwdLIuJomw,13901
 bisheng_langchain/chat_models/proxy_llm.py,sha256=3ZCWU4n4eEMQcWiZt1BgD6DuVlbW8IyZSWGPsRunQco,17084
 bisheng_langchain/chat_models/qwen.py,sha256=W73KxDRQBUZEzttEM4K7ZzPqbN-82O6YQmpX-HB_wZU,19971
-bisheng_langchain/chat_models/sensetime.py,sha256=fuQ5yYGO5F7o7iQ7us17MlL4TAWRRFCCpNN9bAF-ydc,17056
+bisheng_langchain/chat_models/sensetime.py,sha256=vHFIPqjEkiS54BHHGD9_Z1WhNfxsWudnUG-_DZQYt9E,17079
 bisheng_langchain/chat_models/wenxin.py,sha256=OBXmFWkUWZMu1lUz6hPAEawsbAcdgMWcm9WkJJLZyng,13671
 bisheng_langchain/chat_models/xunfeiai.py,sha256=Yz09-I8u6XhGVnT5mdel15Z3CCQZqApJkgnaxyiZNFk,14037
-bisheng_langchain/chat_models/zhipuai.py,sha256=MgN8pFInUB6q5agZSnAOipYxTIxAAGhh-Zq6NXs9Hxc,15342
+bisheng_langchain/chat_models/zhipuai.py,sha256=CO_kadwv2Vp6_5wjKhXJKRSxme4AOkd_ymMuV2dWGtU,15365
 bisheng_langchain/chat_models/interface/__init__.py,sha256=KwcZMPSxFiXu6joXoZEgq6THxZeDXA8neZcOuLKBpUk,443
 bisheng_langchain/chat_models/interface/minimax.py,sha256=tF3S7ryFtYVXwh7jHHH9z1eY8nMCy0iLiFocsPSJ3pA,4423
 bisheng_langchain/chat_models/interface/openai.py,sha256=v4kxxglJoVMJ9kxaRDIJnWHBSvjl9vRhzQb5Fr-keg0,2081
@@ -73,7 +73,7 @@ bisheng_langchain/gpts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 bisheng_langchain/gpts/assistant.py,sha256=Xx5sNVJzB9chUHf9jYigNugWw-gyEIb6GpLOnrMWDXU,5552
 bisheng_langchain/gpts/auto_optimization.py,sha256=WNsC19rgvuDYQlSIaYThq5RqCbuobDbzCwAJW4Ksw0c,3626
 bisheng_langchain/gpts/auto_tool_selected.py,sha256=21WETf9o0YS-QEBwv3mmZRObKWszefQkXEqAA6KzoaM,1582
-bisheng_langchain/gpts/load_tools.py,sha256=uaz80q56lK-VchYkU908W5i0ytsztAJNlHBqQTnIMRI,8868
+bisheng_langchain/gpts/load_tools.py,sha256=uQ-jcnkwRdy2l2S61WQWuodlGAbhHjEwJTTBQ17eHro,9039
 bisheng_langchain/gpts/message_types.py,sha256=7EJOx62j9E1U67jxWgxE_I7a8IjAvvKANknXkD2gFm0,213
 bisheng_langchain/gpts/utils.py,sha256=t3YDxaJ0OYd6EKsek7PJFRYnsezwzEFK5oVU-PRbu5g,6671
 bisheng_langchain/gpts/agent_types/__init__.py,sha256=88tFt1GfrfIqa4hCg0cMJk7rTeUmCSSdiVhR41CW4rM,381
@@ -88,15 +88,19 @@ bisheng_langchain/gpts/prompts/opening_dialog_prompt.py,sha256=VVF0JLHtetupVB0ka
 bisheng_langchain/gpts/prompts/react_agent_prompt.py,sha256=MA5FReipAYfe6ypOvg_SJSlHxsjNdCh1HFG22axjFLo,1968
 bisheng_langchain/gpts/prompts/select_tools_prompt.py,sha256=AyvVnrLEsQy7RHuGTPkcrMUxgA98Q0TzF-xweoc7GyY,1400
 bisheng_langchain/gpts/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/tools/api_tools/__init__.py,sha256=CkEjgIFM4GIv86V1B7SsFLaB6M86c54QuO8wIRizUZ8,1608
+bisheng_langchain/gpts/tools/api_tools/__init__.py,sha256=PovWXou3paSpV9xABCt4HBqcD5saW4gYg1W7eut8oFQ,4810
 bisheng_langchain/gpts/tools/api_tools/base.py,sha256=zPUCM_mOM9ygsc8pwejZvngEfEvGtiWTKbavfza7Eqg,3593
+bisheng_langchain/gpts/tools/api_tools/firecrawl.py,sha256=9zvgE1N1Z9jb8zIpyiDFKP_31bStP4u13fhTPFIVvf8,2682
 bisheng_langchain/gpts/tools/api_tools/flow.py,sha256=ot2YAYgQGWgUpb2nCECAmpqHY6m0SgzwkupF9kDT3lU,2461
+bisheng_langchain/gpts/tools/api_tools/jina.py,sha256=lk8t_PlrcVS_oI5DHgNYpwLtC2tquTb4XmJvJNRsF-k,1321
 bisheng_langchain/gpts/tools/api_tools/macro_data.py,sha256=FyG-qtl2ECS1CDKt6olN0eDTDM91d-UvDkMDBiVLgYQ,27429
-bisheng_langchain/gpts/tools/api_tools/openapi.py,sha256=7i2Dw05u7FMKWeCKBvkNuPt9z575GaYyy-VyodUc2JM,5760
+bisheng_langchain/gpts/tools/api_tools/openapi.py,sha256=6SiL-p80-SN8Q1LWnEqjR7Baq3RfqDwpdjZmOiQQItc,6648
+bisheng_langchain/gpts/tools/api_tools/silicon_flow.py,sha256=VRMqiqO2yWGpYwF2OktSFf9mBNCAioV0Nu2FPBA9x7U,2035
 bisheng_langchain/gpts/tools/api_tools/sina.py,sha256=4KpK7_HUUtjpdJ-K4LjPlb-occyAZcRtmmCWqJ2BotE,9708
 bisheng_langchain/gpts/tools/api_tools/tianyancha.py,sha256=abDAz-yAH1-2rKiSmZ6TgnrNUnpgAZpDY8oDiWfWapc,6684
 bisheng_langchain/gpts/tools/bing_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/tools/bing_search/tool.py,sha256=v_VlqcMplITA5go5qWA4qZ5p43E1-1s0bzmyY7H0hqY,1710
+bisheng_langchain/gpts/tools/bing_search/self_arxiv.py,sha256=Wo8UXgj6zPYADPccIwDP46vIpaMpxxZvBSx6CUBn1V8,1609
+bisheng_langchain/gpts/tools/bing_search/tool.py,sha256=qxeExWyL_wZVGtbcFuHYf9mauUK6oH6D2YkhzvytPLY,1710
 bisheng_langchain/gpts/tools/calculator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/calculator/tool.py,sha256=iwGPE7jvxZg_jUL2Aq9HHwnRJrF9-ongwrsBX6uk1U0,705
 bisheng_langchain/gpts/tools/code_interpreter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,8 +109,13 @@ bisheng_langchain/gpts/tools/dalle_image_generator/__init__.py,sha256=47DEQpj8HB
 bisheng_langchain/gpts/tools/dalle_image_generator/tool.py,sha256=h_mSGn2fvw4wGufrqKYC3lI1LLo9Uu_rynDM88IonMA,7631
 bisheng_langchain/gpts/tools/get_current_time/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/get_current_time/tool.py,sha256=3uvk7Yu07qhZy1sBrFMhGEwyxEGMB8vubizs9x-6DG8,801
+bisheng_langchain/gpts/tools/message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bisheng_langchain/gpts/tools/message/dingding.py,sha256=ovYzyJZpVprKm9-qEAst8rDFKBOj_fVFs1YLA2B6-lg,1744
+bisheng_langchain/gpts/tools/message/email.py,sha256=Oirj4gw-ZkS0EeuPrYG3dSqAHSPSY67CIKZUcAolqE0,3522
+bisheng_langchain/gpts/tools/message/feishu.py,sha256=yVoaugM7T67vNT5r9y8eHjUzmox5NxKnawxrq48bRtc,4519
+bisheng_langchain/gpts/tools/message/wechat.py,sha256=iUHXWiVwlE0GhkSEhzCBOiZq-orkReiBvvCV5PCFImo,1666
 bisheng_langchain/gpts/tools/sql_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/tools/sql_agent/tool.py,sha256=YhKfYOzy4XOMcQtW-AUe85sgWRT5k0--zW4VK6oO-Dg,11239
+bisheng_langchain/gpts/tools/sql_agent/tool.py,sha256=WIN0rfdrNR7uGDIc_VGdPjzXrVnUs24OAicOl0_-5bM,11861
 bisheng_langchain/input_output/__init__.py,sha256=sW_GB7MlrHYsqY1Meb_LeimQqNsMz1gH-00Tqb2BUyM,153
 bisheng_langchain/input_output/input.py,sha256=I5YDmgbvvj1o2lO9wi8LE37wM0wP5jkhUREU32YrZMQ,1094
 bisheng_langchain/input_output/output.py,sha256=6U-az6-Cwz665C2YmcH3SYctWVjPFjmW8s70CA_qphk,11585
@@ -154,10 +163,10 @@ bisheng_langchain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=96-_nO4hDSwyPE4rSYop5SgJ-U9CE2un4bTdW0E5RGU,6582
 bisheng_langchain/utils/requests.py,sha256=vWGKyNTxApVeaVdKxqACfIT1Q8wMy-jC3kUv2Ce9Mzc,8688
 bisheng_langchain/vectorstores/__init__.py,sha256=zCZgDe7LyQ0iDkfcm5UJ5NxwKQSRHnqrsjx700Fy11M,213
-bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=sIMbud4UfbfLTLf_pIIfcVC2lHbaTWCTTABTFP5mXkE,15334
+bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=BxvT9FUTju4AZPtQFTbYLmIIKKw8bqcact5Cav_5H2I,15357
 bisheng_langchain/vectorstores/milvus.py,sha256=jWq_lce-ihOz07D1kwj5ctPzElYexNCjJ-xSv-pK1CI,37172
 bisheng_langchain/vectorstores/retriever.py,sha256=hj4nAAl352EV_ANnU2OHJn7omCH3nBK82ydo14KqMH4,4353
-bisheng_langchain-0.4.1.2.dist-info/METADATA,sha256=KoaWVufE0MmVMNM8fep7mmlrnM1JgySbaVTxvgInzBk,2441
-bisheng_langchain-0.4.1.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bisheng_langchain-0.4.1.2.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-0.4.1.2.dist-info/RECORD,,
+bisheng_langchain-1.0.0.dist-info/METADATA,sha256=GdivqH5jT1mf7I_xk3v8Dz7YIIzasRn_nb1fd-4kt28,2439
+bisheng_langchain-1.0.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bisheng_langchain-1.0.0.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-1.0.0.dist-info/RECORD,,