deepanything 0.1.0__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/Server/__init__.py

@@ -1 +1,4 @@
+from .Server import DeepAnythingServer
+from . import Types
+
 __all__ = ["Server", "Types"]

deepanything/__init__.py

@@ -1 +1,3 @@
+from . import DeepAnythingClient,ResponseClient,ReasonClient,Stream,Server
+
 __all__ = ['DeepAnythingClient', 'ReasonClient', 'Utility', 'Stream', 'ResponseClient', 'Server']

{deepanything-0.1.0.dist-info → deepanything-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepanything
-Version: 0.1.0
+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
@@ -9,6 +9,12 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: openai
+Requires-Dist: uvicorn
+Requires-Dist: attrs
+Requires-Dist: fastapi
+Requires-Dist: pydantic
+Requires-Dist: setuptools
 
 # DeepAnything
 
@@ -28,6 +34,7 @@ DeepAnything is a project that provides DeepSeek R1's deep thinking capabilities
 ## Installation Guide
 
 Install via pip:
+
 ```bash
 pip install deepanything
 ```
@@ -35,6 +42,7 @@ pip install deepanything
 ## Quick Start
 
 ### 1. Integrate into Code
+
 #### Chat Completion
 
 ```python
@@ -72,6 +80,7 @@ completions = da_client.chat_completion(
 ```
 
 #### Streaming Call
+
 ```python
 stream = da_client.chat_completion(
     messages=[
@@ -91,6 +100,7 @@ for chunk in stream:
 ```
 
 #### Asynchronous Usage
+
 ```python
 from deepanything.ReasonClient import AsyncDeepseekReasonClient
 from deepanything.ResponseClient import AsyncOpenaiResponseClient
@@ -129,10 +139,13 @@ async def main():
 
 asyncio.run(main())
 ```
+
 ### 2. Use as a Server
+
 ```bash
  python -m deepanything --host host --port port --config config.json
 ```
+
 | Parameter | Description             |
 | --- |----------------|
 | --host | Server listening address, will override the setting in config.json |
@@ -140,6 +153,7 @@ asyncio.run(main())
 | --config | Configuration file path |
 
 #### Configuration File Format
+
 Below is an example of a configuration file:
 
 ```json
@@ -176,16 +190,19 @@ Below is an example of a configuration file:
   ]
 }
 ```
-**Detailed Explanation**
+
+#### **Detailed Explanation**
 
 - reason_clients: Configuration for thinking models, currently supports deepseek and openai types. When the type is openai, deepanything directly uses the model's output as the thinking content, and it is recommended to use qwq-32b in this case.
 - response_clients: Configuration for response models, currently only supports the openai type.
 - api_keys: API keys for user authentication. When left blank or an empty list, the server does not use API keys for authentication.
 
 ## License
+
 This project is licensed under the [MIT License](LICENSE)
 
 ## Contact Us
+
 Email: 1737636624@qq.com
 
-GitHub Issues: https://github.com/yourusername/deepseek-r1-integration/issues
+GitHub Issues: [https://github.com/junity233/deep-anything/issues](https://github.com/junity233/deep-anything/issues)

{deepanything-0.1.0.dist-info → deepanything-0.1.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 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
-deepanything/__init__.py,sha256=DDDKiR4kl2PhOsVHVQ7GPKNEo5qIaO8w2lbTRn-2XWQ,97
+deepanything/__init__.py,sha256=_2RolcKcpxmW0dmtiQpXlvgxe5dvqx90Yg_Q_oVLVZQ,175
 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=BjkolZTph3fa10A3u02hdPMkSgpDp8BhFv8cf-BNReQ,29
-deepanything-0.1.0.dist-info/LICENSE,sha256=JWYd2E-mcNcSYjT5nk4ayM5kkkDq6ZlOxVcYsyqCIwU,1059
-deepanything-0.1.0.dist-info/METADATA,sha256=JhgQ6s8hUUDsltC7_Y06K-Sg8QaBAPZJgEGK-FGRzlA,5628
-deepanything-0.1.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-deepanything-0.1.0.dist-info/entry_points.txt,sha256=UT4gNGx6dJsKBjZIl3VkMekh385O5WMbMidAAla6UB4,60
-deepanything-0.1.0.dist-info/top_level.txt,sha256=wGeRb__4jEJTclCUl0cxhgubD_Bq-QT38VIH6C4KpzY,13
-deepanything-0.1.0.dist-info/RECORD,,
+deepanything/Server/__init__.py,sha256=eIpn6NbNvEg4ST8CuuIuzPT3m_fTlmPC3sikPoPFsYo,92
+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,,