From fa567efd3ab5373cab536fce89ccd40e84f1ae6e Mon Sep 17 00:00:00 2001 From: bladeclara42 <71927457+bladeclara42@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:04:18 +0700 Subject: [PATCH] rename(deepseek): change name openai to deepseek client --- app/core/__pycache__/config.cpython-313.pyc | Bin 507 -> 787 bytes .../deepseek_client.cpython-313.pyc | Bin 1500 -> 1815 bytes app/core/config.py | 4 ++ app/core/deepseek_client.py | 40 +++++++++++------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/core/__pycache__/config.cpython-313.pyc b/app/core/__pycache__/config.cpython-313.pyc index eff13df0b5190a6f9a9ee4bb8a4379a8b5146bc9..d387dd52457585e61b98d0ef0fd749748697c731 100644 GIT binary patch delta 284 zcmey(JeiH}GcPX}0}yEEMrE)vP2`hc;$obrF=L{iBrj($izyRGj)9?w9VEaN%ncXd z016251oOfLIMW$5`6eDINWLZD;_4a@?CRy0Od69Nm|VE{ Wfa(~5xY&JiACm`rBYzPOkOu%1Y7L|S diff --git a/app/core/__pycache__/deepseek_client.cpython-313.pyc b/app/core/__pycache__/deepseek_client.cpython-313.pyc index 5d4ceee72fedc3ac283c84577877f837994d8d77..5dac047f0cfd0bd155438e2dc7d2a6809b639ba4 100644 GIT binary patch literal 1815 zcmb_cO-~y~7@pnruGcoU0UIz$0~5CtY*mqfv=q`Ng4$F80+cP4T3fOfGlnhpt~`tAwQmUvqRC0t`Rca4?$7ZqAk6T8&Gta#9%scPb z%tKG=@S2tDQ#x52#CP7YxB9BD`s77=Za0u^8`E}{jIikQnJz!H^O*t6(a zkg2?&P-VeOy%=S^W2eeCRfMu?9BJ~aLR&K0=XhLE=sdRc(OQ#oev#Zy0bF*5Sh0a7bR#NFD)_peT zl*RP>2bcdT!G?`Z%fU8ruwi0i-ZZFXmWb)#n>sc0jUurVBJ=8HBez5LnYy9dB)3b8 zOf3=H*0+eAKXt0*8n}u+h5zK7h|r4&LlD=|Ss(%kWzN`|&F!Pu6y_{q15YuJ>2R0C@JG+!H#davsOO#jBL44W5l-Om*QdEmJS@ zXCbSX%h|j|Np=&ww86_<+w4o_eb&t_&wUJ=a~8ZYxTPgK;2KYkAMpCCz2*87w9CJ#Tl``Y1HB|3TA*HDAEjc?UhBQ)@p?>H1c6e?=s z&qg46${xEHIeh1C|Djrmj{hIK=>^4q*|XsBCy`V@_+oZ!E{^VB6#(DA76*KEk>jJd zKcz}XuZ+CaBR%K|0)8+wl9Hr{k_`BvDgh_a#guj^nP}M*3K+GM9ELnx;(371EErpq zzbdWzpk9vnTS9xFV;+7NT8a1?oqzz*Aud+mfNI?>lB@J(nDQsoo`l)PyV~RJcH*lzb>j0XdCBlh7pc5+txCYwL_Z$a;4* zyMZ>R2sj{al|a4bzySmj965)7AXbrV4M9aJLiA=7AtAwmH?cPfQb+c@-+OQ7&Ad0i zx5x2#6mZPkey{pS1bEDqV1&BhxQyTnFu)L2fpQsIg%yDc`gxnU8d?#lxDuw}6^Tmd z3sc#UXrv$(z*2&s1sSyqfo8~s=w!%G4gUDngpZ?7+A-(rb#-i3^j-Az?}-}UCk$4$33wnd2R5wbm2a_ZwBOzg%3 z!z-n#=`*EHJkP8UuOtLlLdh@tG5(J~L+c3Wn0)@!pAX6cx$wC?U6_{xn<31GY~fkh z6mqA@2R?w@N!ibIj&kw;>s-sLfo&7ZZiq(MkY*)2v>D3v2A(tdVi%e>aHkg7pT2gg zn~@>UeGXub06cx2Axju2*B3-PletT0I6$LNi984Sfk2OdIRs#f`BY#rlssBGV^a)n zp~9=70P8@IShkoE%R(7m6NjNJ%pgu*SWAak1fR9IP3|$}j_Hx&4z+53Aag6_lkxi- zOKFKob!UrMG=itFXx+S9^qp;Ddo1RYx=X0(?@+>I&!@z!Q~sX2SJoVz63=yPkLYFU z)OEi~^ph~V&txfes9rKHt7cd9MWmF0l+uxpb9y>K@pNFagLE}(lvA4}7qi(7Bb!}4 z;Vfq*3!m^UhBS07;@9vTCYSJhpD^`wb%)WBQq`%Ih{r^W*eueeD2tRF+b6cqE@bbP zh|6Oz$)z>4h?q(`+{sriSv9^&3DRK#@i2*N%EGJy7qfN6F{^ zltfkDTWUuWlG@S+AI#sMZ)(>X+O?)O(a^&C$um=;T9v>IdPWKHJh#O>Ly1jqGO{+SR5u*3ib9+H^ykKJ1xp zC0_dbw^-jXge3Jyi68d9{H^hQ@|$@byiTv8%G=VL$Ehs}g76sPzrf(n v5Pt;A4Oni=(0~09lC7k^r~aB8-jhF3TNg)AB--JALEV4*FF-+G!2SOLVCPot diff --git a/app/core/config.py b/app/core/config.py index 0c13826..b63258c 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -8,3 +8,7 @@ load_dotenv() OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "") OPENAI_MODEL = os.getenv("OPENAI_MODEL", "gpt-3.5-turbo") OPENAI_API_BASE = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1") +DEEPSEEK_API_KEY = os.getenv("DEEPSEEK_API_KEY", "") +DEEPSEEK_API_BASE = os.getenv("DEEPSEEK_API_BASE", "https://api.deepseek.com/v1") +DEEPSEEK_MODEL = os.getenv("DEEPSEEK_MODEL", "deepseek-chat") + diff --git a/app/core/deepseek_client.py b/app/core/deepseek_client.py index 37223c8..cecf17e 100644 --- a/app/core/deepseek_client.py +++ b/app/core/deepseek_client.py @@ -1,21 +1,23 @@ # app/services/openai_service.py import openai +import os from openai import OpenAI -import openai -from app.core.config import OPENAI_API_KEY, OPENAI_MODEL, OPENAI_API_BASE +from openai import OpenAIError +from app.core.config import DEEPSEEK_API_BASE, DEEPSEEK_MODEL, DEEPSEEK_API_KEY -# Initialize OpenAI client with DeepSeek's API -DEEPSEEK_API_BASE = "https://api.deepseek.com/v1" -DEEPSEEK_MODEL = "deepseek-chat" +# Ensure the API key is properly set +if not DEEPSEEK_API_KEY: + raise ValueError("DEEPSEEK_API_KEY is not set in environment variables") -openai.api_key = OPENAI_API_KEY -openai.api_base = DEEPSEEK_API_BASE +# Initialize the client with proper configuration +client = OpenAI( + api_key=DEEPSEEK_API_KEY, + base_url=DEEPSEEK_API_BASE +) async def chat_with_openai(messages: list): - client = OpenAI( - api_key=openai.api_key, - base_url=DEEPSEEK_API_BASE - ) + if not messages: + raise ValueError("Messages list cannot be empty") try: response = client.chat.completions.create( @@ -26,10 +28,16 @@ async def chat_with_openai(messages: list): stream=False ) - if response.choices and len(response.choices) > 0: - return response.choices[0].message.content - return "No response from the model" + if not response.choices or not response.choices[0].message.content: + return "No response content from the model" + + return response.choices[0].message.content + except OpenAIError as e: + error_msg = f"DeepSeek API Error: {str(e)}" + print(error_msg) + raise Exception(error_msg) from e except Exception as e: - print(f"Error calling DeepSeek API: {str(e)}") - raise + error_msg = f"Unexpected error: {str(e)}" + print(error_msg) + raise Exception(error_msg) from e