tushare 1.4.9__py3-none-any.whl → 1.4.11__py3-none-any.whl

tushare/__init__.py

@@ -2,7 +2,7 @@
 import codecs
 import os
 
-__version__ = '1.4.9'
+__version__ = '1.4.11'
 __author__ = 'Jimmy Liu'
 
 """

tushare/pro/client.py

@@ -17,7 +17,8 @@ import requests
 class DataApi:
 
     __token = ''
-    __http_url = 'http://api.waditu.com'
+    __http_url = 'http://api.waditu.com/dataapi'
+    # __http_url = 'http://127.0.0.1:8000/dataapi'
 
     def __init__(self, token, timeout=30):
         """
@@ -37,7 +38,7 @@ class DataApi:
             'fields': fields
         }
 
-        res = requests.post(self.__http_url, json=req_params, timeout=self.__timeout)
+        res = requests.post(f"{self.__http_url}/{api_name}", json=req_params, timeout=self.__timeout)
         if res:
             result = json.loads(res.text)
             if result['code'] != 0:

tushare/pro/llm.py

@@ -0,0 +1,124 @@
+import json
+
+import requests
+try:
+    import sseclient
+except:
+    raise ImportError("sseclient not found, please install it using 'pip install sseclient-py'.")
+
+
+from tushare import get_token
+
+BASE_URL = "http://api.waditu.com/dataapi"
+# BASE_URL = "http://127.0.0.1:8000/dataapi"
+API_KEY_PREFIX = "tsgpt-"
+
+
+class LlmClent:
+    def __init__(self, token=None, timetout=120):
+        if not token:
+            token = get_token()
+        self.token = token
+        self.timeout = timetout
+
+    def chat_query(self, model, messages, temperature=None, max_tokens=None, pretty=False):
+        """
+        model string 模型名称， doubao-pro-128k
+        messages list 消息列表
+            [
+                {
+                  "role": "user",
+                  "content": "Hello World"
+                }
+            ]
+        pretty bool 是否只返回回答内容文本
+        """
+        resp = requests.post(
+            f'{BASE_URL}/llm/{model}',
+            json={"params": {
+                "stream": False,
+                "messages": messages,
+                "temperature": temperature,
+                "max_tokens": max_tokens
+            }},
+            headers={"Authorization": f"tstoken-{self.token}"},
+            timeout=self.timeout
+        )
+        if resp.status_code != 200:
+            raise Exception(f"请求出现错误，{resp.content}")
+
+        resp_data = resp.json()
+        if resp_data.get('code') not in (0, None):
+            raise Exception(resp_data['msg'])
+        if pretty:
+            return resp_data['choices'][0]["message"]["content"]
+        else:
+            return resp_data
+
+    def chat_stream(self, model, messages, temperature=None, max_tokens=None, pretty=False):
+        """
+        model string 模型名称， doubao-pro-128k
+        messages list 消息列表
+            [
+                {
+                  "role": "user",
+                  "content": "Hello World"
+                }
+            ]
+        pretty bool 是否只返回回答内容文本
+        """
+        resp = requests.post(
+            f'{BASE_URL}/llm/{model}',
+            json={"params": {
+                "stream": True,
+                "messages": messages,
+                "temperature": temperature,
+                "max_tokens": max_tokens
+            }},
+            headers={"Authorization": f"tstoken-{self.token}"},
+            timeout=self.timeout, stream=True
+        )
+        if resp.status_code != 200:
+            raise Exception(f"请求出现错误，{resp.content}")
+
+        for e in sseclient.SSEClient(resp).events():
+            e_data = json.loads(e.data)
+            if pretty:
+                yield e_data["choices"][0]["delta"]["content"]
+            else:
+                yield e_data
+
+
+def test_chart_query():
+    c = LlmClent()
+    dd = c.chat_query("doubao-pro-128k", [{
+        "role": "user",
+        "content": "你好"
+    }])
+    print(dd)
+    dd = c.chat_query("doubao-pro-128k", [{
+        "role": "user",
+        "content": "你好"
+    }], pretty=True)
+    print(dd)
+
+
+def test_chart_stream():
+    c = LlmClent()
+    dd = c.chat_stream("doubao-pro-128k", [
+        {
+            "role": "user",
+            "content": "你好"
+        }
+    ])
+    for d in dd:
+        print(d)
+
+    dd = c.chat_stream("doubao-pro-128k", [
+        {
+            "role": "user",
+            "content": "你好"
+        }
+    ], pretty=True)
+    for d in dd:
+        print(d)

tushare/subs/ts_subs/subscribe.py

@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 class TsSubscribe(object):
 
     def __init__(self, token='', callback_mode='multi-thread', debug=False):
-        self.url = 'ws://10.255.255.202:8081/listening'
+        self.url = 'wss://ws.tushare.pro/listening'
         self.token = token
         self.debug = debug
 

{tushare-1.4.9.dist-info → tushare-1.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.4.9
+Version: 1.4.11
 Summary: A utility for crawling historical and Real-time Quotes data of China stocks
 Home-page: https://tushare.pro
 Author: Jimmy Liu

{tushare-1.4.9.dist-info → tushare-1.4.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tushare/__init__.py,sha256=rOlJsCMrNKMYvCfqTJobHK-xF8Y6Lk-QZk5ReTtU8ME,4764
+tushare/__init__.py,sha256=0pbsHHIjb5rX0pfMWnvQJW2suebAN9kh8pHagccYoGE,4765
 tushare/bond/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/bond/bonds.py,sha256=PJM0xDiWZDpOPwDtbEU9PdP0M_Gu0c599YuB1rbZ3r8,232
 tushare/coins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,8 +17,9 @@ tushare/internet/boxoffice.py,sha256=NaAJYg8e6vldIG7vF2fXOcQSqFrNQ_2z9bLx5-TyMYY
 tushare/internet/caixinnews.py,sha256=IwNOB5F1q_CxfuP93-jgUpTW5yY5NANPRJXySm_bj2A,4178
 tushare/internet/indexes.py,sha256=oteQCv0k2X0pbhXRHwMSviD1AowJWE6xRjKkqr5RNCo,3595
 tushare/pro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tushare/pro/client.py,sha256=91jKHO9OPrNWPp3193edresGg6UoX0NlmOqAdf0mX4A,1312
+tushare/pro/client.py,sha256=w7LfXtlmSd4Aiq7Bz5-tPFfkfjrPS_7jroUiRs7BUWw,1388
 tushare/pro/data_pro.py,sha256=SOHbK-j9CmZguuv0CLIT-Z3hUynEy96mbvvhrGN6y9I,10883
+tushare/pro/llm.py,sha256=OB0LL6YUbGSeat2nA-gP78kPiRCjgQzgIYNc4OJIDFI,3558
 tushare/stock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/stock/billboard.py,sha256=vCrbN7-NGXSpXMc8jq7NcjjHyu9pTcr4uXp559iA1wA,12833
 tushare/stock/classifying.py,sha256=3yWqlLhgj2irk-9ksKWFFS5HY-SnjfEr5erwJxBidG8,10539
@@ -50,7 +51,7 @@ tushare/subs/tgw_subs/convert.py,sha256=VWsDOv_rmz3a9YjQ-ZThXerc1HqcWPlBYAOF6A9S
 tushare/subs/tgw_subs/login.py,sha256=z7laiscTx50LzOB0cM2hypv5E78DvWx-2Ip5kDE7uNk,903
 tushare/subs/tgw_subs/subscribe.py,sha256=OwLKcSTN2xrge33hBkio_S188viMeGuicDj_x0VaR2A,3336
 tushare/subs/ts_subs/__init__.py,sha256=AyX957j8DDjdpIYcNR7dyRaMfxusa6d2VeunMEB6RAc,107
-tushare/subs/ts_subs/subscribe.py,sha256=fCBc4vb1kPawyhEmn_kCVrgEkOw1c61I18wTE7DwVf0,6209
+tushare/subs/ts_subs/subscribe.py,sha256=vy0PA3g6jBQE5f2vSofLNq0zaZy3pJf89KMBfbB1xA8,6205
 tushare/trader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/trader/trader.py,sha256=O2WJkIKGuUFK_hiQj83N5j971VW-TNAgKaCE0O4oFwg,11360
 tushare/trader/utils.py,sha256=CG-TCyeu5WqYjnBARxft2lEnLD3xvhHLU40hPSL_CCw,752
@@ -71,8 +72,8 @@ tushare/util/verify_token.py,sha256=cuV3RErWbOC318NANCYL6K1LKZ3wSAL2yMwZHA7tD3s,
 tushare/util/protobuf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/util/protobuf/funcs.py,sha256=UCdK8FxTyjPZsNzoEeXqYzqrQXUmRMvW5hua6GPA66A,779
 tushare/util/protobuf/response_pb2.py,sha256=vJH9ONkDuJlg6y-q1PvuDZoviKrK7hzNtMieQHK45DI,11347
-tushare-1.4.9.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.4.9.dist-info/METADATA,sha256=pnS8Py3RgZVnzdhOIf-MlTv8OYuqhq3cv96Gm_Lj3E4,2838
-tushare-1.4.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-tushare-1.4.9.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
-tushare-1.4.9.dist-info/RECORD,,
+tushare-1.4.11.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.4.11.dist-info/METADATA,sha256=yKFizbLlZ3y5RnGGiMw6CkJTqTwSL4ZTYVcLD20MPN4,2839
+tushare-1.4.11.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+tushare-1.4.11.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
+tushare-1.4.11.dist-info/RECORD,,