#402 Commit : bug fixed

QUANTAXIS/QAFetch/QAWind.py

@@ -4,11 +4,12 @@
 import datetime,re
 import pymongo
 from WindPy import w
-w.start()
+#w.start()
 
 
 #Stock
-def getStock_Info(startDate,endDate,name):
+def get_stock_info(name,startDate,endDate):
+    w.start()
     #get the all stock list on the endDate
     # judge the vaild date
     if(is_valid_date(endDate)==False):
@@ -21,7 +22,8 @@ def getStock_Info(startDate,endDate,name):
         if (data.ErrorCode!=0):
             print ("Connent to Wind successfully")
             return data.Data
-def getStock_Day(startDate,endDate,name):
+def get_stock_day(name,startDate,endDate):
+    w.start()
     if(is_valid_date(endDate)==False):
         print ("wrong date")
     else :
@@ -31,7 +33,8 @@ def getStock_Day(startDate,endDate,name):
         if (data.ErrorCode==0):
             print ("Connent to Wind successfully")
             return data.Data
-def getStock_Indicator(startDate,endDate,name):
+def get_stock_indicator(name,startDate,endDate):
+    w.start()
     if(is_valid_date(endDate)==False):
         print ("wrong date")
     else :
@@ -40,7 +43,8 @@ def getStock_Indicator(startDate,endDate,name):
         if (data.ErrorCode==0):
             print ("Connent to Wind successfully")
     return data.Data
-def getStock_Shape(startDate,endDate,name):
+def get_stock_shape(name,startDate,endDate):
+    w.start()
     if(is_valid_date(endDate)==False):
         print ("wrong date")
     else :
@@ -49,23 +53,26 @@ def getStock_Shape(startDate,endDate,name):
         if (data.ErrorCode==0):
             print ("Connent to Wind successfully")
     return data.Data
-def getStock_Risk(startDate,endDate,name):
+def get_stock_risk(name,startDate,endDate):
+    w.start()
     if(is_valid_date(endDate)==False):
         print ("wrong date")
     else :
         data=w.wsd(name, "annualyeild_100w,annualyeild_24m,annualyeild_60m,annualstdevr_100w,annualstdevr_24m,annualstdevr_60m,beta_100w,beta_24m,beta_60m,avgreturn,avgreturny,stdevry,stdcof,risk_nonsysrisk1,r2,alpha2,beta,sharpe,treynor,jensen,jenseny,betadf", startDate, endDate, "period=2;returnType=1;index=000001.SH;yield=1")
         if (data.ErrorCode==0):
             print ("Connent to Wind successfully")
     return data.Data
-def getStock_Xueqiu(startDate,endDate,name):
+def get_stock_xueqiu(name,startDate,endDate):
+    w.start()
     if(is_valid_date(endDate)==False):
         print ("wrong date")
     else :
         data=w.wsd(name, "xq_accmfocus,xq_accmcomments,xq_accmshares,xq_focusadded,xq_commentsadded,xq_sharesadded,xq_WOW_focus,xq_WOW_comments,xq_WOW_shares", startDate, endDate, "")
         if (data.ErrorCode==0):
             print ("Connent to Wind successfully")
     return data.Data
-def getStock_Financial(startDate,endDate,name):
+def get_stock_financial(name,startDate,endDate):
+    w.start()
     pass
 def is_valid_date(str):
     try:
@@ -75,7 +82,7 @@ def is_valid_date(str):
         return False
 
 def get_trade_date(endDate,exchange):
-
+    w.start()
     supportExchanges=["SSE","SZSE","CFFEX","SHFE","DCE","CZCE"]
     if (exchange in supportExchanges):
     #"SSE","SZSE","CFFEX","SHFE","DCE","CZCE"

QUANTAXIS/QAMarket/__init__.py

@@ -1,4 +1,3 @@
 #coding : utf-8
 
 import pymongo
-import QAFetch

QUANTAXIS/QATasks/tasks.py

@@ -1,13 +1,12 @@
 from celery import Celery
-import sys
-sys.path.append('c:\\quantaxis')
-import QAFetch
+import QUANTAXIS
+
 quantaxis = Celery('tasks', backend='amqp://guest@localhost//', broker='amqp://guest@localhost//')
 
 @quantaxis.task
 
 def save_data(all):
-  return QAFetch.QAWind()
+  pass
 def update_data():
   pass
 def update_spider(name):

README.md

@@ -35,4 +35,10 @@ mkdir web && cd web
 npm install quantaxiswebkit
 cd node_modules/quantaxiswebkit
 npm run all
+```
+## 使用示例
+```python
+import QUANTAXIS as QA
+print(QA.get_stock_day("ts","000001.SZ","2000-01-01","2017-04-01"))
+print(QA.get_stock_day("wind","000001.SZ","2000-01-01","2017-04-01"))
 ```

setup.py

@@ -22,7 +22,7 @@ def read(fname):
 名字，一般放你包的名字即可
 """
 
-PACKAGES = ["QUANTAXIS", "QUANTAXIS.QAFetch", "QUANTAXIS.QAMarket", "QUANTAXIS.QAStrategy", "QUANTAXIS.QATasks", "QUANTAXIS.QAFetch.QAWind", "QUANTAXIS.QAFetch.QATushare", "QUANTAXIS.QAFetch.QASpider"]
+PACKAGES = ["QUANTAXIS", "QUANTAXIS.QAFetch", "QUANTAXIS.QAMarket", "QUANTAXIS.QAStrategy", "QUANTAXIS.QATasks",  "QUANTAXIS.QASpider"]
 """
 包含的包，可以多个，这是一个列表
 """
@@ -46,7 +46,7 @@ def read(fname):
 
 URL = "http://www.yutiansut.com"
 
-VERSION = "0.3.8"
+VERSION = "0.3.8-beta"
 
 
 LICENSE = "MIT"