neurostats-API 0.0.23b0__py3-none-any.whl → 0.0.23b1__py3-none-any.whl

neurostats_API/fetchers/tech.py

@@ -138,62 +138,6 @@ class TechFetcher(StatsFetcher):
         )
 
         return df
-    
-    def conduct_db_search_tej(self):
-        # 再對TEJ search
-        tej_required_cols = [
-            "mdate", "open_d", 'high_d', 'low_d', 'close_d', 'vol'
-        ]
-
-        required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
-        tej_name_proj = {
-            tej_name: org_name
-            for tej_name, org_name in zip(tej_required_cols, required_cols)
-        }
-
-        query = {'ticker': self.ticker}
-        ticker_full = self.collection.find_one(query)
-
-        if not ticker_full:
-            raise ValueError("No ticker found in database")
-
-        daily_data = ticker_full.get("data", [])
-        if not isinstance(daily_data, list):
-            raise TypeError("Expected 'daily_data' to be a list.")
-
-        df = pd.DataFrame(daily_data)
-
-        if not self.has_required_columns(df, tej_required_cols):
-            raise KeyError(f"Missing required columns")
-        df = df.rename(columns=tej_name_proj)
-
-        return df[required_cols]
-    
-    def conduct_db_search_us(self):
-        required_cols = ['date', 'open', 'high', 'low', 'close', 'volume']
-
-        query = {'ticker': self.ticker}
-        filter_query = {"daily_data" : 1, "_id": 0}
-        ticker_full = self.collection.find_one(query, filter_query)
-
-        if not ticker_full:
-            raise ValueError("No ticker found in database")
-
-        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)
-
-        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")
-
-        return df[required_cols]
 
     
     def conduct_db_search_twse(self):

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.23b0.dist-info → neurostats_API-0.0.23b1.dist-info}/METADATA

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

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

@@ -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=LvgWhcHdruTGJE_1_z8rrArJs3s7X5AbE3LtuR4zwIM,18051
-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.23b0.dist-info/METADATA,sha256=433KG3-zXJJeDPaZcmxBBIsamFrZziYqmGNoNG-Oz5E,31621
-neurostats_API-0.0.23b0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-neurostats_API-0.0.23b0.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.23b0.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,,