hjxdl 0.1.80__py3-none-any.whl → 0.1.82__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.80'
-__version_tuple__ = version_tuple = (0, 1, 80)
+__version__ = version = '0.1.82'
+__version_tuple__ = version_tuple = (0, 1, 82)

hdl/utils/llm/chat.py

@@ -98,6 +98,7 @@ def run_tool_with_kwargs(tool, func_kwargs):
     """
     return tool(**func_kwargs)
 
+
 class OpenAI_M():
     def __init__(
         self,
@@ -143,38 +144,48 @@ class OpenAI_M():
         if tool_desc is not None:
             self.tool_desc = self.tool_desc | tool_desc
 
-    def invoke(
+    def get_resp(
         self,
         prompt : str,
-        image_url: str = None,
+        images: list = [],
+        image_keys: tuple = ("image", "image"),
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
-        # history: list = [],
         model="default_model",
+        stream: bool = True,
         **kwargs: t.Any,
-    ) -> str:
-        """Invoke the chatbot with a prompt and optional image URL.
+    ):
+        """Get response from chat completion model.
 
         Args:
-            prompt (str): The prompt to provide to the chatbot.
-            image_url (str, optional): The URL of the image to include in the chatbot response. Defaults to None.
-            stop (list[str], optional): List of strings that indicate the end of the conversation. Defaults to ["USER:", "ASSISTANT:"].
-            model (str, optional): The model to use for the chatbot. Defaults to "default_model".
-            **kwargs: Additional keyword arguments to pass to the chatbot.
+            prompt (str): The prompt text to generate a response for.
+            images (list, optional): List of image URLs to include in the prompt. Defaults to [].
+            image_keys (tuple, optional): Tuple containing keys for image data. Defaults to ("image", "image").
+            stop (list[str] | None, optional): List of strings to stop the conversation. Defaults to ["USER:", "ASSISTANT:"].
+            model (str, optional): The model to use for generating the response. Defaults to "default_model".
+            stream (bool, optional): Whether to stream the response or not. Defaults to True.
+            **kwargs: Additional keyword arguments to pass to the chat completion API.
+
+        Yields:
+            str: The generated response content.
 
         Returns:
-            str: The response message from the chatbot.
+            str: The generated response content if stream is False.
         """
         content = [
             {"type": "text", "text": prompt},
         ]
-        if image_url is not None:
-            image_content = {
-                "type": "image_url",
-                "image_url": {
-                    "url": image_url,
-                },
-            }
-            content.append(image_content)
+        if images:
+            if isinstance(images, str):
+                images = [images]
+            for img in images:
+                content.append({
+                    "type": image_keys[0],
+                    image_keys[0]: {
+                        image_keys[1]: img
+                    }
+                })
+        else:
+            content = prompt
         response = self.client.chat.completions.create(
             messages=[{
                 "role": "user",
@@ -184,54 +195,45 @@ class OpenAI_M():
             model=model,
             **kwargs
         )
-        return response.choices[0].message.content
+        if stream:
+            for chunk in response:
+                content = chunk.choices[0].delta.content
+                if content:
+                    yield content
+        else:
+            return response.choices[0].message.content
+
+    def invoke(
+        self,
+        *args,
+        **kwargs
+    ) -> str:
+        """Invoke the function with the given arguments and keyword arguments.
+
+        Args:
+            *args: Variable length argument list.
+            **kwargs: Arbitrary keyword arguments.
+
+        Returns:
+            str: The response obtained by calling the get_resp method with the provided arguments and keyword arguments.
+        """
+        return self.get_resp(*args, stream=False, **kwargs)
 
     def stream(
         self,
-        prompt : str,
-        image_url: str = None,
-        stop: list[str] | None = ["USER:", "ASSISTANT:"],
-        # history: list = [],
-        model="default_model",
-        **kwargs: t.Any,
+        *args,
+        **kwargs
     ):
-        """Generates text and potentially image completions based on the prompt provided.
+        """Stream data from the server.
 
         Args:
-            prompt (str): The text prompt to generate completions from.
-            image_url (str, optional): The URL of the image to be included in the completion. Defaults to None.
-            stop (list[str], optional): List of strings that indicate the end of the conversation. Defaults to ["USER:", "ASSISTANT:"].
-            model (str, optional): The model to use for completion generation. Defaults to "default_model".
-            **kwargs: Additional keyword arguments to pass to the completion generation API.
+            *args: Variable length argument list.
+            **kwargs: Arbitrary keyword arguments.
 
-        Yields:
-            str: The generated completion content.
+        Returns:
+            Response from the server with streaming enabled.
         """
-        content = [
-            {"type": "text", "text": prompt},
-        ]
-        if image_url is not None:
-            image_content = {
-                "type": "image_url",
-                "image_url": {
-                    "url": image_url,
-                },
-            }
-            content.append(image_content)
-        response = self.client.chat.completions.create(
-            messages=[{
-                "role": "user",
-                "content": content
-            }],
-            stream=True,
-            model=model,
-            **kwargs
-        )
-
-        for chunk in response:
-            content = chunk.choices[0].delta.content
-            if content:
-                yield content
+        return self.get_resp(*args, stream=True, **kwargs)
 
     def agent_response(
         self,

hdl/utils/llm/vis.py

@@ -113,6 +113,7 @@ class ImgHandler:
         model_path,
         db_host,
         db_port,
+        conn=None,
         model_name: str = None,
         device: str = "cpu",
         num_vec_dim: int = None,

{hjxdl-0.1.80.dist-info → hjxdl-0.1.82.dist-info}/METADATA

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

{hjxdl-0.1.80.dist-info → hjxdl-0.1.82.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=vi0UG5RBPxIXCmwjdgS_LYJzAu3zej2dH5Q8A1c13hg,413
+hdl/_version.py,sha256=uD0kkklP47KEgakV5d1QibkwP9W5l8Jh1sG9ohg63cg,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
@@ -127,16 +127,16 @@ hdl/utils/desc/template.py,sha256=a0UAkkKctt_EHY9UECsIIAwVkGPcM1Hr01HSkRMeIuw,12
 hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=sk7Lw5Oa30k-l2fnJknkMmTc5zkBeEKsR981aeFhH5s,11907
+hdl/utils/llm/chat.py,sha256=uZQuiQKL0i5cRSiJq0CPQOPS2FUmDE90mZzvk9M8FK4,11742
 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/vis.py,sha256=2ZxOE8zvGASg_QputCgnvFcKKln8KsfeJI0SLXCLos8,15697
+hdl/utils/llm/vis.py,sha256=2pI0439GWi_BEVfQJtY29Y72FkUa8jEvBeqMlwy7xkc,15716
 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.1.80.dist-info/METADATA,sha256=S2Mz7p9uRyhNYpdFImolX_VAc2coeIn7zOe9E2z4e08,903
-hjxdl-0.1.80.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-hjxdl-0.1.80.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.80.dist-info/RECORD,,
+hjxdl-0.1.82.dist-info/METADATA,sha256=fajRkx2t1HdlBLjWP43OH9OlXsYTM4V7tOZEhfZ49zA,903
+hjxdl-0.1.82.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+hjxdl-0.1.82.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.82.dist-info/RECORD,,

{hjxdl-0.1.80.dist-info → hjxdl-0.1.82.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any