ezKit 1.8.3__py3-none-any.whl → 1.8.5__py3-none-any.whl

ezKit/cls.py

@@ -94,75 +94,194 @@ def up_down_analysis(
 
 
 def latest_data(
-    payload: dict,
-    end: str = "basic",
+    payload: str | dict,
     data_type: str = "stock",
     df: bool = False
-) -> dict | pd.DataFrame | None:
+) -> list | pd.DataFrame | None:
     """股票或板块的最新数据"""
 
+    # ----------------------------------------------------------------------------------------------
+
+    # 判断参数类型
     match True:
-        case True if isinstance(payload, dict) is False:
+        case True if True not in [isinstance(payload, str), isinstance(payload, dict)]:
             logger.error("Incorrect function argument type: payload")
             return None
-        case True if isinstance(end, str) is False:
-            logger.error("Incorrect function argument type: end")
-            return None
-        case True if isinstance(data_type, str) is False:
+        case True if False in [isinstance(data_type, str), utils.v_true(data_type, str)]:
             logger.error("Incorrect function argument type: data_type")
             return None
         case _:
             pass
 
+    # ----------------------------------------------------------------------------------------------
+
+    # 判断数据类型. 数据类型: 个股, 板块 (产业链: industry)
+    if data_type not in ["stock", "plate"]:
+        logger.error("data_type error")
+        return None
+
+    # ----------------------------------------------------------------------------------------------
+
+    # 日志信息
+
+    # 个股 (默认)
     info: str = "获取股票最新数据"
 
-    if utils.v_true(data_type, str) is True and data_type == "plate":
+    # 板块
+    if data_type == "plate":
         info = "获取板块最新数据"
 
+    # match True:
+    #     case True if data_type == "plate":
+    #         info = "获取板块最新数据"
+    #     case True if data_type == "industry":
+    #         info = "获取产业链最新数据"
+    #     case _:
+    #         pass
+
+    # ----------------------------------------------------------------------------------------------
+
     try:
 
         logger.info(f"{info} ......")
 
+        # ------------------------------------------------------------------------------------------
+
+        # HTTP User Agent
         user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
+
+        # HTTP Headers
         headers = {"User-Agent": user_agent}
 
-        # https://x-quote.cls.cn/quote/stock/basic?secu_code={code}
-        api = f"https://x-quote.cls.cn/quote/stock/{end}"
+        # ------------------------------------------------------------------------------------------
 
-        if data_type == "plate":
-            # https://x-quote.cls.cn/web_quote/plate/stocks?secu_code=cls80382
-            # https://x-quote.cls.cn/web_quote/plate/stocks?secu_code={code}
-            # https://x-quote.cls.cn/web_quote/plate/industry?secu_code={code}
-            api = f"https://x-quote.cls.cn/web_quote/plate/{end}"
+        # 请求参数
+        params: dict = {}
+
+        # 默认请求参数
+        if isinstance(payload, str) and utils.v_true(payload, str):
+            params = {"secu_code": payload}
 
+        # 请求参数
+        if isinstance(payload, dict) and utils.v_true(payload, dict):
+            params = payload
+
+        # ------------------------------------------------------------------------------------------
+
+        # 不直接在API后面跟参数, 使用 params 传递参数
+
+        # API: 股票
+        # api: str = f"https://x-quote.cls.cn/quote/stock/basic?secu_code={code}"
+        api: str = "https://x-quote.cls.cn/quote/stock/basic"
+
+        # API: 板块
+        if data_type == "plate":
+            # api = f"https://x-quote.cls.cn/web_quote/plate/stocks?secu_code={code}"
+            api = "https://x-quote.cls.cn/web_quote/plate/stocks"
+
+        # match True:
+        #     case True if data_type == "plate":
+        #         # 板块
+        #         # api = f"https://x-quote.cls.cn/web_quote/plate/stocks?secu_code={code}"
+        #         api = "https://x-quote.cls.cn/web_quote/plate/stocks"
+        #     case True if data_type == "industry":
+        #         # 产业链
+        #         # api = f"https://x-quote.cls.cn/web_quote/plate/industry?secu_code={code}"
+        #         api = "https://x-quote.cls.cn/web_quote/plate/industry"
+        #     case _:
+        #         pass
+
+        # ------------------------------------------------------------------------------------------
+
+        # 获取数据
         # response = requests.get(api, headers=headers, timeout=10)
-        response = requests.get(api, headers=headers, params=payload, timeout=10)
+        response = requests.get(api, headers=headers, params=params, timeout=10)
 
+        # 转换数据类型
         response_dict: dict = response.json()
 
-        if utils.v_true(df, bool) is False:
+        # ------------------------------------------------------------------------------------------
+
+        # 个股
+
+        if data_type == "stock":
+
+            # 停牌, 返回 None
+            if response_dict["data"]["trade_status"] == "STOPT":
+                logger.error(f"{info} [停牌]")
+                return None
+
+            # pd.DataFrame 数据
+            if utils.v_true(df, bool) is True:
+                df_data = {
+                    # "date": [pd.to_datetime(date_today)],
+                    "open": [float(response_dict["data"]["open_px"])],
+                    "close": [float(response_dict["data"]["last_px"])],
+                    "high": [float(response_dict["data"]["high_px"])],
+                    "low": [float(response_dict["data"]["low_px"])],
+                    "volume": [int(response_dict["data"]["business_amount"])],
+                    "turnover": [float(response_dict["data"]["tr"])]
+                }
+                logger.success(f"{info} [成功]")
+                return pd.DataFrame(data=df_data)
+
+            # 默认返回的数据
             logger.success(f"{info} [成功]")
-            return response_dict
+            return response_dict["data"]
+
+        # ------------------------------------------------------------------------------------------
+
+        # 板块
 
-        if data_type == "plate" and utils.v_true(df, bool) is True:
+        # 板块数据不能转换为 pd.DataFrame
+        if (data_type == "plate") and (utils.v_true(df, bool) is True):
             logger.error(f"{info} [错误]")
             return None
 
-        if response_dict["data"]["trade_status"] == "STOPT":
-            logger.error(f"{info} [停牌]")
-            return None
+        # 数据结果
+        result: list = []
 
-        data_object = {
-            # "date": [pd.to_datetime(date_today)],
-            "open": [float(response_dict["data"]["open_px"])],
-            "close": [float(response_dict["data"]["last_px"])],
-            "high": [float(response_dict["data"]["high_px"])],
-            "low": [float(response_dict["data"]["low_px"])],
-            "volume": [int(response_dict["data"]["business_amount"])],
-            "turnover": [float(response_dict["data"]["tr"])]
-        }
+        # 筛选 主板, 非ST, 非银行, 非证券 的股票
+        for i in response_dict["data"]["stocks"]:
+            if (re.match(r"^(sz00|sh60)", i["secu_code"])) and (not re.search(r"ST|银行|证券", i["secu_name"])):
+                result.append(i)
+
+        # 返回数据
         logger.success(f"{info} [成功]")
-        return pd.DataFrame(data=data_object)
+        return result
+
+    except Exception as e:
+        logger.error(f"{info} [失败]")
+        logger.exception(e)
+        return None
+
+
+# --------------------------------------------------------------------------------------------------
+
+
+def plate_codes(plate: str) -> list | None:
+    """获取板块成分股代码"""
+
+    if utils.v_true(plate, str) is False:
+        logger.error("Incorrect function argument type: plate")
+        return None
+
+    info: str = "获取板块成分股代码"
+
+    try:
+
+        logger.info(f"{info} ......")
+
+        items = latest_data(payload=plate, data_type="plate")
+
+        if isinstance(items, list):
+            codes: list = [stock.coderename(i["secu_code"], restore=True) for i in items]
+            codes.sort()
+            logger.success(f"{info} [成功]")
+            return codes
+
+        logger.error(f"{info} [失败]")
+        return None
 
     except Exception as e:
         logger.error(f"{info} [失败]")

{ezKit-1.8.3.dist-info → ezKit-1.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.8.3
+Version: 1.8.5
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezKit-1.8.3.dist-info → ezKit-1.8.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
 ezKit/bottle_extensions.py,sha256=LQikCbbYZBAa4AcihvrTvixWHHMY7OjCBsT02PqWMMM,1129
 ezKit/cipher.py,sha256=0T_StbjiNI4zgrjVgcfU-ffKgu1waBA9UDudAnqFcNM,2896
-ezKit/cls.py,sha256=RM0w2DFWTOtqBnrMUhi-Qx0mecgdKntjo7LxjFRxT2k,6176
+ezKit/cls.py,sha256=Oy6uEYjtIisWFkhWRj9oLiARZm5yJg75zSa_e2K8Kng,10136
 ezKit/database.py,sha256=kYb0ybACxrdFZnwJ40bTbG8Obh2oEF3GQWmCbPVgH-c,6878
 ezKit/http.py,sha256=N2x86HCmJ5ejwA3-gHowEgSpaFTFT9nCWFjPuQ1T_do,1801
 ezKit/mongo.py,sha256=P6WTwFRxaaHixJK_PyKlOfPHkeJRxxrNLV77xy5LVBQ,2048
@@ -13,8 +13,8 @@ ezKit/stock.py,sha256=p-l6Tv0oZdJ3juxkddScphm7BW4vH-mBozBgSH1Qu0w,1730
 ezKit/token.py,sha256=9CAZhPdXiRiWoOIeWmP0q6L3j1zQAv4YcVWH95Tjefs,1755
 ezKit/utils.py,sha256=an7joZy_EEpYfN8zBtEWAnhP0YXYfPieabsK_HAxXl4,48921
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.8.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.8.3.dist-info/METADATA,sha256=zBWEfYeVzFBpNoj8Cgqwdo1xJANBqF5O_yLGX1S-KTQ,190
-ezKit-1.8.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.8.3.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.8.3.dist-info/RECORD,,
+ezKit-1.8.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.8.5.dist-info/METADATA,sha256=aaBwl8bvxD60a9fHvL-IYjj-ZhM9ysT84zPfocVyNjE,190
+ezKit-1.8.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.8.5.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.8.5.dist-info/RECORD,,