gjdatac-api 0.2.6__tar.gz → 0.2.8__tar.gz

{gjdatac_api-0.2.6 → gjdatac_api-0.2.8}/PKG-INFO

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

{gjdatac_api-0.2.6 → gjdatac_api-0.2.8}/gjdatac_api/data_api_class.py

@@ -10,7 +10,7 @@ import chinese_calendar as calendar
 import pandas as pd
 import dolphindb as ddb
 
-from .dict_data import (get_price_frequency_dict, get_price_data_type_dict, get_instruments_type_dict,
+from dict_data import (get_price_frequency_dict, get_price_data_type_dict, get_instruments_type_dict,
                              future_delivery_fee_return_fields, future_delivery_fee_return_fields_rename,
                              future_margin_ratio_return_fields, future_margin_ratio_return_fields_rename,
                              future_limit_position_return_fields, future_limit_position_return_fields_rename,
@@ -18,13 +18,13 @@ from .dict_data import (get_price_frequency_dict, get_price_data_type_dict, get_
                              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 .dolphindb_info import *
-from .instrument_class import Instrument
+from dolphindb_info import *
+from instrument_class import Instrument
 
 
 class GJDataC:
 
-    def __init__(self, host, port, user_id, password):
+    def __init__(self, host, port, user_id, password, dolphindb_service=None):
         """
         用于定义一些不同接口所需的变量以及一些初始化操作
         :param host: 数据库地址
@@ -56,11 +56,12 @@ class GJDataC:
         # 连接数据库
         db_session = ddb.session()
         # 原始方式
-        # success = db_session.connect(self.host, self.port, self.user_id, self.password)
-
-        # 创建连接；开启高可用，并指定sites为所有可用节点的ip:port
-        success = db_session.connect(self.host, self.port, self.user_id, self.password, highAvailability=True,
-                                     highAvailabilitySites=self.sites)
+        if not self.sites:
+            success = db_session.connect(self.host, self.port, self.user_id, self.password)
+        else:
+            # 创建连接；开启高可用，并指定sites为所有可用节点的ip:port
+            success = db_session.connect(self.host, self.port, self.user_id, self.password, highAvailability=True,
+                                         highAvailabilitySites=self.sites)
         if not success:
             raise Exception("please check your database connection information")
 
@@ -1134,7 +1135,7 @@ class GJDataC:
             return self.get_trading_dates_by_date_n(date, n)
         elif start_date and end_date:  # 根据start_date和end_date获取交易日历
             return self.get_trading_dates_by_start_end(start_date, end_date, is_include_start, is_include_end)
-        elif trade_time and date_count and date_type:  # 查询前/后 N个交易日/时间数据
+        elif trade_time and date_count is not None and date_type:  # 查询前/后 N个交易日/时间数据
             return self.get_trading_date(trade_time, date_count, date_type)
         else:
             raise ValueError("parameter error: please pass date、n or start_date、end_date")
@@ -3868,7 +3869,7 @@ class GJDataC:
 
         # 将结果转换为指定格式的字符串列表
         fina_result = sorted(result.dt.strftime('%Y.%m.%d').tolist())
-        return fina_result[0] if len(fina_result) <= 1 else fina_result
+        return fina_result if len(fina_result) <= 1 else fina_result
 
     @staticmethod
     def get_trading_minutes(trading_dates, trade_time, date_count):
@@ -3885,10 +3886,13 @@ class GJDataC:
         # 筛选 trade_flag 列等于 T 的数据（是交易日的数据）
         trading_dates = trading_dates[trading_dates['trade_flag'] == 'T']
 
+        # 转换字符串为 datetime
+        trade_time = datetime.datetime.strptime(trade_time, '%Y.%m.%d %H:%M:%S')
+
         # 生成时间点列表
         time_points = pd.date_range(start=trade_time - datetime.timedelta(minutes=abs(date_count)),
                                     end=trade_time + datetime.timedelta(minutes=abs(date_count)),
-                                    freq='T')  # 'T' 表示分钟频率
+                                    freq='min')  # 'T' 表示分钟频率
 
         # 将时间点转换为指定格式的字符串
         time_points_str = time_points.strftime('%Y.%m.%d %H:%M:%S')
@@ -3908,7 +3912,8 @@ class GJDataC:
             # 向后查询
             result = [p for p in valid_time_points if pd.to_datetime(p) > trade_time][:date_count]
 
-        return sorted(result) if len(result) > 1 else result[0]
+        # return sorted(result) if len(result) > 1 else result[0]
+        return sorted(result) if len(result) > 1 else result
 
     """ 交易日判断 """
 

{gjdatac_api-0.2.6 → gjdatac_api-0.2.8}/gjdatac_api/dolphindb_info.py

@@ -146,6 +146,3 @@ 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", "10.74.56.104 8902"]

{gjdatac_api-0.2.6 → gjdatac_api-0.2.8}/gjdatac_api.egg-info/PKG-INFO

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

{gjdatac_api-0.2.6 → gjdatac_api-0.2.8}/setup.py

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