hjxdl 0.3.16__py3-none-any.whl → 0.3.18__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.16'
-__version_tuple__ = version_tuple = (0, 3, 16)
+__version__ = version = '0.3.18'
+__version_tuple__ = version_tuple = (0, 3, 18)

hdl/utils/desc/tools.py

@@ -0,0 +1,21 @@
+TOOL_DICT = {
+    "get_weather": {
+        "type": "function",
+        "function": {
+            "name": "get_weather",
+            "description": "Get current temperature for a given location.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "location": {
+                        "type": "string",
+                        "description": "City name e.g. Bogotá"
+                    }
+                },
+                "required": ["location"],
+                "additionalProperties": False
+            },
+            "strict": True
+        }
+    },
+}

hdl/utils/llm/llm_wrapper.py

@@ -2,6 +2,7 @@ import yaml
 import typing as t
 
 from openai import OpenAI
+import instructor
 
 
 class OpenAIWrapper(object):
@@ -63,7 +64,6 @@ class OpenAIWrapper(object):
                 value['host'] = f"http://{host}:{port}/v1"
         self.client_conf = data
 
-
     def get_resp(
         self,
         prompt,
@@ -76,13 +76,17 @@ class OpenAIWrapper(object):
         model: str=None,
         tools: list = None,
         stream: bool = True,
+        response_model = None,
         **kwargs: t.Any,
     ):
+        if not model:
+            model = self.client_conf[client_id]['model']
 
         client = self.client_conf[client_id]['client']
+        if response_model:
+            client = instructor.from_openai(client)
+
         messages = []
-        if history:
-            messages = history
 
         if sys_info:
             messages.append({
@@ -90,6 +94,17 @@ class OpenAIWrapper(object):
                 "content": sys_info
             })
 
+        if history:
+            messages.extend(history)
+            # history 需要符合以下格式，其中system不是必须
+            # history = [
+            #     {"role": "system", "content": "You are a helpful assistant."},
+            #     {"role": "user", "content": "message 1 content."},
+            #     {"role": "assistant", "content": "message 2 content"},
+            #     {"role": "user", "content": "message 3 content"},
+            #     {"role": "assistant", "content": "message 4 content."},
+            #     {"role": "user", "content": "message 5 content."}
+            # ]
 
         if not model:
             model = self.client_conf[client_id]["model"]
@@ -122,3 +137,64 @@ class OpenAIWrapper(object):
             "content": content
         })
 
+        if assis_info:
+            messages.append({
+                "role": "assistant",
+                "content": assis_info
+            })
+
+        resp = client.chat.completions.create(
+            model=model,
+            messages=messages,
+            tools=tools,
+            stream=stream,
+            **kwargs
+        )
+        return resp
+
+    def invoke(
+        self,
+        prompt,
+        **kwargs
+    ):
+        answer_dict = {}
+
+        resp = self.get_resp(
+            prompt,
+            stream=False,
+            **kwargs
+        )
+        if resp.choices[0].finish_reason == "stop":
+            answer_dict["type"] = "text"
+            answer_dict["contents"] = resp.choices[0].message.content
+        elif resp.choices[0].finish_reason == "tool_calls":
+            answer_dict["type"] = "tool_calls"
+            answer_dict["tool_parmas"] = resp.choices[0].message.tool_calls[0].function
+
+        return answer_dict
+
+    def stream(
+        self,
+        prompt,
+        **kwargs
+    ):
+        resp = self.get_resp(
+            prompt=prompt,
+            stream=True,
+            **kwargs
+        )
+        for chunk in resp:
+            if chunk.choices[0].finish_reason == 'tool_calls':
+                answer_dict = {}
+                answer_dict["type"] = "tool_calls"
+                answer_dict["tool_parmas"] = chunk.choices[0].delta.tool_calls[0].function
+                return answer_dict
+            else:
+                yield {
+                    "type": "text",
+                    "content": chunk.choices[0].delta.content
+                }
+
+
+
+

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hjxdl
-Version: 0.3.16
+Version: 0.3.18
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu
@@ -24,6 +24,7 @@ Requires-Dist: Pillow
 Requires-Dist: open_clip_torch
 Requires-Dist: natsort
 Requires-Dist: matplotlib
+Requires-Dist: instructor
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

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

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=D8u-23f8Le_E16tPMMyTPeU4VTKL4yR8GkJhKkxDaXE,413
+hdl/_version.py,sha256=QAzjzlQ8v3ZqOKXdT0jblmkqebjcDj2MPKGBvc_ei_4,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
@@ -124,6 +124,7 @@ hdl/utils/database_tools/web.py,sha256=awJ8lafL-2KRjf3V1uuij8JIvX9U5fI8fLZKOkOvq
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/desc/func_desc.py,sha256=sHmVZZmV7Zgii--gnHqMs6fTb7HVkqTOf8Pl_0F6qlI,3808
 hdl/utils/desc/template.py,sha256=Kf_tbL-XkDCKNQ3UncbCuYEeUgXEa7kRVCf9TD2b8og,2526
+hdl/utils/desc/tools.py,sha256=KNxmmTFFL3BZPh-2NGvNPz2VygHPJ3BWFa4VY2jy58g,619
 hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/general/glob.py,sha256=Zuf7WHU0UdUPOs9UrhxmrCiMC8GrHxQU6n3mTThv6yc,1120
 hdl/utils/general/runners.py,sha256=x7QBolp3MrqNV6L4rB6Ueybr26bqkRFZTuXhY0SwyLk,3061
@@ -133,15 +134,15 @@ 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/llm_wrapper.py,sha256=Wk-ejwooxB6SRKuHW-UYxoBxgpYr9j-7ttKtFAaWFXw,5859
 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.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,,
+hjxdl-0.3.18.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.18.dist-info/METADATA,sha256=X1nGN-ixCM4ltZjIrxPGCzkOGUXy-aIpeRhrNmaCWIQ,1336
+hjxdl-0.3.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+hjxdl-0.3.18.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.18.dist-info/RECORD,,