deepanything 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

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.dist-info → deepanything-0.1.2.dist-info}/METADATA

@@ -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.dist-info → deepanything-0.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 deepanything/DeepAnythingClient.py,sha256=7yf4iteGjcDWcLKd3GD0OWv-A_d54QKVAuSHMl7-T54,15042
-deepanything/ReasonClient.py,sha256=8uV2wuDUmUP7ICCOfClVm5J2gBcdQJwI5F_-ftxS2Ho,5941
+deepanything/ReasonClient.py,sha256=TxyXf7q3f_xASFA-blrKNHhaV38FIcFKmTnGBqU_d0U,7116
 deepanything/ResponseClient.py,sha256=oWPIQXknm7QEkG5Ysx9ejKUyISd0cHZF-HVG0fersOQ,2871
 deepanything/Stream.py,sha256=8ESR8ttjyPZ-uXPDENsVWUzaL34_GT2OZBJ0PWu7vsA,1578
 deepanything/Utility.py,sha256=HmiXU5X1eQO9iL292lfFA3dbGVjEPIM4Ayvw8Z8y2lk,6677
@@ -8,9 +8,9 @@ deepanything/__main__.py,sha256=x9LQGBlVnyML4yJ6Y3Rrt1pZ4xkLu0uZ569wKqwmpJQ,941
 deepanything/Server/Server.py,sha256=rrTVahuDe0U1U6V6IfWJ7p5c-LbOQ15T42lymbwzna4,7211
 deepanything/Server/Types.py,sha256=iN3X2QDnOyKwpuifUymeu1qg4OZ8uu4QG9ThttZFSDQ,390
 deepanything/Server/__init__.py,sha256=eIpn6NbNvEg4ST8CuuIuzPT3m_fTlmPC3sikPoPFsYo,92
-deepanything-0.1.1.dist-info/LICENSE,sha256=JWYd2E-mcNcSYjT5nk4ayM5kkkDq6ZlOxVcYsyqCIwU,1059
-deepanything-0.1.1.dist-info/METADATA,sha256=nEHVkjQXaTRgvlXh1aw0cc0nj6DgVXz_nqUtja8S_V0,5840
-deepanything-0.1.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-deepanything-0.1.1.dist-info/entry_points.txt,sha256=UT4gNGx6dJsKBjZIl3VkMekh385O5WMbMidAAla6UB4,60
-deepanything-0.1.1.dist-info/top_level.txt,sha256=wGeRb__4jEJTclCUl0cxhgubD_Bq-QT38VIH6C4KpzY,13
-deepanything-0.1.1.dist-info/RECORD,,
+deepanything-0.1.2.dist-info/LICENSE,sha256=JWYd2E-mcNcSYjT5nk4ayM5kkkDq6ZlOxVcYsyqCIwU,1059
+deepanything-0.1.2.dist-info/METADATA,sha256=06fgJbN8qXxxsFKbwkUaBs3hJm4VDe5JO3lRAlrk0Ko,5840
+deepanything-0.1.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+deepanything-0.1.2.dist-info/entry_points.txt,sha256=UT4gNGx6dJsKBjZIl3VkMekh385O5WMbMidAAla6UB4,60
+deepanything-0.1.2.dist-info/top_level.txt,sha256=wGeRb__4jEJTclCUl0cxhgubD_Bq-QT38VIH6C4KpzY,13
+deepanything-0.1.2.dist-info/RECORD,,