neurostats-API 1.0.0rc1__tar.gz → 1.0.0rc3__tar.gz

{neurostats_api-1.0.0rc1 → neurostats_api-1.0.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 1.0.0rc1
+Version: 1.0.0rc3
 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 → neurostats_api-1.0.0rc3}/README.md

@@ -54,7 +54,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-1.0.0rc1
+1.0.0rc2
 ```
 
 ### 下載舊版

{neurostats_api-1.0.0rc1 → neurostats_api-1.0.0rc3}/neurostats_API/__init__.py

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

{neurostats_api-1.0.0rc1 → neurostats_api-1.0.0rc3}/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-1.0.0rc3/neurostats_API/async_mode/db_extractors/seasonal/base.py

@@ -0,0 +1,152 @@
+from ..base import BaseDBExtractor
+from datetime import datetime
+import json
+import pandas as pd
+from pymongo import ASCENDING, DESCENDING
+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):
+        super().__init__(ticker, client)
+
+        self.collection_name_map = self._get_collection_map()
+        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)
+
+        self.column_name_map = None
+
+    async def query_data(
+        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)
+
+        query, projection, sort = self._prepare_query(
+            start_year, start_season, end_year, end_season, get_latest
+        )
+        cursor = self.collection.find(query, projection).sort(sort)
+
+        if (get_latest):
+            cursor = cursor.limit(1)
+
+        fetched_data = [data async for data in cursor]
+
+        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"}
+
+    def _prepare_query(
+        self,
+        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,
+            chart_name: {"$exists": True}
+        }
+
+        query = self._update_query_with_year_season(
+            query, start_year, start_season, end_year, end_season
+        )
+
+        projection = {
+            "_id": 0,
+            "ticker": 1,
+            "year": 1,
+            "season": 1,
+            chart_name: 1,
+        }
+
+        if (get_latest):
+            sort = [("year", DESCENDING), ("season", DESCENDING)]
+        else:
+            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")
+
+        year = date.year
+        month = date.month
+
+        season = (month - 1) // 3 + 1
+
+        return year, season
+
+    def _update_query_with_year_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
+                            }
+                        },
+                    ]
+                }
+            )
+
+        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

{neurostats_api-1.0.0rc1 → neurostats_api-1.0.0rc3}/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 → neurostats_api-1.0.0rc3}/neurostats_API.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 1.0.0rc1
+Version: 1.0.0rc3
 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 → neurostats_api-1.0.0rc3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='neurostats_API',
-    version='1.0.0rc1',
+    version='1.0.0rc3',
     long_description=open('README.md', 'r', encoding='utf-8').read(),
     long_description_content_type='text/markdown',
     install_requires=[

{neurostats_api-1.0.0rc1 → neurostats_api-1.0.0rc3}/test/test_async_fetcher.py

@@ -7,7 +7,7 @@ from pymongo import AsyncMongoClient
 
 
 mongo_uri = "mongodb://neurowatt:neurodb123@db.neurowatt.ai:27017/neurowatt"
-tickers = ["-1234"]
+tickers = ["AAPL", "2330", "1260", "-1234"]
 
 client = AsyncMongoClient(mongo_uri)
 
@@ -229,6 +229,7 @@ def print_dict_summary(data: dict, indent: int = 1):
     prefix = " " * indent
     for key, value in data.items():
         if isinstance(value, pd.DataFrame):
+            assert value.shape!= (0, 0)
             print(f"{prefix} \"{key}\": DataFrame shape = {value.shape}")
         elif isinstance(value, pd.Series):
             print(f"{prefix} \"{key}\": Series shape = {value.shape}")

neurostats_api-1.0.0rc1/neurostats_API/async_mode/db_extractors/seasonal/base.py

@@ -1,159 +0,0 @@
-from ..base import BaseDBExtractor
-from datetime import datetime
-import json
-import pandas as pd
-from pymongo import ASCENDING, DESCENDING
-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):
-        super().__init__(ticker, client)
-
-        self.collection_name_map = self._get_collection_map()
-        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
-            )
-        
-        self.column_name_map = None
-
-        
-                
-    
-    async def query_data(
-        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
-        )
-
-        query, projection, sort = self._prepare_query(
-            start_year,
-            start_season,
-            end_year,
-            end_season,
-            get_latest
-        )
-        cursor = self.collection.find(query, projection).sort(sort)
-
-        if (get_latest):
-            cursor = cursor.limit(1)
-
-        fetched_data = [data async for data in cursor]
-
-        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"
-    }
-    
-    def _prepare_query(
-        self,
-        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
-        }
-
-        query = self._update_query_with_year_season(
-            query,
-            start_year,
-            start_season,
-            end_year,
-            end_season
-        )
-
-        projection = {
-            "_id": 0,
-            "ticker": 1,
-            "year": 1,
-            "season": 1,
-            chart_name: 1,
-        }
-        
-        if (get_latest):
-            sort = [
-                ("year", DESCENDING),
-                ("season", DESCENDING)
-            ]
-        else:
-            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")
-
-            year = date.year
-            month = date.month
-
-            season = (month - 1) // 3 + 1
-
-            return year, season
-    
-    def _update_query_with_year_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}},
-                ]
-            })
-
-        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