deepanything 0.1.1__tar.gz → 0.1.2__tar.gz

{deepanything-0.1.1 → deepanything-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepanything
-Version: 0.1.1
+Version: 0.1.2
 Summary: DeepAnything is a project that provides DeepSeek R1's deep thinking capabilities for various large language models (LLMs).
 Author: Junity
 Author-email: 1727636624@qq.com

{deepanything-0.1.1 → deepanything-0.1.2}/deepanything/ReasonClient.py

@@ -1,5 +1,5 @@
 import openai
-from openai.types.chat import chat_completion
+from openai.types.chat import chat_completion, chat_completion_chunk
 from deepanything.Stream import Stream,AsyncStream
 from deepanything import Utility
 
@@ -126,6 +126,15 @@ class AsyncDeepseekReasonClient(AsyncReasonClient):
                 .on_next(lambda it : it.__anext__())
                 .on_close(lambda _: stream.close()))
 
+
+def _rebuild_chunk_for_openai(
+        chunk:chat_completion_chunk.ChatCompletionChunk
+) -> chat_completion_chunk.ChatCompletionChunk:
+    chunk.choices[0].delta.reasoning_content = chunk.choices[0].delta.content
+    chunk.choices[0].delta.content = None
+    return chunk
+
+
 class OpenaiReasonClient(ReasonClient):
     client : openai.OpenAI
     def __init__(
@@ -146,13 +155,15 @@ class OpenaiReasonClient(ReasonClient):
                       model: str,
                       **kwargs
                       ) -> Stream:
-        return self.client.chat.completions.create(
+        stream =  self.client.chat.completions.create(
             messages=messages,
             model=model,
             stream=True,
             **kwargs
         )
 
+        return Stream(stream).on_next(lambda it: _rebuild_chunk_for_openai(it.__next__())).on_close(lambda _: stream.close())
+
     def reason(
             self,
             messages:list[dict],
@@ -160,13 +171,20 @@ class OpenaiReasonClient(ReasonClient):
             stream = False,
             **kwargs
     ) -> Stream or chat_completion.ChatCompletion:
-        return self.client.chat.completions.create(
+        if stream:
+            return self.reason_stream(messages, model, **kwargs)
+        completion = self.client.chat.completions.create(
             messages=messages,
             model=model,
             stream=stream,
             **kwargs
         )
 
+        completion.choices[0].message.reasoning_content = completion.choices[0].message.content
+        completion.choices[0].message.content = None
+
+        return completion
+
 class AsyncOpenaiReasonClient(AsyncReasonClient):
     client : openai.AsyncOpenAI
     def __init__(self,base_url:str,api_key:str,**kwargs) -> None:
@@ -182,22 +200,35 @@ class AsyncOpenaiReasonClient(AsyncReasonClient):
                             model: str,
                             **kwargs
                             ) -> AsyncStream:
-        return await self.client.chat.completions.create(
+
+        stream =  await self.client.chat.completions.create(
             messages=messages,
             model=model,
             stream=True,
             **kwargs
         )
 
+        async def _next(it):
+            return _rebuild_chunk_for_openai(await it.__anext__())
+
+        return AsyncStream(stream).on_next(lambda it: _next(it)).on_close(lambda _: stream.close())
+
     async def reason(self,
                      messages: list[dict],
                      model: str,
                      stream = False,
                      **kwargs
                      ) -> AsyncStream or chat_completion.ChatCompletion:
-        return await self.client.chat.completions.create(
+        if stream:
+            return await self.reason_stream(messages, model, **kwargs)
+
+        completion = await self.client.chat.completions.create(
             messages=messages,
             model=model,
-            stream=stream,
             **kwargs
-        )
+        )
+
+        completion.choices[0].message.reasoning_content = completion.choices[0].message.content
+        completion.choices[0].message.content = None
+
+        return completion

{deepanything-0.1.1 → deepanything-0.1.2}/deepanything.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepanything
-Version: 0.1.1
+Version: 0.1.2
 Summary: DeepAnything is a project that provides DeepSeek R1's deep thinking capabilities for various large language models (LLMs).
 Author: Junity
 Author-email: 1727636624@qq.com

{deepanything-0.1.1 → deepanything-0.1.2}/setup.py

@@ -8,7 +8,7 @@ with open("requirements.txt") as f:
 
 setup(
     name="deepanything",
-    version="0.1.1",
+    version="0.1.2",
     author="Junity",
     author_email="1727636624@qq.com",
     description="DeepAnything is a project that provides DeepSeek R1's deep thinking capabilities for various large language models (LLMs).",