neurostats-API 0.0.23b1__py3-none-any.whl → 0.0.24__py3-none-any.whl

neurostats_API/fetchers/value_invest.py

@@ -8,6 +8,11 @@ class ValueFetcher(StatsFetcher):
 
     def __init__(self, ticker: str, db_client):
         super().__init__(ticker, db_client)
+        self.value_keys = [
+            "P_E", "P_FCF", "P_B", "P_S", 
+            "EV_OPI", "EV_EBIT", "EV_EBITDA", "EV_S", 
+            "Yield"
+        ]
 
     def prepare_query(self, start_date, end_date):
         pipeline = super().prepare_query()
@@ -54,7 +59,8 @@ class ValueFetcher(StatsFetcher):
                                                 "EV_OPI": "$$daily_item.EV_OPI",
                                                 "EV_EBIT": "$$daily_item.EV_EBIT",
                                                 "EV_EBITDA": "$$daily_item.EV_EBITDA",
-                                                "EV_S": "$$daily_item.EV_S"
+                                                "EV_S": "$$daily_item.EV_S",
+                                                "Yield": "$$daily_item.Yield"
                                             }
                                     }
                             },
@@ -89,10 +95,13 @@ class ValueFetcher(StatsFetcher):
         fetched_data = self.collect_data(start_date, end_date)
 
         fetched_data['daily_data'] = fetched_data['daily_data'][-1]
+        for key in self.value_keys:
+            fetched_data['daily_data'][key] = fetched_data['daily_data'].get(key, None)
 
         fetched_data['yearly_data'] = ValueProcessor.transform_to_df(
             fetched_data['daily_data'],
             fetched_data['yearly_data'],
+            required_keys=self.value_keys
         )
 
         return fetched_data
@@ -110,7 +119,8 @@ class ValueFetcher(StatsFetcher):
                 EV_OPI,
                 EV_EBIT,
                 EV_EBITDA,
-                EV_S
+                EV_S,
+                Yield
             }
         """
 
@@ -142,7 +152,8 @@ class ValueFetcher(StatsFetcher):
                                                 "EV_OPI": "$$daily.EV_OPI",
                                                 "EV_EBIT": "$$daily.EV_EBIT",
                                                 "EV_EBITDA": "$$daily.EV_EBITDA",
-                                                "EV_S": "$$daily.EV_S"
+                                                "EV_S": "$$daily.EV_S",
+                                                "Yield": "$$daily.Yield"
                                             }
                                     }
                             }
@@ -153,15 +164,12 @@ class ValueFetcher(StatsFetcher):
         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}
+        return_dict = {value_key: dict() for value_key in self.value_keys}
+
+        for data in fetched_data['daily_data']:
+            for value_key in self.value_keys:
+                return_dict[value_key].update({data['date']: data.get(value_key, None)})
 
-        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])
@@ -173,7 +181,7 @@ class ValueFetcher(StatsFetcher):
 class ValueProcessor(StatsProcessor):
 
     @staticmethod
-    def transform_to_df(daily_dict, yearly_dict):
+    def transform_to_df(daily_dict: dict, yearly_dict: dict, required_keys: list):
         latest_data = {"year": f"過去4季"}
 
         latest_data.update(daily_dict)
@@ -184,4 +192,16 @@ class ValueProcessor(StatsProcessor):
 
         yearly_dict = pd.DataFrame.from_dict(yearly_dict)
 
+        total_keys = [
+            # 年度評價
+            'year', 'P_E', 'P_FCF', 'P_B', 'P_S', 
+            'EV_OPI', 'EV_EBIT', 'EV_EBITDA','EV_S', 
+            
+            # 最新一日交易
+            'open', 'high', 'low', 'close', 'volume', 'dividends',
+            'stock splits', 'Yield', 'dividend_year', 'finance_report_time'
+       ]
+
+        total_keys_list = list(total_keys)
+        yearly_dict = yearly_dict.reindex(columns=total_keys, fill_value=None)
         return yearly_dict

neurostats_API/tools/tej_db/tej_db_percent_index.yaml

@@ -29,9 +29,6 @@ TWN/AINVFQ1:
 - r607
 - r613
 - r612
-- r609
-- r614
-- r611
 TWN/AFESTM1:
 - r105
 - r106

neurostats_API/utils/calculate_value.py

@@ -1,4 +1,5 @@
 from .data_process import StatsProcessor
+import numpy as np
 class YoY_Calculator:
     def __init__(self):
         pass
@@ -23,6 +24,9 @@ class YoY_Calculator:
 
         if (isinstance(YoY, complex)): # 年化成長率有複數問題
             return None
+        
+        if YoY != YoY:  # 確認是否為nan (Python 中 nan不等於自己)
+            return None
 
         return YoY
     @classmethod
@@ -91,7 +95,6 @@ class YoY_Calculator:
             for key in list(this_data.keys()):
                 if key == "season":
                     continue
-                
 
                 value = this_data.get(key, None)
 
@@ -102,7 +105,7 @@ class YoY_Calculator:
                     temp_dict = {"value": value}
                     this_value = value
                 
-                this_value = StatsProcessor.process_str_to_float(this_data[key])
+                this_value = StatsProcessor.process_str_to_float(this_value)
                 
                 last_value = data_dict.get(
                     f"{last_year}Q{last_season}",{}

neurostats_API/utils/data_process.py

@@ -191,7 +191,11 @@ class StatsProcessor:
     @classmethod
     def cal_percentage(cls, value, postfix="%"):
         if (isinstance(value, (float, int))):
+            if (np.isnan(value)):
+                return None
             value = np.round(value * 100, 2).item()
+            if (value != value): # nan值發生
+                return None
             value = f"{value:.2f}{postfix}"
 
             return value
@@ -202,10 +206,11 @@ class StatsProcessor:
     @classmethod
     def cal_non_percentage(cls, value, to_str=False, postfix="元"):
         if (isinstance(value, (float, int))):
-
+            if (np.isnan(value)):
+                return None
             value = np.round(value, 2).item()
             if (postfix == "千元"):
-                value *= 1000
+                value = value * 1000
                 try:
                     value = int(value)
                 except Exception as e:
@@ -283,16 +288,17 @@ class StatsProcessor:
         if (key):
             keys = [key]
         for data in data_list:
-            data = data['data']
 
             pop_keys = []
 
             for key in keys:
                 assert (key in data.keys())
                 pop_keys.append(str(data.pop(key)))
-            
+
             pop_key = delimeter.join(pop_keys)
-            return_dict[pop_key] = data[data_key]
+            target_data = data.get(data_key, data)
+
+            return_dict[pop_key] = target_data
         
         return return_dict
     
@@ -302,5 +308,5 @@ class StatsProcessor:
             value = value.replace("%", "")
         try:
             return float(value)
-        except (ValueError, TypeError):
+        except (ValueError, TypeError) as e:
             return None

neurostats_API/utils/logger.py

@@ -0,0 +1,21 @@
+import logging
+from functools import wraps
+
+class StatsLogger:
+
+    @classmethod
+    def exception_log(cls, default_return=None, level='error'):
+        def decorator(func):
+            @wraps(func)
+            def wrapper(*args, **kwargs):
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    log_fn = getattr(logging, level, logging.error)
+                    log_fn(
+                        f"{func.__name__} failed | args={args}, kwargs={kwargs} | error={e}",
+                        exc_info=True
+                    )
+                    return default_return
+            return wrapper
+        return decorator

{neurostats_API-0.0.23b1.dist-info → neurostats_API-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 0.0.23b1
+Version: 0.0.24
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -89,7 +89,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.23b
+0.0.23
 ```
 
 ### 得到最新一期的評價資料與歷年評價

neurostats_API-0.0.24.dist-info/RECORD

@@ -0,0 +1,36 @@
+neurostats_API/__init__.py,sha256=nUg0aKz0ncXl7wfHthqrmQmVDlUkLKEcjR7ARy_lgWU,288
+neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
+neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
+neurostats_API/fetchers/__init__.py,sha256=KCw-yRSDFa3fw83u73LJ9OVop7gRl_YQYlQq-cITxuo,511
+neurostats_API/fetchers/balance_sheet.py,sha256=h5vQAzqCRrIfSwA4ZFAnCOT-BPIFdhQf5ZPz6YqcKCE,6938
+neurostats_API/fetchers/base.py,sha256=fHdZJtBZ6OD1IUbW6sUTXsPJVWrj41Ay4TOJChp2keI,7236
+neurostats_API/fetchers/cash_flow.py,sha256=OmimJ1afsU8hyJr5GSBhIWvYjtldnoPLSmjuJ1XXriQ,8003
+neurostats_API/fetchers/finance_overview.py,sha256=xRn4UF2iMS13ztsFgBFj4UykyJsWMriuUevNeZHQR7E,27815
+neurostats_API/fetchers/institution.py,sha256=U7N6QenW5XANGI2L-a7tY2agR1iYY8LI6gUarQYS9N8,15250
+neurostats_API/fetchers/macro_daily_event.py,sha256=bThpI17Tk1wVYeuJ56mqoXbV_svJ7Hl1ftY9_9u8WJs,234
+neurostats_API/fetchers/margin_trading.py,sha256=0enMPpq0J55uts0nJFHOylXvLEMWZYSb-gt1BH5_gBM,11430
+neurostats_API/fetchers/month_revenue.py,sha256=K1WZct6vLU3y_8uaXR3po5jzx2w3EYb2v3XkIX2_pBE,8313
+neurostats_API/fetchers/profit_lose.py,sha256=MUTPPXHWZhhvcq1YzrY1dalFIXljUUG3UugXQimFy-Y,9170
+neurostats_API/fetchers/tech.py,sha256=TsS8m25Otc3_2jTYITFe-wNHlDWcfWsHIxhOrqL8qMY,16016
+neurostats_API/fetchers/tej_finance_report.py,sha256=mlIm2Qzs8-Xlzeb8uET8qGPWD3VGUx3g8qFFcY4UbAw,13022
+neurostats_API/fetchers/value_invest.py,sha256=QxQS2GcoLIU9ZBDEo8iRK2yHd8YLmBS70Bq42F3IsSw,8295
+neurostats_API/tools/company_list/tw.json,sha256=VWaDFvd0ACCVSWItcHHpmVuM_RzP71jLZl9RBHztu-0,51332
+neurostats_API/tools/tej_db/tej_db_index.yaml,sha256=lu-cmbB6dhx0eUlBSkyzXWqPKlwRtEvqlMTAh2y0oHs,969
+neurostats_API/tools/tej_db/tej_db_percent_index.yaml,sha256=xSgmamEK0DUBKRllUb94p9TxhJln_BzFoFYK9OJ0fkM,302
+neurostats_API/tools/tej_db/tej_db_skip_index.yaml,sha256=6UtMfPL7XvkKvEWTFXIIUZMJWZSagIduLYJb-r3HEg8,246
+neurostats_API/tools/tej_db/tej_db_thousand_index.yaml,sha256=K2YFBSrxqX1V2upy0IUeQ4ung4aPrjtlqYSvCGaaO8I,479
+neurostats_API/tools/twse/balance_sheet.yaml,sha256=6XygNG_Ybb1Xkk1e39LMLKr7ATvaCP3xxuwFbgNl6dA,673
+neurostats_API/tools/twse/cash_flow_percentage.yaml,sha256=fk2Z4eb1JjGFvP134eJatHacB7BgTkBenhDJr83w8RE,1345
+neurostats_API/tools/twse/finance_overview_dict.yaml,sha256=B9nV75StXkrF3yv2-eezzitlJ38eEK86RD_VY6588gQ,2884
+neurostats_API/tools/twse/profit_lose.yaml,sha256=iyp9asYJ04vAxk_HBUDse_IBy5oVvYHpwsyACg5YEeg,3029
+neurostats_API/tools/twse/seasonal_data_field_dict.txt,sha256=X8yc_el6p8BH_3FikTqBVFGsvWdXT6MHXLfKfi44334,8491
+neurostats_API/utils/__init__.py,sha256=uZk08lGPvVIc7MKAvRdZ2FJzgfa8GzsWG_hWAhF6C5U,152
+neurostats_API/utils/calculate_value.py,sha256=ioPV5VWitJ2NylBi5vwfs-payAUYxWhAiS7aaJjzQKQ,4305
+neurostats_API/utils/data_process.py,sha256=xt5BkXK1zWJaL3ZFyXXmxwsU_YfB66VMZAYBI2Mgm6E,10187
+neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
+neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
+neurostats_API/utils/logger.py,sha256=egBiiPGTi5l1FoX_o6EvdGh81R0_k8hFPctSxq8RCoo,693
+neurostats_API-0.0.24.dist-info/METADATA,sha256=mf7iV7Pud5CLvrVZLO6c_BiodQLzillMO6HScFVLhYM,31618
+neurostats_API-0.0.24.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-0.0.24.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.24.dist-info/RECORD,,

neurostats_API-0.0.23b1.dist-info/RECORD

@@ -1,34 +0,0 @@
-neurostats_API/__init__.py,sha256=ItIYqBMTp2EHBeBahEWCKKGa-JIzQO2ykdQy3A-LNZY,289
-neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
-neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
-neurostats_API/fetchers/__init__.py,sha256=KCw-yRSDFa3fw83u73LJ9OVop7gRl_YQYlQq-cITxuo,511
-neurostats_API/fetchers/balance_sheet.py,sha256=RgiX5wp9UoS7HcXHqwO_NMAFr2ESJSWJenyCwJj6rxU,6060
-neurostats_API/fetchers/base.py,sha256=BcGpwlA0TD8y-Uped68xPf-cZYHP9PB4UyDWgPcURe4,7155
-neurostats_API/fetchers/cash_flow.py,sha256=0it4hnKLKRLAFgrxrsrK2rk7dom7HvQi96z5LXh2w_c,7013
-neurostats_API/fetchers/finance_overview.py,sha256=dDe6THJg1UJffnJ25xwXd4K99s2DBTdGaxmCT3O-xdA,27763
-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=DZeOblfSz7NhQXVvL5xfMHZ1rv2B8pgqu-U-o_gcAuc,6323
-neurostats_API/fetchers/profit_lose.py,sha256=ZvSG4vx4gBrWMKmcyuSaoNyW6JGiOtIpFxRIeyCAeDY,7705
-neurostats_API/fetchers/tech.py,sha256=u0L6X19g7VmbCUXF_9UI_tBIJJ9hPareEggjXUe52_o,16079
-neurostats_API/fetchers/tej_finance_report.py,sha256=og3wg0Vdyzyx3Ex6ejk10ORo4zQjcrUrRtR9W1dCWNE,11320
-neurostats_API/fetchers/value_invest.py,sha256=b_x2Dpgs8VBU5HdG8ocKtfIEkqhU-Q0S5n6RxuFuM2g,7467
-neurostats_API/tools/company_list/tw.json,sha256=VWaDFvd0ACCVSWItcHHpmVuM_RzP71jLZl9RBHztu-0,51332
-neurostats_API/tools/tej_db/tej_db_index.yaml,sha256=lu-cmbB6dhx0eUlBSkyzXWqPKlwRtEvqlMTAh2y0oHs,969
-neurostats_API/tools/tej_db/tej_db_percent_index.yaml,sha256=-rBSdOoYs5UB9H6Y3FE5PTqV9meXEFZD2KhSlAQ_4Eg,323
-neurostats_API/tools/tej_db/tej_db_skip_index.yaml,sha256=6UtMfPL7XvkKvEWTFXIIUZMJWZSagIduLYJb-r3HEg8,246
-neurostats_API/tools/tej_db/tej_db_thousand_index.yaml,sha256=K2YFBSrxqX1V2upy0IUeQ4ung4aPrjtlqYSvCGaaO8I,479
-neurostats_API/tools/twse/balance_sheet.yaml,sha256=6XygNG_Ybb1Xkk1e39LMLKr7ATvaCP3xxuwFbgNl6dA,673
-neurostats_API/tools/twse/cash_flow_percentage.yaml,sha256=fk2Z4eb1JjGFvP134eJatHacB7BgTkBenhDJr83w8RE,1345
-neurostats_API/tools/twse/finance_overview_dict.yaml,sha256=B9nV75StXkrF3yv2-eezzitlJ38eEK86RD_VY6588gQ,2884
-neurostats_API/tools/twse/profit_lose.yaml,sha256=iyp9asYJ04vAxk_HBUDse_IBy5oVvYHpwsyACg5YEeg,3029
-neurostats_API/tools/twse/seasonal_data_field_dict.txt,sha256=X8yc_el6p8BH_3FikTqBVFGsvWdXT6MHXLfKfi44334,8491
-neurostats_API/utils/__init__.py,sha256=uZk08lGPvVIc7MKAvRdZ2FJzgfa8GzsWG_hWAhF6C5U,152
-neurostats_API/utils/calculate_value.py,sha256=Zc5DG_qXnHZLkCjUYdoMWka3KVXu2o9AmDnEYixiXYQ,4197
-neurostats_API/utils/data_process.py,sha256=LdDmhQMGBg1UI6cIWCdsj9YTkixtf1cyrN1xq2JZmPo,9971
-neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
-neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
-neurostats_API-0.0.23b1.dist-info/METADATA,sha256=W8Ks1L96z3SeSc5moAXkDwLYVlbMildAHJH6x4D09mo,31621
-neurostats_API-0.0.23b1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-0.0.23b1.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.23b1.dist-info/RECORD,,