hjxdl 0.1.86__py3-none-any.whl → 0.1.88__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.86'
-__version_tuple__ = version_tuple = (0, 1, 86)
+__version__ = version = '0.1.88'
+__version_tuple__ = version_tuple = (0, 1, 88)

hdl/utils/llm/chat.py

@@ -148,7 +148,7 @@ class OpenAI_M():
         self,
         prompt : str,
         images: list = [],
-        image_keys: tuple = ("image", "image"),
+        image_keys: tuple = ("image", "image", "image"),
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
         model="default_model",
         stream: bool = True,
@@ -171,14 +171,19 @@ class OpenAI_M():
         content = [
             {"type": "text", "text": prompt},
         ]
+        if isinstance(image_keys, str):
+            image_keys = (image_keys, image_keys, image_keys)
+        else:
+            if len(image_keys) == 2:
+                image_keys = (image_keys[0], ) + image_keys
         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
+                    image_keys[1]: {
+                        image_keys[2]: img
                     }
                 })
         else:
@@ -249,119 +254,6 @@ class OpenAI_M():
         else:
             return self.invoke(*args, **kwargs)
 
-
-    def invoke_response(
-        self,
-        prompt : str,
-        images: list = [],
-        image_keys: tuple = ("image", "image"),
-        stop: list[str] | None = ["USER:", "ASSISTANT:"],
-        model="default_model",
-        **kwargs: t.Any,
-    ):
-        """Get response from chat completion model.
-
-        Args:
-            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 generated response content if stream is False.
-        """
-        content = [
-            {"type": "text", "text": prompt},
-        ]
-        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",
-                "content": content
-            }],
-            stream=False,
-            model=model,
-            **kwargs
-        )
-
-        return response.choices[0].message.content
-
-
-    def stream_response(
-        self,
-        prompt : str,
-        images: list = [],
-        image_keys: tuple = ("image", "image"),
-        stop: list[str] | None = ["USER:", "ASSISTANT:"],
-        model="default_model",
-        **kwargs: t.Any,
-    ):
-        """Get response from chat completion model.
-
-        Args:
-            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 generated response content if stream is False.
-        """
-        content = [
-            {"type": "text", "text": prompt},
-        ]
-        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",
-                "content": content
-            }],
-            stream=True,
-            model=model,
-            **kwargs
-        )
-
-        for chunk in response:
-            content = chunk.choices[0].delta.content
-            if content:
-                yield content
-
     def agent_response(
         self,
         prompt : str,

{hjxdl-0.1.86.dist-info → hjxdl-0.1.88.dist-info}/METADATA

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

{hjxdl-0.1.86.dist-info → hjxdl-0.1.88.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=mZDLtoh_fZR4n83Vo2yyLdXtACoTaSE2Hm8mc_lRCCM,413
+hdl/_version.py,sha256=ihTSJ27GUS19zHSycBYFHvlgXp6beIKH-CsSY1r7LJ8,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,7 +127,7 @@ 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=hkFfPHjTwTJwXS3Dvy7j3nqARHsKoWsqJasfDdCjqgY,16211
+hdl/utils/llm/chat.py,sha256=wGMHryafswF3xrkpMjthMQlx5ON8PHbqcbpKthjMxMY,12497
 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
@@ -136,7 +136,7 @@ hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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.86.dist-info/METADATA,sha256=PqxFzQa-kw7zcPAfn8_8lKyfbgLIdUonwSH-CXFyyP8,903
-hjxdl-0.1.86.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-hjxdl-0.1.86.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.86.dist-info/RECORD,,
+hjxdl-0.1.88.dist-info/METADATA,sha256=wN8xFReeugvOrrZfjYImWUomKN_DrneKQPLf-akoPLQ,903
+hjxdl-0.1.88.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+hjxdl-0.1.88.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.88.dist-info/RECORD,,