deepanything 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

deepanything/Utility.py

@@ -6,6 +6,7 @@ import uuid
 from openai.types.chat import chat_completion_chunk,chat_completion,chat_completion_message
 from openai.types import completion_usage,completion_choice
 
+
 def make_usage(
         completion_tokens,
         prompt_tokens,
@@ -207,4 +208,16 @@ def merge_usage(
     )
 
 def make_id_by_timestamp():
-    return "chatcmpl-" + str(uuid.uuid4())
+    return "chatcmpl-" + str(uuid.uuid4())
+
+def extend_message(
+        messages : List,
+        role : Literal["developer", "system", "user", "assistant", "tool"],
+        content : Optional[str] = None,
+        reason_content : Optional[str] = None,
+) -> List:
+    return messages + [make_chat_completion_message(
+        role=role,
+        content=content,
+        reasoning_content=reason_content
+    )]

deepanything/__main__.py

@@ -12,7 +12,7 @@ def main():
     args = parser.parse_args()
 
     if args.config is not None:
-        with open(args.config) as f:
+        with open(args.config, encoding='utf-8') as f:
             config = json.load(f)
         server = DeepAnythingServer(host=args.host, port=args.port, config=config)
         server.run()

deepanything/metadatas.py

@@ -1 +1,4 @@
-VERSION = "v0.1.6"
+from sys import version
+
+VERSION = "v0.1.8"
+PYTHON_RUNTIME = f"python{version}"

{deepanything-0.1.6.dist-info → deepanything-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepanything
-Version: 0.1.6
+Version: 0.1.8
 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
@@ -169,6 +169,12 @@ Below is an example of a configuration file:
       "type" : "deepseek",
       "base_url" : "https://api.siliconflow.cn/v1",
       "api_key" : "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    },
+    {
+      "name" : "qwen",
+      "type" : "openai",
+      "base_url" : "https://dashscope.aliyuncs.com/compatible-mode/v1",
+      "api_key" : "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     }
   ],
   "response_clients": [
@@ -185,7 +191,17 @@ Below is an example of a configuration file:
       "reason_client" : "siliconflow",
       "response_client" : "qwen",
       "reason_model": "Pro/deepseek-ai/DeepSeek-R1",
-      "response_model" :  "qwen-max-latest"
+      "response_model" :  "qwen-max-latest",
+      "reason_prompt" : "<think>{}</think>"
+    },
+    {
+      "name": "QWQ-Qwen-max",
+      "reason_client" : "qwen",
+      "response_client" : "qwen",
+      "reason_model": "qwq-32b-preview",
+      "response_model" :  "qwen-max-latest",
+      "reason_prompt" : "<think>{}</think>",
+      "reason_system_prompt" : "You are a model designed to contemplate questions before providing answers. Your thought process and responses are not directly visible to the user but are instead passed as prompts to the next model. For any question posed by the user, you should carefully consider it and provide as detailed a thought process as possible."
     }
   ],
   "api_keys" : [
@@ -220,7 +236,8 @@ Below is an example of a configuration file:
     "loggers": {
         "uvicorn": {"handlers": ["default"], "level": "INFO", "propagate": false},
         "uvicorn.error": {"level": "INFO"},
-        "uvicorn.access": {"handlers": ["access"], "level": "INFO", "propagate": false}
+        "uvicorn.access": {"handlers": ["access"], "level": "INFO", "propagate": false},
+        "deepanything": {"handlers": ["default"], "level": "INFO", "propagate": false}
     }
   }
 }
@@ -228,13 +245,17 @@ Below is an example of a configuration file:
 
 #### **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.
-- log: Log configuration. If this item is not filled in, the default logging configuration of uvicorn will be used. For details, please refer to [uvicorn logging configuration](https://www.uvicorn.org/settings/#logging).
+- reason_clients: Configuration for the thinking model, currently supporting two types: deepseek and openai. When the type is openai, DeepAnything directly uses the model's output as the thinking content; it is recommended to use qwq-32b in this case.
+- response_clients: Configuration for the response model, currently supporting only one type: openai.
+- models: Model configuration, including model name, thinking model, response model, parameters for the thinking model, and parameters for the response model.
+    - reason_prompt: Specifies how the thinking content should be embedded into the conversation. DeepAnything will use `reason_prompt` to format the thinking content. The default is `<think>{}</think>`.
+    - reason_system_prompt: Adds extra prompt words for the thinking model. This prompt will be placed at the end of the message as a `system` role and passed to the thinking model. If not specified, it will not take effect.
+- api_keys: API keys used for user identity verification. When not filled or an empty list, the server does not use API keys for authentication.
+- log: Log configuration. If this item is not filled, the default uvicorn log configuration will be used. For more details, refer to [uvicorn logging configuration](https://www.uvicorn.org/settings/#logging) and [Python Logging configuration](https://docs.python.org/3/library/logging.config.html).}
 
 ## Deploying with Docker
 ### 1. Pull the Image
+
 ```bash
 docker pull junity233/deepanything:latest
 ```

deepanything-0.1.8.dist-info/RECORD

@@ -0,0 +1,17 @@
+deepanything/DeepAnythingClient.py,sha256=4dJg5CFsQLlhxCWgtj7UYa9VTchogeFm_-B3YExk8Ns,28622
+deepanything/ReasonClient.py,sha256=P1uuwfgds6qch5gPp2BKD1y1myLPZ8BKCs1PiqsZHmw,12888
+deepanything/ResponseClient.py,sha256=BT-5qBv1xs3-5SbYfFEjHYzH0E09I4Fl8h4K1IvSJ8U,5089
+deepanything/Stream.py,sha256=8GSsKeAhSwSt0T6JAO4l3ivTwGuJYMxp7GlqpExp8T8,2440
+deepanything/Utility.py,sha256=dZeCg_D28rwJILLuCsE-ZtcKUkbW1prXPVlpSkYFCKA,7024
+deepanything/__init__.py,sha256=_2RolcKcpxmW0dmtiQpXlvgxe5dvqx90Yg_Q_oVLVZQ,175
+deepanything/__main__.py,sha256=BWGtAVWDgJg50uGTEvZNV4P4PFghYwx5cTpXlEAWRio,1084
+deepanything/metadatas.py,sha256=hfYSJI8zYLB9fgn5puFIHPQWxuMPY_n-YXoSW7y0XZ0,82
+deepanything/Server/Server.py,sha256=avsTMQVtX9RErhKm2JqYt_U_auUyhHiE4u-Xu1zPzOI,11460
+deepanything/Server/Types.py,sha256=yGd1vwYMg2nXXOdFh6esHfrAjCglkg9ivqzBMA4go6Y,646
+deepanything/Server/__init__.py,sha256=eIpn6NbNvEg4ST8CuuIuzPT3m_fTlmPC3sikPoPFsYo,92
+deepanything-0.1.8.dist-info/LICENSE,sha256=JWYd2E-mcNcSYjT5nk4ayM5kkkDq6ZlOxVcYsyqCIwU,1059
+deepanything-0.1.8.dist-info/METADATA,sha256=iLcSCMcTt4SpS5VweRtGlUDrU3Bp9GpCc12j9qWoWbI,9486
+deepanything-0.1.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+deepanything-0.1.8.dist-info/entry_points.txt,sha256=UT4gNGx6dJsKBjZIl3VkMekh385O5WMbMidAAla6UB4,60
+deepanything-0.1.8.dist-info/top_level.txt,sha256=wGeRb__4jEJTclCUl0cxhgubD_Bq-QT38VIH6C4KpzY,13
+deepanything-0.1.8.dist-info/RECORD,,

deepanything-0.1.6.dist-info/RECORD

@@ -1,17 +0,0 @@
-deepanything/DeepAnythingClient.py,sha256=B6m67keuGqUsTBABjSaMpyQpI2e2USbos5Fsmma73HU,15377
-deepanything/ReasonClient.py,sha256=4IAotSKIzxR-jXHfU9YJH1KHdWvBfbTKMVlXvEEHq9E,7558
-deepanything/ResponseClient.py,sha256=NbXjlU_0qTKBNjZy8B9J9emuABQYvx3NZsWuja9OnMI,2989
-deepanything/Stream.py,sha256=8ESR8ttjyPZ-uXPDENsVWUzaL34_GT2OZBJ0PWu7vsA,1578
-deepanything/Utility.py,sha256=TFH-4NS-gQpzzEb1Aba7WpDEqBqNRF1STWFzfRqQLcg,6645
-deepanything/__init__.py,sha256=_2RolcKcpxmW0dmtiQpXlvgxe5dvqx90Yg_Q_oVLVZQ,175
-deepanything/__main__.py,sha256=N40zRebnTUmVd9a0wcK_I0au7Lvl4axxKX6zJGDdXq0,1066
-deepanything/metadatas.py,sha256=WspkzXRul9GiZA9N8kBo-wnZEexn6N3Y_ykPEaT8dL8,18
-deepanything/Server/Server.py,sha256=HIM-MHuRG98jv8MTeGK9So-xd8OiTA9R74uvKbWrXyk,9847
-deepanything/Server/Types.py,sha256=b7aMaRBgODEKdyYe0FeraUfrygJuye3b5lfQTOWASXA,650
-deepanything/Server/__init__.py,sha256=eIpn6NbNvEg4ST8CuuIuzPT3m_fTlmPC3sikPoPFsYo,92
-deepanything-0.1.6.dist-info/LICENSE,sha256=JWYd2E-mcNcSYjT5nk4ayM5kkkDq6ZlOxVcYsyqCIwU,1059
-deepanything-0.1.6.dist-info/METADATA,sha256=-h3eS_CkiwY27ju-QxH2_40IJMBszckjbjmhBTqW0Ig,7851
-deepanything-0.1.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-deepanything-0.1.6.dist-info/entry_points.txt,sha256=UT4gNGx6dJsKBjZIl3VkMekh385O5WMbMidAAla6UB4,60
-deepanything-0.1.6.dist-info/top_level.txt,sha256=wGeRb__4jEJTclCUl0cxhgubD_Bq-QT38VIH6C4KpzY,13
-deepanything-0.1.6.dist-info/RECORD,,