neurostats-API 0.0.22__py3-none-any.whl → 0.0.23b1__py3-none-any.whl

neurostats_API/__init__.py

@@ -1,4 +1,4 @@
-__version__='0.0.22'
+__version__='0.0.23b'
 
 from .fetchers import (
     BalanceSheetFetcher,

neurostats_API/fetchers/tech.py

@@ -13,7 +13,8 @@ class TechFetcher(StatsFetcher):
 
         super().__init__(ticker, db_client)
         if (ticker in self.tw_company_list.keys()):
-            self.collection = self.db["TWN/APIPRCD"]
+            self.twse_collection = self.db['twse_stats']
+            self.tej_collection = self.db["TWN/APIPRCD"]
 
         self.full_ohlcv = self._get_ohlcv()
         self.basic_indexes = [
@@ -53,35 +54,47 @@ class TechFetcher(StatsFetcher):
 
         required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
 
-        try:
-            # 先對yf search
-            if self.ticker in ['GSPC', 'IXIC', 'DJI', 'TWII']:
-                full_tick = f'^{self.ticker}'
-            elif(self.ticker in self.tw_company_list.keys()):
-                full_tick = f'{self.ticker}.tw'
-            else:
-                full_tick = f"{self.ticker}"
-
+        if self.ticker in ['GSPC', 'IXIC', 'DJI', 'TWII']:
+            full_tick = f'^{self.ticker}'
             df = self.conduct_yf_search(full_tick)
 
-            if (
-                self.ticker in self.tw_company_list.keys() and
-                not self.has_required_columns(df, required_cols)
-            ):
-                full_tick = f'{self.ticker}.two'
+            return df[required_cols]
 
-                df = self.conduct_yf_search(full_tick)
+        elif(self.ticker in self.tw_company_list.keys()):
+            search_fns = [
+                self.conduct_db_search_twse, 
+                self.conduct_db_search_tej, 
+                lambda: self.conduct_yf_search(f'{self.ticker}.tw'),
+                lambda: self.conduct_yf_search(f'{self.ticker}.two')
+            ]
+
+            for search_method in search_fns:
+                try:
+                    df = search_method()
+                    break
+                except (KeyError, ValueError, TypeError):
+                    continue
+            else:
+                return pd.DataFrame(columns=required_cols)
 
-                if (df.empty):
-                    raise ValueError(f"No data found for ticker: {self.ticker}")\
-            
+            # break跳出後
             return df[required_cols]
+        else:  # 美股
+            search_fns = [
+                self.conduct_db_search_us,
+                lambda : self.conduct_yf_search(f"{self.ticker}")
+            ]
+            for search_method in search_fns:
+                try:
+                    df = search_method()
+                    break
+                except (KeyError, ValueError, TypeError):
+                    continue
+            else:
+                df = pd.DataFrame()
 
-        except (KeyError, ValueError, TypeError) as e:
-            if (self.collection_name in ['TWN/APIPRCD']):
-                return self.conduct_db_search_tej()
-            elif (self.collection_name == 'us_stats'):
-                return self.conduct_db_search_us()
+            return df
+        
 
     def get_daily(self):
 
@@ -125,6 +138,31 @@ class TechFetcher(StatsFetcher):
         )
 
         return df
+
+    
+    def conduct_db_search_twse(self):
+        required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
+        match_query = {"ticker" : self.ticker}
+        proj_query = {"_id": 0, "daily_data": 1}
+
+        full_data = self.twse_collection.find_one(match_query, proj_query)
+
+        if (not full_data):
+            raise ValueError("No ticker found in database twse_stats")
+
+        daily_data = full_data.get("daily_data", [])
+
+        if (not isinstance(daily_data, list)):
+            raise ValueError("No ticker found in database twse_stats")
+
+        df = pd.DataFrame(daily_data)
+        if not self.has_required_columns(df, required_cols):
+            raise KeyError(f"Missing required columns")
+        
+        df = df[required_cols]
+        df = df.sort_values(by = 'date').drop_duplicates(subset=['date'])
+
+        return df
     
     def conduct_db_search_tej(self):
         # 再對TEJ search
@@ -139,7 +177,7 @@ class TechFetcher(StatsFetcher):
         }
 
         query = {'ticker': self.ticker}
-        ticker_full = self.collection.find_one(query)
+        ticker_full = self.tej_collection.find_one(query)
 
         if not ticker_full:
             raise ValueError("No ticker found in database")
@@ -175,7 +213,6 @@ class TechFetcher(StatsFetcher):
         if not self.has_required_columns(df, required_cols):
             missing_cols = [col for col in required_cols if col not in df.columns]
             missing_cols = ",".join(missing_cols)
-            print(Warning(f"{missing_cols} not in columns"))
             for col in missing_cols:
                 df[col] = pd.NA
             # raise KeyError(f"Missing required columns")

neurostats_API/fetchers/tej_finance_report.py

@@ -176,7 +176,10 @@ class FinanceReportFetcher(BaseTEJFetcher):
         fetched_data = self.collection.aggregate(pipeline).to_list()
         data_dict = self.transform_value(
             StatsProcessor.list_of_dict_to_dict(
-                fetched_data, ["year", "season"], "Q", report_type
+                data_list=fetched_data, 
+                keys=["year", "season"], 
+                delimeter="Q", 
+                data_key=report_type
             )
         )
 
@@ -241,7 +244,7 @@ class FinanceReportFetcher(BaseTEJFetcher):
                     "$gt": start_year,
                     "$lt": end_year
                 },
-                "data.season": end_season
+                "data.season": start_season
             }
         else:
             match_stage = {

neurostats_API/tools/tej_db/tej_db_skip_index.yaml

@@ -9,6 +9,13 @@ TWN/AINVFQ1:
 - annd
 - fin_ind
 - eps
+- r307
+- r305
+- r306
+- r316
+- r609
+- r614
+- r611
 TWN/AFESTM1:
 - coid
 - mdate
@@ -19,4 +26,8 @@ TWN/AFESTM1:
 - curr
 - annd
 - fin_ind
-- eps
+- eps
+- r307
+- r305
+- r306
+- r316

neurostats_API/tools/tej_db/tej_db_thousand_index.yaml

@@ -56,10 +56,6 @@ TWN/AINVFQ1:
 - person
 - shares
 - wavg
-- r304
-- r305
-- r306
-- r316
 - r834
 TWN/AFESTM1:
 - ip12

{neurostats_API-0.0.22.dist-info → neurostats_API-0.0.23b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 0.0.22
+Version: 0.0.23b1
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -89,7 +89,7 @@ pip install neurostats-API
 ```Python 
 >>> import neurostats_API
 >>> print(neurostats_API.__version__)
-0.0.22
+0.0.23b
 ```
 
 ### 得到最新一期的評價資料與歷年評價

{neurostats_API-0.0.22.dist-info → neurostats_API-0.0.23b1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-neurostats_API/__init__.py,sha256=bOEodI1kq0xK8AR_160U9DasXGcjCEZHi7BQGh6Ib-4,288
+neurostats_API/__init__.py,sha256=ItIYqBMTp2EHBeBahEWCKKGa-JIzQO2ykdQy3A-LNZY,289
 neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
 neurostats_API/fetchers/__init__.py,sha256=KCw-yRSDFa3fw83u73LJ9OVop7gRl_YQYlQq-cITxuo,511
@@ -10,14 +10,14 @@ neurostats_API/fetchers/institution.py,sha256=UrcBc6t7u7CnEwUsf6YmLbbJ8VncdWpq8b
 neurostats_API/fetchers/margin_trading.py,sha256=lQImtNdvaBoSlKhJvQ3DkH3HjSSgKRJz4ZZpyR5-Z4I,10433
 neurostats_API/fetchers/month_revenue.py,sha256=DZeOblfSz7NhQXVvL5xfMHZ1rv2B8pgqu-U-o_gcAuc,6323
 neurostats_API/fetchers/profit_lose.py,sha256=ZvSG4vx4gBrWMKmcyuSaoNyW6JGiOtIpFxRIeyCAeDY,7705
-neurostats_API/fetchers/tech.py,sha256=AyxdOjStVJIPFTVcofVOJknXPpv_D9dqkFPjEFXo6iY,14937
-neurostats_API/fetchers/tej_finance_report.py,sha256=5ERpg1kq2wSPdLMBYXX5MUWRxOrwwFHSBXNidSKeuRo,11233
+neurostats_API/fetchers/tech.py,sha256=u0L6X19g7VmbCUXF_9UI_tBIJJ9hPareEggjXUe52_o,16079
+neurostats_API/fetchers/tej_finance_report.py,sha256=og3wg0Vdyzyx3Ex6ejk10ORo4zQjcrUrRtR9W1dCWNE,11320
 neurostats_API/fetchers/value_invest.py,sha256=b_x2Dpgs8VBU5HdG8ocKtfIEkqhU-Q0S5n6RxuFuM2g,7467
 neurostats_API/tools/company_list/tw.json,sha256=VWaDFvd0ACCVSWItcHHpmVuM_RzP71jLZl9RBHztu-0,51332
 neurostats_API/tools/tej_db/tej_db_index.yaml,sha256=lu-cmbB6dhx0eUlBSkyzXWqPKlwRtEvqlMTAh2y0oHs,969
 neurostats_API/tools/tej_db/tej_db_percent_index.yaml,sha256=-rBSdOoYs5UB9H6Y3FE5PTqV9meXEFZD2KhSlAQ_4Eg,323
-neurostats_API/tools/tej_db/tej_db_skip_index.yaml,sha256=nSbrflaJrWCIjL5WeHT3UDKZyN0WegVElUKVYA4YSa0,169
-neurostats_API/tools/tej_db/tej_db_thousand_index.yaml,sha256=S1k4PFZ7NsjGUgeCb89dyaojkOcvGPRdBr45hz3wlWY,507
+neurostats_API/tools/tej_db/tej_db_skip_index.yaml,sha256=6UtMfPL7XvkKvEWTFXIIUZMJWZSagIduLYJb-r3HEg8,246
+neurostats_API/tools/tej_db/tej_db_thousand_index.yaml,sha256=K2YFBSrxqX1V2upy0IUeQ4ung4aPrjtlqYSvCGaaO8I,479
 neurostats_API/tools/twse/balance_sheet.yaml,sha256=6XygNG_Ybb1Xkk1e39LMLKr7ATvaCP3xxuwFbgNl6dA,673
 neurostats_API/tools/twse/cash_flow_percentage.yaml,sha256=fk2Z4eb1JjGFvP134eJatHacB7BgTkBenhDJr83w8RE,1345
 neurostats_API/tools/twse/finance_overview_dict.yaml,sha256=B9nV75StXkrF3yv2-eezzitlJ38eEK86RD_VY6588gQ,2884
@@ -28,7 +28,7 @@ neurostats_API/utils/calculate_value.py,sha256=Zc5DG_qXnHZLkCjUYdoMWka3KVXu2o9Am
 neurostats_API/utils/data_process.py,sha256=LdDmhQMGBg1UI6cIWCdsj9YTkixtf1cyrN1xq2JZmPo,9971
 neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
 neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
-neurostats_API-0.0.22.dist-info/METADATA,sha256=yLp6sTftp5SaxhXZxtLfE7Fvd7OmtZYd3XjwyR4yoG4,31618
-neurostats_API-0.0.22.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-0.0.22.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.22.dist-info/RECORD,,
+neurostats_API-0.0.23b1.dist-info/METADATA,sha256=W8Ks1L96z3SeSc5moAXkDwLYVlbMildAHJH6x4D09mo,31621
+neurostats_API-0.0.23b1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-0.0.23b1.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.23b1.dist-info/RECORD,,