gjdatac-api 0.2.2__tar.gz → 0.2.4__tar.gz

{gjdatac_api-0.2.2 → gjdatac_api-0.2.4}/PKG-INFO

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

{gjdatac_api-0.2.2 → gjdatac_api-0.2.4}/gjdatac_api/data_api_class.py

@@ -2943,14 +2943,16 @@ class GJDataC:
             ValueError: 参数验证失败时抛出
         """
 
+
         ''' 根据参数的不同，调用不同的函数 '''
-        if datetime_str and bar_count:
+        if datetime_str and bar_count is not None:
             # 参数验证
             self._get_history_bar_validate_params(datetime_str, instrument_id, bar_count, frequency, fields)
 
             # 转换日期格式
             # query_time = self._get_history_bar_parse_datetime(datetime_str)
 
+            # 1d ['v2505'] 2025.01.21 1
             # 执行查询并筛选数据
             result, bar_db_session = self._get_history_bar_execute_query(frequency, instrument_id, datetime_str,
                                                                          bar_count)
@@ -2961,6 +2963,7 @@ class GJDataC:
             # 处理结果
             return self._get_history_bar_process_result(result, instrument_id, fields, bar_count)
         else:
+            print("22222")
             return self.get_history_bar(instrument_id, start_date, end_date, frequency, fields)
 
     def _get_history_bar_validate_params(self, datetime_str, instrument_id, bar_count,
@@ -2987,8 +2990,8 @@ class GJDataC:
         self.general_validate_params_required(instrument_id, "instrument_id")
 
         # 验证K线数量
-        if not isinstance(bar_count, int) or bar_count <= 0:
-            raise ValueError("bar_count must be a positive integer")
+        # if not isinstance(bar_count, int) or bar_count <= 0:
+        #     raise ValueError("bar_count must be a positive integer")
 
         # 验证频率
         if frequency not in ['1d', '1m']:
@@ -3052,6 +3055,7 @@ class GJDataC:
 
         # 获取表信息
         table_info = self._get_history_bar_get_table_info(frequency, instrument_id)
+        print(table_info)
 
         # 获取数据
         table_data, bar_db_session = self.connect_db(table_info[0], table_info[1])
@@ -3111,12 +3115,19 @@ class GJDataC:
         # 使用 DolphinDB 的 where 子句筛选数据(这里因为实际需求的原因需要对每个instrument_id进行筛选，所以需要使用 contextby)
         # 根据bar_count 分别对不同的instrument_id 进行筛选
         # 此处的逻辑是，筛选出每个instrument_id距离给定日期最近的前bar_count条数据
+
         if isinstance(instrument_id, str):
-            query_data = (table_data.where(f"instrument_id='{instrument_id}'").where(f"trade_time <= {dolphin_date}")
-                          .contextby("instrument_id").sort("trade_time", ascending=True).limit(-bar_count))
+            if bar_count != 0:
+                query_data = (table_data.where(f"instrument_id='{instrument_id}'").where(f"trading_day <= {dolphin_date}")
+                              .contextby("instrument_id").sort("trading_day", ascending=True).limit(-bar_count))
+            else:
+                query_data = table_data.where(f"instrument_id='{instrument_id}'").where(f"trading_day = {dolphin_date}")
         else:
-            query_data = (table_data.where(f"instrument_id in {instrument_id}").where(f"trade_time <= {dolphin_date}")
-                          .contextby("instrument_id").sort("trade_time", ascending=True).limit(-bar_count))
+            if bar_count != 0:
+                query_data = (table_data.where(f"instrument_id in {instrument_id}").where(f"trading_day <= {dolphin_date}")
+                              .contextby("instrument_id").sort("trading_day", ascending=True).limit(-bar_count))
+            else:
+                query_data = table_data.where(f"instrument_id in {instrument_id}").where(f"trading_day = {dolphin_date}")
 
         # 根据日期对数据再次进行筛选，最大程度减轻数据库压力
         query_data = query_data.where(f"trade_time <= {dolphin_date}")

{gjdatac_api-0.2.2 → gjdatac_api-0.2.4}/gjdatac_api/dolphindb_info.py

@@ -148,4 +148,4 @@ subscribe_min_db_table_name = "QcMinKlineTable"  # 表名
 
 
 ''' 仿真服务器 '''
-dolphindb_service = ["10.74.56.101:8902", "10.74.56.102:8902", "10.74.56.103:8902"]
+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.2 → gjdatac_api-0.2.4}/gjdatac_api.egg-info/PKG-INFO

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

{gjdatac_api-0.2.2 → gjdatac_api-0.2.4}/setup.py

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