From dea7f56713f2fa06d67e72151b3254e314980aa3 Mon Sep 17 00:00:00 2001 From: GuoQing Zhang Date: Fri, 8 Aug 2025 20:23:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=A4=BE?= =?UTF-8?q?=E4=BC=9A=E8=9E=8D=E8=B5=84=E5=B7=A5=E5=85=B7=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gpts/tools/api_tools/macro_data.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/backend/bisheng_langchain/gpts/tools/api_tools/macro_data.py b/src/backend/bisheng_langchain/gpts/tools/api_tools/macro_data.py index 29f38f8dc..9bce863d8 100644 --- a/src/backend/bisheng_langchain/gpts/tools/api_tools/macro_data.py +++ b/src/backend/bisheng_langchain/gpts/tools/api_tools/macro_data.py @@ -4,8 +4,8 @@ from typing import Any import pandas as pd import requests -from pydantic import BaseModel, Field from langchain_core.tools import BaseTool +from pydantic import BaseModel, Field from .base import MultArgsSchemaTool @@ -24,7 +24,7 @@ class MacroData(BaseModel): 以及社融分项包括：人民币贷款，外币贷款，委托贷款，\ 信托贷款，未贴现银行承兑汇票，企业债券，非金融企业境内股票融资 """ - url = 'http://data.mofcom.gov.cn/datamofcom/front/gnmy/shrzgmQuery' + url = 'https://data.mofcom.gov.cn/datamofcom/front/gnmy/shrzgmQuery' r = requests.post(url) data_json = r.json() temp_df = pd.DataFrame(data_json) @@ -106,7 +106,8 @@ class MacroData(BaseModel): 'sec-fetch-dest': 'empty', 'sec-fetch-mode': 'cors', 'sec-fetch-site': 'same-site', - 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36', # noqa + 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36', + # noqa 'x-app-id': 'rU6QIu7JHe2gOUeR', 'x-csrf-token': '', 'x-version': '1.0.0', @@ -136,7 +137,8 @@ class MacroData(BaseModel): """ url = 'https://datacenter-web.eastmoney.com/api/data/v1/get' params = { - 'columns': 'REPORT_DATE,TIME,NATIONAL_SAME,NATIONAL_BASE,NATIONAL_SEQUENTIAL,NATIONAL_ACCUMULATE,CITY_SAME,CITY_BASE,CITY_SEQUENTIAL,CITY_ACCUMULATE,RURAL_SAME,RURAL_BASE,RURAL_SEQUENTIAL,RURAL_ACCUMULATE', # noqa + 'columns': 'REPORT_DATE,TIME,NATIONAL_SAME,NATIONAL_BASE,NATIONAL_SEQUENTIAL,NATIONAL_ACCUMULATE,CITY_SAME,CITY_BASE,CITY_SEQUENTIAL,CITY_ACCUMULATE,RURAL_SAME,RURAL_BASE,RURAL_SEQUENTIAL,RURAL_ACCUMULATE', + # noqa 'pageNumber': '1', 'pageSize': '2000', 'sortColumns': 'REPORT_DATE', @@ -313,7 +315,8 @@ M0数量（单位：亿元），M0 同比（单位：%），M0 环比（单位 """ url = 'https://datacenter-web.eastmoney.com/api/data/v1/get' params = { - 'columns': 'REPORT_DATE,TIME,BASIC_CURRENCY,BASIC_CURRENCY_SAME,BASIC_CURRENCY_SEQUENTIAL,CURRENCY,CURRENCY_SAME,CURRENCY_SEQUENTIAL,FREE_CASH,FREE_CASH_SAME,FREE_CASH_SEQUENTIAL', # noqa + 'columns': 'REPORT_DATE,TIME,BASIC_CURRENCY,BASIC_CURRENCY_SAME,BASIC_CURRENCY_SEQUENTIAL,CURRENCY,CURRENCY_SAME,CURRENCY_SEQUENTIAL,FREE_CASH,FREE_CASH_SAME,FREE_CASH_SEQUENTIAL', + # noqa 'pageNumber': '1', 'pageSize': '2000', 'sortColumns': 'REPORT_DATE', @@ -380,10 +383,12 @@ M0数量（单位：亿元），M0 同比（单位：%），M0 环比（单位 """ url = 'https://datacenter-web.eastmoney.com/api/data/v1/get' headers = { - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36', # noqa + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36', + # noqa } params = { - 'columns': 'REPORT_DATE,TIME,RETAIL_TOTAL,RETAIL_TOTAL_SAME,RETAIL_TOTAL_SEQUENTIAL,RETAIL_TOTAL_ACCUMULATE,RETAIL_ACCUMULATE_SAME', # noqa + 'columns': 'REPORT_DATE,TIME,RETAIL_TOTAL,RETAIL_TOTAL_SAME,RETAIL_TOTAL_SEQUENTIAL,RETAIL_TOTAL_ACCUMULATE,RETAIL_ACCUMULATE_SAME', + # noqa 'pageNumber': '1', 'pageSize': '1000', 'sortColumns': 'REPORT_DATE',