gjdatac-api 0.1.7__tar.gz → 0.1.8__tar.gz

{gjdatac_api-0.1.7 → gjdatac_api-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gjdatac_api
-Version: 0.1.7
+Version: 0.1.8
 Summary: 数据接口打包
 Author: yin
 Author-email: 2018209921@qq.com

{gjdatac_api-0.1.7 → gjdatac_api-0.1.8}/gjdatac_api/data_api_class.py

@@ -15,7 +15,8 @@ from utils.dict_data import (get_price_frequency_dict, get_price_data_type_dict,
                              future_margin_ratio_return_fields, future_margin_ratio_return_fields_rename,
                              future_limit_position_return_fields, future_limit_position_return_fields_rename,
                              main_contract_return_fields, main_contract_return_fields_rename,
-                             tick_main_contract_return_fields, tick_main_contract_return_fields_rename
+                             tick_main_contract_return_fields, tick_main_contract_return_fields_rename,
+                             gtja_mink_main_contract_return_fields, gtja_mink_main_contract_return_fields_rename
                              )
 from utils.dolphindb_info import *
 from utils.instrument_class import Instrument
@@ -44,7 +45,6 @@ class GJDataC:
         # 创建向量，包含所有可用节点的地址和端口
         self.sites = dolphindb_service
 
-
     def connect_db(self, table_name, db_path):
         """
         此方法用于根据不同的数据表及数据库获取数据，只返回Table对象，对应的数据处理在对应的数据接口处理
@@ -60,7 +60,7 @@ class GJDataC:
 
         # 创建连接；开启高可用，并指定sites为所有可用节点的ip:port
         success = db_session.connect(self.host, self.port, self.user_id, self.password, highAvailability=True,
-                  highAvailabilitySites=self.sites)
+                                     highAvailabilitySites=self.sites)
         if not success:
             raise Exception("please check your database connection information")
 
@@ -1767,7 +1767,7 @@ class GJDataC:
         return {
             '1d': (qc_future_maincontract_dayk, dayk_future_maincontract_db),
             '1min': (qc_future_maincontract_minutek, minutek_future_maincontract_db),
-            '1min_gtja': (qc_future_maincontract_minutek, minutek_future_maincontract_db)
+            '1min_gtja': (qc_future_maincontract_gtja_minutek, minutek_future_maincontract_gtja_db)
         }.get(frequency, (None, None))
 
     @staticmethod
@@ -1938,9 +1938,12 @@ class GJDataC:
         """
         new_df = data.copy()
 
-        if frequency in ['1min', '1d', '1min_gtja']:
+        if frequency in ['1min', '1d']:
             return_fields = main_contract_return_fields
             return_fields_rename = main_contract_return_fields_rename
+        elif frequency in ['1min_gtja']:
+            return_fields = gtja_mink_main_contract_return_fields
+            return_fields_rename = gtja_mink_main_contract_return_fields_rename
         else:
             return_fields = tick_main_contract_return_fields
             return_fields_rename = tick_main_contract_return_fields_rename
@@ -1951,10 +1954,12 @@ class GJDataC:
         # 将实际数据字段转换成需求文档中指定的字段
         new_df.rename(columns=return_fields_rename, inplace=True)
 
-        if frequency in ['1min', '1d', '1min_gtja']:
+        if frequency in ['1min', '1d']:
             new_df['none_close'] = new_df['close']
             new_df['none_prev_close'] = new_df['prev_close']
             new_df['ex_factor'] = ex_factor
+        elif frequency in ['1min_gtja']:
+            new_df['ex_factor'] = ex_factor
         else:
             new_df['total_turnover'] = new_df.groupby(['order_book_ids', 'trading_day'])['turnover'].transform('sum')
 
@@ -1971,7 +1976,7 @@ class GJDataC:
         :return: 计算后的数据
         """
 
-        if not adjust_type or frequency in ['tick_l1', 'tick_l2']:
+        if not adjust_type or frequency in ['tick_l1', 'tick_l2', '1min_gtja']:
             return data
 
         adjust_fields = ['open', 'close', 'high', 'low', 'limit_up', 'limit_down', 'settlement', 'prev_settlement',

{gjdatac_api-0.1.7 → gjdatac_api-0.1.8}/gjdatac_api/dolphindb_info.py

@@ -101,7 +101,21 @@ get_warehouse_stocks_future_db_table_name = "qc_warehouse_stocks"  # 表名（
 
 # 主力合约
 main_contract_db_path = "dfs://dayk"  # 数据库路径
-main_contract_db_table_name = "qc_future_maincontract"  # 表名
+main_contract_db_table_name = "qc_gtja_future_maincontract"  # 表名
+
+# 主/次力合约
+dayk_future_maincontract_db = "dfs://dayk_future_maincontract"
+minutek_future_maincontract_db = "dfs://minutek_future_maincontract"
+minutek_future_maincontract_gtja_db = "dfs://minutek"
+
+qc_future_maincontract_dayk = "qc_future_maincontract_dayk"
+qc_future_maincontract_minutek = "qc_future_maincontract_mink"
+qc_future_maincontract_gtja_minutek = "qc_gtja_future_mink"
+
+
+tick_main_contract_db_path = "dfs://tick"  # 数据库路径
+tick_main_contract_db_table_name = "qc_future_tick"  # 表名
+
 
 # 期货交割手续费(目前需求中所需的字段在交易参数表中都存在，所以直接使用交易参数表)
 delivery_fee_db_path = "dfs://basicinfo"  # 数据库路径
@@ -132,5 +146,6 @@ inventory_db_table_name = "qc_product_inventory"  # 表名
 subscribe_min_db_table_name = "QcMinKlineTable"  # 表名
 
 
-''' 仿真 '''
+
+''' 仿真服务器 '''
 dolphindb_service = ["10.74.56.101:8902", "10.74.56.102:8902", "10.74.56.103:8902"]

{gjdatac_api-0.1.7 → gjdatac_api-0.1.8}/gjdatac_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gjdatac-api
-Version: 0.1.7
+Version: 0.1.8
 Summary: 数据接口打包
 Author: yin
 Author-email: 2018209921@qq.com

{gjdatac_api-0.1.7 → gjdatac_api-0.1.8}/setup.py

@@ -5,7 +5,7 @@ with open('description_info.md', 'r', encoding='utf-8') as f:
 
 setup(
     name='gjdatac_api',  # 你的包名
-    version='0.1.7',  # 版本号
+    version='0.1.8',  # 版本号
     description='数据接口打包',  # 包的简要描述
     long_description=long_description,  # 包的详细描述
     long_description_content_type='text/markdown',  # 描述文件的类型