neurostats-API 0.0.16__tar.gz → 0.0.17__tar.gz

{neurostats_api-0.0.16 → neurostats_api-0.0.17}/PKG-INFO

@@ -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 → neurostats_api-0.0.17}/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-0.0.16 → neurostats_api-0.0.17}/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 → neurostats_api-0.0.17}/neurostats_API.egg-info/PKG-INFO

@@ -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 → neurostats_api-0.0.17}/setup.py

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