pop-python 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

POP/LLMClient.py

@@ -84,11 +84,11 @@ class OpenAIClient(LLMClient):
             else:
                 request_payload["response_format"] = {"type": "json_schema", "json_schema": fmt}
 
-        # Handle function tools
+        # Handle function tools (already OpenAI-style)
         tools = kwargs.get("tools", None)
         if tools:
-            request_payload["tools"] = [{"type": "function", "function": tool} for tool in tools]
-            request_payload["tool_choice"] = "auto"
+            request_payload["tools"] = tools
+            request_payload["tool_choice"] = kwargs.get("tool_choice", "auto")
 
         # Temporary patch for models not supporting system roles
         if model == "o1-mini" and request_payload["messages"] and request_payload["messages"][0]["role"] == "system":
@@ -140,6 +140,12 @@ class DeepseekClient(LLMClient):
             role = msg.get("role", "user")
             request_payload["messages"].append({"role": role, "content": content})
 
+        # tools: OpenAI-style list
+        tools = kwargs.get("tools", None)
+        if tools:
+            request_payload["tools"] = tools
+            request_payload["tool_choice"] = kwargs.get("tool_choice", "auto")
+
         # Execute request
         try:
             response = self.client.chat.completions.create(**request_payload)
@@ -291,7 +297,8 @@ class DoubaoClient(LLMClient):
         # Tools (function calling)
         tools = kwargs.get("tools")
         if tools:
-            raise NotImplementedError("DoubaoClient does not support tools yet.")
+            payload["tools"] = tools
+            payload["tool_choice"] = kwargs.get("tool_choice", "auto")
         try:
             response = self.client.chat.completions.create(**payload)
         except Exception as e:
@@ -400,4 +407,4 @@ class OllamaClient(LLMClient):
         class Response:
             def __init__(self, content): self.choices = [Choice(Message(content))]
 
-        return Response(content)
+        return Response(content)

POP/POP.py

@@ -70,6 +70,7 @@ class PromptFunction:
             - sys: Additional system instructions.
             - fmt: Response format/schema.
             - tools: List of function tools to use (for function calling).
+            - tool_choice
             - temp: Temperature.
             - ADD_BEFORE: Text to prepend.
             - ADD_AFTER: Text to append.
@@ -87,6 +88,9 @@ class PromptFunction:
         tools = kwargs.pop("tools", None)
         temp = kwargs.pop("temp", self.temperature)
         images = kwargs.pop("images", None)
+        tool_choice = kwargs.pop("tool_choice", None)
+        if tools and not tool_choice:
+            tool_choice = "auto"
 
         # Prepare the prompt with dynamic injections.
         formatted_prompt = self._prepare_prompt(*args, **kwargs)
@@ -105,15 +109,19 @@ class PromptFunction:
         messages = [system_message, user_message]
 
         try:
-            # Call the LLM client.
-            raw_response = self.client.chat_completion(
-                messages=messages, 
-                model=model, 
-                temperature=temp, 
-                response_format=fmt,
-                tools=tools,
-                images=images
-            )
+            # Call the LLM client. Always include tool_choice when tools are provided.
+            call_kwargs = {
+                "messages": messages,
+                "model": model,
+                "temperature": temp,
+                "response_format": fmt,
+                "tools": tools,
+                "images": images,
+                # Always include tool_choice key so callers can assert on it
+                "tool_choice": tool_choice,
+            }
+
+            raw_response = self.client.chat_completion(**call_kwargs)
         except Exception as e:
             verbose = True
             if verbose:

{pop_python-1.0.3.dist-info → pop_python-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pop-python
-Version: 1.0.3
+Version: 1.0.4
 Summary: Prompt Oriented Programming (POP): reusable, composable prompt functions for LLMs.
 Home-page: https://github.com/sgt1796/POP
 Author: Guotai Shen

{pop_python-1.0.3.dist-info → pop_python-1.0.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 POP/Embedder.py,sha256=KSqneJNdpkE5_b82AHhpXRXAD9DYt9bads6oMcvDIoM,10165
-POP/LLMClient.py,sha256=gFEDUaLba_G0nlpS9qj-ajDhryDuBDztPPF3qhQG7Vg,15449
-POP/POP.py,sha256=b99m3kq298QldMm-Zv09ov2LoJL6n-aG3Z0CRC8dQps,15936
+POP/LLMClient.py,sha256=ew1Yt9pmt3tK6xfZN3_kJ5det0JsGg7fFXxy1zMahjk,15693
+POP/POP.py,sha256=g9v0qa4G7bZPATRycHZ5owdKaha-YC8CD1U_YtnqH1Y,16319
 POP/__init__.py,sha256=aHsN8USyF18G_8Pr3h49SClWywy0y1h5-63u_OSXBQM,429
 POP/prompts/2024-11-19-content_finder.md,sha256=ncMkvL6xUgYDhSXEPGTw5rnYF3b2Gq1nRyAVdaLaNGA,2238
 POP/prompts/2024-11-19-get_content.md,sha256=vQhkGBX5Doj4vsCIfAmGyLwl0f7wHw0TkEJE3wFBdxY,3530
@@ -19,8 +19,8 @@ POP/prompts/openai-json_schema_generator.md,sha256=5N8D3qm5UPqjZNqLYmDhwlCc1GeYH
 POP/prompts/openai-prompt_generator.md,sha256=drMW9fSZUN8ldwNrvc_YsHDiSbwB58jonVSxdgydDro,3645
 POP/schemas/biomedical_ner_extractor.json,sha256=WbWWWypvDdrHLvoFcEaCXa8Mx_FvmKLqUtYs2GWZujQ,929
 POP/schemas/entity_extraction_per_sentence.json,sha256=S9g4pL_LOc36fNM-PA33kRNGEvKQYPe3GpHBrozwbdc,2149
-pop_python-1.0.3.dist-info/licenses/LICENSE,sha256=zm0TNFsVPrnSK7IDoO504aeYMnO69QrL9IY9P5jRHHg,1064
-pop_python-1.0.3.dist-info/METADATA,sha256=nE8u_YyUZWRFWoGGNh66wj1Nm48WtvAQG9ZSmyEbbiI,7033
-pop_python-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pop_python-1.0.3.dist-info/top_level.txt,sha256=n_VDHKZJpAKLhVprDjVofH0AgoRlb1y_uO3aRHNmNyo,4
-pop_python-1.0.3.dist-info/RECORD,,
+pop_python-1.0.4.dist-info/licenses/LICENSE,sha256=zm0TNFsVPrnSK7IDoO504aeYMnO69QrL9IY9P5jRHHg,1064
+pop_python-1.0.4.dist-info/METADATA,sha256=IsvC9tVfSjSQmzbaKw-HTbGcAYdqMYusGpt4HqWsjAY,7033
+pop_python-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pop_python-1.0.4.dist-info/top_level.txt,sha256=n_VDHKZJpAKLhVprDjVofH0AgoRlb1y_uO3aRHNmNyo,4
+pop_python-1.0.4.dist-info/RECORD,,