py-adtools 0.1.3__tar.gz → 0.1.5__tar.gz

{py_adtools-0.1.3 → py_adtools-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-adtools
-Version: 0.1.3
+Version: 0.1.5
 Summary: Useful tools for parsing and evaluating Python programs for LLM-based algorithm design.
 Home-page: https://github.com/RayZhhh/py-adtools
 Author: Rui Zhang

{py_adtools-0.1.3 → py_adtools-0.1.5}/adtools/evaluator.py

@@ -12,6 +12,7 @@ from abc import ABC, abstractmethod
 from queue import Empty
 from typing import Any, Literal, Dict, Callable, List
 import psutil
+import traceback
 
 from .py_code import PyProgram
 
@@ -35,9 +36,9 @@ class PyEvaluator(ABC):
             debug_mode: Debug mode.
             join_timeout_seconds: Timeout in seconds to wait for the process to finish. Kill the process if timeout.
         """
-        self._debug_mode = debug_mode
-        self._exec_code = exec_code
-        self._join_timeout_seconds = join_timeout_seconds
+        self.debug_mode = debug_mode
+        self.exec_code = exec_code
+        self.join_timeout_seconds = join_timeout_seconds
 
     @abstractmethod
     def evaluate_program(
@@ -73,13 +74,13 @@ class PyEvaluator(ABC):
             children_processes = []
         # Terminate parent process
         process.terminate()
-        process.join(timeout=self._join_timeout_seconds)
+        process.join(timeout=self.join_timeout_seconds)
         if process.is_alive():
             process.kill()
             process.join()
         # Kill all children processes
         for child in children_processes:
-            if self._debug_mode:
+            if self.debug_mode:
                 print(f"Killing process {process.pid}'s children process {child.pid}")
             child.terminate()
 
@@ -97,7 +98,7 @@ class PyEvaluator(ABC):
             class_names = [c.name for c in program.classes]
 
             # Execute the code and get callable instances
-            if self._exec_code:
+            if self.exec_code:
                 all_globals_namespace = {}
                 # Execute the program, map func/var/class to global namespace
                 exec(str(program), all_globals_namespace)
@@ -123,8 +124,8 @@ class PyEvaluator(ABC):
             )
             return res
         except Exception as e:
-            if self._debug_mode:
-                print(e)
+            if self.debug_mode:
+                print(traceback.format_exc())
             return None
 
     def _evaluate_in_safe_process(
@@ -148,7 +149,7 @@ class PyEvaluator(ABC):
             self,
             program: str | PyProgram,
             timeout_seconds: int | float = None,
-            redirect_to_devnull: bool = True,
+            redirect_to_devnull: bool = False,
             multiprocessing_start_method: Literal['default', 'auto', 'fork', 'spawn'] = 'auto',
             **kwargs
     ):
@@ -188,14 +189,14 @@ class PyEvaluator(ABC):
                     # After getting the result, terminate/kill the process
                     self._kill_process_and_its_children(process)
                 except Empty:  # The queue is empty indicates a timeout
-                    if self._debug_mode:
+                    if self.debug_mode:
                         print(f'DEBUG: the evaluation time exceeds {timeout_seconds}s.')
                     # Terminate/kill all processes if timeout happens
                     self._kill_process_and_its_children(process)
                     result = None
                 except Exception as e:
-                    if self._debug_mode:
-                        print(f'DEBUG: evaluation failed with exception:\n{e}')
+                    if self.debug_mode:
+                        print(f'DEBUG: evaluation failed with exception:\n{traceback.format_exc()}')
                     # Terminate/kill all processes if meet exceptions
                     self._kill_process_and_its_children(process)
                     result = None
@@ -206,6 +207,6 @@ class PyEvaluator(ABC):
                 self._kill_process_and_its_children(process)
             return result
         except Exception as e:
-            if self._debug_mode:
-                print(e)
+            if self.debug_mode:
+                print(traceback.format_exc())
             return None

{py_adtools-0.1.3 → py_adtools-0.1.5}/adtools/evaluator_pool.py

@@ -26,12 +26,12 @@ class EvaluatorExecutorPool:
             max_workers: The maximum number of workers.
             pool_type: Type of the executor pool.
         """
-        self._evaluator = evaluator
-        self._max_workers = max_workers
+        self.evaluator = evaluator
+        self.max_workers = max_workers
         if pool_type == 'thread':
-            self._pool = ThreadPoolExecutor(max_workers=self._max_workers)
+            self.pool = ThreadPoolExecutor(max_workers=self.max_workers)
         else:
-            self._pool = ProcessPoolExecutor(max_workers=self._max_workers)
+            self.pool = ProcessPoolExecutor(max_workers=self.max_workers)
 
     def evaluate(self, program: str | PyProgram, return_time=True, **kwargs):
         """Evaluate program.
@@ -40,7 +40,7 @@ class EvaluatorExecutorPool:
             **kwargs: additional keyword arguments to pass to 'evaluate_program'.
         """
         start_time = time.time()
-        future = self._pool.submit(self._evaluator.evaluate, program, **kwargs)
+        future = self.pool.submit(self.evaluator.evaluate, program, **kwargs)
         res = future.result()
         duration = time.time() - start_time
         if return_time:
@@ -52,7 +52,7 @@ class EvaluatorExecutorPool:
             self,
             program: str | PyProgram,
             timeout_seconds: Optional[float],
-            redirect_to_devnull: bool = True,
+            redirect_to_devnull: bool = False,
             multiprocessing_start_method: Literal['default', 'auto', 'fork', 'spawn'] = 'auto',
             return_time=True,
             **kwargs
@@ -66,8 +66,8 @@ class EvaluatorExecutorPool:
             **kwargs: additional keyword arguments to pass to 'evaluate_program'.
         """
         start_time = time.time()
-        future = self._pool.submit(
-            self._evaluator.secure_evaluate,
+        future = self.pool.submit(
+            self.evaluator.secure_evaluate,
             program,
             timeout_seconds,
             redirect_to_devnull,

{py_adtools-0.1.3 → py_adtools-0.1.5}/py_adtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-adtools
-Version: 0.1.3
+Version: 0.1.5
 Summary: Useful tools for parsing and evaluating Python programs for LLM-based algorithm design.
 Home-page: https://github.com/RayZhhh/py-adtools
 Author: Rui Zhang

{py_adtools-0.1.3 → py_adtools-0.1.5}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setup(
     name='py-adtools',
-    version='0.1.3',
+    version='0.1.5',
     author='Rui Zhang',
     author_email='rzhang.cs@gmail.com',
     description='Useful tools for parsing and evaluating Python programs for LLM-based algorithm design.',