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

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

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

{gjdatac_api-0.2.8 → gjdatac_api-0.2.9}/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,8 +18,8 @@ from dict_data import (get_price_frequency_dict, get_price_data_type_dict, get_i
                              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:
@@ -3845,8 +3845,7 @@ class GJDataC:
 
         return trading_dates
 
-    @staticmethod
-    def get_trading_days(trading_dates, trade_time, date_count):
+    def get_trading_days(self, trading_dates, trade_time, date_count):
         """
         查询前后 N 个交易日
         :param trading_dates: 交易日历数据
@@ -3862,10 +3861,13 @@ class GJDataC:
             # 向前查询
             filtered_dates = trading_dates[trading_dates['trading_day'] < trade_time]
             result = filtered_dates['trading_day'].sort_values(ascending=False).head(abs(date_count))
-        else:
+        elif date_count > 0:
             # 向后查询
             filtered_dates = trading_dates[trading_dates['trading_day'] > trade_time]
             result = filtered_dates['trading_day'].sort_values().head(date_count)
+        else:
+            filtered_dates = trading_dates[trading_dates['trading_day'] == trade_time]
+            result = filtered_dates['trading_day']
 
         # 将结果转换为指定格式的字符串列表
         fina_result = sorted(result.dt.strftime('%Y.%m.%d').tolist())
@@ -3908,9 +3910,11 @@ class GJDataC:
         if date_count < 0:
             # 向前查询
             result = [p for p in valid_time_points if pd.to_datetime(p) < trade_time][-abs(date_count):]
-        else:
+        elif date_count > 0:
             # 向后查询
             result = [p for p in valid_time_points if pd.to_datetime(p) > trade_time][:date_count]
+        else:
+            result = [p for p in valid_time_points if pd.to_datetime(p) == trade_time]
 
         # return sorted(result) if len(result) > 1 else result[0]
         return sorted(result) if len(result) > 1 else result

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

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

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

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