py-adtools 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

adtools/lm/__init__.py

@@ -0,0 +1,6 @@
+try:
+    import openai
+except ImportError:
+    raise ImportError('Python package "openai" is not installed.')
+
+from .lm_base import LanguageModel

adtools/lm/lm_base.py

@@ -0,0 +1,39 @@
+"""
+Copyright (c) 2025 Rui Zhang <rzhang.cs@gmail.com>
+
+NOTICE: This code is under MIT license. This code is intended for academic/research purposes only.
+Commercial use of this software or its derivatives requires prior written permission.
+"""
+
+from abc import abstractmethod
+from typing import List
+
+import openai.types.chat
+
+
+class LanguageModel:
+    """Base class for language model interface."""
+
+    @abstractmethod
+    def chat_completion(
+            self,
+            message: str | List[openai.types.chat.ChatCompletionMessageParam],
+            max_tokens: int,
+            timeout_seconds: float,
+            *args,
+            **kwargs
+    ):
+        """Send a chat completion query with OpenAI format to the vLLM server. Return the response content.
+        Args:
+            message: The message in str or openai format.
+            max_tokens: The maximum number of tokens to generate.
+            timeout_seconds: The timeout seconds.
+        """
+        pass
+
+    def close(self):
+        """Release resources (if necessary)."""
+        pass
+
+    def __del__(self):
+        self.close()

adtools/lm/openai_api.py

@@ -0,0 +1,72 @@
+"""
+Copyright (c) 2025 Rui Zhang <rzhang.cs@gmail.com>
+
+NOTICE: This code is under MIT license. This code is intended for academic/research purposes only.
+Commercial use of this software or its derivatives requires prior written permission.
+"""
+
+import os
+from typing import List
+
+import openai.types.chat
+
+from .lm_base import LanguageModel
+
+
+class OpenAIAPI(LanguageModel):
+    def __init__(
+            self,
+            model: str,
+            base_url: str = None,
+            api_key: str = None,
+            **openai_init_kwargs
+    ):
+        super().__init__()
+        # If base_url is set to None, find 'OPENAI_BASE_URL' in environment variables
+        if base_url is None:
+            if 'OPENAI_BASE_URL' not in os.environ:
+                raise RuntimeError('If "base_url" is None, the environment variable OPENAI_BASE_URL must be set.')
+            else:
+                base_url = os.environ['OPENAI_BASE_URL']
+
+        # If api_key is set to None, find 'OPENAI_API_KEY' in environment variables
+        if api_key is None:
+            if 'OPENAI_API_KEY' not in os.environ:
+                raise RuntimeError('If "api_key" is None, OPENAI_API_KEY must be set.')
+            else:
+                api_key = os.environ['OPENAI_API_KEY']
+
+        self._model = model
+        self._client = openai.OpenAI(
+            api_key=api_key,
+            base_url=base_url,
+            **openai_init_kwargs
+        )
+
+    def chat_completion(
+            self,
+            message: str | List[openai.types.chat.ChatCompletionMessageParam],
+            max_tokens: int,
+            timeout_seconds: float,
+            *args,
+            **kwargs
+    ):
+        """Send a chat completion query with OpenAI format to the vLLM server. Return the response content.
+        Args:
+            message: The message in str or openai format.
+            max_tokens: The maximum number of tokens to generate.
+            timeout_seconds: The timeout seconds.
+        """
+        if isinstance(message, str):
+            message = [{'role': 'user', 'content': message.strip()}]
+
+        response = self._client.chat.completions.create(
+            model=self._model,
+            messages=message,
+            stream=False,
+            max_tokens=max_tokens,
+            timeout=timeout_seconds,
+            *args,
+            **kwargs,
+        )
+        return response.choices[0].message.content

adtools/{lm_base.py → lm/vllm_server.py}

@@ -5,103 +5,27 @@ NOTICE: This code is under MIT license. This code is intended for academic/resea
 Commercial use of this software or its derivatives requires prior written permission.
 """
 
-from abc import abstractmethod
+try:
+    import vllm
+except ImportError:
+    raise ImportError('Python package "vllm" is not installed.')
+
+try:
+    import requests
+except ImportError:
+    raise ImportError('Python package "requests" is not installed.')
+
 from typing import Optional, List, Literal, Dict, Any
 import os
 import subprocess
 import sys
 from pathlib import Path
 import psutil
-import requests
 import time
 
 import openai.types.chat
 
-__all__ = ['LanguageModel', 'OpenAIAPI', 'VLLMServer']
-
-
-class LanguageModel:
-    """Base class for language model interface."""
-
-    @abstractmethod
-    def chat_completion(
-            self,
-            message: str | List[openai.types.chat.ChatCompletionMessageParam],
-            max_tokens: int,
-            timeout_seconds: float,
-            *args,
-            **kwargs
-    ):
-        """Send a chat completion query with OpenAI format to the vLLM server. Return the response content.
-        Args:
-            message: The message in str or openai format.
-            max_tokens: The maximum number of tokens to generate.
-            timeout_seconds: The timeout seconds.
-        """
-        pass
-
-    def close(self):
-        """Release resources (if necessary)."""
-        pass
-
-
-class OpenAIAPI(LanguageModel):
-    def __init__(
-            self,
-            model: str,
-            base_url: str = None,
-            api_key: str = None,
-            **openai_init_kwargs
-    ):
-        super().__init__()
-        # If base_url is set to None, find 'OPENAI_BASE_URL' in environment variables
-        if base_url is None:
-            if 'OPENAI_BASE_URL' not in os.environ:
-                raise RuntimeError('If "base_url" is None, the environment variable OPENAI_BASE_URL must be set.')
-            else:
-                base_url = os.environ['OPENAI_BASE_URL']
-
-        # If api_key is set to None, find 'OPENAI_API_KEY' in environment variables
-        if api_key is None:
-            if 'OPENAI_API_KEY' not in os.environ:
-                raise RuntimeError('If "api_key" is None, OPENAI_API_KEY must be set.')
-            else:
-                api_key = os.environ['OPENAI_API_KEY']
-
-        self._model = model
-        self._client = openai.OpenAI(
-            api_key=api_key,
-            base_url=base_url,
-            **openai_init_kwargs
-        )
-
-    def chat_completion(
-            self,
-            message: str | List[openai.types.chat.ChatCompletionMessageParam],
-            max_tokens: int,
-            timeout_seconds: float,
-            *args,
-            **kwargs
-    ):
-        """Send a chat completion query with OpenAI format to the vLLM server. Return the response content.
-        Args:
-            message: The message in str or openai format.
-            max_tokens: The maximum number of tokens to generate.
-            timeout_seconds: The timeout seconds.
-        """
-        if isinstance(message, str):
-            message = [{'role': 'user', 'content': message.strip()}]
-
-        response = self._client.chat.completions.create(
-            model=self._model,
-            messages=message,
-            stream=False,
-            max_tokens=max_tokens,
-            timeout=timeout_seconds,
-            *args,
-            **kwargs,
-        )
-        return response.choices[0].message.content
+from .lm_base import LanguageModel
 
 
 def _print_cmd_list(cmd_list, gpus, host, port):
@@ -115,24 +39,26 @@ def _print_cmd_list(cmd_list, gpus, host, port):
     print('=' * 80 + '\n', flush=True)
 
 
-class VLLMServer:
-    def __init__(self,
-                 model_path: str,
-                 port: int,
-                 gpus: int | list[int],
-                 tokenizer_path: Optional[str] = None,
-                 max_model_len: int = 16384,
-                 max_lora_rank: Optional[int] = None,
-                 host: str = '0.0.0.0',
-                 mem_util: float = 0.85,
-                 deploy_timeout_seconds: int = 600,
-                 enforce_eager: bool = False,
-                 vllm_log_level: Literal['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] = 'INFO',
-                 silent_mode: bool = False,
-                 env_variable_dict: Optional[Dict[str, str]] = None,
-                 vllm_serve_args: Optional[List[str]] = None,
-                 vllm_serve_kwargs: Optional[Dict[str, str]] = None,
-                 chat_template_kwargs: Optional[Dict[str, Any]] = None):
+class VLLMServer(LanguageModel):
+    def __init__(
+            self,
+            model_path: str,
+            port: int,
+            gpus: int | list[int],
+            tokenizer_path: Optional[str] = None,
+            max_model_len: int = 16384,
+            max_lora_rank: Optional[int] = None,
+            host: str = '0.0.0.0',
+            mem_util: float = 0.85,
+            deploy_timeout_seconds: int = 600,
+            enforce_eager: bool = False,
+            vllm_log_level: Literal['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] = 'INFO',
+            silent_mode: bool = False,
+            env_variable_dict: Optional[Dict[str, str]] = None,
+            vllm_serve_args: Optional[List[str]] = None,
+            vllm_serve_kwargs: Optional[Dict[str, str]] = None,
+            chat_template_kwargs: Optional[Dict[str, Any]] = None
+    ):
         """Deploy an LLM on specified GPUs.
         Args:
             model_path: Path to the model to deploy.
@@ -234,8 +160,8 @@ class VLLMServer:
         env['CUDA_VISIBLE_DEVICES'] = gpus
         env['VLLM_LOGGING_LEVEL'] = self._vllm_log_level
 
-        # FIXME: These code are required for my machine :-(
-        # FIXME: This may due to the bad NCCL environment configuration :-(
+        # FIXME: These code are required for my machine :(
+        # FIXME: This may due to the bad NCCL configuration :(
         if isinstance(self._gpus, list) and len(self._gpus) > 1:
             # set NCCL environment variable
             env['NCCL_P2P_DISABLE'] = '1'
@@ -352,24 +278,26 @@ class VLLMServer:
                     print(f'[vLLM] Failed to load LoRA adapter. '
                           f'Status code: {response.status_code}, Response: {response.text}')
                 return True
-            except requests.exceptions.RequestException as e:
+            except requests.exceptions.RequestException:
                 continue
 
-        print(f'[vLLM] Error loading LoRA adapter: {str(e)}')
+        print(f'[vLLM] Error loading LoRA adapter.')
         return False
 
     def close(self):
         """Shut down vLLM server and kill all vLLM processes."""
         self._kill_vllm_process()
 
-    def chat_completion(self,
-                        message: str | List[openai.types.chat.ChatCompletionMessageParam],
-                        max_tokens: Optional[int] = None,
-                        timeout_seconds: Optional[int] = None,
-                        lora_name: Optional[str] = None,
-                        temperature: float = 0.9,
-                        top_p: float = 0.9,
-                        chat_template_kwargs: Optional[Dict[str, Any]] = None) -> str:
+    def chat_completion(
+            self,
+            message: str | List[openai.types.chat.ChatCompletionMessageParam],
+            max_tokens: Optional[int] = None,
+            timeout_seconds: Optional[int] = None,
+            lora_name: Optional[str] = None,
+            temperature: float = 0.9,
+            top_p: float = 0.9,
+            chat_template_kwargs: Optional[Dict[str, Any]] = None
+    ) -> str:
         """Send a chat completion query with OpenAI format to the vLLM server. Return the response content.
         Args:
             message: The message in str or openai format.

{py_adtools-0.1.5.dist-info → py_adtools-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-adtools
-Version: 0.1.5
+Version: 0.1.7
 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
@@ -13,6 +13,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psutil
+Requires-Dist: openai
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

py_adtools-0.1.7.dist-info/RECORD

@@ -0,0 +1,13 @@
+adtools/__init__.py,sha256=kbxntZFeCcURiIypNOdMWyeKPdlzRsWOB-K7z6HNCsc,150
+adtools/evaluator.py,sha256=weA6zR1WyUE3f5pt7wQYF1ukmkA-e2kDLaogbDmG_Ig,9154
+adtools/evaluator_pool.py,sha256=v_NZibN4VI3STVUZt6ARdyoB4Z061xAefZlH8lkWsjE,2972
+adtools/py_code.py,sha256=FZfkp-IZ4zpOjrWe6svKNJsQhVANaTTkE0l0mc4aMW8,14277
+adtools/lm/__init__.py,sha256=PZf5Lraly9rAWz-cxOSLCvZ9OZ4EI8aQEluetvNX8LM,146
+adtools/lm/lm_base.py,sha256=KtO7KTrrMW7oWN-BhncoIOsbOVQsSc-0gNCYtvR6Sog,1105
+adtools/lm/openai_api.py,sha256=LcfLkNOBrJTdsp0zcUjaCelIcQK5XknpHWrlB0S67_k,2390
+adtools/lm/vllm_server.py,sha256=BPZoTS77wNJDcJ_0FO2QFyZTf6WR0isYKMuTctqKEU8,12942
+py_adtools-0.1.7.dist-info/licenses/LICENSE,sha256=E5GGyecx3y5h2gcEGQloF-rDY9wbaef5IHjRsvtFbt8,1065
+py_adtools-0.1.7.dist-info/METADATA,sha256=952zQgrdHcpBYGmnYqfwlVFfMubvvSYixg-weIf4eWU,6386
+py_adtools-0.1.7.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+py_adtools-0.1.7.dist-info/top_level.txt,sha256=X2kKzmJFDAKR2FWCij5pfMG9pVVjVUomyl4e-1VLXIk,8
+py_adtools-0.1.7.dist-info/RECORD,,

py_adtools-0.1.5.dist-info/RECORD

@@ -1,10 +0,0 @@
-adtools/__init__.py,sha256=kbxntZFeCcURiIypNOdMWyeKPdlzRsWOB-K7z6HNCsc,150
-adtools/evaluator.py,sha256=weA6zR1WyUE3f5pt7wQYF1ukmkA-e2kDLaogbDmG_Ig,9154
-adtools/evaluator_pool.py,sha256=v_NZibN4VI3STVUZt6ARdyoB4Z061xAefZlH8lkWsjE,2972
-adtools/lm_base.py,sha256=fXltOlJpxy_b4ByX7nSIGXcMnH71W81tuzLsRtq_7JE,15709
-adtools/py_code.py,sha256=FZfkp-IZ4zpOjrWe6svKNJsQhVANaTTkE0l0mc4aMW8,14277
-py_adtools-0.1.5.dist-info/licenses/LICENSE,sha256=E5GGyecx3y5h2gcEGQloF-rDY9wbaef5IHjRsvtFbt8,1065
-py_adtools-0.1.5.dist-info/METADATA,sha256=iR6GXsszQb8aFq8SQiXFWU_dUTTJ83MyhtEUfDEK93g,6364
-py_adtools-0.1.5.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-py_adtools-0.1.5.dist-info/top_level.txt,sha256=X2kKzmJFDAKR2FWCij5pfMG9pVVjVUomyl4e-1VLXIk,8
-py_adtools-0.1.5.dist-info/RECORD,,