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

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

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

gjdatac_api-0.0.2/gjdatac_api/__init__.py

@@ -0,0 +1,9 @@
+from .data_api_class import GJDataC
+from .initializer import init  # 导入你的初始化函数
+
+__all__ = ['GJDataC']
+
+
+def __init__(ip_address, port, user_id, password):
+    init(ip_address, port, user_id, password)  # 执行初始化验证
+    return GJDataC()  # 验证成功后返回你的类实例

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

@@ -581,47 +581,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.2/gjdatac_api/initializer.py

@@ -0,0 +1,10 @@
+import dolphindb as ddb
+
+
+def init(ip_address, port, user_id, password):
+    # 在这里实现 IP 地址和端口号的验证逻辑
+    try:
+        db_session = ddb.session()
+        db_session.connect(ip_address, port, user_id, password)
+    except Exception as e:
+        raise Exception("please check your ip_address, port, user_id, password")

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

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

{gjdatac_api-0.0.1 → gjdatac_api-0.0.2}/gjdatac_api.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ gjdatac_api/__init__.py
 gjdatac_api/data_api_class.py
 gjdatac_api/dict_data.py
 gjdatac_api/dolphin_db_info.py
+gjdatac_api/initializer.py
 gjdatac_api.egg-info/PKG-INFO
 gjdatac_api.egg-info/SOURCES.txt
 gjdatac_api.egg-info/dependency_links.txt

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

@@ -5,12 +5,12 @@ with open('description_info.md', 'r', encoding='utf-8') as f:
 
 setup(
     name='gjdatac_api',  # 你的包名
-    version='0.0.1',  # 版本号
+    version='0.0.2',  # 版本号
     description='主动管理项目第一版(部分接口)',  # 包的简要描述
     long_description=long_description,  # 包的详细描述
     long_description_content_type='text/markdown',  # 描述文件的类型
     include_package_data=True,  # 包含包数据
-    package_data={'gjdatac_api': ['*.py', 'dict_data.py', 'dolphin_db_info.py']},  # 指定数据文件
+    package_data={'gjdatac_api': ['*.py', 'dict_data.py', 'dolphin_db_info.py', 'initializer.py']},  # 指定数据文件
     author='yin',  # 作者姓名
     author_email='2018209921@qq.com',  # 作者邮箱
     packages=find_packages(),  # 自动查找包目录

gjdatac_api-0.0.1/gjdatac_api/__init__.py

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