add support for V3.0

suqingdong · Oct 26, 2023 · 168d963 · 168d963
1 parent 2ff4fa2
commit 168d963
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 ## Installation
 ```bash
-python3 -m pip install sparkapi-python
+python3 -m pip install -U sparkapi-python
 ```
 
 ## Configuration
@@ -12,8 +12,8 @@ python3 -m pip install sparkapi-python
 SPARK_APP_ID=<your-app-id>
 SPARK_API_SECRET=<your-api-secret>
 SPARK_API_KEY=<your-api-key>
-SPARK_API_MODEL='v2.0'          # v1.5, v2.0
-SPARK_CHAT_MAX_TOKENS=4096      # 1-4096
+SPARK_API_MODEL='v3.0'          # v1.5, v2.0, v3.0
+SPARK_CHAT_MAX_TOKENS=4096      # v1.5: 1-4096, v2.0: 1-8192
 SPARK_CHAT_TEMPERATURE=0.5      # 0-1
 SPARK_CHAT_TOP_K=4              # 1-6
 ```

diff --git a/example.env b/example.env
@@ -1,7 +1,7 @@
 SPARK_APP_ID=<your-app-id>
 SPARK_API_SECRET=<your-api-secret>
 SPARK_API_KEY=<your-api-key>
-SPARK_API_MODEL='v2.0'          # v1.5, v2.0
-SPARK_CHAT_MAX_TOKENS=4096      # 1-4096
+SPARK_API_MODEL='v2.0'          # v1.5, v2.0, v3.0
+SPARK_CHAT_MAX_TOKENS=4096      # v1.5: 1-4096, v2.0: 1-8192
 SPARK_CHAT_TEMPERATURE=0.5      # 0-1
 SPARK_CHAT_TOP_K=4              # 1-6
diff --git a/sparkapi/core/api.py b/sparkapi/core/api.py
@@ -47,6 +47,8 @@ def get_completion_from_messages(self, messages: List[dict], **kwargs):
         wss = self.create_wss_connection()
 
         query = self.build_query(messages, **kwargs)
+        from pprint import pprint
+        # pprint(query)
         wss.send(query)
 
         while True:

diff --git a/sparkapi/core/model.py b/sparkapi/core/model.py
@@ -7,4 +7,8 @@
         'domain': 'generalv2',
         'url': 'wss://spark-api.xf-yun.com/v2.1/chat',
     },
+    'v3.0': {
+        'domain': 'generalv3',
+        'url': 'wss://spark-api.xf-yun.com/v3.1/chat',
+    },
 }
diff --git a/sparkapi/core/query.py b/sparkapi/core/query.py
@@ -7,6 +7,7 @@
 class Domain(Enum):
     GENERAL = 'general'
     GENERAL_V2 = 'generalv2'
+    GENERAL_V3 = 'generalv3'
 
     def __str__(self):
         return self.value

diff --git a/sparkapi/version.json b/sparkapi/version.json
@@ -4,5 +4,5 @@
     "url": "https://github.com/suqingdong/sparkapi",
     "author": "suqingdong",
     "author_email": "suqingdong1114@gmail.com",
-    "version": "1.0.2"
+    "version": "1.0.3"
 }