neurostats-API 0.0.11__py3-none-any.whl → 0.0.12__py3-none-any.whl

neurostats_API/__init__.py

@@ -1 +1 @@
-__version__='0.0.11'
+__version__='0.0.12'

neurostats_API/fetchers/__init__.py

@@ -3,6 +3,7 @@ from .balance_sheet import BalanceSheetFetcher
 from .cash_flow import CashFlowFetcher
 from .finance_overview import FinanceOverviewFetcher
 from .institution import InstitutionFetcher
+from .margin_trading import MarginTradingFetcher
 from .month_revenue import MonthRevenueFetcher
 from .profit_lose import ProfitLoseFetcher
 from .value_invest import ValueFetcher

neurostats_API/fetchers/institution.py

@@ -51,6 +51,27 @@ class InstitutionFetcher(StatsFetcher):
                         "as": "target_daily_data",
                         "in": "$$target_daily_data"
                     }
+                },
+                "institution_trading": {
+                    "$map": {
+                        "input": {
+                            "$filter": {
+                                "input": "$institution_trading",
+                                "as": "institution",
+                                "cond": {
+                                    "$and": [{
+                                        "$gte":
+                                        ["$$institution.date", start_date]
+                                    }, {
+                                        "$lte":
+                                        ["$$institution.date", end_date]
+                                    }]
+                                }
+                            }
+                        },
+                        "as": "target_institution_data",
+                        "in": "$$target_institution_data"
+                    },
                 }
             }
         })
@@ -68,81 +89,110 @@ class InstitutionFetcher(StatsFetcher):
         try:
             latest_time = StatsDateTime.get_latest_time(
                 self.ticker, self.collection)['last_update_time']
-            latest_date = latest_time['institution_trading'][
-                'latest_date']
-            date = latest_date.replace(hour=0,
-                                       minute=0,
-                                       second=0,
-                                       microsecond=0)
+            latest_date = latest_time['institution_trading']['latest_date']
+            end_date = latest_date.replace(hour=0,
+                                           minute=0,
+                                           second=0,
+                                           microsecond=0)
         except Exception as e:
             print(
                 f"No updated time for institution_trading in {self.ticker}, use current time instead"
             )
-            date = datetime.now(self.timezone)
-            date = date.replace(hour=0, minute=0, second=0, microsecond=0)
+            end_date = datetime.now(self.timezone)
+            end_date = date.replace(hour=0, minute=0, second=0, microsecond=0)
 
             if (date.hour < 17):  # 拿不到今天的資料
-                date = date - timedelta(days=1)
+                end_date = end_date - timedelta(days=1)
 
-        start_date = date - timedelta(days=365)
+        start_date = end_date - timedelta(days=365)
 
-        daily_data = self.collect_data(start_date, end_date=date)
+        fetched_data = self.collect_data(start_date, end_date)
 
-        daily_data = sorted(daily_data['daily_data'],
-                            key=lambda x: x['date'],
-                            reverse=True)
+        fetched_data['daily_data'] = sorted(fetched_data['daily_data'],
+                                            key=lambda x: x['date'],
+                                            reverse=True)
+        fetched_data['institution_trading'] = sorted(
+            fetched_data['institution_trading'],
+            key=lambda x: x['date'],
+            reverse=True)
 
-        table_dict = self.process_data(daily_data)
+        table_dict = self.process_data(fetched_data)
 
         return table_dict
 
-    def process_data(self, daily_data):
+    def process_data(self, fetched_data):
         table_dict = dict()
 
-        latest_data = daily_data[0]
-        yesterday_data = daily_data[1]
+        daily_datas = fetched_data['daily_data']
+        institution_tradings = fetched_data['institution_trading']
+
+        latest_daily_data = daily_datas[0]
+        yesterday_daily_data = daily_datas[1]
 
         # 交易價格與昨天交易
         price_dict = {
-            "open": latest_data['open'],
-            'close': latest_data['close'],
-            'range': f"{latest_data['low']}-{latest_data['high']}",
-            'volumn': latest_data['volume'] / 1000,
-            'last_open': yesterday_data['open'],
-            'last_close': yesterday_data['close'],
-            'last_range': f"{yesterday_data['low']}-{yesterday_data['high']}",
-            'last_volumn': yesterday_data['volume'] / 1000
+            "open": latest_daily_data['open'],
+            'close': latest_daily_data['close'],
+            'range':
+            f"{latest_daily_data['low']} - {latest_daily_data['high']}",
+            'volume': latest_daily_data['volume'] / 1000,
+            'last_open': yesterday_daily_data['open'],
+            'last_close': yesterday_daily_data['close'],
+            'last_range':
+            f"{yesterday_daily_data['low']} - {yesterday_daily_data['high']}",
+            'last_volume': yesterday_daily_data['volume'] / 1000
         }
         # 一年範圍
-        annual_lows = [data['low'] for data in daily_data]
-        annual_highs = [data['high'] for data in daily_data]
+        annual_lows = [data['low'] for data in daily_datas]
+        annual_highs = [data['high'] for data in daily_datas]
         lowest = np.min(annual_lows).item()
         highest = np.max(annual_highs).item()
 
-        price_dict['52weeks_range'] = f"{lowest}-{highest}"
+        price_dict['52weeks_range'] = f"{lowest} - {highest}"
         table_dict['price'] = price_dict
 
         # 發行股數 & 市值
+        # 沒有實作
 
         # 今日法人買賣
+        latest_trading = institution_tradings[0]
         table_dict['latest_trading'] = {
             "date":
-            daily_data[0]['date'],
+            latest_trading['date'],
             "table":
-            self.process_latest_trading(daily_data[0]['institution_trading'], daily_data[0]['volume'])
+            self.process_latest_trading(latest_trading,
+                                        latest_daily_data['volume'])
         }
         # 一年內法人
-        annual_trading = [
-            {
-                **data['institution_trading'],
-                "收盤價": int(data['close'])
+        annual_dates = [data['date'].strftime("%Y-%m-%d") for data in daily_datas]
+        annual_closes = {
+            data['date'].strftime("%Y-%m-%d") : data['close']
+            for data in daily_datas
+            if (data['date'].strftime("%Y-%m-%d") in annual_dates)
+        }
+        annual_volumes = {
+            data['date'].strftime("%Y-%m-%d") : data['volume']
+            for data in daily_datas
+            if (data['date'].strftime("%Y-%m-%d") in annual_dates)
+        }
+        annual_trading = {
+            data['date'].strftime("%Y-%m-%d") : data
+            for data in institution_tradings
+        } 
+
+        annual_trading = {
+            date: {
+                
+                "close": annual_closes[date],
+                "volume": annual_volumes[date],
+                **annual_trading[date]
             }
-            for data in daily_data
-        ]  # 將close也併入這個表格
-        annual_dates = [data['date'] for data in daily_data]
+            for date in annual_dates
+        }
+
         table_dict['annual_trading'] = self.process_annual_trading(
             annual_dates, annual_trading)
-        
+
         return table_dict
 
     def process_latest_trading(self, latest_trading, volume):
@@ -150,34 +200,61 @@ class InstitutionFetcher(StatsFetcher):
             "foreign": self.default_institution_chart(),
             "mutual": self.default_institution_chart(),
             "prop": self.default_institution_chart(),
-            "institutional_investor":self.default_institution_chart(),
+            "institutional_investor": self.default_institution_chart(),
         }
 
         for key in latest_trading.keys():
             if (key.find("外陸資") >= 0 or key.find("外資") >= 0):
-                self.target_institution(latest_trading, latest_table['foreign'], key, volume)
+                self.target_institution(latest_trading,
+                                        latest_table['foreign'], key, volume)
             elif (key.find("自營商") >= 0):
-                self.target_institution(latest_trading,latest_table['prop'], key, volume)
+                self.target_institution(latest_trading, latest_table['prop'],
+                                        key, volume)
             elif (key.find("投信") >= 0):
-                self.target_institution(latest_trading,latest_table['mutual'], key, volume)
+                self.target_institution(latest_trading, latest_table['mutual'],
+                                        key, volume)
             elif (key.find("三大法人") >= 0):
-                self.target_institution(latest_trading,latest_table['institutional_investor'], key, volume)
+                self.target_institution(latest_trading,
+                                        latest_table['institutional_investor'],
+                                        key, volume)
+
+            for trade_type in ['buy', 'sell']:
+                for unit in ['stock', 'percentage']:
+                    latest_table['institutional_investor'][trade_type][
+                        unit] = (latest_table['foreign'][trade_type][unit] +
+                                 latest_table['prop'][trade_type][unit] +
+                                 latest_table['mutual'][trade_type][unit])
 
         frames = []
         for category, trades in latest_table.items():
             temp_df = pd.DataFrame(trades).T
             temp_df['category'] = category
             frames.append(temp_df)
-        
+
         latest_df = pd.concat(frames)
         latest_df = latest_df.reset_index().rename(columns={'index': 'type'})
-        latest_df = latest_df[['type', 'category', 'stock', 'price', 'average_price', 'percentage']]
+        latest_df = latest_df[[
+            'type', 'category', 'stock', 'price', 'average_price', 'percentage'
+        ]]
+
+        latest_df = pd.melt(latest_df,
+                            id_vars=['type', 'category'],
+                            var_name='variable',
+                            value_name='value')
+
+        latest_df = latest_df.pivot_table(index=['category', 'variable'],
+                                          columns='type',
+                                          values='value',
+                                          aggfunc='first')
+
+        # 重設列名，去除多層索引
+        latest_df.columns.name = None  # 去除列名稱
+        latest_df = latest_df.reset_index()
 
         return latest_df
 
     def process_annual_trading(self, dates, annual_tradings):
-        dates = [date.strftime("%m/%d") for date in dates]
-        return pd.DataFrame(annual_tradings, index=dates)
+        return pd.DataFrame.from_dict(annual_tradings, orient='index')
 
     def target_institution(self, old_table, new_table, key, volume):
         if (key.find("買進") >= 0):
@@ -185,12 +262,14 @@ class InstitutionFetcher(StatsFetcher):
         elif (key.find("賣出") >= 0):
             self.cal_institution(old_table, new_table['sell'], key, volume)
         elif (key.find("買賣超") >= 0):
-            self.cal_institution(old_table, new_table['over_buy_sell'], key, volume)
-        
+            self.cal_institution(old_table, new_table['over_buy_sell'], key,
+                                 volume)
+
     def cal_institution(self, old_table, new_table, key, volume):
         new_table['stock'] = np.round(old_table[key] / 1000, 2).item()
-        new_table['percentage'] = np.round((old_table[key] / volume) * 100, 2).item()
-    
+        new_table['percentage'] = np.round((old_table[key] / volume) * 100,
+                                           2).item()
+
     def default_institution_chart(self):
         return {
             "buy": {
@@ -211,4 +290,4 @@ class InstitutionFetcher(StatsFetcher):
                 "average_price": 0,
                 "percentage": 0
             },
-        }
+        }

neurostats_API/fetchers/margin_trading.py

@@ -0,0 +1,279 @@
+from .base import StatsFetcher
+from datetime import datetime, timedelta
+import json
+import numpy as np
+import pandas as pd
+from ..utils import StatsDateTime, StatsProcessor
+import importlib.resources as pkg_resources
+import yaml
+
+
+class MarginTradingFetcher(StatsFetcher):
+
+    def __init__(self, ticker, db_client):
+        """
+        iFa -> 交易資訊 -> 資券變化
+
+        包括: 
+        1. 當日交易
+        2. 一年內交易
+        """
+        super().__init__(ticker, db_client)
+
+    def prepare_query(self, start_date, end_date):
+        pipeline = super().prepare_query()
+
+        pipeline.append({
+            "$project": {
+                "_id": 0,
+                "ticker": 1,
+                "company_name": 1,
+                "daily_data": {
+                    "$map": {
+                        "input": {
+                            "$filter": {
+                                "input": "$daily_data",
+                                "as": "daliy",
+                                "cond": {
+                                    "$and": [{
+                                        "$gte": ["$$daliy.date", start_date]
+                                    }, {
+                                        "$lte": ["$$daliy.date", end_date]
+                                    }]
+                                }
+                            }
+                        },
+                        "as": "target_daliy_data",
+                        "in": "$$target_daliy_data"
+                    }
+                },
+                "margin_trading": {
+                    "$map": {
+                        "input": {
+                            "$filter": {
+                                "input": "$margin_trading",
+                                "as": "margin",
+                                "cond": {
+                                    "$and": [{
+                                        "$gte": ["$$margin.date", start_date]
+                                    }, {
+                                        "$lte": ["$$margin.date", end_date]
+                                    }]
+                                }
+                            }
+                        },
+                        "as": "target_margin_data",
+                        "in": "$$target_margin_data"
+                    }
+                },
+                "security_lending": {
+                    "$map": {
+                        "input": {
+                            "$filter": {
+                                "input": "$security_lending",
+                                "as": "lending",
+                                "cond": {
+                                    "$and": [{
+                                        "$gte": ["$$lending.date", start_date]
+                                    }, {
+                                        "$lte": ["$$lending.date", end_date]
+                                    }]
+                                }
+                            }
+                        },
+                        "as": "target_lending_data",
+                        "in": "$$target_lending_data"
+                    }
+                }
+            }
+        })
+
+        return pipeline
+
+    def collect_data(self, start_date, end_date):
+        pipeline = self.prepare_query(start_date, end_date)
+
+        fetched_data = self.collection.aggregate(pipeline).to_list()
+
+        return fetched_data[-1]
+
+    def query_data(self):
+        try:
+            latest_time = StatsDateTime.get_latest_time(
+                self.ticker, self.collection)['last_update_time']
+            latest_date = latest_time['margin_trading']['latest_date']
+            end_date = latest_date.replace(hour=0,
+                                           minute=0,
+                                           second=0,
+                                           microsecond=0)
+        except Exception as e:
+            print(
+                f"No updated time for institution_trading in {self.ticker}, use current time instead"
+            )
+            end_date = datetime.now(self.timezone)
+            end_date = end_date.replace(hour=0,
+                                        minute=0,
+                                        second=0,
+                                        microsecond=0)
+
+            if (end_date.hour < 22):  # 拿不到今天的資料
+                end_date = end_date - timedelta(days=1)
+
+        start_date = end_date - timedelta(days=365)
+
+        fetched_data = self.collect_data(start_date, end_date)
+
+        fetched_data['daily_data'] = sorted(fetched_data['daily_data'],
+                                            key=lambda x: x['date'],
+                                            reverse=True)
+        fetched_data['margin_trading'] = sorted(fetched_data['margin_trading'],
+                                                key=lambda x: x['date'],
+                                                reverse=True)
+        fetched_data['security_lending'] = sorted(
+            fetched_data['security_lending'],
+            key=lambda x: x['date'],
+            reverse=True)
+
+        table_dict = self.process_data(fetched_data)
+
+        return table_dict
+
+    def process_data(self, fetched_data):
+        return_dict = dict()
+
+        daily_datas = fetched_data['daily_data']
+        latest_data = fetched_data['daily_data'][0]
+        yesterday_data = fetched_data['daily_data'][1]
+
+        # 交易價格與昨天交易
+        price_dict = {
+            "open": latest_data['open'],
+            'close': latest_data['close'],
+            'range': f"{latest_data['low']} - {latest_data['high']}",
+            'volume': latest_data['volume'] / 1000,
+            'last_open': yesterday_data['open'],
+            'last_close': yesterday_data['close'],
+            'last_range':
+            f"{yesterday_data['low']} - {yesterday_data['high']}",
+            'last_volume': yesterday_data['volume'] / 1000
+        }
+        annual_lows = [data['low'] for data in daily_datas]
+        annual_highs = [data['high'] for data in daily_datas]
+        lowest = np.min(annual_lows).item()
+        highest = np.max(annual_highs).item()
+        price_dict['52weeks_range'] = f"{lowest} - {highest}"
+
+        return_dict['price'] = price_dict
+
+        # 當日交易
+        margin_trading = fetched_data['margin_trading']
+        security_lending = fetched_data['security_lending']
+
+        latest_margin_date = margin_trading[0]['date']
+        latest_lending_date = security_lending[0]['date']
+        ## 融資融券
+        ### 先將所有現金償還與現券償還改成現償
+        for trading in margin_trading:
+            trading['financing']['現償'] = trading['financing'].pop('現金償還')
+            trading['short_selling']['現償'] = trading['short_selling'].pop(
+                '現券償還')
+        ### 轉換
+        latest_margin_trading = margin_trading[0]
+        latest_margin_trading_df = {
+            category: sub_dict
+            for category, sub_dict in latest_margin_trading.items()
+            if (isinstance(sub_dict, dict))
+        }
+        latest_margin_trading_df = pd.DataFrame.from_dict(
+            latest_margin_trading_df)
+
+        ## 借券表格
+        latest_stock_lending = security_lending[0]['stock_lending']
+
+        latest_stock_lending = {
+            type_name: StatsProcessor.cal_round_int(value / 1000)
+            for type_name, value in latest_stock_lending.items()
+        }
+        latest_stock_lending.pop("前日餘額")
+        latest_stock_lending_df = pd.DataFrame.from_dict(latest_stock_lending,
+                                                         orient="index",
+                                                         columns=['stock_lending'])
+
+        latest_dict = {
+            "date": latest_margin_date,
+            "margin_trading": latest_margin_trading_df,
+            "stock_lending": latest_stock_lending_df,
+            "security_offset": latest_margin_trading['資券互抵']
+        }
+
+        return_dict['latest_trading'] = latest_dict
+
+        # 一年內
+        annual_dates = [
+            data['date'].strftime('%Y-%m-%d')
+            for data in fetched_data['margin_trading']
+        ]
+        close_prices = {
+            data['date'].strftime('%Y-%m-%d'): data['close']
+            for data in fetched_data['daily_data']
+            if data['date'].strftime('%Y-%m-%d') in annual_dates
+        }
+        volumes = {
+            data['date'].strftime('%Y-%m-%d'):
+            StatsProcessor.cal_round_int(data['volume'] / 1000)
+            for data in fetched_data['daily_data']
+            if data['date'].strftime('%Y-%m-%d') in annual_dates
+        }
+
+        ## 融資融券
+        financings = {
+            data['date'].strftime("%Y-%m-%d"): {
+                f"融資_{type_name}": num_of_stocks
+                for type_name, num_of_stocks in data['financing'].items()
+            }
+            for data in fetched_data['margin_trading']
+        }
+
+        short_sellings = {
+            data['date'].strftime("%Y-%m-%d"): {
+                f"融券_{type_name}": num_of_stocks
+                for type_name, num_of_stocks in data['short_selling'].items()
+            }
+            for data in fetched_data['margin_trading']
+        }
+
+        ### 資券互抵
+        security_offsets = {
+            data['date'].strftime("%Y-%m-%d"): data['資券互抵']
+            for data in fetched_data['margin_trading']
+        }
+
+        ## 借券(stock lendings)
+        stock_lendings = {
+            data['date'].strftime('%Y-%m-%d'): {
+                f"借券_{type_name}":
+                (num_of_stocks /
+                 1000) if isinstance(num_of_stocks,
+                                     (int, float)) else num_of_stocks
+                for type_name, num_of_stocks in data['stock_lending'].items()
+            }
+            for data in fetched_data['security_lending']
+        }
+
+        annual_dict = {
+            date: {
+                "close": close_prices[date],
+                "volume": volumes[date],
+                **financings[date],
+                **short_sellings[date],
+                **stock_lendings[date], 
+                "資券互抵":security_offsets[date]
+            }
+            for date in annual_dates
+        }
+
+        annual_table = pd.DataFrame.from_dict(annual_dict)
+
+        return_dict['annual_margin'] = annual_table.T
+
+        return return_dict

neurostats_API/utils/data_process.py

@@ -17,6 +17,11 @@ target_metric_dict = {
 
 
 class StatsProcessor:
+    """
+    1. 讀檔: txt / yaml
+    2. 將巢狀dictionary / DataFrame扁平化
+
+    """
 
     @classmethod
     def load_txt(cls, filename, json_load=True):
@@ -173,3 +178,13 @@ class StatsProcessor:
 
         else:
             return value
+    
+    @classmethod
+    def cal_round_int(cls, value):
+        """
+        將數值取到個位數後轉為int
+        """
+        if (isinstance(value, (int, float))):
+            return int(np.round(value).item())
+        else:
+            return value

{neurostats_API-0.0.11.dist-info → neurostats_API-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: neurostats-API
-Version: 0.0.11
+Name: neurostats_API
+Version: 0.0.12
 Summary: The service of NeuroStats website
 Home-page: https://github.com/NeurowattStats/NeuroStats_API.git
 Author: JasonWang@Neurowatt
@@ -19,6 +19,8 @@ Description-Content-Type: text/markdown
     - [損益表](#損益表)
     - [資產負債表](#資產負債表)
     - [現金流量表](#現金流量表)
+    - [法人交易](#法人交易)
+    - [資券餘額](#資券餘額)
     - [版本紀錄](#版本紀錄)
 
 
@@ -89,7 +91,8 @@ from neurostats_API.utils import ValueFetcher, DBClient
 db_client = DBClient("<連接的DB位置>").get_client()
 ticker = "2330" # 換成tw50內任意ticker
 fetcher = ValueFetcher(ticker, db_client)
-data = stats_fetcher.query_data()
+
+fetcher.query_data()
 ```
 
 #### 回傳(2330為例)
@@ -324,7 +327,7 @@ db_client = DBClient("<連接的DB位置>").get_client()
 ticker = "2330" # 換成tw50內任意ticker
 fetcher = BalanceSheetFetcher(ticker, db_client)
 
-stats_fetcher.query_data()
+fetcher.query_data()
 ```
 
 #### 回傳
@@ -386,7 +389,7 @@ db_client = DBClient("<連接的DB位置>").get_client()
 ticker = 2330 # 換成tw50內任意ticker
 fetcher = StatsFetcher(ticker, db_client)
 
-stats_fetcher.query()
+fetcher.query()
 ```
 #### 回傳
 ```Python
@@ -435,8 +438,178 @@ stats_fetcher.query()
 
 > 大部分資料缺失是因為尚未計算，僅先填上已經有的資料
 
+## 籌碼面
+### 法人交易
+``` Python
+from neurostats_API.fetchers import InstitutionFetcher
+db_client = DBClient("<連接的DB位置>").get_client()
+ticker = 2330 # 換成tw50內任意ticker
+fetcher = StatsFetcher(ticker, db_client)
+
+fetcher.query()
+```
+### 回傳
+```Python
+{ 'annual_trading':       
+                        close      volume  ... 自營商買賣超股數(避險)   三大法人買賣超股數
+        2024-12-02  1035.000000  31168404.0  ...    -133215.0  11176252.0
+        2024-11-29   996.000000  40094983.0  ...     401044.0  -7880519.0
+        ...                 ...         ...  ...          ...         ...
+        2023-12-05   559.731873  22229723.0  ...       33,400  -5,988,621
+        2023-12-04   563.659790  26847171.0  ...     -135,991  -5,236,743
+
+,
+  'latest_trading': 
+  { 'date': datetime.datetime(2024, 12, 2, 0, 0),
+    'table':              
+            category       variable  ...  over_buy_sell   sell
+        0   foreign  average_price  ...           0.00    0.0
+        1   foreign     percentage  ...           0.00    0.0
+        ..      ...            ...  ...            ...    ...
+        14     prop          price  ...           0.00    0.0
+        15     prop          stock  ...        -133.22  217.2
+  }
+,
+  'price': 
+  { 
+        '52weeks_range': '555.8038940429688-1100.0', # str
+        'close': 1035.0, # float
+        'last_close': 996.0, # float
+        'last_open': 995.0, # float
+        'last_range': '994.0-1010.0', # str
+        'last_volume': 40094.983, # float
+        'open': 1020.0, # float
+        'range': '1015.0-1040.0', # str
+        'volume': 32238.019 # float
+  }
+}
+```
+
+- `annual_trading`: 對應一年內每日的交易量
+- `latest_trading`: 對應當日交易
+##### 欄位項目名稱
+|英文|中文對應|
+|----|-------|
+|buy|買進|
+|sell|賣出|
+|over_buy_sell|買賣超|
+
+##### category項目名稱
+|英文|中文對應|
+|----|-------|
+|foreign|外資|
+|prop|自營商|
+|mutual|投信|
+|institutional_investor|三大法人|
+
+##### variable項目名稱
+|英文|中文對應|
+|----|-------|
+|stock|股票張數|
+|price|成交金額|
+|average_price|均價|
+|percetage|佔成交比重|
+
+**成交金額以及均價因為資料沒有爬到而無法計算**
+**仍然先將這項目加入，只是數值都會是0**
+
+- `price`: 對應法人買賣頁面的今日與昨日交易價
+請注意`range`, `last_range`, `52week_range`這三個項目型態為字串，其餘為float
+
+##### 項目名稱
+|英文|中文對應|
+|----|-------|
+|open|開盤價|
+|close|收盤價|
+|range|當日範圍|
+|volume|成交張數|
+|last_open|開盤價(昨)|
+|last_close|收盤價(昨)|
+|last_range|昨日範圍|
+|last_volume|成交張數(昨)|
+|52weeks_range|52週範圍|
+
+## 資券餘額
+對應iFa.ai -> 交易資訊 -> 資券變化
+```Python
+from neurostats_API.fetchers import MarginTradingFetcher
+db_client = DBClient("<連接的DB位置>").get_client()
+ticker = 2330 # 換成tw50內任意ticker
+fetcher = MarginTradingFetcher(ticker, db_client)
+
+fetcher.query()
+```
+
+### 回傳
+```Python
+{ 'annual_margin':                   
+                        close   volume  ...  借券_次一營業日可限額  資券互抵
+        2024-12-03  1060.000000  29637.0  ...    12222.252   0.0
+        2024-12-02  1035.000000  31168.0  ...    12156.872   1.0
+        ...                 ...      ...  ...          ...   ...
+        2023-12-05   559.731873  22230.0  ...     7838.665   1.0
+        2023-12-04   563.659790  26847.0  ...     7722.725   2.0
+
+  'latest_trading': { 
+        'date': datetime.datetime(2024, 12, 3, 0, 0),
+        'margin_trading':          
+                        financing  short_selling
+        買進           761.0           34.0
+        賣出          1979.0           44.0
+        ...            ...            ...
+        次一營業日限額  6483183.0      6483183.0
+        現償             3.0           12.0
+
+
+        'security_offset': 0.0,
+        'stock_lending':           stock_lending
+                當日賣出                 10
+                當日還券                  0
+                當日調整                  0
+                當日餘額              14688
+                次一營業日可限額          12222
+  },
+  'price': { '52weeks_range': '555.8038940429688 - 1100.0',
+             'close': 1060.0,
+             'last_close': 1035.0,
+             'last_open': 1020.0,
+             'last_range': '1015.0 - 1040.0',
+             'last_volume': 31168.404,
+             'open': 1060.0,
+             'range': '1055.0 - 1065.0',
+             'volume': 29636.523}}
+```
+- `annual_trading`: 對應一年內每日的資券變化量
+- `latest_trading`: 對應當日交易
+##### 欄位項目名稱
+|英文|中文對應|
+|----|-------|
+|financing|融資|
+|short_selling|融券|
+
+- `price`: 對應法人買賣頁面的今日與昨日交易價
+##### 項目名稱
+|英文|中文對應|
+|----|-------|
+|open|開盤價|
+|close|收盤價|
+|range|當日範圍|
+|volume|成交張數|
+|last_open|開盤價(昨)|
+|last_close|收盤價(昨)|
+|last_range|昨日範圍|
+|last_volume|成交張數(昨)|
+|52weeks_range|52週範圍|
+
+請注意`range`, `last_range`, `52week_range`這三個項目型態為字串，其餘為float
 
 ## 版本紀錄
+### 0.0.11
+- 修復財務分析的千元計算問題
+
+- 籌碼面新增法人買賣(institution_trading)
+
+- 將財報三表與月營收的資料型態與數值做轉換(%轉字串, 千元乘以1000)
 ### 0.0.10
 - 更新指標的資料型態: 單位為千元乘以1000之後回傳整數
 

{neurostats_API-0.0.11.dist-info → neurostats_API-0.0.12.dist-info}/RECORD

@@ -1,12 +1,13 @@
-neurostats_API/__init__.py,sha256=oR5iCRZvbIRoODxS1VocreTo19N5L8Omvx_AgflzOO0,20
+neurostats_API/__init__.py,sha256=9UMAkivMiZfppwpwVdBxJI652ZiB-ir2iX3yh0Gxu9M,20
 neurostats_API/cli.py,sha256=UJSWLIw03P24p-gkBb6JSEI5dW5U12UvLf1L8HjQD-o,873
 neurostats_API/main.py,sha256=QcsfmWivg2Dnqw3MTJWiI0QvEiRs0VuH-BjwQHFCv00,677
-neurostats_API/fetchers/__init__.py,sha256=27kdeBuM7dNBRcIyQ1u863CYw0P_DQz-I1G6iSFDq-c,357
+neurostats_API/fetchers/__init__.py,sha256=ylYEySHQxcAhUUWEOCGZfmaAg7Mir5MfuEhOjk3POJg,406
 neurostats_API/fetchers/balance_sheet.py,sha256=sQv4Gk5uoKURLEdh57YknOQWiyVwaXJ2Mw75jxNqUS0,5804
 neurostats_API/fetchers/base.py,sha256=NW2SFzrimyAIrdJx1LVmTazelyZOAtcj54kJKHc4Vaw,1662
 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=aODtsFyQcnD9PnMeaehMAN9wZdZ2a0EqSSZO57dY9RE,7691
+neurostats_API/fetchers/institution.py,sha256=rEcs5-JKbWjg8lSjG1V3YdHJQuPSN1GntnxvedESCeo,10984
+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=xlLNsGSy4Azf4HyZyYaX3dFad-ACO-vuQToBooZi1_w,5698
 neurostats_API/fetchers/tech.py,sha256=wH1kkqiETQhF0HAhk-UIiucnZ3EiL85Q-yMWCcVOiFM,11395
@@ -17,11 +18,11 @@ neurostats_API/tools/finance_overview_dict.yaml,sha256=B9nV75StXkrF3yv2-eezzitlJ
 neurostats_API/tools/profit_lose.yaml,sha256=dcO-0J0BC4p06XBNuowu8ux0NTbyZiOkGfy6szHF6fw,2402
 neurostats_API/tools/seasonal_data_field_dict.txt,sha256=X8yc_el6p8BH_3FikTqBVFGsvWdXT6MHXLfKfi44334,8491
 neurostats_API/utils/__init__.py,sha256=FTYKRFzW2XVXdnSHXnS3mQQaHlKF9xGqrMsgZZ2kroc,142
-neurostats_API/utils/data_process.py,sha256=mDznLqAAZ7gFX3LlJkJvtrMPt38Lh5-NONqgnqT5tSY,5990
+neurostats_API/utils/data_process.py,sha256=2yrO0iP1LHhF0uhXZ442PHQBI-Zd2xIqNItkNf5hKIc,6339
 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.11.dist-info/METADATA,sha256=Tddw5SxRekTkTtemDXgYPoiJf9sxICyRkdlFAbvniSM,18529
-neurostats_API-0.0.11.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-neurostats_API-0.0.11.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
-neurostats_API-0.0.11.dist-info/RECORD,,
+neurostats_API-0.0.12.dist-info/METADATA,sha256=-1MqxrAVp-6u25PFIMmrMv5ad6RrWwguHiONp0worpc,24008
+neurostats_API-0.0.12.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+neurostats_API-0.0.12.dist-info/top_level.txt,sha256=nSlQPMG0VtXivJyedp4Bkf86EOy2TpW10VGxolXrqnU,15
+neurostats_API-0.0.12.dist-info/RECORD,,

{neurostats_API-0.0.11.dist-info → neurostats_API-0.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any