FinMind 2.0.1__tar.gz → 2.0.3__tar.gz

{finmind-2.0.1 → finmind-2.0.3}/FinMind/data/data_loader.py

@@ -2489,12 +2489,17 @@ class DataLoader(FinMindApi):
         date: str = "",
         timeout: int = None,
         use_async: bool = False,
+        use_object: bool = False,
     ) -> pd.DataFrame:
         """get 當日權證卷商分點表
         :param stock_id (str): 股票代號("2330")
         :param securities_trader_id (str): 卷商代號("1020")
         :param date (str): 日期("2018-01-01")
         :param timeout (int): timeout seconds, default None
+        :param use_async (bool): 是否使用非同步下載, default False
+        :param use_object (bool): 是否透過 signed URL 下載整日 parquet 資料物件,
+            設為 True 時忽略 stock_id, securities_trader_id, stock_id_list,
+            use_async 參數, default False
 
         :return: 當日權證卷商分點表 TaiwanStockWarrantTradingDailyReport
         :rtype pd.DataFrame
@@ -2506,6 +2511,12 @@ class DataLoader(FinMindApi):
         :rtype column stock_id (str): 股票代碼
         :rtype column date (str): 日期
         """
+        if use_object:
+            return self.get_object(
+                dataset=Dataset.TaiwanStockWarrantTradingDailyReport,
+                date=date,
+                timeout=timeout,
+            )
         stock_trading_daily_report = self.get_data(
             dataset=Dataset.TaiwanStockWarrantTradingDailyReport,
             data_id=stock_id,

{finmind-2.0.1 → finmind-2.0.3}/FinMind/data/finmind_api.py

@@ -144,22 +144,24 @@ class FinMindApi:
         :param params: finmind api參數
         :return:
         """
-        if use_async:
-            if securities_trader_id_list:
-                return self._get_data_with_async_with_securities_trader_id(
-                    dataset=dataset,
-                    securities_trader_id_list=securities_trader_id_list,
-                    start_date=start_date,
-                    end_date=end_date,
-                )
-            elif data_id_list:
-                return self._get_data_with_async(
-                    dataset=dataset,
-                    data_id_list=data_id_list,
-                    start_date=start_date,
-                    end_date=end_date,
-                    max_retry_times=max_retry_times,
-                )
+        # 只要傳入 id 列表就走非同步批次下載，不再依賴 use_async 旗標。
+        # 過去 use_async 預設 False 時 sync 分支會忽略 data_id_list、
+        # 只用空的 data_id 查詢，導致回傳空 DataFrame。
+        if securities_trader_id_list:
+            return self._get_data_with_async_with_securities_trader_id(
+                dataset=dataset,
+                securities_trader_id_list=securities_trader_id_list,
+                start_date=start_date,
+                end_date=end_date,
+            )
+        elif data_id_list:
+            return self._get_data_with_async(
+                dataset=dataset,
+                data_id_list=data_id_list,
+                start_date=start_date,
+                end_date=end_date,
+                max_retry_times=max_retry_times,
+            )
         else:
             logger.info(f"download {dataset}, data_id: {data_id}")
             params = dict(

{finmind-2.0.1 → finmind-2.0.3}/FinMind/schema/plot.py

@@ -1,38 +1,34 @@
 import typing
 
 import pandas as pd
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 
 
 class Labels(BaseModel):
     labels: typing.List[typing.Union[str, int]]
 
-    @validator("labels", allow_reuse=True, each_item=True)
+    @field_validator("labels")
+    @classmethod
     def valid(cls, value):
-        if isinstance(value, str):
-            pass
-        elif isinstance(value, int):
-            pass
-        else:
-            raise Exception(
-                "the type of labels must be list[int] for list[str]."
-            )
+        for item in value:
+            if not isinstance(item, (str, int)):
+                raise Exception(
+                    "the type of labels must be list[int] for list[str]."
+                )
         return value
 
 
 class Series(BaseModel):
     series: typing.List[typing.Union[int, float]]
 
-    @validator("series", allow_reuse=True, each_item=True)
+    @field_validator("series")
+    @classmethod
     def valid(cls, value):
-        if isinstance(value, int):
-            pass
-        elif isinstance(value, float):
-            pass
-        else:
-            raise Exception(
-                "the type of series must be list[int] for list[str]."
-            )
+        for item in value:
+            if not isinstance(item, (int, float)):
+                raise Exception(
+                    "the type of series must be list[int] for list[str]."
+                )
         return value
 
 

{finmind-2.0.1/finmind.egg-info → finmind-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finmind
-Version: 2.0.1
+Version: 2.0.3
 Summary: financial mining
 Author-email: linsam <finmind.tw@gmail.com>
 License:                                  Apache License
@@ -219,17 +219,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas<3.0.0,>=2.0.0
-Requires-Dist: numpy<2.0.0,>=1.19.5
+Requires-Dist: numpy<3.0.0,>=1.19.5
 Requires-Dist: requests<3.0.0,>=2.23.0
-Requires-Dist: pydantic<2.0.0,>=1.6.1
+Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: ta<1.0.0,>=0.11.0
 Requires-Dist: lxml<5.0.0,>=4.6.3
 Requires-Dist: pyecharts<2.0.0,>=1.9.0
 Requires-Dist: ipython<8.0.0,>=7.16.1
 Requires-Dist: loguru<1.0.0,>=0.5.3
 Requires-Dist: aiohttp<4.0.0,>=3.7.4.post0
-Requires-Dist: importlib-metadata<5.0.0,>=4.8.1
-Requires-Dist: Flask<3.0.0,>=2.0.2
+Requires-Dist: importlib-metadata<9.0.0,>=4.8.1
 Requires-Dist: typing-extensions<5.0.0,>=4.0.0
 Requires-Dist: tqdm
 Requires-Dist: nest-asyncio==1.6.0

{finmind-2.0.1 → finmind-2.0.3/finmind.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finmind
-Version: 2.0.1
+Version: 2.0.3
 Summary: financial mining
 Author-email: linsam <finmind.tw@gmail.com>
 License:                                  Apache License
@@ -219,17 +219,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas<3.0.0,>=2.0.0
-Requires-Dist: numpy<2.0.0,>=1.19.5
+Requires-Dist: numpy<3.0.0,>=1.19.5
 Requires-Dist: requests<3.0.0,>=2.23.0
-Requires-Dist: pydantic<2.0.0,>=1.6.1
+Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: ta<1.0.0,>=0.11.0
 Requires-Dist: lxml<5.0.0,>=4.6.3
 Requires-Dist: pyecharts<2.0.0,>=1.9.0
 Requires-Dist: ipython<8.0.0,>=7.16.1
 Requires-Dist: loguru<1.0.0,>=0.5.3
 Requires-Dist: aiohttp<4.0.0,>=3.7.4.post0
-Requires-Dist: importlib-metadata<5.0.0,>=4.8.1
-Requires-Dist: Flask<3.0.0,>=2.0.2
+Requires-Dist: importlib-metadata<9.0.0,>=4.8.1
 Requires-Dist: typing-extensions<5.0.0,>=4.0.0
 Requires-Dist: tqdm
 Requires-Dist: nest-asyncio==1.6.0

{finmind-2.0.1 → finmind-2.0.3}/finmind.egg-info/requires.txt

@@ -1,15 +1,14 @@
 pandas<3.0.0,>=2.0.0
-numpy<2.0.0,>=1.19.5
+numpy<3.0.0,>=1.19.5
 requests<3.0.0,>=2.23.0
-pydantic<2.0.0,>=1.6.1
+pydantic<3.0.0,>=2.0.0
 ta<1.0.0,>=0.11.0
 lxml<5.0.0,>=4.6.3
 pyecharts<2.0.0,>=1.9.0
 ipython<8.0.0,>=7.16.1
 loguru<1.0.0,>=0.5.3
 aiohttp<4.0.0,>=3.7.4.post0
-importlib-metadata<5.0.0,>=4.8.1
-Flask<3.0.0,>=2.0.2
+importlib-metadata<9.0.0,>=4.8.1
 typing-extensions<5.0.0,>=4.0.0
 tqdm
 nest-asyncio==1.6.0

{finmind-2.0.1 → finmind-2.0.3}/pyproject.toml

@@ -24,17 +24,16 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "pandas>=2.0.0,<3.0.0",
-    "numpy>=1.19.5,<2.0.0",
+    "numpy>=1.19.5,<3.0.0",
     "requests>=2.23.0,<3.0.0",
-    "pydantic>=1.6.1,<2.0.0",
+    "pydantic>=2.0.0,<3.0.0",
     "ta>=0.11.0,<1.0.0",
     "lxml>=4.6.3,<5.0.0",
     "pyecharts>=1.9.0,<2.0.0",
     "ipython>=7.16.1,<8.0.0",
     "loguru>=0.5.3,<1.0.0",
     "aiohttp>=3.7.4.post0,<4.0.0",
-    "importlib-metadata>=4.8.1,<5.0.0",
-    "Flask>=2.0.2,<3.0.0",
+    "importlib-metadata>=4.8.1,<9.0.0",
     "typing-extensions>=4.0.0,<5.0.0",
     "tqdm",
     "nest-asyncio==1.6.0",