neurostats-API 1.0.2rc1__tar.gz → 1.0.2rc2__tar.gz

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 1.0.2rc1
+Version: 1.0.2rc2
 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.2rc1
+1.0.2rc2
 ```
 
 ### 下載舊版

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/README.md

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

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API/__init__.py

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

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API/async_mode/db_extractors/base.py

@@ -18,6 +18,19 @@ class BaseDBExtractor(abc.ABC):
         self.db_client = self._set_db_connection()
 
     def _set_company_name(self, ticker):
+
+        index_dict = {
+            "^TWII": ("台灣加權指數", 'tw'),
+            "^GSPC": ("S&P 500", 'us'),
+            "^DJI": ("Dow Jones Indices", 'us'),
+            "^IXIC": ("NASDAQ Composite", 'us')
+        }
+
+        for key, values in index_dict.items():
+            if (key == ticker):
+                company_name, zone  = values
+                return company_name, zone
+
         company_lists = [
             (self.tw_company_list, 'tw'),
             (self.us_company_list, 'us')
@@ -28,6 +41,7 @@ class BaseDBExtractor(abc.ABC):
             if (company_name):
                 return company_name, zone
         # 沒找到公司名稱
+
         raise NoCompanyError(f"Ticker-{ticker} not found in any company lists")
     
     def _set_db_connection(self):
@@ -38,7 +52,6 @@ class BaseDBExtractor(abc.ABC):
         db_client = db_map.get(self.zone, TWSEDBClient)
         return db_client(self.client)
 
-
     
     async def query_data(self):
         """

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API/async_mode/db_extractors/daily/us_chip.py

@@ -88,14 +88,20 @@ class AsyncUS_CelebrityDBExtractor(AsyncUS_F13DBExtractor):
             self, start_date=None, end_date=None, get_latest=False,
             value_throshold=None, title=None
         ):
-
-        start_date = self._transform_date(start_date)
-        end_date = self._transform_date(end_date)
-
-        query = {
-            "manager": self.manager,
-            "reportDate": {"$gte": start_date, "$lte": end_date}
-        }
+        query = {"manager": self.manager}
+
+        if start_date:
+            start_date = self._transform_date(start_date)
+        if end_date:
+            end_date = self._transform_date(end_date)
+
+        if start_date or end_date:
+            date_range = {}
+            if start_date:
+                date_range["$gte"] = start_date
+            if end_date:
+                date_range["$lte"] = end_date
+            query["reportDate"] = date_range
 
         if value_throshold:
             query["value"] = {"$gt": value_throshold}

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API/async_mode/fetchers/tech.py

@@ -7,6 +7,8 @@ from neurostats_API.async_mode.factory import get_extractor
 from neurostats_API.transformers import DailyTechTransformer
 from neurostats_API.utils import NotSupportedError
 import pandas as pd
+from pytz import timezone
+from neurostats_API.utils import StatsDateTime
 import yfinance as yf
 
 
@@ -79,9 +81,8 @@ class AsyncTechFetcher(AsyncBaseFetcher):
 
     async def _fetch_data(self, start_date, end_date):
 
-        if (self.ticker in ['GSPC', 'IXIC', 'DJI', 'TWII']):
-            full_tick = f'^{self.ticker}'
-            df = self._conduct_yf_search(full_tick, start_date, end_date)
+        if (self.ticker in ['^GSPC', '^IXIC', '^DJI', '^TWII']):
+            df = self._conduct_yf_search(self.ticker, start_date, end_date)
 
             return df[self.required_cols]
 
@@ -97,11 +98,14 @@ class AsyncTechFetcher(AsyncBaseFetcher):
 
     def _conduct_yf_search(self, ticker, start_date, end_date):
         yf_ticker = yf.Ticker(ticker)
-        origin_df = yf_ticker.history(period="10y")
+        origin_df = yf_ticker.history(period="max")
 
         if origin_df.empty:
             return origin_df
 
+        start_date = StatsDateTime.transform_date(start_date, tz=str(origin_df.index.tz)) # 跟隨yf搜尋結果的時區
+        end_date = StatsDateTime.transform_date(end_date, tz=str(origin_df.index.tz))
+
         origin_df = origin_df.reset_index()
         origin_df["Date"] = pd.to_datetime(origin_df["Date"])
         df = origin_df.rename(
@@ -116,6 +120,7 @@ class AsyncTechFetcher(AsyncBaseFetcher):
         )
 
         df = df.loc[(df['date'] >= start_date) & (df['date'] <= end_date)]
+        df['date'] = df['date'].dt.tz_convert("Asia/Taipei")
         return df
 
     async def _conduct_tw_db_search(self, start_date, end_date):

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API/fetchers/tech.py

@@ -8,7 +8,7 @@ class TechFetcher(StatsFetcher):
     def __init__(self, ticker: str, db_client):
         """
         The Capitalization-Weighted Index includes the following tickers:
-        ['GSPC', 'IXIC', 'DJI', 'TWII']   
+        ['^GSPC', '^IXIC', '^DJI', '^TWII']   
         """
 
         super().__init__(ticker, db_client)

neurostats_api-1.0.2rc2/neurostats_API/utils/datetime.py

@@ -0,0 +1,52 @@
+from datetime import datetime
+from pytz import timezone
+
+class StatsDateTime():
+
+    def __init__(self, date, year, month, day, season):
+        self.date = date
+        self.year = year
+        self.month = month
+        self.day = day
+        self.season = season
+    
+    @classmethod
+    def get_today(cls):
+        today = datetime.today()
+        this_year = today.year
+        this_month = today.month
+        this_day = today.day
+        this_season = ((this_month - 1) // 3) + 1
+
+        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 }
+        )
+
+    @classmethod
+    def transform_date(cls, date, tz:str = None):
+        if (isinstance(date, str)):
+            try:
+                date = datetime.strptime(date, "%Y-%m-%d")
+                if (tz):
+                    date = date.astimezone(tz = timezone(tz))
+                return date 
+            except Exception as e:
+                print(e)
+                raise ValueError(
+                    "date string format imcompatible, should be \"YYYY-MM-DD\""
+                )
+        elif (isinstance(date, datetime)):
+            if (tz):
+                return date.astimezone(tz = timezone(tz))
+            else:
+                return date
+        else:
+            raise ValueError(
+                "date type imcompatible, should be string(\"YYYY-MM-DD\") or datetime.datetime"
+            )

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 1.0.2rc1
+Version: 1.0.2rc2
 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.2rc1
+1.0.2rc2
 ```
 
 ### 下載舊版

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/neurostats_API.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ neurostats_API/async_mode/fetchers/twse_margin.py
 neurostats_API/async_mode/fetchers/us_chip.py
 neurostats_API/async_mode/fetchers/value.py
 neurostats_API/async_mode/fetchers/tej/__init__.py
+neurostats_API/async_mode/fetchers/tej/chip.py
 neurostats_API/async_mode/fetchers/tej/seasonal_data.py
 neurostats_API/async_mode/fetchers/tej/tech.py
 neurostats_API/config/company_list/ticker_index_industry_map.json
@@ -115,6 +116,7 @@ neurostats_API/transformers/profit_lose/twse.py
 neurostats_API/transformers/profit_lose/us.py
 neurostats_API/transformers/tej/__init__.py
 neurostats_API/transformers/tej/base.py
+neurostats_API/transformers/tej/chip.py
 neurostats_API/transformers/tej/finance_statement.py
 neurostats_API/transformers/value/__init__.py
 neurostats_API/transformers/value/base.py

{neurostats_api-1.0.2rc1 → neurostats_api-1.0.2rc2}/setup.py

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

neurostats_api-1.0.2rc1/neurostats_API/utils/datetime.py

@@ -1,29 +0,0 @@
-from datetime import datetime
-
-class StatsDateTime():
-
-    def __init__(self, date, year, month, day, season):
-        self.date = date
-        self.year = year
-        self.month = month
-        self.day = day
-        self.season = season
-    
-    @classmethod
-    def get_today(cls):
-        today = datetime.today()
-        this_year = today.year
-        this_month = today.month
-        this_day = today.day
-        this_season = ((this_month - 1) // 3) + 1
-
-        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 }
-        )
-