jarvis-ai-assistant 0.1.213__py3-none-any.whl → 0.1.216__py3-none-any.whl

jarvis/jarvis_platform_manager/service.py

@@ -180,7 +180,7 @@ def start_service(
         request: ChatCompletionRequest,
     ) -> Response:
         """Create a chat completion in OpenAI-compatible format.
-        
+
         Returns:
             Response: Either a JSONResponse or StreamingResponse depending on the request.
         """
@@ -233,7 +233,7 @@ def start_service(
         if stream:
             # Return streaming response
             return StreamingResponse(
-                stream_chat_response(platform, message_text, model),
+                stream_chat_response(platform, message_text, model),  # type: ignore
                 media_type="text/event-stream",
             )
 
@@ -258,36 +258,36 @@ def start_service(
                 response_text,
             )
 
-            return JSONResponse({
-                "id": completion_id,
-                "object": "chat.completion",
-                "created": int(time.time()),
-                "model": model,
-                "choices": [
-                    {
-                        "index": 0,
-                        "message": {"role": "assistant", "content": response_text},
-                        "finish_reason": "stop",
-                    }
-                ],
-                "usage": {
-                    "prompt_tokens": len(message_text) // 4,
-                    "completion_tokens": len(response_text) // 4,
-                    "total_tokens": (len(message_text) + len(response_text)) // 4,
-                },
-            })
+            return JSONResponse(
+                {
+                    "id": completion_id,
+                    "object": "chat.completion",
+                    "created": int(time.time()),
+                    "model": model,
+                    "choices": [
+                        {
+                            "index": 0,
+                            "message": {"role": "assistant", "content": response_text},
+                            "finish_reason": "stop",
+                        }
+                    ],
+                    "usage": {
+                        "prompt_tokens": len(message_text) // 4,
+                        "completion_tokens": len(response_text) // 4,
+                        "total_tokens": (len(message_text) + len(response_text)) // 4,
+                    },
+                }
+            )
         except Exception as exc:
             raise HTTPException(status_code=500, detail=str(exc))
 
-    async def stream_chat_response(
-        platform: Any, message: str, model_name: str
-    ) -> Any:
+    async def stream_chat_response(platform: Any, message: str, model_name: str) -> Any:
         """Stream chat response in OpenAI-compatible format."""
         completion_id = f"chatcmpl-{str(uuid.uuid4())}"
         created_time = int(time.time())
         conversation_id = str(uuid.uuid4())
 
-        # Modify first yield statement format
+        # Send the initial chunk with the role
         initial_data = {
             "id": completion_id,
             "object": "chat.completion.chunk",
@@ -300,21 +300,17 @@ def start_service(
         yield f"data: {json.dumps(initial_data)}\n\n"
 
         try:
-            # Get chat response directly
-            response = platform.chat_until_success(message)
+            # Use the streaming-capable chat method
+            response_generator = platform.chat(message)
 
-            # Record full response
             full_response = ""
+            has_content = False
 
-            # If there is a response, send it in chunks
-            if response:
-                # Split into small chunks for better streaming experience
-                chunk_size = 4
-                for i in range(0, len(response), chunk_size):
-                    chunk = response[i : i + chunk_size]
+            # Iterate over the generator and stream chunks
+            for chunk in response_generator:
+                if chunk:
+                    has_content = True
                     full_response += chunk
-
-                    # Create and send chunk
                     chunk_data = {
                         "id": completion_id,
                         "object": "chat.completion.chunk",
@@ -328,13 +324,10 @@ def start_service(
                             }
                         ],
                     }
-
                     yield f"data: {json.dumps(chunk_data)}\n\n"
 
-                    # Small delay to simulate streaming
-                    await asyncio.sleep(0.01)
-            else:
-                # If no output, send an empty content chunk
+            if not has_content:
+                no_response_message = "No response from model."
                 chunk_data = {
                     "id": completion_id,
                     "object": "chat.completion.chunk",
@@ -343,15 +336,15 @@ def start_service(
                     "choices": [
                         {
                             "index": 0,
-                            "delta": {"content": "No response from model."},
+                            "delta": {"content": no_response_message},
                             "finish_reason": None,
                         }
                     ],
                 }
                 yield f"data: {json.dumps(chunk_data)}\n\n"
-                full_response = "No response from model."
+                full_response = no_response_message
 
-            # Modify final yield statement format
+            # Send the final chunk with finish_reason
             final_data = {
                 "id": completion_id,
                 "object": "chat.completion.chunk",
@@ -361,72 +354,45 @@ def start_service(
             }
             yield f"data: {json.dumps(final_data)}\n\n"
 
-            # Send [DONE] marker
+            # Send the [DONE] marker
             yield "data: [DONE]\n\n"
 
-            # Log conversation to file
-            timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-            log_file = os.path.join(
-                logs_dir, f"stream_conversation_{conversation_id}_{timestamp}.json"
-            )
-
-            log_data = {
-                "conversation_id": conversation_id,
-                "timestamp": timestamp,
-                "model": model_name,
-                "message": message,
-                "response": full_response,
-            }
-
-            with open(log_file, "w", encoding="utf-8", errors="ignore") as f:
-                json.dump(log_data, f, ensure_ascii=False, indent=2)
-
-            PrettyOutput.print(
-                f"Stream conversation logged to {log_file}", OutputType.INFO
+            # Log the full conversation
+            log_conversation(
+                conversation_id,
+                [{"role": "user", "content": message}],
+                model_name,
+                full_response,
             )
 
         except Exception as exc:
-            # Send error message
-            error_msg = f"Error: {str(exc)}"
-            print(f"Streaming error: {error_msg}")
+            error_msg = f"Error during streaming: {str(exc)}"
+            PrettyOutput.print(error_msg, OutputType.ERROR)
 
-            res = json.dumps(
-                {
-                    "id": completion_id,
-                    "object": "chat.completion.chunk",
-                    "created": created_time,
-                    "model": model_name,
-                    "choices": [
-                        {
-                            "index": 0,
-                            "delta": {"content": error_msg},
-                            "finish_reason": "stop",
-                        }
-                    ],
-                }
-            )
-            yield f"data: {res}\n\n"
-            yield f"data: {json.dumps({'error': {'message': error_msg, 'type': 'server_error'}})}\n\n"
-            yield "data: [DONE]\n\n"
-
-            # Log error to file
-            timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-            log_file = os.path.join(
-                logs_dir, f"stream_error_{conversation_id}_{timestamp}.json"
-            )
-
-            log_data = {
-                "conversation_id": conversation_id,
-                "timestamp": timestamp,
+            # Send error information in the stream
+            error_chunk = {
+                "id": completion_id,
+                "object": "chat.completion.chunk",
+                "created": created_time,
                 "model": model_name,
-                "message": message,
-                "error": error_msg,
+                "choices": [
+                    {
+                        "index": 0,
+                        "delta": {"content": error_msg},
+                        "finish_reason": "stop",
+                    }
+                ],
             }
+            yield f"data: {json.dumps(error_chunk)}\n\n"
+            yield "data: [DONE]\n\n"
 
-            with open(log_file, "w", encoding="utf-8", errors="ignore") as f:
-                json.dump(log_data, f, ensure_ascii=False, indent=2)
-
-            PrettyOutput.print(f"Stream error logged to {log_file}", OutputType.ERROR)
+            # Log the error
+            log_conversation(
+                conversation_id,
+                [{"role": "user", "content": message}],
+                model_name,
+                response=f"ERROR: {error_msg}",
+            )
 
     # Run the server
     uvicorn.run(app, host=host, port=port)

jarvis/jarvis_utils/input.py

@@ -109,6 +109,7 @@ class FileCompleter(Completer):
                 (ot("Clear"), "清除历史"),
                 (ot("ToolUsage"), "工具使用说明"),
                 (ot("ReloadConfig"), "重新加载配置"),
+                (ot("SaveSession"), "保存当前会话"),
             ]
         )
 
@@ -222,10 +223,11 @@ def get_multiline_input(tip: str) -> str:
         if last_msg:
             try:
                 # 使用xsel将内容复制到剪贴板
-                process = subprocess.Popen(["xsel", "-b", "-i"], stdin=subprocess.PIPE)
-                process.communicate(input=last_msg.encode("utf-8"))
+                subprocess.run(
+                    ["xsel", "-b", "-i"], input=last_msg.encode("utf-8"), check=True
+                )
                 PrettyOutput.print("已将最后一条消息复制到剪贴板", OutputType.INFO)
-            except Exception as e:
+            except subprocess.CalledProcessError as e:
                 PrettyOutput.print(f"复制到剪贴板失败: {e}", OutputType.ERROR)
         else:
             PrettyOutput.print("没有可复制的消息", OutputType.INFO)

{jarvis_ai_assistant-0.1.213.dist-info → jarvis_ai_assistant-0.1.216.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.213
+Version: 0.1.216
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.213.dist-info → jarvis_ai_assistant-0.1.216.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=-plSw2QooYexMaRlKIRHSdkQww5y9LDlUdoQ1gxFf2I,75
-jarvis/jarvis_agent/__init__.py,sha256=QbI5vkourPJZ2OR63RBZAtFptTYrZz_si8bIkc9EB2o,31709
-jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
-jarvis/jarvis_agent/edit_file_handler.py,sha256=bIciBghx5maDz09x0XNTxdNsyrBbTND95GupVdJIVVg,16762
-jarvis/jarvis_agent/jarvis.py,sha256=tTv9X1oSRDGRmNkM1F3RNN6ikFbc_PkRBIbZIffbA_8,5802
+jarvis/__init__.py,sha256=rTb7P5Us8MKb-Bgo5O9dZfaWM0pDjYYSSZCgb59Yois,75
+jarvis/jarvis_agent/__init__.py,sha256=Ftod6FDMlGJ_DuueI2W19whAmpldVAsGYvlgbvqC55w,33260
+jarvis/jarvis_agent/builtin_input_handler.py,sha256=lcw-VBm8-CVcblxEbGU4dVD6IixgXTLz9uBrv9Y6p20,2710
+jarvis/jarvis_agent/edit_file_handler.py,sha256=vKx26I4yOQwiQHNfkqMJ44Ybf90n37mojTcXNQQy-hw,17382
+jarvis/jarvis_agent/jarvis.py,sha256=4LBtAh9_AuQcjvqBFInqY19eyEJVJtGH4py32yu8olc,6287
 jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
 jarvis/jarvis_agent/shell_input_handler.py,sha256=zVaKNthIHJh1j4g8_-d3w5ahNH9aH-ZNRSOourQpHR4,1328
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=x8CVDZstnRy2jemdnNN-avt1-wGntlSBD7qLlrk0qzU,17951
+jarvis/jarvis_code_agent/code_agent.py,sha256=mQosGLngkM23sMAW9BJtl7XBPFmwOiIZUDG9tb7xAq8,18571
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
 jarvis/jarvis_code_analysis/code_review.py,sha256=uCCbGd4Y1RjDzhZoVE8JdN2avlwOfqimSDIrcM-KMew,30456
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -45,18 +45,18 @@ jarvis/jarvis_methodology/main.py,sha256=-PqsWvtpUJkkhiGgV-1JegEnEZBmv8SHnNMNNm_
 jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2rQQmrKbU,4512
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
-jarvis/jarvis_platform/ai8.py,sha256=UWbe6kveQvOO8wMM9mh5YWyB0zapUEeFiYVPBMnhBAE,8845
-jarvis/jarvis_platform/base.py,sha256=CBFk1Kq7qzOwafOj22bacXChWvCnap3D4IacZCWC_Ss,7882
-jarvis/jarvis_platform/human.py,sha256=_WQtC5w6QJnHh-3KuW8T49C-HucXiHsBEVw-m51ykj4,3196
-jarvis/jarvis_platform/kimi.py,sha256=w0-OJ6xkOGPApcc2Jvc30BMjabwrnzcndmsJJsWOWJg,13419
-jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
-jarvis/jarvis_platform/oyi.py,sha256=U6klSMESC69H9xTo44PXD1ZvdnMa5d7qE3jcPmPBspY,10662
-jarvis/jarvis_platform/registry.py,sha256=Sz4ADAaxuufpAQG0KSQZuL1yALzH-aF3FDapkNn5foE,8107
-jarvis/jarvis_platform/tongyi.py,sha256=juvzMjZ2mbNzSWzem8snmFuE28YVOjjE_YdHCZa9Qnw,20698
-jarvis/jarvis_platform/yuanbao.py,sha256=ZsKXWifESXGfvB9eOot1I6TnhlmgXwnaft3e2UXgSXk,21045
+jarvis/jarvis_platform/ai8.py,sha256=yi7xG8ld4Yrf7drz-uu_JT_XCGYRB0obhygt-jKik8o,10871
+jarvis/jarvis_platform/base.py,sha256=-XegiAS8G_nzwsWPOVEAQ2iTxE33fxu5-TWV4c3Pz-g,8981
+jarvis/jarvis_platform/human.py,sha256=quB5yMMoyU8w55IrVqa9F4ITOpF2TdM0GHQVD9zyWgk,4925
+jarvis/jarvis_platform/kimi.py,sha256=OEiRNlC4Ao3PrO_yiogEwgMtTobehoEm_X4CMGT-Aas,15315
+jarvis/jarvis_platform/openai.py,sha256=ccGqsU2cFfd5324P7SH1tSmFABpvto8fytmxQGkr3BA,6412
+jarvis/jarvis_platform/oyi.py,sha256=GvVooV8ScRqDb9QxJdINtdZwsx6PUIdo1-bt9k0hmqY,12604
+jarvis/jarvis_platform/registry.py,sha256=1bMy0YZUa8NLzuZlKfC4CBtpa0iniypTxUZk0Hv6g9Y,8415
+jarvis/jarvis_platform/tongyi.py,sha256=vSK1b4NhTeHbNhTgGRj4PANXptwCAwitczwK8VXwWwU,22921
+jarvis/jarvis_platform/yuanbao.py,sha256=W4yEsjkxnwi681UnAX0hV8vVPuNRmn6lRGZ3G-d74nw,23007
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=tIb3jUuMF0ErislPjo8TkEUqL04snfEJwMPSZiOkMmY,15659
-jarvis/jarvis_platform_manager/service.py,sha256=rY1FmNl-tmbkkke_3SlH9h6ckyPIgmSwbaRorURp9Cc,14916
+jarvis/jarvis_platform_manager/main.py,sha256=LxlXSfIfmkYNcajOG_XvvlmwlSWSGb0DmbzIDSHHYOU,18330
+jarvis/jarvis_platform_manager/service.py,sha256=hQGWQ2qAlzm_C_lNQDuLORQ4rmjR1P1-V3ou7l2Bv0s,13622
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=DbhRSP1sZfSIaTltP1YWVDSQOTYEsbiOnfO9kSYwcNs,6959
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -83,14 +83,14 @@ jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxW
 jarvis/jarvis_utils/git_utils.py,sha256=7AZblSD4b76vXxaDFkmZOy5rNkwvkwQQxGUy3NAusDQ,21641
 jarvis/jarvis_utils/globals.py,sha256=WzZh_acNfHJj1LDulhyLQ7cojksBy0gdrITe0vH1XA0,3901
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
-jarvis/jarvis_utils/input.py,sha256=D0fQ6sRHjBaMm8s1L8HccC09Qlt_JD_SB_EHPCoztyA,8907
+jarvis/jarvis_utils/input.py,sha256=XNnSOY7EEcqxA2DZcCQ40l0q30b1Lu7ijbfKjq6WWCA,8965
 jarvis/jarvis_utils/methodology.py,sha256=-cvM6pwgJK7BXCYg2uVjIId_j3v5RUh2z2PBcK_2vj4,8155
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=BoRwLcixdf7mU3Tawe95ygGhQpkMffrFYLYhPwIvw8A,14498
-jarvis_ai_assistant-0.1.213.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.213.dist-info/METADATA,sha256=ihUbPrOcnHuEjAtbY2-IA3Tj_ZOM3Hj_YDT5wJcsH6M,19564
-jarvis_ai_assistant-0.1.213.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.213.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
-jarvis_ai_assistant-0.1.213.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.213.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.216.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.216.dist-info/METADATA,sha256=h2xfZU2lBL5kVLTBDEXchXrSf5iOo19QISqjp1E2V64,19564
+jarvis_ai_assistant-0.1.216.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.216.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
+jarvis_ai_assistant-0.1.216.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.216.dist-info/RECORD,,