hjxdl 0.3.14__py3-none-any.whl → 0.3.16__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.14'
-__version_tuple__ = version_tuple = (0, 3, 14)
+__version__ = version = '0.3.16'
+__version_tuple__ = version_tuple = (0, 3, 16)

hdl/utils/llm/chat.py

@@ -125,6 +125,7 @@ class OpenAI_M:
         self,
         client_conf: dict = None,
         client_conf_dir: str = None,
+        load_conf: bool = True,
         tools: list = None,
         tool_desc: dict = None,
         cot_desc: str = None,
@@ -150,11 +151,12 @@ class OpenAI_M:
             *args: Additional positional arguments.
             **kwargs: Additional keyword arguments.
         """
-
+        self.client_conf = {}
         if client_conf is None:
             assert client_conf_dir is not None
             self.client_conf_path = client_conf_dir
-            self.load_clients()
+            if load_conf:
+                self.load_clients()
         else:
             self.client_conf = client_conf
 
@@ -188,6 +190,26 @@ class OpenAI_M:
         self.cot_desc = cot_desc if cot_desc else COT_TEMPLATE
         self.od_desc = od_desc if od_desc else OD_TEMPLATE
 
+    def add_client(
+        self,
+        client_id: str,
+        host: str,
+        port: int = None,
+        model: str = "default_model",
+        api_key: str = "dummy_key",
+        **kwargs
+    ):
+        self.client_conf[client_id] = {}
+        if not host.startswith('http') and port:
+            host = f"http://{host}:{port}/v1"
+        self.client_conf[client_id]['host'] = host
+        self.client_conf[client_id]['model'] = model
+        self.client_conf[client_id]['client'] = OpenAI(
+            base_url=host,
+            api_key=api_key,
+            **kwargs
+        )
+
     def load_clients(self):
         with open(self.client_conf_path, 'r') as file:
             data = yaml.safe_load(file)

hdl/utils/llm/llm_wrapper.py

@@ -0,0 +1,124 @@
+import yaml
+import typing as t
+
+from openai import OpenAI
+
+
+class OpenAIWrapper(object):
+    def __init__(
+        self,
+        client_conf: dict = None,
+        client_conf_dir: str = None,
+        load_conf: bool = True,
+        *args,
+        **kwargs
+    ):
+        self.client_conf = {}
+        if client_conf is None:
+            assert client_conf_dir is not None
+            self.client_conf_path = client_conf_dir
+            if load_conf:
+                self.load_clients()
+        else:
+            self.client_conf = client_conf
+
+        # self.clients = {}
+        for _, conf in self.client_conf.items():
+            conf["client"] = OpenAI(
+                base_url=conf["host"],
+                api_key=conf.get("api_key", "dummy_key"),
+                *args,
+                **kwargs
+            )
+
+    def add_client(
+        self,
+        client_id: str,
+        host: str,
+        port: int = None,
+        model: str = "default_model",
+        api_key: str = "dummy_key",
+        **kwargs
+    ):
+        self.client_conf[client_id] = {}
+        if not host.startswith('http') and port:
+            host = f"http://{host}:{port}/v1"
+        self.client_conf[client_id]['host'] = host
+        self.client_conf[client_id]['model'] = model
+        self.client_conf[client_id]['client'] = OpenAI(
+            base_url=host,
+            api_key=api_key,
+            **kwargs
+        )
+
+    def load_clients(self):
+        with open(self.client_conf_path, 'r') as file:
+            data = yaml.safe_load(file)
+
+        # 更新 host 字段
+        for _, value in data.items():
+            host = value.get('host', '')
+            port = value.get('port', '')
+            if not host.startswith('http') and port:  # 确保有 port 才处理
+                value['host'] = f"http://{host}:{port}/v1"
+        self.client_conf = data
+
+
+    def get_resp(
+        self,
+        prompt,
+        client_id: str = None,
+        history: list = None,
+        sys_info: str = None,
+        assis_info: str = None,
+        images: list = None,
+        image_keys: tuple = ("image_url", "url"),
+        model: str=None,
+        tools: list = None,
+        stream: bool = True,
+        **kwargs: t.Any,
+    ):
+
+        client = self.client_conf[client_id]['client']
+        messages = []
+        if history:
+            messages = history
+
+        if sys_info:
+            messages.append({
+                "role": "system",
+                "content": sys_info
+            })
+
+
+        if not model:
+            model = self.client_conf[client_id]["model"]
+        # Adjust the image_keys to be a tuple of length 3 based on its current length
+        if isinstance(image_keys, str):
+            image_keys = (image_keys,) * 3
+        elif len(image_keys) == 2:
+            image_keys = (image_keys[0],) + tuple(image_keys)
+        elif len(image_keys) == 1:
+            image_keys = (image_keys[0],) * 3
+
+        content = []
+        if images:
+            if isinstance(images, str):
+                images = [images]
+            for img in images:
+                content.append({
+                    "type": image_keys[0],
+                    image_keys[1]: {
+                        image_keys[2]: img
+                    }
+                })
+        else:
+            # If no images are provided, content is simply the prompt text
+            content = prompt
+
+        # Add the user's input as a message
+        messages.append({
+            "role": "user",
+            "content": content
+        })
+

{hjxdl-0.3.14.dist-info → hjxdl-0.3.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hjxdl
-Version: 0.3.14
+Version: 0.3.16
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu

{hjxdl-0.3.14.dist-info → hjxdl-0.3.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=uXvaQV0x-j_stHaI7VjSOLUNVrd36A2OO0ftk9b0Dmw,413
+hdl/_version.py,sha256=D8u-23f8Le_E16tPMMyTPeU4VTKL4yR8GkJhKkxDaXE,413
 hdl/args/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/args/loss_args.py,sha256=s7YzSdd7IjD24rZvvOrxLLFqMZQb9YylxKeyelSdrTk,70
 hdl/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,19 +128,20 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=Zuf7WHU0UdUPOs9UrhxmrCiMC8GrHxQU6n3mTThv6yc,1120
 hdl/utils/general/runners.py,sha256=x7QBolp3MrqNV6L4rB6Ueybr26bqkRFZTuXhY0SwyLk,3061
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=9xAq8WBav8r0rayp66cPTZhAzEmMgTbtvDK7vP7rMcc,25850
+hdl/utils/llm/chat.py,sha256=q0zQmf-6DeSYOrC2qDn_QFOlILjRHU69eVRUn0eIIbA,26526
 hdl/utils/llm/chatgr.py,sha256=5F5PJHe8vz3iCfi4TT54DCLRi1UeJshECdVtgvvvao0,3696
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/llm/llama_chat.py,sha256=watcHGOaz-bv3x-yDucYlGk5f8FiqfFhwWogrl334fk,4387
+hdl/utils/llm/llm_wrapper.py,sha256=sE0vays3ndXTa1HozoLOERYcloxyBW63EWdSwMLp2Yo,3511
 hdl/utils/llm/vis.py,sha256=SSP6tOwKLq0hWcpM3twI9TitqzBmKjlcGrnXEWYlCzM,26055
 hdl/utils/llm/visrag.py,sha256=0i-VrxqgiV-J7R3VPshu9oc7-rKjFJOldYik3HDXj6M,10176
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.3.14.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.14.dist-info/METADATA,sha256=ZG_NJf4IUzL5F9xlgBpgVcZV6nWYbgDYk76tvOBSMNw,1310
-hjxdl-0.3.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-hjxdl-0.3.14.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.14.dist-info/RECORD,,
+hjxdl-0.3.16.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.16.dist-info/METADATA,sha256=cCJsd4iB2Da-q95aYZ6GmY6TT0f9nHOCtjNDg1WQDC0,1310
+hjxdl-0.3.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+hjxdl-0.3.16.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.16.dist-info/RECORD,,