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

hdl/utils/llm/chat.py

@@ -154,22 +154,19 @@ class OpenAI_M():
         stream: bool = True,
         **kwargs: t.Any,
     ):
-        """Get response from chat completion model.
+        """Get response from chatbot based on the provided prompt and optional images.
 
         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 [].
+            prompt (str): The prompt to provide to the chatbot.
+            images (list, optional): List of images to include in the response. 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:"].
+            stop (list[str] | None, optional): List of strings that indicate the end of 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.
+            stream (bool, optional): Whether to stream the response. Defaults to True.
+            **kwargs: Additional keyword arguments to pass to the chatbot API.
 
         Returns:
-            str: The generated response content if stream is False.
+            dict: The response from the chatbot.
         """
         content = [
             {"type": "text", "text": prompt},
@@ -196,19 +193,13 @@ class OpenAI_M():
             model=model,
             **kwargs
         )
-        if not stream:
-            return response.choices[0].message.content
-        else:
-            for chunk in response:
-                content = chunk.choices[0].delta.content
-                if content:
-                    yield content
+        return response
 
     def invoke(
         self,
         *args,
         **kwargs
-    ) -> str:
+    ):
         """Invoke the function with the given arguments and keyword arguments.
 
         Args:
@@ -216,25 +207,160 @@ class OpenAI_M():
             **kwargs: Arbitrary keyword arguments.
 
         Returns:
-            str: The response obtained by calling the get_resp method with the provided arguments and keyword arguments.
+            str: The content of the first choice message in the response.
         """
-        return self.get_resp(*args, stream=False, **kwargs)
+        response = self.get_resp(*args, stream=False, **kwargs)
+        return response.choices[0].message.content
 
     def stream(
         self,
         *args,
         **kwargs
     ):
-        """Stream data from the server.
+        """Stream content from the response in chunks.
+
+            Args:
+                *args: Variable length argument list.
+                **kwargs: Arbitrary keyword arguments.
+
+            Yields:
+                str: Content in chunks from the response.
+        """
+        response = self.get_resp(*args, stream=True, **kwargs)
+        for chunk in response:
+            content = chunk.choices[0].delta.content
+            if content:
+                yield content
+
+
+    def chat(self, *args, stream=True, **kwargs):
+        """Call either the stream or invoke method based on the value of the stream parameter.
 
         Args:
             *args: Variable length argument list.
+            stream (bool): A flag to determine whether to call the stream method (default is True).
             **kwargs: Arbitrary keyword arguments.
 
         Returns:
-            Response from the server with streaming enabled.
+            The result of calling either the stream or invoke method based on the value of the stream parameter.
+        """
+        if stream:
+            return self.stream(*args, **kwargs)
+        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.
         """
-        return self.get_resp(*args, stream=True, **kwargs)
+        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,

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

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

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

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=d0L59EfPQwDJVDuCyDuNn4UyYbrKwPsGT6cg6MNTnD0,413
+hdl/_version.py,sha256=mZDLtoh_fZR4n83Vo2yyLdXtACoTaSE2Hm8mc_lRCCM,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=XU_tEwRGRDlg7KPdLetE3K6dbD3aPcmWGU7Vd56g0XQ,11748
+hdl/utils/llm/chat.py,sha256=hkFfPHjTwTJwXS3Dvy7j3nqARHsKoWsqJasfDdCjqgY,16211
 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.84.dist-info/METADATA,sha256=NmWiAiAY4fIeJrJKSEs_FsD7wI76d8QafZW_N4zNWhI,903
-hjxdl-0.1.84.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-hjxdl-0.1.84.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.84.dist-info/RECORD,,
+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,,