neurostats-API 0.0.7__tar.gz → 0.0.9__tar.gz

{neurostats_API-0.0.7 → neurostats_API-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 0.0.7
+Version: 0.0.9
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -78,7 +78,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.6
+0.0.9
 ```
 
 ### 得到最新一期的評價資料與歷年評價
@@ -379,11 +379,12 @@ stats_fetcher.query_data()
 
 ### 現金流量表
 ``` Python
-from neurostats_API.utils import StatsFetcher, DBClient
+from neurostats_API.fetchers import CashFlowFetcher
 db_client = DBClient("<連接的DB位置>").get_client()
-fetcher = StatsFetcher(db_client)
 ticker = 2330 # 換成tw50內任意ticker
-stats_fetcher.get_cash_flow(ticker)
+fetcher = StatsFetcher(ticker, db_client)
+
+stats_fetcher.query()
 ```
 #### 回傳
 ```Python

{neurostats_API-0.0.7 → neurostats_API-0.0.9}/README.md

@@ -68,7 +68,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.6
+0.0.9
 ```
 
 ### 得到最新一期的評價資料與歷年評價
@@ -369,11 +369,12 @@ stats_fetcher.query_data()
 
 ### 現金流量表
 ``` Python
-from neurostats_API.utils import StatsFetcher, DBClient
+from neurostats_API.fetchers import CashFlowFetcher
 db_client = DBClient("<連接的DB位置>").get_client()
-fetcher = StatsFetcher(db_client)
 ticker = 2330 # 換成tw50內任意ticker
-stats_fetcher.get_cash_flow(ticker)
+fetcher = StatsFetcher(ticker, db_client)
+
+stats_fetcher.query()
 ```
 #### 回傳
 ```Python

neurostats_API-0.0.9/neurostats_API/__init__.py

@@ -0,0 +1 @@
+__version__='0.0.8'

{neurostats_API-0.0.7 → neurostats_API-0.0.9}/neurostats_API/fetchers/balance_sheet.py

@@ -1,10 +1,12 @@
 from .base import StatsFetcher, StatsDateTime
 import json
+import numpy as np
 import pandas as pd
 from ..utils import StatsDateTime, StatsProcessor
 import importlib.resources as pkg_resources
 import yaml
 
+
 class BalanceSheetFetcher(StatsFetcher):
     """
     對應iFa.ai -> 財務分析 ->  資產負債表
@@ -13,7 +15,7 @@ class BalanceSheetFetcher(StatsFetcher):
     def __init__(self, ticker, db_client):
         super().__init__(ticker, db_client)
         self.table_settings = StatsProcessor.load_yaml("balance_sheet.yaml")
- 
+
     def prepare_query(self, target_year, target_season):
         pipeline = super().prepare_query()
 
@@ -24,36 +26,42 @@ class BalanceSheetFetcher(StatsFetcher):
         }
 
         pipeline.append({
-        "$project": {
-            "_id": 0,
-            "ticker": 1,
-            "company_name": 1,
-            "balance_sheets": {
-                "$sortArray": {
-                    "input": {
-                        "$map": {
-                            "input": {
-                                "$filter": {
-                                    "input": "$seasonal_data",
-                                    "as": "season",
-                                    "cond": {
-                                        "$eq": ["$$season.season", target_season]
+            "$project": {
+                "_id": 0,
+                "ticker": 1,
+                "company_name": 1,
+                "balance_sheets": {
+                    "$sortArray": {
+                        "input": {
+                            "$map": {
+                                "input": {
+                                    "$filter": {
+                                        "input": "$seasonal_data",
+                                        "as": "season",
+                                        "cond": {
+                                            "$eq":
+                                            ["$$season.season", target_season]
+                                        }
                                     }
+                                },
+                                "as": "target_season_data",
+                                "in": {
+                                    "year":
+                                    "$$target_season_data.year",
+                                    "season":
+                                    "$$target_season_data.season",
+                                    "balance_sheet":
+                                    "$$target_season_data.balance_sheet"
                                 }
-                            },
-                            "as": "target_season_data",
-                            "in": {
-                                "year": "$$target_season_data.year",
-                                "season": "$$target_season_data.season",
-                                "balance_sheet": "$$target_season_data.balance_sheet"
                             }
-                        }
-                    },
-                    "sortBy": { "year": -1 }  # 按 year 降序排序
+                        },
+                        "sortBy": {
+                            "year": -1
+                        }  # 按 year 降序排序
+                    }
                 }
             }
-        }
-    })
+        })
 
         return pipeline
 
@@ -67,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)
@@ -93,20 +107,26 @@ class BalanceSheetFetcher(StatsFetcher):
 
             time_index = f"{year}Q{target_season}"
 
-             # 蒐集整體的keys
+            # 蒐集整體的keys
             index_names += list(data['balance_sheet'].keys())
             balance_sheet = data['balance_sheet']
 
             for index_name, value_dict in balance_sheet.items():
                 for item_name, item in value_dict.items():
-                    try: # table_dict[項目][(2020Q1, '%')]
-                        table_dict[index_name][(time_index,item_name)] = item
+                    try:  # table_dict[項目][(2020Q1, '%')]
+                        if (item_name == 'percentage'):
+                            if (isinstance(item, (float, int))):
+                                item = np.round(item, 2)
+                        if ("YoY" in item_name):
+                            if (isinstance(item, (float, int))):
+                                item = np.round(item * 100, 2)
+                        table_dict[index_name][(time_index, item_name)] = item
 
                     except KeyError:
                         if (index_name not in table_dict.keys()):
                             table_dict[index_name] = dict()
 
-                        table_dict[index_name][(time_index,item_name)] = item
+                        table_dict[index_name][(time_index, item_name)] = item
 
         total_table = pd.DataFrame.from_dict(table_dict, orient='index')
         total_table.columns = pd.MultiIndex.from_tuples(total_table.columns)
@@ -118,5 +138,4 @@ class BalanceSheetFetcher(StatsFetcher):
                 target_index=setting['target_index']
                 if "target_index" in setting.keys() else None)
 
-            print(f"{name}: {return_dict[name].columns}")
         return return_dict

{neurostats_API-0.0.7 → neurostats_API-0.0.9}/neurostats_API/fetchers/cash_flow.py

@@ -1,5 +1,6 @@
 from .base import StatsFetcher, StatsDateTime
 import json
+import numpy as np
 import pandas as pd
 from ..utils import StatsDateTime, StatsProcessor
 import importlib.resources as pkg_resources
@@ -64,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)
 
@@ -127,8 +133,9 @@ class CashFlowFetcher(StatsFetcher):
                         'value']
                     if (value['value']):
                         table_dict[time_index][index_name][
-                            'percentage'] = value['value'] / cash_flow[
-                                main_cash_flow_name]['value']
+                            'percentage'] = np.round(
+                                (value['value'] / cash_flow[
+                                main_cash_flow_name]['value']) * 100, 2)
                     else:
                         table_dict[time_index][index_name][
                             'percentage'] = None
@@ -141,8 +148,9 @@ class CashFlowFetcher(StatsFetcher):
                         'value']
                     if (value['value']):
                         table_dict[time_index][index_name][
-                            'percentage'] = value['value'] / cash_flow[
-                                main_cash_flow_name]['value']
+                            'percentage'] = np.round(
+                                (value['value'] / cash_flow[
+                                main_cash_flow_name]['value']) * 100, 2) 
                     else:
                         table_dict[time_index][index_name][
                             'percentage'] = None