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

hdl/utils/llm/chat.py

@@ -8,7 +8,7 @@ from openai import OpenAI
 def chat_oai_stream(
     base_url="http://127.0.0.1:8000/v1",
     api_key="dummy_key",
-    model="/data/models/Qwen-7B-Chat-Int4",
+    model="default_model",
     prompt="Who are you?",
     *args,
     **kwargs
@@ -48,7 +48,7 @@ def chat_oai_stream(
 def chat_oai_invoke(
     base_url="http://127.0.0.1:8000/v1",
     api_key="dummy_key",
-    model="/data/models/Qwen-7B-Chat-Int4",
+    model="default_model",
     prompt="Who are you?",
     *args,
     **kwargs
@@ -318,11 +318,14 @@ class GGUF_M(Llama):
 class OpenAI_M():
     def __init__(
         self,
-        model_path: str = None,
+        model_path: str = "default_model",
         device: str='gpu',
         generation_kwargs: dict = {},
         server_ip: str = "172.28.1.2",
         server_port: int = 8000,
+        api_key: str = "dummy_key",
+        *args,
+        **kwargs
     ):
         """Initialize the class with the specified parameters.
         
@@ -337,7 +340,14 @@ class OpenAI_M():
         self.server_ip = server_ip
         self.server_port = server_port
         self.base_url = "http://{self.server_ip}:{str(self.server_port)}/v1"
-    
+        self.api_key = api_key
+        self.client = OpenAI(
+            base_url=self.base_url,
+            api_key=self.api_key,
+            *args,
+            **kwargs
+        )
+        
     def invoke(
         self, 
         prompt : str,
@@ -355,33 +365,45 @@ class OpenAI_M():
         Returns:
             str: The response generated by the chatbot.
         """
-        resp = chat_oai_invoke(
-            base_url=self.base_url,
+        response = self.client.chat.completions.create(
             model=self.model_path,
-            prompt=prompt
+            messages=[{
+                "role": "user",
+                "content": prompt
+            }],
+            stream=False,
+            **kwargs
         )
-        return resp
-    
+        return response.choices[0].message.content
+
     def stream(
         self, 
         prompt : str,
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
         # history: list = [],
         **kwargs: t.Any,
-    ) -> str:
-        """Generate a response by streaming conversation with the OpenAI chat model.
+    ):
+        """Generate text completion in a streaming fashion.
         
         Args:
-            prompt (str): The prompt to start the conversation.
-            stop (list[str], optional): List of strings that indicate when the conversation should stop. Defaults to ["USER:", "ASSISTANT:"].
-            **kwargs: Additional keyword arguments to pass to the chat model.
+            prompt (str): The text prompt to generate completion for.
+            stop (list[str], optional): List of strings to stop streaming at. Defaults to ["USER:", "ASSISTANT:"].
+            **kwargs: Additional keyword arguments to pass to the completion API.
         
-        Returns:
-            str: The response generated by the chat model.
+        Yields:
+            str: The generated text completion in a streaming fashion.
         """
-        resp = chat_oai_stream(
-            base_url=self.base_url,
+        response = self.client.chat.completions.create(
             model=self.model_path,
-            prompt=prompt
+            messages=[{
+                "role": "user",
+                "content": prompt
+            }],
+            stream=True,
+            **kwargs
         )
-        return resp
+        
+        for chunk in response:
+            content = chunk.choices[0].delta.content
+            if content:
+                yield content 

hdl/utils/llm/embs.py

@@ -1,4 +1,4 @@
-from sentence_transformers import SentenceTransformer
+import re
 
 
 class BEEmbedder():
@@ -118,6 +118,8 @@ class HFEmbedder():
         Returns:
             None
         """
+
+        from sentence_transformers import SentenceTransformer
         
         self.device = device
         self.emb_dir = emb_dir
@@ -190,7 +192,7 @@ class HFEmbedder():
 
 def get_n_tokens(
     paragraph,
-    model: str = None
+    model: str = ""
 ):
     """Get the number of tokens in a paragraph using a specified model.
     
@@ -201,7 +203,7 @@ def get_n_tokens(
     Returns:
         int: The number of tokens in the paragraph based on the specified model or default CJK tokenization.
     """
-    if model is None:
+    if model == "":
         cjk_regex = re.compile(u'[\u1100-\uFFFDh]+?')
         trimed_cjk = cjk_regex.sub( ' a ', paragraph, 0)
         return len(trimed_cjk.split())

{hjxdl-0.1.7.dist-info → hjxdl-0.1.9.dist-info}/METADATA

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

{hjxdl-0.1.7.dist-info → hjxdl-0.1.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=5sZZNySv08wwfzJcSDssGTqUn9wlmDsR6R4XB8J8mFM,70
-hdl/_version.py,sha256=0A08Kvw-SYs_CkLPEV1KmD8lb9IPH1psSxb5iQEGtI8,411
+hdl/_version.py,sha256=NWmu2cvzOcqY9v-ee-qFLmtXRczssdN-cFGZ9qMNSmY,411
 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
@@ -84,12 +84,12 @@ hdl/utils/database_tools/connect.py,sha256=KUnVG-8raifEJ_N0b3c8LkTTIfn9NIyw8LX6q
 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=gsbqWh8fTcJUENU6ZuMClZAuSOLFnD5VP8kXOxGh3Zw,13776
-hdl/utils/llm/embs.py,sha256=ntT9Noax4ao7Rm1kjVMtXa3j0ykbRq0cABAci147Bu0,7159
+hdl/utils/llm/chat.py,sha256=67Mx1Q077BOscQbHiDxJpjBQalJKO8SQMLcRch5_Xj8,14352
+hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
-hjxdl-0.1.7.dist-info/METADATA,sha256=MMDp3uVtFocfPk5vDF056atHLM0dBDzPu6GrLZXbGDg,542
-hjxdl-0.1.7.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-hjxdl-0.1.7.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.7.dist-info/RECORD,,
+hjxdl-0.1.9.dist-info/METADATA,sha256=O6Utim9uYtAH6dTsbrPQrgkdzCOHjwsYaGUHn6_noIM,542
+hjxdl-0.1.9.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+hjxdl-0.1.9.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.9.dist-info/RECORD,,