neurostats-API 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

neurostats_API/fetchers/base.py

@@ -53,6 +53,23 @@ class StatsFetcher:
         season = (month - 1) // 3 + 1
 
         return StatsDateTime(date, year, month, day, season)
+    
+    def has_required_columns(self, df:pd.DataFrame, required_cols=None):
+        """
+        Check if the required columns are present in the DataFrame.
+
+        Args:
+            df (pd.DataFrame): The DataFrame to check.
+            required_cols (list, optional): List of required column names. 
+                                            Defaults to ['date', 'open', 'high', 'low', 'close', 'volume'].
+
+        Returns:
+            bool: True if all required columns are present, False otherwise.
+        """
+        if required_cols is None:
+            required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
+        
+        return all(col in df.columns for col in required_cols)
 
 
 class BaseTEJFetcher(abc.ABC):

neurostats_API/fetchers/tech.py

@@ -47,40 +47,46 @@ class TechFetcher(StatsFetcher):
         )
 
     def _get_ohlcv(self):
-        
-        if self.ticker in ['GSPC', 'IXIC', 'DJI', 'TWII']:
-            
-            full_tick = f'^{self.ticker}'
-            yf_ticker = yf.Ticker(full_tick)
-            origin_df = yf_ticker.history(period="10y")
-            origin_df = origin_df.reset_index()
-            origin_df["Date"] = pd.to_datetime(origin_df["Date"]).dt.date
-            df = origin_df.rename(
-                columns={
-                    "Date": "date",
-                    "Open": "open",
-                    "High": "high",
-                    "Low": "low",
-                    "Close": "close",
-                    "Volume": "volume"
-                }
-            )
-        else:
 
+        required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
+
+        try:
             query = {'ticker': self.ticker}
-            ticker_full = list(self.collection.find(query))
+            ticker_full = self.collection.find_one(query)
 
             if not ticker_full:
                 raise ValueError(f"No data found for ticker: {self.ticker}")
 
-            if 'daily_data' not in ticker_full[0] or ticker_full[0]['daily_data'] is None:
-                raise KeyError("Missing 'daily_data' in the retrieved data")
+            daily_data = ticker_full.get("daily_data", [])
+            if not isinstance(daily_data, list):
+                raise TypeError("Expected 'daily_data' to be a list.")
+
+            df = pd.DataFrame(daily_data)
 
-            df = pd.DataFrame(ticker_full[0]['daily_data'])
+            if not self.has_required_columns(df, required_cols):
+                raise KeyError(f"Missing required columns")
 
-        selected_cols = ['date','open','high','low','close','volume']
+        except (KeyError, ValueError, TypeError) as e:
+
+            print(f"Conduct yf searching")
+
+            if self.ticker in ['GSPC', 'IXIC', 'DJI', 'TWII']:
+                full_tick = f'^{self.ticker}'
+            else:
+                full_tick = f'{self.ticker}.tw'
+
+            df = self.conduct_yf_search(full_tick)
+
+            if not self.has_required_columns(df, required_cols):
+
+                print(f".tw failed, try .two")
+            
+                full_tick = f'{self.ticker}.two'
+
+                df = self.conduct_yf_search(full_tick)
+                
+        return df[required_cols]
 
-        return df[selected_cols]
 
     def get_daily(self):
 
@@ -101,6 +107,29 @@ class TechFetcher(StatsFetcher):
     def get_yearly(self):
 
         return self.yearly_index
+    
+    def conduct_yf_search(self, ticker:str):
+
+        yf_ticker = yf.Ticker(ticker)
+        origin_df = yf_ticker.history(period="10y")
+        
+        if origin_df.empty:
+            return origin_df
+            
+        origin_df = origin_df.reset_index()
+        origin_df["Date"] = pd.to_datetime(origin_df["Date"])
+        df = origin_df.rename(
+            columns={
+                "Date": "date",
+                "Open": "open",
+                "High": "high",
+                "Low": "low",
+                "Close": "close",
+                "Volume": "volume"
+            }
+        )
+
+        return df
 
 class TechProcessor:
     

{neurostats_API-0.0.16.dist-info → neurostats_API-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neurostats_API
-Version: 0.0.16
+Version: 0.0.17
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt

{neurostats_API-0.0.16.dist-info → neurostats_API-0.0.17.dist-info}/RECORD

@@ -3,14 +3,14 @@ neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
 neurostats_API/fetchers/__init__.py,sha256=B4aBwVzf_X-YieEf3fZteU0qmBPVIB9VjrmkyWhLK18,489
 neurostats_API/fetchers/balance_sheet.py,sha256=sQv4Gk5uoKURLEdh57YknOQWiyVwaXJ2Mw75jxNqUS0,5804
-neurostats_API/fetchers/base.py,sha256=rcrKW2PTJYfBsxsiGpCYiVTK9pQW4aALYLixIjvNMUk,4890
+neurostats_API/fetchers/base.py,sha256=Rl88Mhvi0uFpPupUvy0iyS7IA4B3fnn6ovMNzS7EU34,5594
 neurostats_API/fetchers/cash_flow.py,sha256=TY7VAWVXkj5-mzH5Iu0sIE-oV8MvGmmDy0URNotNV1E,7614
 neurostats_API/fetchers/finance_overview.py,sha256=PxUdWY0x030olYMLcCHDBn068JLmCE2RTOce1dxs5vM,27753
 neurostats_API/fetchers/institution.py,sha256=UrcBc6t7u7CnEwUsf6YmLbbJ8VncdWpq8bCz17q2dgs,11168
 neurostats_API/fetchers/margin_trading.py,sha256=lQImtNdvaBoSlKhJvQ3DkH3HjSSgKRJz4ZZpyR5-Z4I,10433
 neurostats_API/fetchers/month_revenue.py,sha256=nixX2llzjCFr2m2YVjxrSfkBusnZPrPb2dRDq1XLGhw,4251
 neurostats_API/fetchers/profit_lose.py,sha256=EN9Y0iamcAaHMZdjHXO6b_2buLnORssf8ZS7A0hi74s,5896
-neurostats_API/fetchers/tech.py,sha256=Hol1bcwJ_ERcnoTXNWlqqaWOuzdl7MeiAjCvzQMZDTg,12269
+neurostats_API/fetchers/tech.py,sha256=8U6kn7cvWJsmKIMn_f2l6U9H_NBy_OwOXlS26XhFIv0,12926
 neurostats_API/fetchers/tej_finance_report.py,sha256=laXph2ca1LCFocZjjdvtzmm5fcUecHk2Gs5h6-XMSWY,12967
 neurostats_API/fetchers/value_invest.py,sha256=b_x2Dpgs8VBU5HdG8ocKtfIEkqhU-Q0S5n6RxuFuM2g,7467
 neurostats_API/tools/balance_sheet.yaml,sha256=6XygNG_Ybb1Xkk1e39LMLKr7ATvaCP3xxuwFbgNl6dA,673
@@ -24,7 +24,7 @@ neurostats_API/utils/data_process.py,sha256=A--dzOsu42jRxqqCD41gTtjE5rhEBYmhB6y-
 neurostats_API/utils/datetime.py,sha256=XJya4G8b_-ZOaBbMXgQjWh2MC4wc-o6goQ7EQJQMWrQ,773
 neurostats_API/utils/db_client.py,sha256=OYe6yazcR4Aa6jYmy47JrryUeh2NnKGqY2K_lSZe6i8,455
 neurostats_API/utils/fetcher.py,sha256=VbrUhjA-GG5AyjPX2SHtFIbZM4dm3jo0RgZzuCbb_Io,40927
-neurostats_API-0.0.16.dist-info/METADATA,sha256=9US1mdwWnOCAnwfsOj-ZLRCfo07p3yd0UfwMKS6989g,29848
-neurostats_API-0.0.16.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-0.0.16.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.16.dist-info/RECORD,,
+neurostats_API-0.0.17.dist-info/METADATA,sha256=_MqEN2Yi-tDE8i4UzX9WGUi25Z7SzyNgDR2kj0p2vhw,29848
+neurostats_API-0.0.17.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-0.0.17.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.17.dist-info/RECORD,,