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

neurostats_API/__init__.py

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

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/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/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/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/utils/datetime.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from pytz import timezone
 
 class StatsDateTime():
 
@@ -27,3 +28,25 @@ class StatsDateTime():
             { "_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.dist-info → neurostats_API-1.0.2rc2.dist-info}/METADATA

@@ -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.dist-info → neurostats_API-1.0.2rc2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-neurostats_API/__init__.py,sha256=rYPiKrSMClreRwkPjRz5Rfn1wyJ82TiNAkOvNUUamEY,704
+neurostats_API/__init__.py,sha256=oH2hrua3CZYdbrjGZRXlGCJfijzllr_fZ6yKSj5t8gk,704
 neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
 neurostats_API/async_mode/__init__.py,sha256=8tsW_UDLJXuwzWdZJSacOqZatwzqr7v60hRk0PbgB-w,377
@@ -8,13 +8,13 @@ neurostats_API/async_mode/db/tej.py,sha256=ku7CfhrSJ8gfUQ_NRjyjSz-OFmqyCGGnXz8Tp
 neurostats_API/async_mode/db/twse.py,sha256=YZA-NUZ01EAUKPsaNEaZn3cuzeL9n1fi03aBiHUJGAA,220
 neurostats_API/async_mode/db/us.py,sha256=SgoU_OpSkpmrlBiNvy5xgyssb7-xK8ptezi4SR00t4I,271
 neurostats_API/async_mode/db_extractors/__init__.py,sha256=S6-lz6SZGzsSem-Kicr8UKsbPcuUA3Wyu276yMJN0tg,512
-neurostats_API/async_mode/db_extractors/base.py,sha256=3Xgdl6A5x93Qg7zMyJJFdE9ZMxsSDFtmXQ-i3gmnpjQ,1831
+neurostats_API/async_mode/db_extractors/base.py,sha256=DLtNONV5F9Lj3OlXeGm_bnR6AMA5d6tL3r7na4H7FRE,2221
 neurostats_API/async_mode/db_extractors/daily/__init__.py,sha256=8vw8W8AZ_zi_hSshlobN4ITK9qaFVoNy66OmOT7cNj4,306
 neurostats_API/async_mode/db_extractors/daily/base.py,sha256=ePvYxqOypy0F9VI33nSJQGpG5zMNO_EGZ3owVUeKFLw,3204
 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=WICwcsy2m_2ua9UnIjs_SZGFq7m2-UByx9x7TCk_rlY,1490
-neurostats_API/async_mode/db_extractors/daily/us_chip.py,sha256=CMaKFsL5ryohvvmoq1jOrSE4DLWDD0nXeGCuXJc2gZo,3936
+neurostats_API/async_mode/db_extractors/daily/us_chip.py,sha256=0Ycuqy3lqwA0kxAhv-KVqMUEMGQhOV3YMbHarWWT2PQ,4154
 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
@@ -36,12 +36,13 @@ neurostats_API/async_mode/fetchers/cash_flow.py,sha256=uj2JEbilgn595yJcMNvlTZHdk
 neurostats_API/async_mode/fetchers/finance_overview.py,sha256=YETx7uxS6OQgzJ0v_3JMJoUfuWciWmKAzitm91XffHk,4441
 neurostats_API/async_mode/fetchers/month_revenue.py,sha256=GDrFrjTe81uAzeKvd5HghH9iPXouXL8JTt8hfaFkig4,1258
 neurostats_API/async_mode/fetchers/profit_lose.py,sha256=-YMqO6hEbGntAeAf9y66LX56fj6VrHWr1_IIbQ_bUBQ,1483
-neurostats_API/async_mode/fetchers/tech.py,sha256=xj6LRnexMePi4Nc9P0lduAjJwjcVOp1xInIFjrRMrbM,6686
+neurostats_API/async_mode/fetchers/tech.py,sha256=fQChyVBPzT4oSOSeCZ5Et6nKf1XUA1U-RxFaezkUr0Y,6993
 neurostats_API/async_mode/fetchers/twse_institution.py,sha256=DKyecoIa_2-CUfDXKp2dBFJk0lfCBIr2steVVa-jq9o,2055
 neurostats_API/async_mode/fetchers/twse_margin.py,sha256=wra84uFh9ooCoyFWhRuV4vP3Uhojc13XHx51UD90uYo,3173
 neurostats_API/async_mode/fetchers/us_chip.py,sha256=1C7wsdgXkf4SOHUyqGKNEsr0Ijds7l4jLLsPMYyMRQo,2365
 neurostats_API/async_mode/fetchers/value.py,sha256=7FpO0_BOOvq4ZlwwaIfSD8xO_s1O8ykxz147fkiZIt4,2883
 neurostats_API/async_mode/fetchers/tej/__init__.py,sha256=QNXGg1gE_bnkZWybulRZXtcCPWV6Aj1nLz7r0Mo4BN0,93
+neurostats_API/async_mode/fetchers/tej/chip.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 neurostats_API/async_mode/fetchers/tej/seasonal_data.py,sha256=oeMpj4GMzw22KHjVDTcVO2hwVfxmnO291N6O_dKp0sw,2836
 neurostats_API/async_mode/fetchers/tej/tech.py,sha256=0wG2bep_nJp3kBS0nIzH6191R5bwEeS-upK40DTGpjU,1110
 neurostats_API/config/company_list/ticker_index_industry_map.json,sha256=JPSrkMrxOg5GB6HoOhOKeCatznvGAFJpWt92iAhutak,162681
@@ -67,7 +68,7 @@ neurostats_API/fetchers/institution.py,sha256=YsPRnM2M25plhrgSQ6ckO7gj_toydBXYlR
 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/tech.py,sha256=_718Na2r3K3c9f-3cIx42jIg5g_mDHNrV6aZYFFba8A,16020
 neurostats_API/fetchers/tej_finance_report.py,sha256=mlIm2Qzs8-Xlzeb8uET8qGPWD3VGUx3g8qFFcY4UbAw,13022
 neurostats_API/fetchers/value_invest.py,sha256=QxQS2GcoLIU9ZBDEo8iRK2yHd8YLmBS70Bq42F3IsSw,8295
 neurostats_API/transformers/__init__.py,sha256=sePY-KavG_7xMA-dvWiC_Z6gXGZUmoCoMeuJCcZSe6A,729
@@ -107,6 +108,7 @@ neurostats_API/transformers/profit_lose/twse.py,sha256=RwAJWQBdsjFaLlW-HL6oUGxLA
 neurostats_API/transformers/profit_lose/us.py,sha256=q7Vbxp_xzB0SUsxIqQYENi3RayfqR6Nfynvt7p-KHlI,847
 neurostats_API/transformers/tej/__init__.py,sha256=WihARZhphkvApsKr4U0--68m1M-Dc_rpV7xoV2fUV7E,61
 neurostats_API/transformers/tej/base.py,sha256=YD6M3Iok-KXb5EDhqa_fUzJ-zWXLeoXPsavdDJD-ks4,5436
+neurostats_API/transformers/tej/chip.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 neurostats_API/transformers/tej/finance_statement.py,sha256=rE-Kc94hzW8-xcKn6ry8LwwT8dSoGRKGsmvd5W4_SUs,2798
 neurostats_API/transformers/value/__init__.py,sha256=D8qMk0aLsv7CBBJHo5zsq_UuBKmZYNyqS3s-RWfhvy8,73
 neurostats_API/transformers/value/base.py,sha256=wR2LDiwGET126mwrPxYoApyl4lwx1MjWxFpOKLso_As,186
@@ -115,11 +117,11 @@ neurostats_API/transformers/value/twse.py,sha256=uNGLkxCIfQhzRkalSn6o2kgPT-uw41K
 neurostats_API/utils/__init__.py,sha256=pmOZSjSJ8434GbofV1Wx4GAzcDabOK80LFVS4y3T6-A,223
 neurostats_API/utils/calculate_value.py,sha256=ioPV5VWitJ2NylBi5vwfs-payAUYxWhAiS7aaJjzQKQ,4305
 neurostats_API/utils/data_process.py,sha256=cD1Vzv8oDpsd1Y7qCALTyM-AP1nkwqhfOgDY0KQpXec,10442
-neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
+neurostats_API/utils/datetime.py,sha256=e6p2XIXaDMOWNJ2qnwqZBScC9J6kB6h0Ef1A7fuWq-w,1607
 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.2rc1.dist-info/METADATA,sha256=3wWTuXmARFNpWZvrk1lwRdcVVWOAJ62UXeaLXX-sD_8,2964
-neurostats_API-1.0.2rc1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-1.0.2rc1.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-1.0.2rc1.dist-info/RECORD,,
+neurostats_API-1.0.2rc2.dist-info/METADATA,sha256=x-b56LcvMZHRcsM-4rQcwfGkzs5CFDkfFIDi9UBZeDE,2964
+neurostats_API-1.0.2rc2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-1.0.2rc2.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-1.0.2rc2.dist-info/RECORD,,