gjdatac-api 0.0.1__tar.gz → 0.0.3__tar.gz

{gjdatac_api-0.0.1 → gjdatac_api-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gjdatac_api
-Version: 0.0.1
+Version: 0.0.3
 Summary: 主动管理项目第一版(部分接口)
 Home-page: UNKNOWN
 Author: yin

{gjdatac_api-0.0.1 → gjdatac_api-0.0.3}/gjdatac_api/__init__.py

@@ -1,3 +1,4 @@
 from .data_api_class import GJDataC
 
-__all__ = ['GJDataC']
+__all__ = ['GJDataC']
+

{gjdatac_api-0.0.1 → gjdatac_api-0.0.3}/gjdatac_api/data_api_class.py

@@ -12,20 +12,25 @@ from .dolphin_db_info import *
 
 class GJDataC:
 
-    def __init__(self):
+    def __init__(self, host, port, user_id, password):
         """
         用于定义一些不同接口所需的变量以及一些初始化操作
         """
 
+        ''' 初始化校验 '''
         # 数据库参数
-        # self.host = HOST
-        # self.port = PORT
-        # self.user_id = USER_ID
-        # self.password = PASSWORD
+        self.host = host
+        self.port = port
+        self.user_id = user_id
+        self.password = password
 
         # 连接数据库
-        # self.db_session = ddb.session()
-        # self.db_session.connect(self.host, self.port, self.user_id, self.password)
+        try:
+            self.db_session = ddb.session()
+            self.db_session.connect(self.host, self.port, self.user_id, self.password)
+            self.db_session.close()
+        except Exception as e:
+            raise Exception("please check your database connection information")
 
         ''' get_price 接口相关属性 '''
         self.get_price_data = None  # 用于存放get_price接口数据
@@ -312,16 +317,6 @@ class GJDataC:
         self.general_validate_params_required(order_book_ids, "order_book_ids")  # 校验必填参数
         self.general_validate_field_str_or_list(order_book_ids, "order_book_ids")  # 校验参数类型
 
-    # def get_price_filter_by_order_book_ids(self, order_book_ids):
-    #     """
-    #     根据order_book_ids筛选数据
-    #     """
-    #     if isinstance(order_book_ids, str):
-    #         self.get_price_data = self.get_price_data[self.get_price_data["order_book_ids"] == order_book_ids]
-    #     elif isinstance(order_book_ids, list):
-    #         self.get_price_data = self.get_price_data[self.get_price_data["order_book_ids"].isin(order_book_ids)]
-    #     return self.get_price_data
-
     def __get_price_validate_frequency(self, frequency):
         """
         对frequency进行校验
@@ -581,47 +576,36 @@ class GJDataC:
     def __get_price_data_get_data(self, order_book_ids, asset_type, frequency):
         """ 
         根据参数获取数据库和表名，调用接口获取数据 
-        
+
         :param order_book_ids: 合约代码列表
         :param asset_type: 合约类型
         :param frequency: 频率
         :return: None
         """
 
-        ''' 期货行情数据 '''
-        if asset_type == "future":
-            if frequency == "tick_l1":  # 期货l1级别tick行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_future_tick_db_table_name,
-                                                               history_future_tick_db_path)
-            elif frequency == "1d":  # 期货日bar行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_future_day_db_table_name,
-                                                               history_future_day_db_path)
-            elif frequency == "1min":  # 期货分钟bar行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_future_min_db_table_name,
-                                                               history_future_min_db_path)
-            # 数据库暂无数据
-            # elif frequency == "1min_gtja":  # 公司合成的分钟bar行情数据
-            #     self.get_price_data = self._get_price_get_data(order_book_ids, history_future_min_gtja_db_table_name,
-            #                                                    history_future_min_gtja_db_path)
-            # elif frequency == "tick_l2":  # 期货l2级别tick行情数据
-            #     self.get_price_data = self._get_price_get_data(order_book_ids, history_future_tick_l2_db_table_name,
-            #                                                      history_future_tick_l2_db_path)
-            # else:
-            #     raise Exception("frequency is not valid for future contract")
-        elif asset_type == "option":
-            if frequency == "1d":  # 期权日bar行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_option_day_db_table_name,
-                                                               history_option_day_db_path)
-            elif frequency == "1min":  # 期权分钟bar行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_option_min_db_table_name,
-                                                               history_option_min_db_path)
-            elif frequency == "tick":  # 期权tick行情数据
-                self.get_price_data = self._get_price_get_data(order_book_ids, history_option_tick_db_table_name,
-                                                               history_option_tick_db_path)
+        def get_db_table_name(asset_type, frequency):
+            if asset_type == "future":
+                return {
+                    "tick_l1": (history_future_tick_db_table_name, history_future_tick_db_path),
+                    "1d": (history_future_day_db_table_name, history_future_day_db_path),
+                    "1min": (history_future_min_db_table_name, history_future_min_db_path),
+                    # "1min_gtja": (history_future_min_gtja_db_table_name, history_future_min_gtja_db_path),
+                    # "tick_l2": (history_future_tick_l2_db_table_name, history_future_tick_l2_db_path),
+                }.get(frequency)
+            elif asset_type == "option":
+                return {
+                    "1d": (history_option_day_db_table_name, history_option_day_db_path),
+                    "1min": (history_option_min_db_table_name, history_option_min_db_path),
+                    "tick": (history_option_tick_db_table_name, history_option_tick_db_path),
+                }.get(frequency)
             else:
-                raise Exception("frequency is not valid for option contract")
-        else:
-            raise Exception("asset_type is not valid")
+                raise Exception("asset_type is not valid")
+
+        db_table_name = get_db_table_name(asset_type, frequency)
+        if db_table_name is None:
+            raise Exception("frequency is not valid for this asset_type")
+
+        self.get_price_data = self._get_price_get_data(order_book_ids, *db_table_name)
 
     """ get_instruments(合约基础信息) """
 

{gjdatac_api-0.0.1 → gjdatac_api-0.0.3}/gjdatac_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gjdatac-api
-Version: 0.0.1
+Version: 0.0.3
 Summary: 主动管理项目第一版(部分接口)
 Home-page: UNKNOWN
 Author: yin

{gjdatac_api-0.0.1 → gjdatac_api-0.0.3}/setup.py

@@ -5,7 +5,7 @@ with open('description_info.md', 'r', encoding='utf-8') as f:
 
 setup(
     name='gjdatac_api',  # 你的包名
-    version='0.0.1',  # 版本号
+    version='0.0.3',  # 版本号
     description='主动管理项目第一版(部分接口)',  # 包的简要描述
     long_description=long_description,  # 包的详细描述
     long_description_content_type='text/markdown',  # 描述文件的类型