half-sample 0.1.8__tar.gz → 0.1.10__tar.gz

{half-sample-0.1.8 → half-sample-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: half-sample
-Version: 0.1.8
+Version: 0.1.10
 Summary: sample data and analysis
 Home-page: https://github.com/KD-Group/Half.Sample
 Author: kunde

{half-sample-0.1.8 → half-sample-0.1.10}/half_sample.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: half-sample
-Version: 0.1.8
+Version: 0.1.10
 Summary: sample data and analysis
 Home-page: https://github.com/KD-Group/Half.Sample
 Author: kunde

{half-sample-0.1.8 → half-sample-0.1.10}/half_sample.egg-info/SOURCES.txt

@@ -6,5 +6,6 @@ half_sample.egg-info/SOURCES.txt
 half_sample.egg-info/dependency_links.txt
 half_sample.egg-info/top_level.txt
 sample/__init__.py
+sample/process.py
 sample/result.py
 sample/sample.py

{half-sample-0.1.8 → half-sample-0.1.10}/sample/__init__.py

@@ -1,2 +1,3 @@
+from .process import Process
 from .result import Result
 from .sample import Sampler, sampler

half-sample-0.1.10/sample/process.py

@@ -0,0 +1,154 @@
+import time
+import logging
+import sys
+import threading
+import subprocess
+import multiprocessing
+
+
+logger = logging.getLogger('library')
+
+
+def process(target, args=(), finished=None):
+    p = multiprocessing.Process(target=target, args=args)
+    p.start()
+
+    def check_finished():
+        p.join()
+        finished()
+
+    threading.Thread(target=check_finished).start()
+
+
+class Process:
+    def __init__(self, cmd):
+        self.cmd = cmd
+        self.p = None
+        self._max_retries = 1
+        self._start_process()
+
+    def set_max_retry(self, max_retries):
+        self._max_retries = max_retries
+
+    def get_max_retry(self):
+        return self._max_retries
+
+    def _start_process(self):
+        """启动或重启子进程"""
+        if self.p is not None:
+            # 如果旧进程还在运行，先终止它
+            try:
+                if self.p.poll() is None:  # 进程仍在运行
+                    self.p.terminate()
+                    self.p.wait(timeout=3)
+            except Exception as e:
+                logger.warning(f"failed to poll: {e}")
+                try:
+                    self.p.kill()
+                    self.p.wait()
+                except Exception as e:
+                    logger.warning(f"failed to kill: {e}")
+                    pass
+        # 启动新进程
+        self.p = subprocess.Popen(self.cmd,
+                                  shell=False,
+                                  creationflags=0x00000008 if sys.platform == "win32" else 0,
+                                  stdin=subprocess.PIPE,
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE)
+
+    def _is_process_alive(self):
+        """检查进程是否存活"""
+        if self.p is None:
+            return False
+        return self.p.poll() is None
+
+    def _ensure_process_alive(self):
+        """确保进程存活，如果崩溃则重启"""
+        if not self._is_process_alive():
+            logger.warning(f"subprocess [{self.cmd}] crash, restarting...")
+            self._start_process()
+            logger.warning(f"subprocess [{self.cmd}] restart completed")
+
+    def write_line(self, line: str):
+        """写入一行数据，自动处理进程重启"""
+        for attempt in range(self._max_retries):
+            try:
+                self._ensure_process_alive()
+                self.p.stdin.write(line.encode())
+                self.p.stdin.write('\n'.encode())
+                self.p.stdin.flush()
+                return  # 成功写入，退出重试循环
+            except (BrokenPipeError, OSError) as e:
+                if attempt < self._max_retries - 1:
+                    logger.warning(f"write line failed (attempted {attempt + 1}/{self._max_retries}): {e}")
+                    self._start_process()  # 重启进程
+                    time.sleep(0.1)  # 短暂等待新进程启动
+                else:
+                    raise RuntimeError(f"无法向子进程写入数据，已重试{self._max_retries}次: {e}")
+
+    def read_line(self) -> str:
+        """读取一行数据，自动处理进程重启"""
+        for attempt in range(self._max_retries):
+            try:
+                self._ensure_process_alive()
+                line = self.p.stdout.readline()
+                if not line:  # EOF，进程可能已终止
+                    if not self._is_process_alive():
+                        raise RuntimeError("子进程已终止")
+                    return ""
+                return line.decode().replace('\r\n', '').replace('\n', '')
+            except (OSError, RuntimeError) as e:
+                if attempt < self._max_retries - 1:
+                    logger.warning(f"read line failed (attempted {attempt + 1}/{self._max_retries}): {e}")
+                    self._start_process()  # 重启进程
+                    time.sleep(0.1)  # 短暂等待新进程启动
+                else:
+                    raise RuntimeError(f"无法从子进程读取数据，已重试{self._max_retries}次: {e}")
+
+    def read_until(self, until):
+        """读取直到指定字符串，自动处理进程重启"""
+        lines = []
+
+        for attempt in range(self._max_retries):
+            try:
+                while True:
+                    line = self.read_line()
+                    if line == until:
+                        return '\n'.join(lines)
+                    elif not line:
+                        break
+                    else:
+                        lines.append(line)
+            except (RuntimeError, OSError) as e:
+                if attempt < self._max_retries - 1:
+                    logger.warning(f"read_until failed (attempted {attempt + 1}/{self._max_retries}): {e}")
+                    self._start_process()  # 重启进程
+                    lines = []  # 清空已读取的行
+                    time.sleep(0.1)
+                else:
+                    raise RuntimeError(f"read_until 失败，已重试{self._max_retries}次: {e}")
+
+        return '\n'.join(lines)
+
+    def terminate(self):
+        """终止子进程"""
+        if self.p is not None and self.p.poll() is None:
+            try:
+                self.p.terminate()
+                self.p.wait(timeout=3)
+            except subprocess.TimeoutExpired as e:
+                logger.warning(f"Timeout expired while trying to terminate [{self.cmd}]: {e}")
+                try:
+                    self.p.kill()
+                    self.p.wait()
+                except Exception as e:
+                    logger.warning(f"Failed to kill [{self.cmd}]: {e}")
+            except Exception as e:
+                logger.warning(f"Failed to terminate [{self.cmd}]: {e}")
+
+    def get_return_code(self):
+        """获取进程返回码"""
+        if self.p is not None:
+            return self.p.poll()
+        return None

{half-sample-0.1.8 → half-sample-0.1.10}/sample/sample.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 
-import st
+from . import Process
 from . import Result
 
 
@@ -29,16 +29,16 @@ class Sampler:
         raise self.Error('Sample Driver Not Found')
 
     @property
-    def p(self) -> st.Process:
+    def p(self) -> Process:
         p = getattr(self, 'p_', None)
         if p is not None:
             return p
 
-        p = st.Process(self.execution_path)
+        p = Process(self.execution_path)
         setattr(self, 'p_', p)
         return p
 
-    def communicate(self, command: str, executor: st.Process = None) -> Result:
+    def communicate(self, command: str, executor: Process = None) -> Result:
         result = Result()
         try:
             executor = executor or self.p
@@ -78,6 +78,8 @@ class Sampler:
     def query(self) -> Result:
         result = self.communicate("to_query")
         result.process()
+        if not result.success and result.message == "success":
+            result.message = "error_undefined"
         return result
 
     class Error(RuntimeError):

{half-sample-0.1.8 → half-sample-0.1.10}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="half-sample",
-    version="0.1.8",
+    version="0.1.10",
     author="kunde",
     author_email="gzkunde@163.com",
     description="sample data and analysis",