akshare 1.14.48__tar.gz → 1.14.49__tar.gz

{akshare-1.14.48 → akshare-1.14.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.48
+Version: 1.14.49
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.14.48 → akshare-1.14.49}/akshare/__init__.py

@@ -2859,9 +2859,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.46 add: add spot_hog_soozhu interface
 1.14.47 fix: fix spot_hog_soozhu interface
 1.14.48 add: add spot_hog_year_trend_soozhu interface
+1.14.49 fix: fix fortune_rank interface
 """
 
-__version__ = "1.14.48"
+__version__ = "1.14.49"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.14.48 → akshare-1.14.49}/akshare/fortune/fortune_500.py

@@ -7,6 +7,7 @@ https://www.fortunechina.com/fortune500/index.htm
 特殊情况说明：
 2010年由于网页端没有公布公司所属的国家, 故 2010 年数据没有国家这列
 """
+
 import json
 from functools import lru_cache
 from io import StringIO
@@ -28,12 +29,12 @@ def _fortune_rank_year_url_map() -> dict:
     url = "https://www.fortunechina.com/fortune500/index.htm"
     r = requests.get(url)
     soup = BeautifulSoup(r.text, features="lxml")
-    url_2023 = soup.find(name='meta', attrs={"property": "og:url"})['content'].strip()
-    node_list = soup.find_all(name='div', attrs={"class": "swiper-slide"})
-    url_list = [item.find("a")['href'] for item in node_list]
+    url_2023 = "https://www.fortunechina.com/fortune500/c/2023-08/02/content_436874.htm"
+    node_list = soup.find_all(name="div", attrs={"class": "swiper-slide"})
+    url_list = [item.find("a")["href"] for item in node_list]
     year_list = [item.find("a").text for item in node_list]
     year_url_map = dict(zip(year_list, url_list))
-    year_url_map['2023'] = url_2023
+    year_url_map["2023"] = url_2023
     return year_url_map
 
 
@@ -49,17 +50,17 @@ def fortune_rank(year: str = "2015") -> pd.DataFrame:
     r = requests.get(url)
     r.encoding = "utf-8"
     if int(year) < 2007:
-        df = pd.read_html(StringIO(r.text))[0].iloc[1:-1, ]
+        df = pd.read_html(StringIO(r.text))[0].iloc[1:-1,]
         df.columns = pd.read_html(StringIO(r.text))[0].iloc[0, :].tolist()
         return df
     elif 2006 < int(year) < 2010:
-        df = pd.read_html(StringIO(r.text))[0].iloc[1:, ]
+        df = pd.read_html(StringIO(r.text))[0].iloc[1:,]
         df.columns = pd.read_html(StringIO(r.text))[0].iloc[0, :].tolist()
         for page in tqdm(range(2, 11), leave=False):
             # page =2
             r = requests.get(url.rsplit(".", maxsplit=1)[0] + "_" + str(page) + ".htm")
             r.encoding = "utf-8"
-            temp_df = pd.read_html(StringIO(r.text))[0].iloc[1:, ]
+            temp_df = pd.read_html(StringIO(r.text))[0].iloc[1:,]
             temp_df.columns = pd.read_html(StringIO(r.text))[0].iloc[0, :].tolist()
             df = pd.concat(objs=[df, temp_df], ignore_index=True)
         return df
@@ -79,18 +80,20 @@ def fortune_rank_eng(year: str = "2023") -> pd.DataFrame:
     :rtype: pandas.DataFrame
     """
     url = f"https://fortune.com/ranking/global500/{year}/search/"
-    res = requests.get(url)
-    soup = BeautifulSoup(res.text, "lxml")
-    code = json.loads(soup.find("script", attrs={"type": "application/ld+json"}).string)["identifier"]
-    url = f"https://content.fortune.com/wp-json/irving/v1/data/franchise-search-results"
+    r = requests.get(url)
+    soup = BeautifulSoup(r.text, features="lxml")
+    code = json.loads(
+        soup.find(name="script", attrs={"type": "application/ld+json"}).string
+    )["identifier"]
+    url = "https://content.fortune.com/wp-json/irving/v1/data/franchise-search-results"
     params = {
         "list_id": code,
         "token": "Zm9ydHVuZTpCcHNyZmtNZCN5SndjWkkhNHFqMndEOTM=",
     }
-    res = requests.get(url, params=params)
+    r = requests.get(url, params=params)
     big_df = pd.DataFrame()
-    for i in range(len(res.json()[1]["items"][0]['fields'])):
-        temp_df = pd.DataFrame([item["fields"][i] for item in res.json()[1]["items"]])
+    for i in range(len(r.json()[1]["items"][0]["fields"])):
+        temp_df = pd.DataFrame([item["fields"][i] for item in r.json()[1]["items"]])
         big_df[temp_df["key"].values[0]] = temp_df["value"]
     big_df["rank"] = big_df["rank"].astype(int)
     big_df.sort_values(by="rank", inplace=True)
@@ -98,23 +101,23 @@ def fortune_rank_eng(year: str = "2023") -> pd.DataFrame:
     return big_df
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     fortune_rank_eng_df = fortune_rank_eng(year="2022")
     print(fortune_rank_eng_df)
 
-    fortune_rank_df = fortune_rank(year='2023')  # 2010 不一样
+    fortune_rank_df = fortune_rank(year="2023")  # 2010 不一样
     print(fortune_rank_df)
 
-    fortune_rank_df = fortune_rank(year='2022')  # 2010 不一样
+    fortune_rank_df = fortune_rank(year="2022")  # 2010 不一样
     print(fortune_rank_df)
 
-    fortune_rank_df = fortune_rank(year='2008')  # 2010 不一样
+    fortune_rank_df = fortune_rank(year="2008")  # 2010 不一样
     print(fortune_rank_df)
 
-    fortune_rank_df = fortune_rank(year='2008')  # 2010 不一样
+    fortune_rank_df = fortune_rank(year="2008")  # 2010 不一样
     print(fortune_rank_df)
 
-    fortune_rank_df = fortune_rank(year='2009')  # 2010 不一样
+    fortune_rank_df = fortune_rank(year="2009")  # 2010 不一样
     print(fortune_rank_df)
 
     for item in range(1996, 2008):

{akshare-1.14.48 → akshare-1.14.49}/akshare/other/other_car_cpca.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/3/31 19:00
+Date: 2024/8/3 20:00
 Desc: 乘联会
-http://data.cpcaauto.com/FuelMarket
+http://data.cpcadata.com/FuelMarket
 """
 
 import pandas as pd
@@ -15,7 +15,7 @@ def car_market_total_cpca(
 ) -> pd.DataFrame:
     """
     乘联会-统计数据-总体市场
-    http://data.cpcaauto.com/TotalMarket
+    http://data.cpcadata.com/TotalMarket
     :param symbol: choice of {"狭义乘用车", "广义乘用车"}
     :type symbol: str
     :param indicator: choice of {"产量", "批发", "零售", "出口"}
@@ -23,7 +23,7 @@ def car_market_total_cpca(
     :return: 统计数据-总体市场
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "1"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -163,13 +163,13 @@ def car_market_total_cpca(
 def __car_market_man_rank_cpca_pifa(symbol: str = "狭义乘用车-累计") -> pd.DataFrame:
     """
     乘联会-统计数据-厂商排名
-    http://data.cpcaauto.com/ManRank
+    http://data.cpcadata.com/ManRank
     :param symbol: choice of {"狭义乘用车-单月", "狭义乘用车-累计", "广义乘用车-单月", "广义乘用车-累计"}
     :type symbol: str
     :return: 统计数据-厂商排名
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "2"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -278,13 +278,13 @@ def __car_market_man_rank_cpca_lingshou(
 ) -> pd.DataFrame:
     """
     乘联会-统计数据-厂商排名
-    http://data.cpcaauto.com/ManRank
+    http://data.cpcadata.com/ManRank
     :param symbol: choice of {"狭义乘用车-单月", "狭义乘用车-累计", "广义乘用车-单月", "广义乘用车-累计"}
     :type symbol: str
     :return: 统计数据-厂商排名
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist_2"
+    url = "http://data.cpcadata.com/api/chartlist_2"
     params = {"charttype": "2"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -393,7 +393,7 @@ def car_market_man_rank_cpca(
 ) -> pd.DataFrame:
     """
     乘联会-统计数据-厂商排名
-    http://data.cpcaauto.com/ManRank
+    http://data.cpcadata.com/ManRank
     :param symbol: choice of {"狭义乘用车-单月", "狭义乘用车-累计", "广义乘用车-单月", "广义乘用车-累计"}
     :type symbol: str
     :param indicator: choice of {"批发", "零售"}
@@ -412,13 +412,13 @@ def car_market_man_rank_cpca(
 def __car_market_cate_cpca_pifa(symbol: str = "MPV") -> pd.DataFrame:
     """
     乘联会-统计数据-车型大类
-    http://data.cpcaauto.com/CategoryMarket
+    http://data.cpcadata.com/CategoryMarket
     :param symbol: choice of {"轿车", "MPV", "SUV", "占比"}
     :type symbol: str
     :return: 统计数据-车型大类
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "3"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -530,13 +530,13 @@ def __car_market_cate_cpca_lingshou(
 ) -> pd.DataFrame:
     """
     乘联会-统计数据-车型大类
-    http://data.cpcaauto.com/CategoryMarket
+    http://data.cpcadata.com/CategoryMarket
     :param symbol: choice of {"轿车", "MPV", "SUV", "占比"}
     :type symbol: str
     :return: 统计数据-车型大类
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "3"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -646,7 +646,7 @@ def __car_market_cate_cpca_lingshou(
 def car_market_cate_cpca(symbol: str = "轿车", indicator: str = "批发") -> pd.DataFrame:
     """
     乘联会-统计数据-车型大类
-    http://data.cpcaauto.com/CategoryMarket
+    http://data.cpcadata.com/CategoryMarket
     :param symbol: choice of {"轿车", "MPV", "SUV", "占比"}
     :type symbol: str
     :param indicator: choice of {"批发", "零售"}
@@ -665,11 +665,11 @@ def car_market_cate_cpca(symbol: str = "轿车", indicator: str = "批发") -> p
 def car_market_country_cpca() -> pd.DataFrame:
     """
     乘联会-统计数据-国别细分市场
-    http://data.cpcaauto.com/CountryMarket
+    http://data.cpcadata.com/CountryMarket
     :return: 统计数据-车型大类
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "4"}
     r = requests.get(url=url, params=params)
     data_json = r.json()
@@ -685,13 +685,13 @@ def car_market_country_cpca() -> pd.DataFrame:
 def car_market_segment_cpca(symbol: str = "轿车") -> pd.DataFrame:
     """
     乘联会-统计数据-级别细分市场
-    http://data.cpcaauto.com/SegmentMarket
+    http://data.cpcadata.com/SegmentMarket
     :param symbol: choice of {"轿车", "MPV", "SUV"}
     :type symbol: str
     :return: 统计数据-车型大类
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "5"}
     r = requests.get(url=url, params=params)
     data_json = r.json()
@@ -724,11 +724,11 @@ def car_market_fuel_cpca(symbol: str = "整体市场") -> pd.DataFrame:
     乘联会-统计数据-新能源细分市场
     :param symbol: choice of {"整体市场", "销量占比-PHEV-BEV", "销量占比-ICE-NEV"}
     :type symbol: str
-    https://data.cpcaauto.com/FuelMarket
+    https://data.cpcadata.com/FuelMarket
     :return: 新能源细分市场
     :rtype: pandas.DataFrame
     """
-    url = "http://data.cpcaauto.com/api/chartlist"
+    url = "http://data.cpcadata.com/api/chartlist"
     params = {"charttype": "6"}
     r = requests.get(url, params=params)
     data_json = r.json()

{akshare-1.14.48 → akshare-1.14.49}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.48
+Version: 1.14.49
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily