From 07504ad3f23331985c7080874b351c17128385e3 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 27 Jun 2025 09:19:33 +0800
Subject: [PATCH] 'commit'

---
 dsRag/Config/Config.py                        |   4 +-
 .../Config/__pycache__/Config.cpython-310.pyc | Bin 761 -> 763 bytes
 dsRag/Test/TestQWen3.py                       |  37 ++----------------
 dsRag/Util/ALiYunUtil.py                      |  28 +++++++++++++
 .../__pycache__/ALiYunUtil.cpython-310.pyc    | Bin 0 -> 1283 bytes
 5 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 dsRag/Util/ALiYunUtil.py
 create mode 100644 dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc

diff --git a/dsRag/Config/Config.py b/dsRag/Config/Config.py
index d5365f11..1bc2ae76 100644
--- a/dsRag/Config/Config.py
+++ b/dsRag/Config/Config.py
@@ -28,5 +28,5 @@ DEEPSEEK_URL = 'https://api.deepseek.com'
 
 # 阿里云中用来调用 deepseek v3 的密钥【驿来特】
 MODEL_API_KEY = "sk-f6da0c787eff4b0389e4ad03a35a911f"
-MODEL_NAME = "qwen-plus"
-#MODEL_NAME = "deepseek-v3"
\ No newline at end of file
+#MODEL_NAME = "qwen-plus"
+MODEL_NAME = "deepseek-v3"
\ No newline at end of file
diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc
index dd640b9d6d26cb00265e5d14e0664458cc9674fd..87b9ddcd6a3a7588a95a1126f16a9381e104f1b8 100644
GIT binary patch
delta 39
scmey#`kR$2pO=@50R%p5<Z5N);Z8|SEhtV+&DJe5-aL~ro{^CW0M~#DumAu6

delta 37
rcmey(`jeF_pO=@50SNrxZ{%ua<l-zWPtDUU$SEz}Jex6|k&zJq$@2<}

diff --git a/dsRag/Test/TestQWen3.py b/dsRag/Test/TestQWen3.py
index d12fada8..f7e6f5b1 100644
--- a/dsRag/Test/TestQWen3.py
+++ b/dsRag/Test/TestQWen3.py
@@ -1,39 +1,10 @@
-import requests
-from Config.Config import MODEL_API_KEY, MODEL_NAME
-
-class QWenClient:
-    def __init__(self):
-        self.api_key = MODEL_API_KEY
-        self.model_name = MODEL_NAME
-        self.base_url = "https://dashscope.aliyuncs.com/api/v1/services/aigc/text-generation/generation"
-        
-    def generate(self, prompt):
-        headers = {
-            "Authorization": f"Bearer {self.api_key}",
-            "Content-Type": "application/json"
-        }
-        
-        payload = {
-            "model": self.model_name,
-            "input": {
-                "messages": [
-                    {"role": "user", "content": prompt}
-                ]
-            }
-        }
-        
-        response = requests.post(self.base_url, json=payload, headers=headers)
-        response.raise_for_status()
-        return response.json()
+from Util.ALiYunUtil import ALiYunUtil
 
 if __name__ == '__main__':
-    client = QWenClient()
+    ali_util = ALiYunUtil()
     while True:
         prompt = input("请输入问题(输入q退出): ")
         if prompt.lower() == 'q':
             break
-        try:
-            result = client.generate(prompt)
-            print("回答:", result['output']['text'])
-        except Exception as e:
-            print(f"发生错误: {str(e)}")
\ No newline at end of file
+        answer = ali_util.chat(prompt)
+        print("回答:", answer)
\ No newline at end of file
diff --git a/dsRag/Util/ALiYunUtil.py b/dsRag/Util/ALiYunUtil.py
new file mode 100644
index 00000000..8d88d746
--- /dev/null
+++ b/dsRag/Util/ALiYunUtil.py
@@ -0,0 +1,28 @@
+from openai import OpenAI
+from Config.Config import MODEL_API_KEY, MODEL_NAME
+
+class ALiYunUtil:
+    def __init__(self):
+        self.client = OpenAI(
+            api_key=MODEL_API_KEY,
+            base_url="https://dashscope.aliyuncs.com/compatible-mode/v1"
+        )
+        self.model_name = MODEL_NAME
+    
+    def chat(self, prompt, model=None):
+        """
+        与阿里云大模型对话
+        :param prompt: 用户输入的问题
+        :param model: 可选，指定使用的模型，默认使用Config中的MODEL_NAME
+        :return: 模型返回的答案
+        """
+        try:
+            completion = self.client.chat.completions.create(
+                model=model or self.model_name,
+                messages=[
+                    {'role': 'user', 'content': prompt}
+                ]
+            )
+            return completion.choices[0].message.content
+        except Exception as e:
+            return f"发生错误: {str(e)}"
\ No newline at end of file
diff --git a/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc b/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b3e93cbe24c44be8c4757800c58123ff1061a140
GIT binary patch
literal 1283
zcmZuw&2Jk;6rY(LuQ%H`jX*+_1M<}pI4VaAA)+=y6|GxQp(v}M)plnRue;ve&WtIs
z98{@6Eh43=utaESQBe`)(D+FCYW@oj%aJ&-PpH=(THfsD!$Q2(ynXZLeayV~dvU2`
zBcMx9KWhAGAoRE1j1%b4yRc*x7()z)sD&MjwM;_NG905t9g5L=h#8EoAx5tfr@#v5
zQN<jA531nQJe%-n_Ed$Wr88$w&YgB=&z*ALpIb=nd|RJAGv{mDaXQHSI%qj^FhdSu
zn2|N)7|djp71pprnE{!KsXco-SZGHdsvz|7SQsr+SSMh~SAi*{u#R$rbdgJx0h}@f
zF^qcWctfc~)@EjyCmYg_6JGVgV5J@Tvg*gJ8CZ#@f(s#kvlTNw^YQTtaf)6NxEJ|~
zV_onhciSSY6a;}xLcbt2{V?E>68aLUt=&R5@>(3qLM0EEenMgbj-I`7vbM<Nd@L@)
z@0^I6+*crd;4LreM=c({ubQl+mg@#lpj@{AzEZc4VEtLoZQ6Nx%y!?d?(5s^llIb1
zSyh%m=p5^!CTij)X&POU*s!AvccD(-l4Z<{8)Vh!8qETu$57L37U!X26e(-vEsR#7
z`<)UisEIDUitnJiWFDDl0WouxeoD{p{V(Io(5LoaI&*oCwjX~v+SnRhTi^cm*5JX9
zI}h&<?tL-n|1#{~J+P@Ip72`bL_qCTt-RZNxO4sI;ghchpZ&0Vdu{af=IHy4{~Bji
zu9XKj`=cwL|MUC$&ib{%=I!l2w!j;l@;sm){kAdOe30u;#L-f)y#4qQ7#yPVFtXsP
zEuvaEcOGu_26yg(>F%T6&i(5LW+`n;E&%9M#34_MejF+2J}3&=r5vlprSz7$6dIZB
zDPV(}w|0Bqje6e<`~6zEUa^G<+LZbYPdP_4=0dK5IFf)R!9B%AQJ)w6MjZHDrp3LG
zLI+DH=05RxqU}>dDgjuuwA#!ID2~F$u@8f$m}mIQnZ|^e1~v&xz5<LCZERtSkQe6j
zX>$s{hOH~)Md#=k#PmHYxLzq}RBC9uZfd(Oytf@{dD3++wY@Mu5l8k@jHT5BAhO&V
zn0ivAE`fzCJXI80SFf0k3G*0vK{i`XDeqS`|7D|=jaX*=f1y+B?fgdX=)!05C($&1
GiTn$!w`}?V

literal 0
HcmV?d00001