FinMind 2.0.0__tar.gz → 2.0.2__tar.gz

{finmind-2.0.0 → finmind-2.0.2}/FinMind/data/data_loader.py

@@ -509,6 +509,55 @@ class DataLoader(FinMindApi):
         )
         return stock_institutional_investors
 
+    def taiwan_stock_institutional_investors_wide(
+        self,
+        stock_id: str = "",
+        start_date: str = "",
+        end_date: str = "",
+        timeout: int = None,
+        use_async: bool = False,
+        stock_id_list: typing.List[str] = None,
+    ) -> pd.DataFrame:
+        """get 個股三大法人買賣表（寬表）
+
+        與 taiwan_stock_institutional_investors 相同資料，改為寬表（橫式）：
+        每個交易日一列，各法人別買進、賣出攤平成獨立欄位。欄位涵蓋所有歷史
+        法人別分類，尚未存在的年代該欄為 0（自營商於 2014-12-01 由合併拆為
+        自行買賣／避險、外資自營商於 2018-01-15 起提供）。
+
+        :param stock_id (str): 股票代號("2330")
+        :param start_date (str): 起始日期("2018-01-01")
+        :param end_date (str): 結束日期("2021-03-06")
+        :param timeout (int): timeout seconds, default None
+
+        :return: 個股三大法人買賣表（寬表）TaiwanStockInstitutionalInvestorsBuySellWide
+        :rtype pd.DataFrame
+        :rtype column date (str): 日期
+        :rtype column stock_id (str): 股票代碼
+        :rtype column Foreign_Investor_buy (int): 外資買進
+        :rtype column Foreign_Investor_sell (int): 外資賣出
+        :rtype column Foreign_Dealer_Self_buy (int): 外資自營商買進
+        :rtype column Foreign_Dealer_Self_sell (int): 外資自營商賣出
+        :rtype column Investment_Trust_buy (int): 投信買進
+        :rtype column Investment_Trust_sell (int): 投信賣出
+        :rtype column Dealer_buy (int): 自營商買進（合併，舊制）
+        :rtype column Dealer_sell (int): 自營商賣出（合併，舊制）
+        :rtype column Dealer_self_buy (int): 自營商買進（自行買賣）
+        :rtype column Dealer_self_sell (int): 自營商賣出（自行買賣）
+        :rtype column Dealer_Hedging_buy (int): 自營商買進（避險）
+        :rtype column Dealer_Hedging_sell (int): 自營商賣出（避險）
+        """
+        stock_institutional_investors_wide = self.get_data(
+            dataset=Dataset.TaiwanStockInstitutionalInvestorsBuySellWide,
+            data_id=stock_id,
+            start_date=start_date,
+            end_date=end_date,
+            timeout=timeout,
+            use_async=use_async,
+            data_id_list=stock_id_list,
+        )
+        return stock_institutional_investors_wide
+
     def taiwan_stock_institutional_investors_total(
         self, start_date: str, end_date: str = "", timeout: int = None
     ) -> pd.DataFrame:
@@ -2440,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
@@ -2457,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.0 → finmind-2.0.2}/FinMind/schema/data.py

@@ -7,6 +7,9 @@ class Dataset(str, Enum):
     TaiwanStockInstitutionalInvestorsBuySell = (
         "TaiwanStockInstitutionalInvestorsBuySell"
     )
+    TaiwanStockInstitutionalInvestorsBuySellWide = (
+        "TaiwanStockInstitutionalInvestorsBuySellWide"
+    )
     TaiwanStockTotalInstitutionalInvestors = (
         "TaiwanStockTotalInstitutionalInvestors"
     )

{finmind-2.0.0 → finmind-2.0.2}/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.0/finmind.egg-info → finmind-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finmind
-Version: 2.0.0
+Version: 2.0.2
 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.0 → finmind-2.0.2/finmind.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finmind
-Version: 2.0.0
+Version: 2.0.2
 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.0 → finmind-2.0.2}/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.0 → finmind-2.0.2}/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",