dais-shell 0.3.0__tar.gz → 0.3.2__tar.gz

{dais_shell-0.3.0 → dais_shell-0.3.2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.3
 Name: dais-shell
-Version: 0.3.0
+Version: 0.3.2
 Summary: The shell tool for Dais.
 Author: BHznJNs
 Author-email: BHznJNs <441768875@qq.com>
+Requires-Dist: charset-normalizer>=3.5.1
 Requires-Dist: psutil>=7.2.2
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

dais_shell-0.3.2/pyproject.toml

@@ -0,0 +1,21 @@
+[project]
+name = "dais-shell"
+version = "0.3.2"
+description = "The shell tool for Dais."
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "charset-normalizer>=3.5.1",
+    "psutil>=7.2.2",
+]
+
+[[project.authors]]
+name = "BHznJNs"
+email = "441768875@qq.com"
+
+[dependency-groups]
+dev = ["pytest"]
+
+[build-system]
+requires = ["uv_build>=0.9.28,<0.13.0"]
+build-backend = "uv_build"

dais_shell-0.3.0/pyproject.toml → dais_shell-0.3.2/pyproject.toml.orig

@@ -1,15 +1,18 @@
 [project]
 name = "dais-shell"
-version = "0.3.0"
+version = "0.3.2"
 description = "The shell tool for Dais."
 readme = "README.md"
 authors = [{ name = "BHznJNs", email = "441768875@qq.com" }]
 requires-python = ">=3.11"
-dependencies = ["psutil>=7.2.2"]
+dependencies = [
+    "charset-normalizer>=3.5.1",
+    "psutil>=7.2.2",
+]
 
 [dependency-groups]
 dev = ["pytest"]
 
 [build-system]
-requires = ["uv_build>=0.9.28,<0.11.0"]
+requires = ["uv_build>=0.9.28,<0.13.0"]
 build-backend = "uv_build"

{dais_shell-0.3.0 → dais_shell-0.3.2}/src/dais_shell/iostream_reader.py

@@ -4,6 +4,7 @@ from enum import Enum
 from dataclasses import dataclass
 from collections import deque
 from typing import Callable
+from charset_normalizer import from_bytes
 
 
 IOStreamCallback = Callable[[str], None]
@@ -45,12 +46,22 @@ class IOStreamReader:
         self._on_stdout = on_stdout
         self._on_stderr = on_stderr
 
+    @staticmethod
+    def _decode(data: bytes) -> str:
+        try:
+            return data.decode("utf-8")
+        except UnicodeDecodeError:
+            result = from_bytes(data).best()
+            if result is None:
+                return data.decode("utf-8", errors="replace")
+            return result.output().decode("utf-8")
+
     @staticmethod
     async def _consumer(stream: asyncio.StreamReader, callback: IOStreamCallback | None, buf: IOStreamBuffer):
         while not stream.at_eof():
             line = await stream.readline()
             if not line: break
-            text = line.decode("utf-8", errors="replace").rstrip("\r\n")
+            text = IOStreamReader._decode(line).rstrip("\r\n")
             buf.append(text)
             if callback: callback(text)
 

{dais_shell-0.3.0 → dais_shell-0.3.2}/src/dais_shell/runtimes/PowershellRuntime.py

@@ -1,6 +1,5 @@
 import asyncio
 import base64
-import json
 import shutil
 import re
 import xml.etree.ElementTree as ET
@@ -15,6 +14,17 @@ from ..types.shell_script import ShellScript
 from ..types.exceptions import ShellRuntimeNotFoundError
 
 
+POWERSHELL_PREFERENCES = """
+$ErrorActionPreference = "Stop"
+$WarningPreference = "SilentlyContinue"
+$VerbosePreference = "SilentlyContinue"
+$DebugPreference = "SilentlyContinue"
+$InformationPreference = "SilentlyContinue"
+$ProgressPreference = "SilentlyContinue"
+
+$PSNativeCommandArgumentPassing = "Standard"
+""".strip()
+
 @dataclass
 class PowerShellScript(ShellScript):
     @classmethod
@@ -27,8 +37,7 @@ class PowerShellScript(ShellScript):
 
     def to_wrapper_script(self):
         return f"""
-$ErrorActionPreference = "Stop"
-$PSNativeCommandArgumentPassing = "Standard"
+{POWERSHELL_PREFERENCES}
 
 chcp 65001 | Out-Null
 $OutputEncoding           = [System.Text.Encoding]::UTF8
@@ -61,8 +70,7 @@ class PowerShellCommandStep(CommandStep):
             return "'" + s.replace("'", "''") + "'"
 
         script = f"""
-$ErrorActionPreference = "Stop"
-$PSNativeCommandArgumentPassing = "Standard"
+{POWERSHELL_PREFERENCES}
 
 chcp 65001 | Out-Null
 $OutputEncoding           = [System.Text.Encoding]::UTF8