chinadata 0.0.7__tar.gz → 0.1.8__tar.gz

{chinadata-0.0.7 → chinadata-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chinadata
-Version: 0.0.7
+Version: 0.1.8
 Author: xc
 Author-email: utyu@gmail.com
 Platform: any

{chinadata-0.0.7 → chinadata-0.1.8}/chinadata/ca_data.py

@@ -3,8 +3,6 @@ import pandas as pd
 import time
 
 
-
-
 class pro_api:
     # def __init__(self, token):
     #     self.token = token  # 实例变量 name
@@ -43,7 +41,7 @@ class pro_api:
         pd.DataFrame: A DataFrame containing the fetched stock data.
         """
         # url="http://127.0.0.1:9002/tq"
-        url = "http://152.136.171.135:9002/tq"
+        url = "http://123.57.69.240:9002/tq"
 
         params = {
             'token': get_token(),
@@ -52,6 +50,8 @@ class pro_api:
             'fields': fields,
         }
 
+
+
         response = requests.post(url, json=params)
 
         if response.status_code == 200:
@@ -64,12 +64,11 @@ class pro_api:
                     df = pd.DataFrame(data)
                     return df
             except ValueError as e:
-                print("Error parsing JSON response:", e)
-                return None
+
+                raise ValueError("数据获取错误",e)
+
         else:
-            print(f"Failed to fetch data. Status code: {response.status_code}")
-            print(response.text)
-            return None
+            raise ValueError("数据获取错误",response.status_code,response.text)
 
 
 
@@ -295,7 +294,8 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def news(self, api_name='news', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
+
 
     def weekly(self, api_name='weekly', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -319,7 +319,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def cctv_news(self, api_name='cctv_news', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def index_daily(self, api_name='index_daily', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -406,7 +406,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def hk_daily(self, api_name='hk_daily', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def stk_managers(self, api_name='stk_managers', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -415,7 +415,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def major_news(self, api_name='major_news', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def ggt_daily(self, api_name='ggt_daily', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -440,6 +440,10 @@ class pro_api:
 
     def index_global(self, api_name='index_global', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
+    def idx_factor_pro(self, api_name='idx_factor_pro', **kwargs):
+        return self.query(token=self.token, api_name=api_name, **kwargs)
+
+
 
     def ncov_global(self, api_name='ncov_global', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -502,7 +506,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def us_daily(self, api_name='us_daily', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def bak_daily(self, api_name='bak_daily', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -588,7 +592,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def hk_mins(self, api_name='hk_mins', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def cb_rate(self, api_name='cb_rate', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -606,7 +610,7 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def ft_mins(self, api_name='ft_mins', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def realtime_quote(self, api_name='realtime_quote', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -666,16 +670,16 @@ class pro_api:
         return self.query(token=self.token, api_name=api_name, **kwargs)
 
     def us_daily_adj(self, api_name='us_daily_adj', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def hk_daily_adj(self, api_name='hk_daily_adj', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def rt_fut_min(self, api_name='rt_fut_min', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def opt_mins(self, api_name='opt_mins', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def moneyflow_ind_ths(self, api_name='moneyflow_ind_ths', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -703,9 +707,10 @@ class pro_api:
 
     def stk_auction_o(self, api_name='stk_auction_o', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
+        # return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def stk_auction_c(self, api_name='stk_auction_c', **kwargs):
-        return self.query(token=self.token, api_name=api_name, **kwargs)
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
 
     def limit_list_ths(self, api_name='limit_list_ths', **kwargs):
         return self.query(token=self.token, api_name=api_name, **kwargs)
@@ -769,7 +774,8 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
 
     """
     # url = "http://127.0.0.1:9002/tp"
-    url = "http://152.136.171.135:9002/tp"
+    url = "http://123.57.69.240:9002/tp"
+
     params = {
         'token':get_token(),
         'ts_code':ts_code,
@@ -788,22 +794,25 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
         "fields" : fields,
         "contract_type" : contract_type
     }
+    if 'min' in freq :
+        return '此接口为单独权限，和积分没有关系,需要单独购买'
+    else:
 
-    response = requests.post(url, json=params,)
+        response = requests.post(url, json=params,)
 
-    if response.status_code == 200:
-        try:
-            data = response.json()
-            # print(data)
-            if data == 'token无效或已超期,请重新购买':
-                return data
-            else:
-                df = pd.DataFrame(data)
-                return df
-        except ValueError as e:
-            print("Error parsing JSON response:", e)
-            return None
-    else:
-        print(f"Failed to fetch data. Status code: {response.status_code}")
-        print(response.text)
-        return None
+        if response.status_code == 200:
+            try:
+                data = response.json()
+                # print(data)
+                if data == 'token无效或已超期,请重新购买':
+                    return data
+                else:
+                    df = pd.DataFrame(data)
+                    return df
+            except ValueError as e:
+                # print("Error parsing JSON response:", e)
+                # return None
+                raise ValueError(e)
+        else:
+
+            raise ValueError("数据获取错误",response.status_code,response.text)

{chinadata-0.0.7 → chinadata-0.1.8}/chinadata/example.py

@@ -4,24 +4,30 @@
 pip install chinadata
 
 """
+
+
 #2、
 import  chinadata.ca_data as ts
 
 
-ts.set_token('db99d45c0a4d67ad8ad2fa66be7994')
-pro=ts.pro_api('db99d45c0a4d67ad8ad2fa66be7994')
+ts.set_token('3a9e334456c8405c00d013914953')
+pro=ts.pro_api('a9e334456c8405c00d013914953')
+
+
 
+# 你要测量的代码块
 
 # #查询当前所有正常上市交易的股票列表
 data = pro.stock_basic(exchange='', list_status='L', fields='ts_code,symbol,name,area,industry,list_date')
 print(data)
 
-
-df = ts.pro_bar(ts_code='000007.SZ', start_date='20240817', end_date='20241215', )
+#
+df = ts.pro_bar(ts_code='000007.SZ', start_date='20240817', end_date='20241215')
 print(df)
 
 
-
+df = pro.daily(ts_code='000001.SZ', start_date='20000701', end_date='20180718')
+print(df)
 
 
 

{chinadata-0.0.7 → chinadata-0.1.8}/chinadata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chinadata
-Version: 0.0.7
+Version: 0.1.8
 Author: xc
 Author-email: utyu@gmail.com
 Platform: any

{chinadata-0.0.7 → chinadata-0.1.8}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name='chinadata',
-    version='0.0.7',
+    version='0.1.8',
     author='xc',
     author_email='utyu@gmail.com',
     # license='MIT License',