tushare 1.4.12__py3-none-any.whl → 1.4.13__py3-none-any.whl

tushare/__init__.py

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

tushare/pro/llm.py

@@ -14,14 +14,14 @@ BASE_URL = "http://api.waditu.com/dataapi"
 API_KEY_PREFIX = "tsgpt-"
 
 
-class LlmClient:
+class GPTClient:
     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):
+    def _request(self, model, messages, temperature=None, max_tokens=None, stream=True, pretty=False) -> requests.Response:
         """
         model string 模型名称， doubao-pro-128k
         messages list 消息列表
@@ -36,17 +36,20 @@ class LlmClient:
         resp = requests.post(
             f'{BASE_URL}/llm/{model}',
             json={"params": {
-                "stream": False,
+                "stream": stream,
                 "messages": messages,
                 "temperature": temperature,
                 "max_tokens": max_tokens
             }},
             headers={"Authorization": f"tstoken-{self.token}"},
-            timeout=self.timeout
+            timeout=self.timeout, stream=stream
         )
         if resp.status_code != 200:
             raise Exception(f"请求出现错误，{resp.content}")
+        return resp
 
+    def gpt_query(self, model, messages, temperature=None, max_tokens=None, pretty=False):
+        resp = self._request(model, messages, temperature, max_tokens, False, pretty)
         resp_data = resp.json()
         if resp_data.get('code') not in (0, None):
             raise Exception(resp_data['msg'])
@@ -55,32 +58,8 @@ class LlmClient:
         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}")
-
+    def gpt_stream(self, model, messages, temperature=None, max_tokens=None, pretty=False):
+        resp = self._request(model, messages, temperature, max_tokens, True, pretty)
         for e in sseclient.SSEClient(resp).events():
             e_data = json.loads(e.data)
             if pretty:
@@ -88,24 +67,31 @@ class LlmClient:
             else:
                 yield e_data
 
+    def gpt(self, model, query) -> str:
+        messages = [{
+          "role": "user",
+          "content": query
+        }]
+        return self.gpt_query(model, messages, pretty=True)
+
 
-def test_chart_query():
-    c = LlmClient()
-    dd = c.chat_query("doubao-pro-128k", [{
+def test_gpt_query():
+    c = GPTClient()
+    dd = c.gpt_query("doubao-pro-128k", [{
         "role": "user",
         "content": "你好"
     }])
     print(dd)
-    dd = c.chat_query("doubao-pro-128k", [{
+    dd = c.gpt_query("doubao-pro-128k", [{
         "role": "user",
         "content": "你好"
     }], pretty=True)
     print(dd)
 
 
-def test_chart_stream():
-    c = LlmClient()
-    dd = c.chat_stream("doubao-pro-128k", [
+def test_gpt_stream():
+    c = GPTClient()
+    dd = c.gpt_stream("doubao-pro-128k", [
         {
             "role": "user",
             "content": "你好"
@@ -114,7 +100,7 @@ def test_chart_stream():
     for d in dd:
         print(d)
 
-    dd = c.chat_stream("doubao-pro-128k", [
+    dd = c.gpt_stream("doubao-pro-128k", [
         {
             "role": "user",
             "content": "你好"
@@ -122,3 +108,9 @@ def test_chart_stream():
     ], pretty=True)
     for d in dd:
         print(d)
+
+
+def test_gpt():
+    c = GPTClient()
+    dd = c.gpt("doubao-pro-128k", "你好")
+    print(dd)

{tushare-1.4.12.dist-info → tushare-1.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.4.12
+Version: 1.4.13
 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.12.dist-info → tushare-1.4.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tushare/__init__.py,sha256=jyET1cC5S1mBEZSSBRhY1j9eacrqXF3pyXTUv5ouuko,4765
+tushare/__init__.py,sha256=qwKDSMvh3WbshnQP2JjgCyIzZZb874LlAvhB9VAYlm4,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
@@ -19,7 +19,7 @@ tushare/internet/indexes.py,sha256=oteQCv0k2X0pbhXRHwMSviD1AowJWE6xRjKkqr5RNCo,3
 tushare/pro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/pro/client.py,sha256=w7LfXtlmSd4Aiq7Bz5-tPFfkfjrPS_7jroUiRs7BUWw,1388
 tushare/pro/data_pro.py,sha256=SOHbK-j9CmZguuv0CLIT-Z3hUynEy96mbvvhrGN6y9I,10883
-tushare/pro/llm.py,sha256=gmc8vG7Vzv9JlusiWnSLEmcPX8X-NN-WkLUk4ibB5E8,3561
+tushare/pro/llm.py,sha256=TQi0Zk-UZESBaH9qwEY0f4VofrGkCl-4ajFn-IksW2s,3355
 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
@@ -72,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.12.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.4.12.dist-info/METADATA,sha256=qrBJtq0rMmPCKXiSMP4LdbS3AlQjAklBxtLhQvfscgw,2839
-tushare-1.4.12.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-tushare-1.4.12.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
-tushare-1.4.12.dist-info/RECORD,,
+tushare-1.4.13.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.4.13.dist-info/METADATA,sha256=DC65n8RDTT4yM6ZOVjaXRLlKwywunlkC3OaqYzEX_U4,2839
+tushare-1.4.13.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+tushare-1.4.13.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
+tushare-1.4.13.dist-info/RECORD,,