neurostats-API 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

neurostats_API/__init__.py

@@ -1 +1 @@
-__version__='0.0.8'
+__version__='0.0.10'

neurostats_API/fetchers/balance_sheet.py

@@ -75,10 +75,16 @@ class BalanceSheetFetcher(StatsFetcher):
         return fetched_data[-1]
 
     def query_data(self):
-        today = StatsDateTime.get_today()
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            year = latest_time['seasonal_data']['latest_year']
+            season = latest_time['seasonal_data']['latest_season']
+        except Exception as e:
+            today = StatsDateTime.get_today()
+            year = today.year - 1 if (today.season == 1) else today.year
+            season = 4 if (today.season == 1) else today.season - 1
 
-        year = today.year - 1 if (today.season == 1) else today.year
-        season = 4 if (today.season == 1) else today.season - 2
         fetched_data = self.collect_data(year, season)
 
         return self.process_data(season, fetched_data)
@@ -126,10 +132,17 @@ class BalanceSheetFetcher(StatsFetcher):
         total_table.columns = pd.MultiIndex.from_tuples(total_table.columns)
 
         for name, setting in self.table_settings.items():
-            return_dict[name] = StatsProcessor.slice_multi_col_table(
-                total_table=total_table,
-                mode=setting['mode'],
-                target_index=setting['target_index']
-                if "target_index" in setting.keys() else None)
-
+            if ('target_index' in setting.keys()):
+                target_indexes = [target_index.strip() for target_index in setting['target_index']]
+            else:
+                target_indexes = [None]
+            for target_index in target_indexes:
+                try:
+                    return_dict[name] = StatsProcessor.slice_multi_col_table(
+                        total_table=total_table,
+                        mode=setting['mode'],
+                        target_index=target_index)
+                    break
+                except Exception as e:
+                    continue
         return return_dict

neurostats_API/fetchers/cash_flow.py

@@ -65,9 +65,14 @@ class CashFlowFetcher(StatsFetcher):
         return list(fetched_data)[0]
     
     def query_data(self):
-        today = StatsDateTime.get_today()
-
-        target_season = today.season - 1 if (today.season > 1) else 4
+        
+        try:
+            latest_time = StatsDateTime.get_latest_time(self.ticker, self.collection)['last_update_time']
+            target_season = latest_time['seasonal_data']['latest_season']
+        
+        except:
+            today = StatsDateTime.get_today()
+            target_season = today.season - 1 if (today.season > 1) else 4
 
         fetched_data = self.collect_data(target_season)
 

neurostats_API/fetchers/finance_overview.py

@@ -31,15 +31,19 @@ class FinanceOverviewFetcher(StatsFetcher):
 
         for key, target_sets in self.target_fields.items():
             try:
-                small_target = target_sets['field']
-                big_target = self.inverse_dict[
-                    small_target]  # balance_sheet/profit_lose/cash_flow
+                small_targets = target_sets['field']
+
                 value_index = target_sets['value']  # "金額" or "%"
 
-                target_query.update({
-                    f"{key}":
-                    f"$$target_season_data.{big_target}.{small_target}.{value_index}"
-                })
+                for small_target in small_targets:
+                    big_target = self.inverse_dict[
+                    small_target]  # balance_sheet/profit_lose/cash_flow
+                    if (small_target == "利息費用_bank"):
+                        small_target = small_target[:small_target.find("_bank")]
+                    target_query.update({
+                        f"{key}":
+                        f"$$target_season_data.{big_target}.{small_target}.{value_index}"
+                    })
             except Exception:
                 continue
 
@@ -83,16 +87,31 @@ class FinanceOverviewFetcher(StatsFetcher):
         return fetched_data[0]
 
     def query_data(self):
-        today = StatsDateTime.get_today()
 
-        year = today.year - 1 if (today.season == 1) else today.year
-        season = 4 if (today.season == 1) else today.season - 1
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            year = latest_time['seasonal_data']['latest_year']
+            season = latest_time['seasonal_data']['latest_season']
+        except Exception as e:
+            today = StatsDateTime.get_today()
+            year = today.year - 1 if (today.season == 1) else today.year
+            season = 4 if (today.season == 1) else today.season - 1
+
         fetched_data = self.collect_data(year, season)
         finance_dict = fetched_data['seasonal_data'][0]
         FinanceOverviewProcessor.process_rate(finance_dict)
         FinanceOverviewProcessor.process_all(finance_dict)
+        self.fill_nan_index(finance_dict)
+        FinanceOverviewProcessor.process_thousand_dollar(finance_dict)
         fetched_data['seasonal_data'] = finance_dict
+
         return fetched_data
+    
+    def fill_nan_index(self, finance_dict):
+        for key in self.target_fields.keys():
+            if (key not in finance_dict.keys()):
+                finance_dict[key] = None
 
 
 class FinanceOverviewProcessor(StatsProcessor):
@@ -109,6 +128,34 @@ class FinanceOverviewProcessor(StatsProcessor):
             else:
                 finance_dict[key] = StatsProcessor.cal_non_percentage(
                     finance_dict[key])
+    
+    
+    @classmethod
+    def process_thousand_dollar(cls, finance_dict):
+        process_index = [
+            "revenue",
+            "gross_profit",
+            "operating_income",
+            "net_income",
+            "operating_cash_flow",
+            "invest_cash_flow",
+            "financing_cash_flow",
+            "fcf",
+
+            'current_assets',
+            'current_liabilities',
+            'non_current_assets',
+            'non_current_liabilities',
+            'total_assets',
+            "total_liabilities",
+            "equity"
+        ]
+        
+        for index in process_index:
+            try:
+                finance_dict[index] = StatsProcessor.cal_non_percentage(finance_dict[index], postfix="千元")
+            except Exception as e:
+                finance_dict[index] = None
 
     @classmethod
     def process_all(cls, finance_dict):
@@ -128,12 +175,16 @@ class FinanceOverviewProcessor(StatsProcessor):
             cls.cal_quick_ratio, cls.cal_debt_to_equity_ratio,
             cls.cal_net_debt_to_equity_ratio, cls.cal_interest_coverage_ratio,
             cls.cal_debt_to_operating_cash_flow,
-            cls.cal_debt_to_free_cash_flow, cls.cal_cash_flow_ratio
+            cls.cal_debt_to_free_cash_flow, cls.cal_cash_flow_ratio,
+
+            # process to 千元
+            cls.process_thousand_dollar
         ]
 
         for method in methods:
             method(finance_dict)
 
+
     @classmethod
     def cal_EBIT(cls, finance_dict):
         """
@@ -142,7 +193,8 @@ class FinanceOverviewProcessor(StatsProcessor):
         """
         try:
             EBIT = (finance_dict['revenue'] - finance_dict['operating_cost'] -
-                    finance_dict['operating_expenses'] - finance_dict['tax_fee'])
+                    finance_dict['operating_expenses'] -
+                    finance_dict['tax_fee'])
             finance_dict['EBIT'] = StatsProcessor.cal_non_percentage(EBIT)
         except (KeyError, ZeroDivisionError, TypeError) as e:
             finance_dict['EBIT'] = None
@@ -216,7 +268,14 @@ class FinanceOverviewProcessor(StatsProcessor):
         計算每股毛利
         = （當期營業毛利）÷（當期在外流通股數）
         """
-
+        if ('gross_profit' not in finance_dict.keys()):
+            try:
+                finance_dict['gross_profit'] = (
+                    finance_dict['revenue'] - 
+                    finance_dict['operating_cost']
+                )
+            except:
+                finance_dict['gross_profit'] = None
         try:
             gross_per_share = (finance_dict['gross_profit'] /
                                finance_dict['share_outstanding'])
@@ -259,7 +318,7 @@ class FinanceOverviewProcessor(StatsProcessor):
                     operating_cash_flow_per_share)
         except (KeyError, ZeroDivisionError, TypeError) as e:
             finance_dict['operating_cash_flow_per_share'] = None
-            print(f'operating_cash_flow_per_share because of {str(e)}')
+            # print(f'operating_cash_flow_per_share because of {str(e)}')
 
     @classmethod
     def fcf_per_share(cls, finance_dict):
@@ -284,12 +343,15 @@ class FinanceOverviewProcessor(StatsProcessor):
         計算資產報酬率(ROA)
         ROA = [ 本期淨利 + 利息費用 × (1-有效稅率) ] ÷（資產總額）
         """
-        roa = (
-            finance_dict['net_income'] + finance_dict['interest'] +
-            (1 * 0.1)  # 有效稅率需要改，這裡先設0.1
-        ) / finance_dict['inventories']
+        try:
+            roa = (
+                finance_dict['net_income'] + finance_dict['interest'] +
+                (1 * 0.1)  # 有效稅率需要改，這裡先設0.1
+            ) / finance_dict['inventories']
 
-        finance_dict["roa"] = StatsProcessor.cal_percentage(roa)
+            finance_dict["roa"] = StatsProcessor.cal_percentage(roa)
+        except Exception as e:
+            finance_dict["roa"] = None
 
     @classmethod
     def cal_roe(cls, finance_dict):
@@ -297,8 +359,11 @@ class FinanceOverviewProcessor(StatsProcessor):
         計算股東權益報酬率(ROE)
         ROE = (本期淨利) ÷（權益總額）
         """
-        roe = (finance_dict['net_income'] / finance_dict['equity'])
-        finance_dict['roe'] = StatsProcessor.cal_percentage(roe)
+        try:
+            roe = (finance_dict['net_income'] / finance_dict['equity'])
+            finance_dict['roe'] = StatsProcessor.cal_percentage(roe)
+        except Exception as e:
+            finance_dict['roe'] = None
 
     @classmethod
     def cal_gross_over_asset(cls, finance_dict):
@@ -307,7 +372,7 @@ class FinanceOverviewProcessor(StatsProcessor):
         """
         try:
             gross_over_asset = (finance_dict['gross_profit'] /
-                                finance_dict['total_asset'])
+                                finance_dict['total_assets'])
             finance_dict['gross_over_asset'] = StatsProcessor.cal_percentage(
                 gross_over_asset)
         except (KeyError, ZeroDivisionError, TypeError) as e:
@@ -323,7 +388,7 @@ class FinanceOverviewProcessor(StatsProcessor):
         try:
             roce = ((finance_dict['net_income_before_tax'] +
                      finance_dict['interest']) /
-                    (finance_dict['total_asset'] -
+                    (finance_dict['total_assets'] -
                      finance_dict['current_liabilities']))
             finance_dict['roce'] = StatsProcessor.cal_percentage(roce)
 
@@ -343,7 +408,7 @@ class FinanceOverviewProcessor(StatsProcessor):
             finance_dict[
                 'gross_profit_margin'] = StatsProcessor.cal_percentage(
                     gross_profit_margin)
-        except:
+        except Exception as e:
             finance_dict['gross_profit_margin'] = None
             print(f"gross_profit_margin failed because of {str(e)}")
 
@@ -401,7 +466,7 @@ class FinanceOverviewProcessor(StatsProcessor):
                    (finance_dict['account_pay'] / finance_dict['revenue']))
             finance_dict['dso'] = StatsProcessor.cal_non_percentage(
                 dso, to_str=True, postfix="日")
-        except:
+        except Exception as e:
             finance_dict['dso'] = None
             print(f"Error calculating 應收帳款收現天數 because of {str(e)}")
 
@@ -411,11 +476,15 @@ class FinanceOverviewProcessor(StatsProcessor):
         計算應收帳款佔營收比率
         = 應收帳款平均餘額 ÷ 營業收入
         """
-        account_receive_over_revenue = (finance_dict['account_receive'] /
-                                        finance_dict['revenue'])
-        finance_dict[
-            "account_receive_over_revenue"] = StatsProcessor.cal_percentage(
-                account_receive_over_revenue)
+        try:
+            account_receive_over_revenue = (finance_dict['account_receive'] /
+                                            finance_dict['revenue'])
+            finance_dict[
+                "account_receive_over_revenue"] = StatsProcessor.cal_percentage(
+                    account_receive_over_revenue)
+        except Exception as e:
+            finance_dict[
+                "account_receive_over_revenue"] = None
 
     @classmethod
     def cal_dpo(cls, finance_dict):
@@ -505,10 +574,13 @@ class FinanceOverviewProcessor(StatsProcessor):
         計算資產周轉率
         營業收入 ÷ 資產總額
         """
-        asset_turnover = (finance_dict["revenue"] /
-                          finance_dict["inventories"])
-        finance_dict["asset_turnover"] = StatsProcessor.cal_percentage(
-            asset_turnover)
+        try:
+            asset_turnover = (finance_dict["revenue"] /
+                            finance_dict["inventories"])
+            finance_dict["asset_turnover"] = StatsProcessor.cal_percentage(
+                asset_turnover)
+        except Exception as e:
+            finance_dict["asset_turnover"] = None
 
     @classmethod
     def cal_application_turnover(cls, finance_dict):
@@ -520,11 +592,12 @@ class FinanceOverviewProcessor(StatsProcessor):
             applcation_turnover = (finance_dict['revenue'] /
                                    finance_dict["application"])
             finance_dict[
-                'applcation_turnover'] = StatsProcessor.cal_percentage(
+                'application_turnover'] = StatsProcessor.cal_percentage(
                     applcation_turnover)
 
-        except (KeyError, ZeroDivisionError, TypeError) as e:
+        except Exception as e:
             finance_dict['application_turnover'] = None
+        
 
     @classmethod
     def cal_current_ratio(cls, finance_dict):

neurostats_API/fetchers/institution.py

@@ -0,0 +1,114 @@
+from .base import StatsFetcher
+from datetime import datetime, timedelta
+import json
+import numpy as np
+import pandas as pd
+from ..utils import StatsDateTime, StatsProcessor
+import importlib.resources as pkg_resources
+import yaml
+
+
+class InstitutionFetcher(StatsFetcher):
+    """
+    iFa -> 交易資訊 -> 法人買賣
+
+    包括: 
+    1. 當日交易
+    2. 一年內交易
+    """
+
+    def __init__(self, ticker, db_client):
+        raise(NotImplementedError("InstitutionFetcher : Not done yet"))
+        super().__init__(ticker, db_client)
+
+    def prepare_query(self, start_date, end_date):
+        pipeline = super().prepare_query()
+
+        target_query = {
+            "date": date,
+            "institution_trading": "$$target_season_data.institution_trading"
+        }
+
+
+        pipeline.append({
+            "$project": {
+                "_id": 0,
+                "ticker": 1,
+                "company_name": 1,
+                "profit_loses": {
+                    "$map": {
+                        "input": {
+                            "$filter": {
+                                "input": "$daily_data",
+                                "as": "daily",
+                                "cond": {
+                                        "$and": [
+                                        {"$gte": ["$$daily.date", start_date]},
+                                        {"$lte": ["$$daily.date", end_date]}
+                                    ]
+                                }
+                            }
+                        },
+                        "as": "target_daily_data",
+                        "in": "$$target_daily_data"
+                    }
+                }
+            }
+        })
+
+        return pipeline
+
+    def collect_data(self, date):
+        pipeline = self.prepare_query(date)
+
+        fetched_data = self.collection.aggregate(pipeline).to_list()
+
+        return fetch_data[-1]
+    
+    def query_data(self):
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            latest_date = latest_time['daily_data']['institution_trading']['last_update']
+            date = latest_date.replace(hour=0, minute=0, second=0, microsecond=0) 
+        except Exception as e:
+            print(f"No updated time for institution_trading in {self.ticker}, use current time instead")
+            date = datetime.now(self.timezone)
+            date = date.replace(hour=0, minute=0, second=0, microsecond=0) 
+
+            if (date.hour < 17):  # 拿不到今天的資料
+                date = date - timedelta(days=1)
+        
+        start_date = start_date - timedelta(days=365)
+
+        daily_data = self.collect_data(date)
+
+        daily_data = sorted(daily_data['daily_data'], key = lambda x : x['date'], reverse = True)
+
+        self.process_data(self.ticker, daily_data)
+    
+    def process_data(self, daily_data):
+        table_dict = dict()
+
+        latest_data = daily_data[0] 
+        yesterday_data = daily_data[1]
+
+        # 交易價格與昨天交易
+        table_dict = {
+            "open": latest_data['open'],
+            'close': latest_data['close'],
+            'range': f"{latest_data['high']}-{latest_data['low']}",
+            'volumn': latest_data['volumn'] / 1000
+
+        }
+
+        # 今日法人買賣
+
+        # 一年內法人
+
+
+
+
+
+
+        

neurostats_API/fetchers/month_revenue.py

@@ -46,9 +46,15 @@ class MonthRevenueFetcher(StatsFetcher):
         return fetched_data[-1]
 
     def query_data(self):
-        today = StatsDateTime.get_today()
-        target_month = today.month
-        target_year = today.year
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            target_year = latest_time['monthly_data']['latest_year']
+            target_month = latest_time['monthly_data']['latest_month']
+        except Exception as e:
+            today = StatsDateTime.get_today()
+            target_month = today.month
+            target_year = today.year
 
         # Query data
         fetched_data = self.collect_data(target_year, target_month)

neurostats_API/fetchers/profit_lose.py

@@ -75,10 +75,15 @@ class ProfitLoseFetcher(StatsFetcher):
         return list(fetched_data)[-1]
 
     def query_data(self):
-        today = StatsDateTime.get_today()
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            target_season = latest_time['seasonal_data']['latest_season']
+        except Exception as e:
+            today = StatsDateTime.get_today()
 
-        target_season = today.season
-        target_season = target_season - 1 if target_season > 1 else 4
+            target_season = today.season
+            target_season = target_season - 1 if target_season > 1 else 4
 
         fetched_data = self.collect_data(target_season)
 
@@ -132,10 +137,19 @@ class ProfitLoseFetcher(StatsFetcher):
         total_table = total_table.replace("N/A", None)
 
         for name, setting in self.table_settings.items():
-            return_dict[name] = StatsProcessor.slice_multi_col_table(
-                total_table=total_table,
-                mode=setting['mode'],
-                target_index=setting['target_index']
-                if "target_index" in setting.keys() else None)
+            if ('target_index' in setting.keys()):
+                target_indexes = [target.strip() for target in setting['target_index']]
+            else:
+                target_indexes = [None]
+            
+            for target_index in target_indexes:
+                try:
+                    return_dict[name] = StatsProcessor.slice_multi_col_table(
+                        total_table=total_table,
+                        mode=setting['mode'],
+                        target_index=target_index)
+                    break
+                except Exception as e:
+                    continue
 
         return return_dict

neurostats_API/fetchers/value_invest.py

@@ -54,11 +54,20 @@ class ValueFetcher(StatsFetcher):
         return pipeline
 
     def query_data(self):
-        today = StatsDateTime.get_today()
-
-        this_year = today.year - 1911
-        start_date = (today.date - timedelta(days=31))
-        end_date = today.date
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            target_year = latest_time['daily_data']['last_update'].year
+            start_date = latest_time['daily_data']['last_update'] - timedelta(days=31)
+            end_date = latest_time['daily_data']['last_update']
+
+        except Exception as e:
+            today = StatsDateTime.get_today()
+            target_year = today.year
+            start_date = (today.date - timedelta(days=31))
+            end_date = today.date
+
+        this_year = target_year - 1911
 
         fetched_data = self.collect_data(start_date, end_date)
 

neurostats_API/tools/balance_sheet.yaml

@@ -3,24 +3,32 @@ balance_sheet:
 
 total_asset:
   mode: value_and_percentage
-  target_index: 資產總額 負債總額 權益總額
-
+  target_index: 
+    - 資產總額 負債總額 權益總額
+    - 資產總計 負債總計 權益總計
+ 
 current_asset:
   mode: value_and_percentage
-  target_index: 流動資產合計
+  target_index: 
+    - 流動資產合計
 
 non_current_asset:
   mode: value_and_percentage
-  target_index: 非流動資產合計
+  target_index: 
+    - 非流動資產合計
 
 current_debt:
   mode: value_and_percentage
-  target_index: 流動負債合計
+  target_index: 
+    - 流動負債合計
 
 non_current_debt:
   mode: value_and_percentage
-  target_index: 非流動負債合計
+  target_index: 
+    - 非流動負債合計
 
 equity:
   mode: value_and_percentage
-  target_index: 權益總額
+  target_index: 
+    - 權益總額
+    - 權益總計

neurostats_API/tools/finance_overview_dict.yaml

@@ -1,89 +1,111 @@
 # 財務概況
 revenue:
-  field: 營業收入合計
+  field: 
+    - 營業收入合計
   value: value
 
 gross_profit:
-  field: 營業毛利（毛損）淨額
+  field: 
+    - 營業毛利（毛損）淨額
   value: value
 
 operating_income:
-  field: 營業利益（損失）
+  field: 
+    - 營業利益（損失）
   value: value
 
 net_income:
-  field: 本期淨利（淨損）
+  field: 
+    - 本期淨利（淨損）
   value: value
 
 tax_fee:
-  field: 所得稅費用（利益）合計
+  field: 
+    - 所得稅費用（利益）合計
   value: value
 
 # TODO: 以下所爬到的資料都是累計的，Ifa有額外計算當季的變化量
 operating_cash_flow:
-  field: 營業活動之淨現金流入（流出）
+  field: 
+    - 營業活動之淨現金流入（流出）
   value: single_season_value
 
 invest_cash_flow:
-  field: 投資活動之淨現金流入（流出）
+  field: 
+    - 投資活動之淨現金流入（流出）
   value: single_season_value
 
 financing_cash_flow:
-  field: 籌資活動之淨現金流入（流出）
+  field: 
+    - 籌資活動之淨現金流入（流出）
   value: single_season_value
 # ^^^ 以上皆需要額外在DataBase處理
 
 # 每股財務狀況
 capital:
-  field: 普通股股本
+  field: 
+    - 普通股股本
   value: value
+
 eps:
-  field: 基本每股盈餘
+  field: 
+    - 基本每股盈餘
   value: value
 
 # 獲利能力
-total_asset:
-  field: 資產總額
+total_assets:
+  field: 
+    - 資產總額
   value: value
 
 equity:
-  field: 權益總額
+  field: 
+    - 權益總額
   value: value
 
 net_income_before_tax:
-  field: 稅前淨利（淨損）
+  field: 
+    - 稅前淨利（淨損）
   value: value
 
 interest:
-  field: 利息收入
+  field: 
+    - 利息收入
   value: value
 
 operating_expenses:
-  field: 營業費用合計
+  field: 
+    - 營業費用合計
   value: value
 
 net_income_rate:
-  field: 本期淨利（淨損）
+  field: 
+    - 本期淨利（淨損）
   value: percentage
 # 成長動能
 revenue_YoY:
-  field: 營業收入合計
+  field: 
+    - 營業收入合計
   value: YoY_1
 
 gross_prof_YoY:
-  field: 營業毛利（毛損）淨額
+  field: 
+    - 營業毛利（毛損）淨額
   value: YoY_1
 
 operating_income_YoY:
-  field: 營業利益（損失）
+  field: 
+    - 營業利益（損失）
   value: YoY_1
 
 net_income_YoY:
-  field: 本期淨利（淨損）
+  field: 
+    - 本期淨利（淨損）
   value: YoY_1
 
 operating_cash_flow_YoY:
-  field: 營業活動之淨現金流入（流出）
+  field: 
+    - 營業活動之淨現金流入（流出）
   value: single_season_YoY
 
 # operating_cash_flow_per_share_YoY:
@@ -91,53 +113,73 @@ operating_cash_flow_YoY:
 #   value: YoY_1
 # 營運指標
 account_receive:
-  field: 應收帳款淨額
+  field: 
+    - 應收帳款淨額
   value: value
 
 account_pay:
-  field: 應付帳款
+  field: 
+    - 應付帳款
   value: value
 
 inventories:
-  field: 存貨
+  field: 
+    - 存貨
   value: value
 
 operating_cost:
-  field: 營業成本合計
+  field: 
+    - 營業成本合計
   value: value
 
 application:
-  field: 不動產、廠房及設備
+  field: 
+    - 不動產、廠房及設備
   value: value
 
 # 財務韌性
 current_assets:
-  field: 流動資產合計
+  field: 
+    - 流動資產合計
   value: value
 
 current_liabilities:
-  field: 流動負債合計
+  field: 
+    - 流動負債合計
   value: value
 
 total_liabilities:
-  field: 負債總額
+  field: 
+    - 負債總額
   value: value
 
 short_term_liabilities:
-  field: 短期借款
+  field: 
+    - 短期借款
   value: value
 
 long_term_liabilities:
-  field: 長期借款
+  field: 
+    - 長期借款
   value: value
 # 
 cash_and_cash_equivalents:
-  field: 現金及約當現金
+  field: 
+    - 現金及約當現金
   value: value
 
 interest_expense: 
-  field: 利息費用
+  field: 
+    - 利息費用
   value: value
 
+non_current_assets:
+  field: 
+    - 非流動資產合計
+  value: value
 
+non_current_liabilities:
+  field: 
+    - 非流動負債合計
+  value: value
 

neurostats_API/tools/profit_lose.yaml

@@ -6,88 +6,116 @@ grand_total_profit_lose:
 
 revenue:
   mode: growth
-  target_index: 營業收入合計
+  target_index: 
+    - 營業收入合計
+    - 利息收入
 
 grand_total_revenue:
   mode: grand_total_growth
-  target_index: 營業收入合計 
+  target_index: 
+    - 營業收入合計
+    - 利息收入
 
 gross_profit:
   mode: growth
-  target_index: 營業毛利（毛損）淨額
+  target_index: 
+    -  營業毛利（毛損）淨額
 
 grand_total_gross_profit:
   mode: grand_total_growth
-  target_index: 營業毛利（毛損）淨額
+  target_index: 
+    - 營業毛利（毛損）淨額
 
 gross_profit_percentage:
   mode: percentage
-  target_index: 營業毛利（毛損）淨額
+  target_index: 
+    - 營業毛利（毛損）淨額
 
 grand_total_gross_profit_percentage:
   mode: grand_total_percentage
-  target_index: 營業毛利（毛損）淨額
+  target_index: 
+    - 營業毛利（毛損）淨額
 # 營利
 operating_income:
   mode: growth
-  target_index: 營業利益（損失）
+  target_index: 
+    - 營業利益（損失）
 
 grand_total_operating_income:
   mode: grand_total_growth
-  target_index: 營業利益（損失）
+  target_index: 
+    - 營業利益（損失）
 
 operating_income_percentage:
   mode: percentage
-  target_index: 營業利益（損失）
+  target_index: 
+    - 營業利益（損失）
 
 grand_total_operating_income_percentage:
   mode: grand_total_percentage
-  target_index: 營業利益（損失）
+  target_index: 
+    - 營業利益（損失）
 # 稅前淨利
 net_income_before_tax:
   mode: growth
-  target_index: 稅前淨利（淨損）
+  target_index: 
+    - 稅前淨利（淨損）
 
 grand_total_net_income_before_tax:
   mode: grand_total_growth
-  target_index: 稅前淨利（淨損）
+  target_index: 
+    - 稅前淨利（淨損）
 
 net_income_before_tax_percentage:
   mode: percentage
-  target_index: 稅前淨利（淨損）
+  target_index: 
+    - 稅前淨利（淨損）
 
 grand_total_net_income_before_tax_percentage:
   mode: grand_total_percentage
-  target_index: 稅前淨利（淨損）
+  target_index: 
+    - 稅前淨利（淨損）
 # 本期淨利
 net_income:
   mode: growth
-  target_index: 本期淨利（淨損）
+  target_index: 
+    - 本期淨利（淨損）
 
 grand_total_net_income:
   mode: grand_total_growth
-  target_index: 本期淨利（淨損）
+  target_index: 
+    - 本期淨利（淨損）
 
 net_income_percentage:
   mode: percentage
-  target_index: 本期淨利（淨損）
+  target_index: 
+    - 本期淨利（淨損）
 
 grand_total_income_percentage:
   mode: grand_total_percentage
-  target_index: 本期淨利（淨損）
+  target_index: 
+    - 本期淨利（淨損）
 # EPS
 EPS:
   mode: value
-  target_index: 稀釋每股盈餘
+  target_index: 
+    - 基本每股盈餘
+    - 基本每股盈餘合計
 
 EPS_growth:
   mode: growth
-  target_index: 稀釋每股盈餘
+  target_index: 
+    - 基本每股盈餘
+    - 基本每股盈餘合計
 
 grand_total_EPS:
   mode: grand_total
-  target_index: 稀釋每股盈餘
+  target_index: 
+    - 基本每股盈餘
+    - 基本每股盈餘合計
 
 grand_total_EPS_growth:
   mode: grand_total_growth
-  target_index: 稀釋每股盈餘
+  target_index: 
+    - 基本每股盈餘
+    - 基本每股盈餘合計

neurostats_API/tools/seasonal_data_field_dict.txt

@@ -22,11 +22,14 @@
   "其他非流動資產": "balance_sheet",
   "非流動資產合計": "balance_sheet",
   "資產總額": "balance_sheet",
+  "資產總計": "balance_sheet",
   "短期借款": "balance_sheet",
   "長期借款": "balance_sheet",
   "透過損益按公允價值衡量之金融負債－流動": "balance_sheet",
   "應付票據": "balance_sheet",
   "應付帳款": "balance_sheet",
+  "應收款項－淨額": "balance_sheet",
+  "應付款項": "balance_sheet",
   "應付帳款－關係人": "balance_sheet",
   "其他應付款": "balance_sheet",
   "其他應付款項－關係人": "balance_sheet",
@@ -38,6 +41,7 @@
   "其他非流動負債": "balance_sheet",
   "非流動負債合計": "balance_sheet",
   "負債總額": "balance_sheet",
+  "負債總計": "balance_sheet",
   "普通股股本": "balance_sheet",
   "股本合計": "balance_sheet",
   "資本公積－發行溢價": "balance_sheet",
@@ -52,10 +56,12 @@
   "歸屬於母公司業主之權益合計": "balance_sheet",
   "非控制權益": "balance_sheet",
   "權益總額": "balance_sheet",
+  "權益總計": "balance_sheet",
   "負債及權益總計": "balance_sheet",
   "待註銷股本股數（單位：股）": "balance_sheet",
   "預收股款（權益項下）之約當發行股數（單位：股）": "balance_sheet",
   "母公司暨子公司所持有之母公司庫藏股股數（單位：股）": "balance_sheet",
+  "應收款項－淨額": "balance_sheet",
   "繼續營業單位稅前淨利（淨損）": "cash_flow",
   "停業單位稅前淨利（淨損）": "cash_flow",
   "本期稅前淨利（淨損）": "cash_flow",
@@ -135,6 +141,7 @@
   "管理費用": "profit_lose",
   "研究發展費用": "profit_lose",
   "營業費用合計": "profit_lose",
+  "營業費用": "profit_lose",
   "營業利益（損失）": "profit_lose",
   "其他收入": "profit_lose",
   "其他利益及損失淨額": "profit_lose",
@@ -142,6 +149,7 @@
   "營業外收入及支出合計": "profit_lose",
   "稅前淨利（淨損）": "profit_lose",
   "所得稅費用（利益）合計": "profit_lose",
+  "所得稅費用（利益）": "profit_lose",
   "繼續營業單位本期淨利（淨損）": "profit_lose",
   "本期淨利（淨損）": "profit_lose",
   "確定福利計畫之再衡量數": "profit_lose",
@@ -155,5 +163,12 @@
   "母公司業主（綜合損益）": "profit_lose",
   "非控制權益（綜合損益）": "profit_lose",
   "基本每股盈餘": "profit_lose",
-  "稀釋每股盈餘": "profit_lose"
+  "稀釋每股盈餘": "profit_lose",
+  "淨收益": "profit_lose",
+  "利息收入": "profit_lose",
+  "利息費用_bank": "profit_lose",
+  "利息淨收益": "profit_lose",
+  "繼續營業單位稅前損益": "profit_lose",
+  "本期稅後淨利（淨損）": "profit_lose",
+  "減：利息費用": "profit_lose"
 }

neurostats_API/utils/data_process.py

@@ -152,10 +152,21 @@ 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
+                value = int(value)
+
+                postfix = "元"
+
             if (to_str):
-                value = f"{value:.2f}{postfix}"
-                return value
+                if (isinstance(value, float)):
+                    value = f"{value:.2f}{postfix}"
+                    return value
+                elif (isinstance(value, int)):
+                    value = f"{value}{postfix}"
+                    return value
 
             else:
                 return value

neurostats_API/utils/datetime.py

@@ -19,3 +19,11 @@ class StatsDateTime():
 
         return StatsDateTime(today, this_year, this_month, this_day,
                              this_season)
+
+    @classmethod
+    def get_latest_time(cls, ticker, collection):
+        return collection.find_one(
+            { "ticker" : ticker }, 
+            { "_id": 0, "last_update_time": 1 }
+        )
+

{neurostats_API-0.0.8.dist-info → neurostats_API-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats-API
-Version: 0.0.8
+Version: 0.0.10
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -19,6 +19,8 @@ Description-Content-Type: text/markdown
     - [損益表](#損益表)
     - [資產負債表](#資產負債表)
     - [現金流量表](#現金流量表)
+    - [版本紀錄](#版本紀錄)
+
 
 ## 檔案架構
 
@@ -78,7 +80,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.8
+0.0.10
 ```
 
 ### 得到最新一期的評價資料與歷年評價
@@ -434,6 +436,11 @@ stats_fetcher.query()
 > 大部分資料缺失是因為尚未計算，僅先填上已經有的資料
 
 
-## TODO
-- 將utils/fetcher.py中的功能切分到fetchers資料夾中
+## 版本紀錄
+### 0.0.10
+- 更新指標的資料型態: 單位為千元乘以1000之後回傳整數
+
+- 處理銀行公司在finanace_overview會報錯誤的問題(未完全解決，因銀行公司財報有許多名稱不同，目前都會顯示為None)
 
+### 0.0.9
+- 更新指標的資料型態: 單位為日, %, 倍轉為字串

neurostats_API-0.0.10.dist-info/RECORD

@@ -0,0 +1,27 @@
+neurostats_API/__init__.py,sha256=WzeHQJ3r8kPKWXSBuphad80I6bJ-GJORgQF6wSrYmhI,20
+neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
+neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
+neurostats_API/fetchers/__init__.py,sha256=U_OMG-mLpsVKYnCBrW2OjFuCzvPeVQ__7A676vGzztY,313
+neurostats_API/fetchers/balance_sheet.py,sha256=3FzVuDPm88tgljvu5gIxVXcZYQWebMrGnM5_ch9Vdgw,5549
+neurostats_API/fetchers/base.py,sha256=NW2SFzrimyAIrdJx1LVmTazelyZOAtcj54kJKHc4Vaw,1662
+neurostats_API/fetchers/cash_flow.py,sha256=4G4SIUoBSwT-BePmz-SprQ0IJRL2QNWqWdQtlgaRKd4,7371
+neurostats_API/fetchers/finance_overview.py,sha256=hmMurCSCEjYBQ6gRmVgoX6T57g8MjsdWec6LdVztVoE,27813
+neurostats_API/fetchers/institution.py,sha256=EYxPebJrcCMm7fW2nBlu4bVsksMMxgcQh16jJ1NxP6I,3384
+neurostats_API/fetchers/month_revenue.py,sha256=QmhMAO8jbkjg2R1LR0TAPE3bmDnyuLNjnD24ZsFkTBU,3501
+neurostats_API/fetchers/profit_lose.py,sha256=nc9YVi5kv3_loF8m82h3Fxpms7573_rPP9OM36bCK3A,5455
+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/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/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=mDznLqAAZ7gFX3LlJkJvtrMPt38Lh5-NONqgnqT5tSY,5990
+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.10.dist-info/METADATA,sha256=2zDomUXohUsLpnl4MeD6anZimrhnWvd8n0Rv8d4qkUk,18529
+neurostats_API-0.0.10.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+neurostats_API-0.0.10.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.10.dist-info/RECORD,,

neurostats_API-0.0.8.dist-info/RECORD

@@ -1,26 +0,0 @@
-neurostats_API/__init__.py,sha256=9_jSwg7P5SlFv0Ci2ZSYBcAbygp9XV2C8sryRO8tvko,19
-neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
-neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
-neurostats_API/fetchers/__init__.py,sha256=U_OMG-mLpsVKYnCBrW2OjFuCzvPeVQ__7A676vGzztY,313
-neurostats_API/fetchers/balance_sheet.py,sha256=kOpk_83qeNgfhjF44UEmma8k6V6qTsIaFYiEcSVV20A,4910
-neurostats_API/fetchers/base.py,sha256=NW2SFzrimyAIrdJx1LVmTazelyZOAtcj54kJKHc4Vaw,1662
-neurostats_API/fetchers/cash_flow.py,sha256=5xN5YPGb7i4slDYe_KI2ucL4kh733iC5LLOEmm4J8mM,7137
-neurostats_API/fetchers/finance_overview.py,sha256=-cUb4wWr02xKhNCAXLuduhpvXsO0b14hJLqJqhagooY,25307
-neurostats_API/fetchers/month_revenue.py,sha256=RNA7ROl2vm8Xbib3k50p_1shsHDVSKIbHkyNiRa8yMw,3182
-neurostats_API/fetchers/profit_lose.py,sha256=aCvcTbe1FjR3oi8QIDZg0c6G7-r0B-cCdfj6Rtlw0Jw,4870
-neurostats_API/fetchers/tech.py,sha256=wH1kkqiETQhF0HAhk-UIiucnZ3EiL85Q-yMWCcVOiFM,11395
-neurostats_API/fetchers/value_invest.py,sha256=tg8yELbVnTFTEclrwgXnCRW377KkcoLiP-Gk2pyM-9Y,2886
-neurostats_API/tools/balance_sheet.yaml,sha256=dKTMbsYR9EFp48WAzmm_ISHMiJQLyE0V-XWS_gkxmr0,541
-neurostats_API/tools/cash_flow_percentage.yaml,sha256=fk2Z4eb1JjGFvP134eJatHacB7BgTkBenhDJr83w8RE,1345
-neurostats_API/tools/finance_overview_dict.yaml,sha256=URL1IFqO0j5uOwN3xETHriy_u9lYbLvdwghuznenP2Q,2500
-neurostats_API/tools/profit_lose.yaml,sha256=qHBnqG7fR4Pxc_c3n4raL-3l7o5RnABLz9YGOXoaGiA,2086
-neurostats_API/tools/seasonal_data_field_dict.txt,sha256=Za1fJR1yERbqrX8TgsS2kmMYMbaye43Gu_5ukUNBCNM,7904
-neurostats_API/utils/__init__.py,sha256=FTYKRFzW2XVXdnSHXnS3mQQaHlKF9xGqrMsgZZ2kroc,142
-neurostats_API/utils/data_process.py,sha256=m1B4EhCNSzOMfTBDtYCjkQSjbDTAEFC6TNf3NNxV36k,5657
-neurostats_API/utils/datetime.py,sha256=I9CIgZdE5OMzUciOS5wvapOVEIrXG_0Qb6iDKfIod6c,574
-neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
-neurostats_API/utils/fetcher.py,sha256=VbrUhjA-GG5AyjPX2SHtFIbZM4dm3jo0RgZzuCbb_Io,40927
-neurostats_API-0.0.8.dist-info/METADATA,sha256=SCspApNeq7b9pflJC30SaOVCdZtQjBIbh6QOps9HnGw,18232
-neurostats_API-0.0.8.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-neurostats_API-0.0.8.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.8.dist-info/RECORD,,