neurostats-API 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

neurostats_API/__init__.py

@@ -1 +1 @@
-__version__='0.0.12'
+__version__='0.0.14'

neurostats_API/fetchers/institution.py

@@ -164,25 +164,26 @@ class InstitutionFetcher(StatsFetcher):
                                         latest_daily_data['volume'])
         }
         # 一年內法人
-        annual_dates = [data['date'].strftime("%Y-%m-%d") for data in daily_datas]
+        annual_dates = [
+            data['date'].strftime("%Y-%m-%d") for data in daily_datas
+        ]
         annual_closes = {
-            data['date'].strftime("%Y-%m-%d") : data['close']
+            data['date'].strftime("%Y-%m-%d"): data['close']
             for data in daily_datas
             if (data['date'].strftime("%Y-%m-%d") in annual_dates)
         }
         annual_volumes = {
-            data['date'].strftime("%Y-%m-%d") : data['volume']
+            data['date'].strftime("%Y-%m-%d"): data['volume']
             for data in daily_datas
             if (data['date'].strftime("%Y-%m-%d") in annual_dates)
         }
         annual_trading = {
-            data['date'].strftime("%Y-%m-%d") : data
+            data['date'].strftime("%Y-%m-%d"): data
             for data in institution_tradings
-        } 
+        }
 
         annual_trading = {
             date: {
-                
                 "close": annual_closes[date],
                 "volume": annual_volumes[date],
                 **annual_trading[date]
@@ -217,13 +218,18 @@ class InstitutionFetcher(StatsFetcher):
                 self.target_institution(latest_trading,
                                         latest_table['institutional_investor'],
                                         key, volume)
-
-            for trade_type in ['buy', 'sell']:
-                for unit in ['stock', 'percentage']:
-                    latest_table['institutional_investor'][trade_type][
-                        unit] = (latest_table['foreign'][trade_type][unit] +
-                                 latest_table['prop'][trade_type][unit] +
-                                 latest_table['mutual'][trade_type][unit])
+        # 計算合計
+        for unit in ['stock', 'percentage']:
+            # 買進總和
+            latest_table['institutional_investor']['buy'][unit] = (
+                latest_table['foreign']['buy'][unit] +
+                latest_table['prop']['buy'][unit] +
+                latest_table['mutual']['buy'][unit])
+            # 賣出總和
+            latest_table['institutional_investor']['sell'][unit] = (
+                latest_table['foreign']['sell'][unit] +
+                latest_table['prop']['sell'][unit] +
+                latest_table['mutual']['sell'][unit])
 
         frames = []
         for category, trades in latest_table.items():

neurostats_API/fetchers/profit_lose.py

@@ -21,12 +21,6 @@ class ProfitLoseFetcher(StatsFetcher):
     def prepare_query(self, target_season):
         pipeline = super().prepare_query()
 
-        target_query = {
-            "year": "$$target_season_data.year",
-            "season": "$$target_season_data.season",
-            "balance_sheet": "$$$$target_season_data.balance_sheet"
-        }
-
         pipeline.append({
             "$project": {
                 "_id": 0,
@@ -121,6 +115,9 @@ class ProfitLoseFetcher(StatsFetcher):
                     elif ('YoY' in item_name):
                         if (isinstance(item, (float, int))):
                             item = StatsProcessor.cal_percentage(item)
+                    elif ('每股盈餘' in index_name):
+                        if (isinstance(item, (float, int))):
+                            item = StatsProcessor.cal_non_percentage(item,  postfix="元")
                     else:
                         if (isinstance(item, (float, int))):
                             item = StatsProcessor.cal_non_percentage(item,  postfix="千元")
@@ -153,6 +150,9 @@ class ProfitLoseFetcher(StatsFetcher):
                         target_index=target_index)
                     break
                 except Exception as e:
-                    continue
+                    return_dict[name] = StatsProcessor.slice_multi_col_table(
+                        total_table=total_table,
+                        mode=setting['mode'],
+                        target_index=target_index)
 
         return return_dict

neurostats_API/fetchers/value_invest.py

@@ -79,6 +79,78 @@ class ValueFetcher(StatsFetcher):
         )
 
         return fetched_data
+    
+    def query_value_serie(self):
+        """
+        回傳指定公司的歷來評價
+        return : Dict[pd.DataFrame]
+        Dict中包含以下八個key, 每個key對應DataFrame
+            {
+                P_E,
+                P_FCF,
+                P_S,
+                P_B,
+                EV_OPI,
+                EV_EBIT,
+                EV_EBITDA,
+                EV_S
+            }
+        """
+
+        pipeline = [
+            {
+                "$match": {
+                    "ticker": self.ticker,
+                }
+            },
+            {
+                "$project": {
+                    "_id": 0,
+                    "ticker": 1,
+                    "company_name": 1,
+                    "daily_data": {
+                        "$map": {
+                            "input": "$daily_data",  # 正確地指定要處理的陣列
+                            "as": "daily",  # 每個元素的名稱
+                            "in": {
+                                "date": "$$daily.date",
+                                "P_E": "$$daily.P_E",
+                                "P_FCF": "$$daily.P_FCF",
+                                "P_B": "$$daily.P_B",
+                                "P_S": "$$daily.P_S",
+                                "EV_OPI": "$$daily.EV_OPI",
+                                "EV_EBIT": "$$daily.EV_EBIT",
+                                "EV_EBITDA": "$$daily.EV_EBITDA",
+                                "EV_S": "$$daily.EV_S"
+                            }
+                        }
+                    }
+                }
+            }
+        ]
+
+        fetched_data = self.collection.aggregate(pipeline).to_list()
+        fetched_data = fetched_data[0]
+
+        value_keys = ["P_E", "P_FCF", "P_B", "P_S", "EV_OPI", "EV_EBIT", "EV_EVITDA", "EV_S"]
+        return_dict = {
+            value_key: dict() for value_key in value_keys
+        }
+
+        for value_key in value_keys:
+            for data in fetched_data['daily_data']:
+                if (value_key not in data.keys()):
+                    continue
+                else:
+                    return_dict[value_key].update({
+                        data['date']: data[value_key] 
+                    })
+
+        return_dict = {
+            value_key: pd.DataFrame.from_dict(value_dict, orient = 'index', columns = [value_key])
+            for value_key, value_dict in return_dict.items()
+        }
+        return return_dict
 
 
 class ValueProcessor(StatsProcessor):

neurostats_API/tools/balance_sheet.yaml

@@ -21,6 +21,7 @@ current_debt:
   mode: value_and_percentage
   target_index: 
     - 流動負債合計
+    - 流動負債總額
 
 non_current_debt:
   mode: value_and_percentage

neurostats_API/tools/profit_lose.yaml

@@ -3,38 +3,45 @@ profit_lose:  # 總營收表
 
 grand_total_profit_lose:
   mode: grand_total_values
-
+  
 revenue:
   mode: growth
   target_index: 
     - 營業收入合計
+    - 收入合計
     - 利息收入
 
 grand_total_revenue:
   mode: grand_total_growth
   target_index: 
     - 營業收入合計
+    - 收入合計
     - 利息收入
 
 gross_profit:
   mode: growth
   target_index: 
     -  營業毛利（毛損）淨額
+    -  利息淨收益
 
 grand_total_gross_profit:
   mode: grand_total_growth
   target_index: 
     - 營業毛利（毛損）淨額
-
+    - 利息淨收益
+ 
 gross_profit_percentage:
   mode: percentage
   target_index: 
     - 營業毛利（毛損）淨額
+    - 利息淨收益
 
 grand_total_gross_profit_percentage:
   mode: grand_total_percentage
   target_index: 
     - 營業毛利（毛損）淨額
+    - 利息淨收益
+
 # 營利
 operating_income:
   mode: growth
@@ -55,46 +62,61 @@ grand_total_operating_income_percentage:
   mode: grand_total_percentage
   target_index: 
     - 營業利益（損失）
+
 # 稅前淨利
 net_income_before_tax:
   mode: growth
   target_index: 
     - 稅前淨利（淨損）
+    - 繼續營業單位稅前損益
+    - 繼續營業單位稅前淨利（淨損）
 
 grand_total_net_income_before_tax:
   mode: grand_total_growth
   target_index: 
     - 稅前淨利（淨損）
+    - 繼續營業單位稅前損益
+    - 繼續營業單位稅前淨利（淨損）
 
 net_income_before_tax_percentage:
   mode: percentage
   target_index: 
     - 稅前淨利（淨損）
+    - 繼續營業單位稅前損益
+    - 繼續營業單位稅前淨利（淨損）
 
 grand_total_net_income_before_tax_percentage:
   mode: grand_total_percentage
   target_index: 
     - 稅前淨利（淨損）
+    - 繼續營業單位稅前損益
+    - 繼續營業單位稅前淨利（淨損）
+
 # 本期淨利
 net_income:
   mode: growth
   target_index: 
     - 本期淨利（淨損）
+    - 本期稅後淨利（淨損）
 
 grand_total_net_income:
   mode: grand_total_growth
   target_index: 
     - 本期淨利（淨損）
+    - 本期稅後淨利（淨損）
 
 net_income_percentage:
   mode: percentage
   target_index: 
     - 本期淨利（淨損）
+    - 本期稅後淨利（淨損）
 
 grand_total_income_percentage:
   mode: grand_total_percentage
   target_index: 
     - 本期淨利（淨損）
+    - 本期稅後淨利（淨損）
+
 # EPS
 EPS:
   mode: value
@@ -118,4 +140,4 @@ grand_total_EPS_growth:
   mode: grand_total_growth
   target_index: 
     - 基本每股盈餘
-    - 基本每股盈餘合計
+    - 基本每股盈餘合計

neurostats_API/utils/data_process.py

@@ -97,20 +97,47 @@ class StatsProcessor:
         """
         對Multicolumn的dataframe切出目標的index
         """
-        times = total_table.columns.get_level_values(0).unique()
         try:
             target_metrics = target_metric_dict[mode]
         except KeyError as e:
             return f"mode Error: Get mode should be {list(target_metric_dict.keys())} but get {mode}"
 
+        times = total_table.columns.get_level_values(0).unique()
         desired_order = [(time, value_name) for time in times
                          for value_name in target_metrics]
 
         if (target_index):
             target_index = target_index.split()
-            sliced_table = total_table.loc[
-                target_index, pd.IndexSlice[:,
-                                            target_metrics]][desired_order].T
+            try:
+                sliced_table = total_table.loc[
+                    target_index,
+                    pd.IndexSlice[:, target_metrics]][desired_order].T
+
+            except Exception as e:  # 沒辦法完整取得表格
+                # 先設立空表格
+                empty_index = pd.Index(desired_order)
+                empty_columns = pd.Index(target_index)
+                sliced_table = pd.DataFrame(index=empty_index,
+                                            columns=empty_columns)
+
+                try:
+                    # 提取有效的部分資料
+                    partial_table = total_table.loc[
+                        total_table.index.intersection(target_index),
+                        pd.IndexSlice[:, target_metrics]
+                    ]
+
+                    # 遍歷 partial_table 的索引和值，手動填入 sliced_table
+                    for row_index in partial_table.index:
+                        for col_index in partial_table.columns:
+                            if col_index in desired_order and row_index in target_index:
+                                sliced_table.loc[col_index, row_index] = partial_table.loc[row_index, col_index]
+
+                    # 確保 `sliced_table` 的排序符合 `desired_order`
+                    sliced_table = sliced_table.reindex(index=desired_order, columns=target_index)
+                except Exception as sub_e:
+                    pass
+
             if (mode == 'value_and_percentage'):  # 因應balance_sheet 頁面的格式
                 return_table = sliced_table.T
                 return_table.columns = [
@@ -146,7 +173,7 @@ class StatsProcessor:
     @classmethod
     def cal_percentage(cls, value, postfix="%"):
         if (isinstance(value, (float, int))):
-            value = np.round(value * 100 , 2).item()
+            value = np.round(value * 100, 2).item()
             value = f"{value:.2f}{postfix}"
 
             return value
@@ -157,7 +184,7 @@ class StatsProcessor:
     @classmethod
     def cal_non_percentage(cls, value, to_str=False, postfix="元"):
         if (isinstance(value, (float, int))):
-            
+
             value = np.round(value, 2).item()
             if (postfix == "千元"):
                 value *= 1000
@@ -178,7 +205,7 @@ class StatsProcessor:
 
         else:
             return value
-    
+
     @classmethod
     def cal_round_int(cls, value):
         """

{neurostats_API-0.0.12.dist-info → neurostats_API-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 0.0.12
+Version: 0.0.14
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 - [使用方法](#使用方法)
     - [下載](#下載)
     - [價值投資](#得到最新一期的評價資料與歷年評價)
+        - [歷史評價](#得到指定公司的歷來評價)
     - [財務分析-重要指標](#財務分析-重要指標)
     - [月營收表](#回傳月營收表)
     - [損益表](#損益表)
@@ -82,7 +83,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.10
+0.0.14
 ```
 
 ### 得到最新一期的評價資料與歷年評價
@@ -127,6 +128,69 @@ fetcher.query_data()
 ```
 > 這裡有Nan是因為本益比與P/B等資料沒有爬到最新的時間
 
+### 得到指定公司的歷來評價
+``` Python
+from neurostats_API.utils import ValueFetcher, DBClient
+db_client = DBClient("<連接的DB位置>").get_client()
+ticker = "2330" # 換成tw50內任意ticker
+fetcher = ValueFetcher(ticker, db_client)
+
+fetcher.query_value_serie()
+```
+#### 回傳(2330為例)
+```Python
+{
+'EV_EBIT':               EV_EBIT
+        2014-01-02        NaN
+        2014-01-03        NaN
+        ...               ...
+        2024-12-12  15.021431
+        2024-12-13  15.088321
+,
+'EV_OPI':                EV_OPI
+        2014-01-03        NaN
+        ...               ...
+        2024-12-12  15.999880
+        2024-12-13  16.071128
+,
+'EV_S':                 EV_S
+        2014-01-02       NaN
+        2014-01-03       NaN
+        ...              ...
+        2024-12-12  6.945457
+        2024-12-13  6.976385
+,
+'P_B':              P_B
+        2014-01-02   NaN
+        2014-01-03   NaN
+        ...          ...
+        2024-12-12  6.79
+        2024-12-13  6.89
+,
+'P_E':               P_E
+        2014-01-02    NaN
+        2014-01-03    NaN
+        ...           ...
+        2024-12-12  26.13
+        2024-12-13  26.50
+,
+'P_FCF':                 P_FCF
+        2014-01-02        NaN
+        2014-01-03        NaN
+        ...               ...
+        2024-12-12  45.302108
+        2024-12-13  45.515797
+,
+'P_S':                  P_S
+        2014-01-02       NaN
+        2014-01-03       NaN
+        ...              ...
+        2024-12-12  6.556760
+        2024-12-13  6.587688
+}
+```
+
+
 ### 回傳月營收表
 ``` Python
 from neurostats_API.fetchers import MonthRevenueFetcher, DBClient
@@ -604,6 +668,19 @@ fetcher.query()
 請注意`range`, `last_range`, `52week_range`這三個項目型態為字串，其餘為float
 
 ## 版本紀錄
+## 0.0.14
+- 修改部分財報資料錯誤的乘以1000的問題
+
+- 新增例外處理: 若資料庫對於季資料一部分index缺失的情況下仍會盡可能去將資料蒐集並呈現
+
+### 0.0.13
+- value_fetcher 新增獲得一序列評價的功能
+
+### 0.0.12
+- 新增資券變化(margin trading)
+
+- 修改法人買賣(institution_trading)的query方式
+
 ### 0.0.11
 - 修復財務分析的千元計算問題
 

{neurostats_API-0.0.12.dist-info → neurostats_API-0.0.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-neurostats_API/__init__.py,sha256=9UMAkivMiZfppwpwVdBxJI652ZiB-ir2iX3yh0Gxu9M,20
+neurostats_API/__init__.py,sha256=zDrZHoj7CyPMzwVv9Yxva_-e95Gd1sRJSB99gLu9kXU,20
 neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
 neurostats_API/fetchers/__init__.py,sha256=ylYEySHQxcAhUUWEOCGZfmaAg7Mir5MfuEhOjk3POJg,406
@@ -6,23 +6,23 @@ neurostats_API/fetchers/balance_sheet.py,sha256=sQv4Gk5uoKURLEdh57YknOQWiyVwaXJ2
 neurostats_API/fetchers/base.py,sha256=NW2SFzrimyAIrdJx1LVmTazelyZOAtcj54kJKHc4Vaw,1662
 neurostats_API/fetchers/cash_flow.py,sha256=TY7VAWVXkj5-mzH5Iu0sIE-oV8MvGmmDy0URNotNV1E,7614
 neurostats_API/fetchers/finance_overview.py,sha256=PxUdWY0x030olYMLcCHDBn068JLmCE2RTOce1dxs5vM,27753
-neurostats_API/fetchers/institution.py,sha256=rEcs5-JKbWjg8lSjG1V3YdHJQuPSN1GntnxvedESCeo,10984
+neurostats_API/fetchers/institution.py,sha256=UrcBc6t7u7CnEwUsf6YmLbbJ8VncdWpq8bCz17q2dgs,11168
 neurostats_API/fetchers/margin_trading.py,sha256=lQImtNdvaBoSlKhJvQ3DkH3HjSSgKRJz4ZZpyR5-Z4I,10433
 neurostats_API/fetchers/month_revenue.py,sha256=nixX2llzjCFr2m2YVjxrSfkBusnZPrPb2dRDq1XLGhw,4251
-neurostats_API/fetchers/profit_lose.py,sha256=xlLNsGSy4Azf4HyZyYaX3dFad-ACO-vuQToBooZi1_w,5698
+neurostats_API/fetchers/profit_lose.py,sha256=EN9Y0iamcAaHMZdjHXO6b_2buLnORssf8ZS7A0hi74s,5896
 neurostats_API/fetchers/tech.py,sha256=wH1kkqiETQhF0HAhk-UIiucnZ3EiL85Q-yMWCcVOiFM,11395
-neurostats_API/fetchers/value_invest.py,sha256=O5IKC8Nl7p5-E-1zoyAyWtiDznaxNemeabanmaHDdJs,3327
-neurostats_API/tools/balance_sheet.yaml,sha256=yTxrWh7m4K3LnaNunETidfNzl6S4Bf58VIg9U38XShQ,648
+neurostats_API/fetchers/value_invest.py,sha256=_eQxuEnIYvksb06QHixGK29Gnwr_3xmI6Tu7dv4J__E,5769
+neurostats_API/tools/balance_sheet.yaml,sha256=6XygNG_Ybb1Xkk1e39LMLKr7ATvaCP3xxuwFbgNl6dA,673
 neurostats_API/tools/cash_flow_percentage.yaml,sha256=fk2Z4eb1JjGFvP134eJatHacB7BgTkBenhDJr83w8RE,1345
 neurostats_API/tools/finance_overview_dict.yaml,sha256=B9nV75StXkrF3yv2-eezzitlJ38eEK86RD_VY6588gQ,2884
-neurostats_API/tools/profit_lose.yaml,sha256=dcO-0J0BC4p06XBNuowu8ux0NTbyZiOkGfy6szHF6fw,2402
+neurostats_API/tools/profit_lose.yaml,sha256=iyp9asYJ04vAxk_HBUDse_IBy5oVvYHpwsyACg5YEeg,3029
 neurostats_API/tools/seasonal_data_field_dict.txt,sha256=X8yc_el6p8BH_3FikTqBVFGsvWdXT6MHXLfKfi44334,8491
 neurostats_API/utils/__init__.py,sha256=FTYKRFzW2XVXdnSHXnS3mQQaHlKF9xGqrMsgZZ2kroc,142
-neurostats_API/utils/data_process.py,sha256=2yrO0iP1LHhF0uhXZ442PHQBI-Zd2xIqNItkNf5hKIc,6339
+neurostats_API/utils/data_process.py,sha256=YKfk3fXkcmwFS_8YxOV2uRLnt9NX3cYPV_XxrCgk8Yo,7597
 neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
 neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
 neurostats_API/utils/fetcher.py,sha256=VbrUhjA-GG5AyjPX2SHtFIbZM4dm3jo0RgZzuCbb_Io,40927
-neurostats_API-0.0.12.dist-info/METADATA,sha256=-1MqxrAVp-6u25PFIMmrMv5ad6RrWwguHiONp0worpc,24008
-neurostats_API-0.0.12.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-0.0.12.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.12.dist-info/RECORD,,
+neurostats_API-0.0.14.dist-info/METADATA,sha256=MeV1goaFbTQI0ddvr-TvElrggROHEiAixNCqP_gyLkI,25935
+neurostats_API-0.0.14.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-0.0.14.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.14.dist-info/RECORD,,