neurostats-API 1.0.0rc1__py3-none-any.whl → 1.0.0rc2__py3-none-any.whl

neurostats_API/__init__.py

@@ -1,4 +1,4 @@
-__version__='1.0.0rc1'
+__version__='1.0.0rc2'
 
 from .fetchers import (
     AgentFinanceOverviewFetcher,

neurostats_API/async_mode/db_extractors/daily/twse_chip.py

@@ -34,6 +34,11 @@ class AsyncTWSEChipDBExtractor(BaseDailyTechDBExtractor):
     
     def _prepare_query(self, start_date=None, end_date=None, get_latest = False):
         query, projection, sort = super()._prepare_query(start_date, end_date, get_latest)
+        query.update(
+            {
+                self.target_column: {"$exists" : True}
+            }
+        )
         projection.update(
             {
                 'date': 1,

neurostats_API/async_mode/db_extractors/seasonal/base.py

@@ -7,6 +7,7 @@ from neurostats_API.async_mode.db import TWSEDBClient, USDBClient
 from neurostats_API.utils import StatsDateTime, StatsProcessor, NotSupportedError
 import yaml
 
+
 class AsyncBaseSeasonalDBExtractor(BaseDBExtractor):
 
     def __init__(self, ticker, client):
@@ -16,41 +17,28 @@ class AsyncBaseSeasonalDBExtractor(BaseDBExtractor):
         self.collection_name = self._get_collection_name()
         if (self.collection_name is None):
             raise NotSupportedError(
-                    f"{self.__class__.__name__} only supports {list(self.collection_name_map.keys())}, got {self.zone} with ticker = \"{self.ticker}\""
-                )
-        self.collection = self.db_client.get_collection(
-                self.collection_name
+                f"{self.__class__.__name__} only supports {list(self.collection_name_map.keys())}, got {self.zone} with ticker = \"{self.ticker}\""
             )
-        
+        self.collection = self.db_client.get_collection(self.collection_name)
+
         self.column_name_map = None
 
-        
-                
-    
     async def query_data(
-        self, 
-        start_date = None,
-        end_date = None,
-        get_latest = False # 決定是否只取得最新一筆資料
+        self,
+        start_date=None,
+        end_date=None,
+        get_latest=False    # 決定是否只取得最新一筆資料
     ):
         if (start_date is None):
             start_date = "1991-01-01"
         if (end_date is None):
             end_date = self._get_today()
-        
-        start_year, start_season = self._get_year_and_season(
-            date = start_date
-        )
-        end_year, end_season = self._get_year_and_season(
-            date = end_date
-        )
+
+        start_year, start_season = self._get_year_and_season(date=start_date)
+        end_year, end_season = self._get_year_and_season(date=end_date)
 
         query, projection, sort = self._prepare_query(
-            start_year,
-            start_season,
-            end_year,
-            end_season,
-            get_latest
+            start_year, start_season, end_year, end_season, get_latest
         )
         cursor = self.collection.find(query, projection).sort(sort)
 
@@ -62,35 +50,29 @@ class AsyncBaseSeasonalDBExtractor(BaseDBExtractor):
         return fetched_data
 
     def _get_collection_name(self):
-        
+
         return self.collection_name_map.get(self.zone, None)
-    
+
     def _get_collection_map(self):
-        return {
-        "tw": "twse_seasonal_report",
-        "us": "us_fundamentals"
-    }
-    
+        return {"tw": "twse_seasonal_report", "us": "us_fundamentals"}
+
     def _prepare_query(
         self,
-        start_year = None,
-        start_season = None,
-        end_year = None,
-        end_season = None,
-        get_latest = False
+        start_year=None,
+        start_season=None,
+        end_year=None,
+        end_season=None,
+        get_latest=False
     ):
         chart_name = self.column_name_map.get(self.get_zone(), None)
 
         query = {
-            "ticker": self.ticker
+            "ticker": self.ticker,
+            "chart_name": {"$exists": True}
         }
 
         query = self._update_query_with_year_season(
-            query,
-            start_year,
-            start_season,
-            end_year,
-            end_season
+            query, start_year, start_season, end_year, end_season
         )
 
         projection = {
@@ -100,60 +82,71 @@ class AsyncBaseSeasonalDBExtractor(BaseDBExtractor):
             "season": 1,
             chart_name: 1,
         }
-        
+
         if (get_latest):
-            sort = [
-                ("year", DESCENDING),
-                ("season", DESCENDING)
-            ]
+            sort = [("year", DESCENDING), ("season", DESCENDING)]
         else:
-            sort = [
-                ("year", ASCENDING),
-                ("season", ASCENDING)
-            ]
+            sort = [("year", ASCENDING), ("season", ASCENDING)]
 
         return query, projection, sort
 
-
     def _get_year_and_season(self, date):
-            if (isinstance(date, str)):
-                date = datetime.strptime(date, "%Y-%m-%d")
+        if (isinstance(date, str)):
+            date = datetime.strptime(date, "%Y-%m-%d")
+
+        year = date.year
+        month = date.month
 
-            year = date.year
-            month = date.month
+        season = (month - 1) // 3 + 1
 
-            season = (month - 1) // 3 + 1
+        return year, season
 
-            return year, season
-    
     def _update_query_with_year_season(
-        self, 
-        query, 
-        start_year, 
-        start_season, 
-        end_year, 
-        end_season
+        self, query, start_year, start_season, end_year, end_season
     ):
         if all(v is not None for v in [start_year, start_season]):
             # 大於start_year條件
-            query.update({
-                "$or": [
-                    {"year": {"$gt": start_year}},
-                    {"year": start_year, "season": {"$gte": start_season}},
-                ]
-            })
+            query.update(
+                {
+                    "$or": [
+                        {
+                            "year": {
+                                "$gt": start_year
+                            }
+                        },
+                        {
+                            "year": start_year,
+                            "season": {
+                                "$gte": start_season
+                            }
+                        },
+                    ]
+                }
+            )
 
         if all(v is not None for v in [end_year, end_season]):
             # 小於end_year條件
-            query.update({
-                "$and": query.get("$and", []) + [
-                    {
-                        "$or": [
-                            {"year": {"$lt": end_year}},
-                            {"year": end_year, "season": {"$lte": end_season}},
-                        ]
-                    }
-                ]
-            })
-        
-        return query
+            query.update(
+                {
+                    "$and":
+                    query.get("$and", []) + [
+                        {
+                            "$or": [
+                                {
+                                    "year": {
+                                        "$lt": end_year
+                                    }
+                                },
+                                {
+                                    "year": end_year,
+                                    "season": {
+                                        "$lte": end_season
+                                    }
+                                },
+                            ]
+                        }
+                    ]
+                }
+            )
+
+        return query

neurostats_API/transformers/daily_chip/twse_chip.py

@@ -62,7 +62,9 @@ class TWSEChipTransformer(BaseChipTransformer):
     def _process_latest(self, latest_data: dict, latest_tech: dict, key: str):
         latest_trade = latest_data.get(key)
         return {
-            "date": latest_data.get('date', datetime.today().strftime("%Y-%m-%d")),
+            "date":
+            latest_data.get('date',
+                            datetime.today().strftime("%Y-%m-%d")),
             **self._process_latest_trading(latest_trade, latest_tech, key)
         }
 
@@ -182,8 +184,8 @@ class TWSEChipTransformer(BaseChipTransformer):
                     )
                 elif (key.find("三大法人") >= 0):
                     self._target_institution(
-                        latest_trading, latest_table['institutional_investor'], key,
-                        volume
+                        latest_trading, latest_table['institutional_investor'],
+                        key, volume
                     )
             # 計算合計
             for unit in ['stock', 'percentage']:
@@ -321,18 +323,16 @@ class TWSEChipTransformer(BaseChipTransformer):
                                            2).item()
 
     def _process_latest_margin(self, latest_trading, *args):
+
         def _default_margin_chart():
-            dafault_dict = {                
-                "financing": {},
-                "short_selling": {}
-            }
+            dafault_dict = {"financing": {}, "short_selling": {}}
             return {
                 "margin_trading": pd.DataFrame.from_dict(dafault_dict),
                 "security_offset": None
             }
-        
+
         if (latest_trading is None):
-            return  _default_margin_chart()
+            return _default_margin_chart()
 
         latest_trading['financing']['現償'] = latest_trading['financing'].pop(
             '現金償還'
@@ -354,14 +354,17 @@ class TWSEChipTransformer(BaseChipTransformer):
         }
 
     def _process_latest_security(self, latest_trading, *args):
+
         def _default_margin_chart():
-            return  {
+            return {
                 "stock_lending":
-                pd.DataFrame(index = ["當日賣出", "現償", "當日還券", "當日調整", "當日餘額", "次一營業日可限額"])
+                pd.DataFrame(
+                    index=["當日賣出", "現償", "當日還券", "當日調整", "當日餘額", "次一營業日可限額"]
+                )
             }
-        
+
         if (latest_trading is None):
-            return  _default_margin_chart()
+            return _default_margin_chart()
 
         latest_stock_lending = latest_trading['stock_lending']
 

{neurostats_API-1.0.0rc1.dist-info → neurostats_API-1.0.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 1.0.0rc1
+Version: 1.0.0rc2
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -71,7 +71,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-1.0.0rc1
+1.0.0rc2
 ```
 
 ### 下載舊版

{neurostats_API-1.0.0rc1.dist-info → neurostats_API-1.0.0rc2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-neurostats_API/__init__.py,sha256=WELjgN6N6r4KIzw_tmKuk3TIyUBFcnxHUhKY0tBDqSM,323
+neurostats_API/__init__.py,sha256=58rMdx6r5TIsGQzFXciGec5dDXE4IAHXd4j7caKw624,323
 neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
 neurostats_API/async_mode/__init__.py,sha256=arSINQm3O3g-IwfOSLsGraEj2icJbkuW0t5HLPQ4Xk8,348
@@ -13,7 +13,7 @@ neurostats_API/async_mode/db_extractors/daily/__init__.py,sha256=crXYyPT-LnEWsMF
 neurostats_API/async_mode/db_extractors/daily/base.py,sha256=U7cxKHIqSITEoDxqShN-3k7_pzLW-VnKLSsXo-eQh0s,2925
 neurostats_API/async_mode/db_extractors/daily/tej_chip.py,sha256=Ywc0iIIPWw1VdtVc2_s1CNrgj0_G1wOaGzrgyVTN2k8,414
 neurostats_API/async_mode/db_extractors/daily/tej_tech.py,sha256=M3k1pmv48DfiUaIfDKx5gk85C5JpmuXdQhRcNzgOhPI,349
-neurostats_API/async_mode/db_extractors/daily/twse_chip.py,sha256=pl8vRJuPr0bpSnumGPX28xlyQAp9QuXM86chigccbYI,1375
+neurostats_API/async_mode/db_extractors/daily/twse_chip.py,sha256=WICwcsy2m_2ua9UnIjs_SZGFq7m2-UByx9x7TCk_rlY,1490
 neurostats_API/async_mode/db_extractors/daily/value.py,sha256=j5QjFOhmvVum0D10prcZZ7_sxrojA-b8sP72Ge9lOnY,2859
 neurostats_API/async_mode/db_extractors/daily/yf.py,sha256=GewIRJ7_baBc9QL7BHVdnxQ0uXYpFNeiPuwKxzByULg,377
 neurostats_API/async_mode/db_extractors/month_revenue/__init__.py,sha256=VXjEn4xnXsPpt8lq7egSM_3sLnhtOIQG2lNedDC_Shw,50
@@ -21,7 +21,7 @@ neurostats_API/async_mode/db_extractors/month_revenue/base.py,sha256=pXK6MEQtwCh
 neurostats_API/async_mode/db_extractors/month_revenue/twse.py,sha256=54HT6ISZYC9uFx-YAcWQN4r3rKuZN0fbC5zgsJE46Ic,197
 neurostats_API/async_mode/db_extractors/seasonal/__init__.py,sha256=sotZHTbuGH2am48hb0bIGVs3K_14PgMKsO-FEQzF0dI,236
 neurostats_API/async_mode/db_extractors/seasonal/balance_sheet.py,sha256=67OzGUxZbt7LQ9m3uTcnPPhEYQ17ygEH-Kv1eaR1X2Y,560
-neurostats_API/async_mode/db_extractors/seasonal/base.py,sha256=3mSoh-zmxx2gc57MD1Uii073_BqGCohwYJJjBbXHz5w,4352
+neurostats_API/async_mode/db_extractors/seasonal/base.py,sha256=1Un39qDmckL-eL_-QM4BS8M5CCmALZv4g0m6799ez8g,4664
 neurostats_API/async_mode/db_extractors/seasonal/cashflow.py,sha256=2yOIOMFic9DTeEyhD2xD_tGrtSWb-LirUnN1a5ka_3A,293
 neurostats_API/async_mode/db_extractors/seasonal/profit_lose.py,sha256=AMKMVIVIBWTRk2b_A33OUuTLrCwc-xYj5fIL4YjLnug,564
 neurostats_API/async_mode/db_extractors/seasonal/tej.py,sha256=SqObDqR3uOnxXGF12VQz7Rzw7B5YAimY1-nR0ImLkaY,2591
@@ -78,7 +78,7 @@ neurostats_API/transformers/cash_flow/us.py,sha256=nRJajeDz4HNkv42NosoP0Jir4tIA0
 neurostats_API/transformers/daily_chip/__init__.py,sha256=e-yvQ94J3dkzRbhZwOiAkyt_ub9bRQ7pAVDbO-61Grw,43
 neurostats_API/transformers/daily_chip/base.py,sha256=KBsnpACakJh2W-k4Kvv-dVNnSNbUCGMeqvQsTQkz-aE,184
 neurostats_API/transformers/daily_chip/tej.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-neurostats_API/transformers/daily_chip/twse_chip.py,sha256=QZlbOCOSRH0ds1NZjJdQWfHhVfmkmAS9G5zM64dhAis,14663
+neurostats_API/transformers/daily_chip/twse_chip.py,sha256=mUcHHQN9EFJkn1kB5KCcUoZJrHrMPBXotiJKQv7hM4Y,14660
 neurostats_API/transformers/daily_chip/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 neurostats_API/transformers/daily_chip/utils/institution.py,sha256=1Zj9mxIhvwkmA599a1OYmdorPEAN_U3sl8uhvddxUW0,3384
 neurostats_API/transformers/daily_chip/utils/margin_trading.py,sha256=oVY_OW63pcSc1TyM_jSPNAoj4HLyZCRshkdsHQsnxyk,38
@@ -113,7 +113,7 @@ neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQM
 neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
 neurostats_API/utils/exception.py,sha256=yv92GVh5uHV1BgRmO4DwJcX_PtE0-TSgQoo3VnZ5hOQ,277
 neurostats_API/utils/logger.py,sha256=egBiiPGTi5l1FoX_o6EvdGh81R0_k8hFPctSxq8RCoo,693
-neurostats_API-1.0.0rc1.dist-info/METADATA,sha256=86hApbJb36N44lqvTcbsh2QRV9uvOSXwtruFLt0EWB8,2964
-neurostats_API-1.0.0rc1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-1.0.0rc1.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-1.0.0rc1.dist-info/RECORD,,
+neurostats_API-1.0.0rc2.dist-info/METADATA,sha256=xQ479cEYQ3A48QpJlltoMehvj3mG6fxyT09XjWru4SU,2964
+neurostats_API-1.0.0rc2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-1.0.0rc2.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-1.0.0rc2.dist-info/RECORD,,