llm-dialog-manager 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

llm_dialog_manager/__init__.py

@@ -1,4 +1,4 @@
 from .chat_history import ChatHistory
 from .agent import Agent
 
-__version__ = "0.4.4" 
+__version__ = "0.4.6" 

llm_dialog_manager/agent.py

@@ -2,7 +2,7 @@
 import json
 import os
 import uuid
-from typing import List, Dict, Optional, Union
+from typing import List, Dict, Union, Optional, Any
 import logging
 from pathlib import Path
 import random
@@ -97,13 +97,30 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
             api_key = os.getenv(f"{service.upper()}_API_KEY")
             base_url = os.getenv(f"{service.upper()}_BASE_URL")
 
-        def format_messages_for_api(model, messages):
-            """Convert ChatHistory messages to the format required by the specific API."""
+        def format_messages_for_api(
+            model: str,
+            messages: List[Dict[str, Union[str, List[Union[str, Image.Image, Dict]]]]]
+        ) -> tuple[Optional[str], List[Dict[str, Any]]]:
+            """
+            Convert ChatHistory messages to the format required by the specific API.
+            
+            Args:
+                model: The model name (e.g., "claude", "gemini", "gpt")
+                messages: List of message dictionaries with role and content
+                
+            Returns:
+                tuple: (system_message, formatted_messages)
+                    - system_message is extracted system message for Claude, None for others 
+                    - formatted_messages is the list of formatted message dictionaries
+            """
             if "claude" in model and "openai" not in model:
                 formatted = []
                 system_msg = ""
+                
+                # Extract system message if present
                 if messages and messages[0]["role"] == "system":
                     system_msg = messages.pop(0)["content"]
+                    
                 for msg in messages:
                     content = msg["content"]
                     if isinstance(content, str):
@@ -113,9 +130,12 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
                         combined_content = []
                         for block in content:
                             if isinstance(block, str):
-                                combined_content.append({"type": "text", "text": block})
+                                combined_content.append({
+                                    "type": "text",
+                                    "text": block
+                                })
                             elif isinstance(block, Image.Image):
-                                # For Claude, convert PIL.Image to base64
+                                # Convert PIL.Image to base64
                                 buffered = io.BytesIO()
                                 block.save(buffered, format="PNG")
                                 image_base64 = base64.b64encode(buffered.getvalue()).decode("utf-8")
@@ -145,9 +165,12 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
                                             "data": block["image_base64"]["data"]
                                         }
                                     })
-                        formatted.append({"role": msg["role"], "content": combined_content})
+                        formatted.append({
+                            "role": msg["role"],
+                            "content": combined_content
+                        })
                 return system_msg, formatted
-
+                
             elif ("gemini" in model or "gpt" in model or "grok" in model) and "openai" not in model:
                 formatted = []
                 for msg in messages:
@@ -160,40 +183,75 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
                             if isinstance(block, str):
                                 parts.append(block)
                             elif isinstance(block, Image.Image):
+                                # Keep PIL.Image objects as is for Gemini
                                 parts.append(block)
                             elif isinstance(block, dict):
                                 if block.get("type") == "image_url":
-                                    parts.append({"type": "image_url", "image_url": {"url": block["image_url"]["url"]}})
+                                    parts.append({
+                                        "type": "image_url",
+                                        "image_url": {
+                                            "url": block["image_url"]["url"]
+                                        }
+                                    })
                                 elif block.get("type") == "image_base64":
-                                    parts.append({"type": "image_base64", "image_base64": {"data": block["image_base64"]["data"], "media_type": block["image_base64"]["media_type"]}})
-                        formatted.append({"role": msg["role"], "parts": parts})
+                                    parts.append({
+                                        "type": "image_base64",
+                                        "image_base64": {
+                                            "data": block["image_base64"]["data"],
+                                            "media_type": block["image_base64"]["media_type"]
+                                        }
+                                    })
+                        formatted.append({
+                            "role": msg["role"],
+                            "parts": parts
+                        })
                 return None, formatted
-
+                
             else:  # OpenAI models
                 formatted = []
                 for msg in messages:
                     content = msg["content"]
                     if isinstance(content, str):
-                        formatted.append({"role": msg["role"], "content": content})
+                        formatted.append({
+                            "role": msg["role"],
+                            "content": content
+                        })
                     elif isinstance(content, list):
-                        # OpenAI expects 'content' as string; images are not directly supported
-                        # You can convert images to URLs or descriptions if needed
-                        combined_content = ""
+                        formatted_content = []
                         for block in content:
                             if isinstance(block, str):
-                                combined_content += block + "\n"
+                                formatted_content.append({
+                                    "type": "text",
+                                    "text": block
+                                })
                             elif isinstance(block, Image.Image):
-                                # Convert PIL.Image to base64 or upload and use URL
+                                # Convert PIL.Image to base64
                                 buffered = io.BytesIO()
                                 block.save(buffered, format="PNG")
                                 image_base64 = base64.b64encode(buffered.getvalue()).decode("utf-8")
-                                combined_content += f"[Image Base64: {image_base64[:30]}...]\n"
+                                formatted_content.append({
+                                    "type": "image_url",
+                                    "image_url": {
+                                        "url": f"data:image/jpeg;base64,{image_base64}"
+                                    }
+                                })
                             elif isinstance(block, dict):
                                 if block.get("type") == "image_url":
-                                    combined_content += f"[Image: {block['image_url']['url']}]\n"
+                                    formatted_content.append({
+                                        "type": "image_url",
+                                        "image_url": block["image_url"]
+                                    })
                                 elif block.get("type") == "image_base64":
-                                    combined_content += f"[Image Base64: {block['image_base64']['data'][:30]}...]\n"
-                        formatted.append({"role": msg["role"], "content": combined_content.strip()})
+                                    formatted_content.append({
+                                        "type": "image_url",
+                                        "image_url": {
+                                            "url": f"data:image/jpeg;base64,{block['image_base64']['data']}"
+                                        }
+                                    })
+                        formatted.append({
+                            "role": msg["role"],
+                            "content": formatted_content
+                        })
                 return None, formatted
 
         system_msg, formatted_messages = format_messages_for_api(model, messages.copy())
@@ -336,16 +394,21 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
             if model.endswith("-openai"):
                 model = model[:-7]  # Remove last 7 characters ("-openai")
             client = openai.OpenAI(api_key=api_key, base_url=base_url)
-            # Set response_format based on json_format
-            response_format = {"type": "json_object"} if json_format else {"type": "plain_text"}
-
-            response = client.chat.completions.create(
-                model=model,
-                messages=formatted_messages,
-                max_tokens=max_tokens,
-                temperature=temperature,
-                response_format=response_format  # Added response_format
-            )
+            
+            # Create base parameters
+            params = {
+                "model": model,
+                "messages": formatted_messages,
+            }
+            
+            # Add optional parameters
+            if json_format:
+                params["response_format"] = {"type": "json_object"}
+            if not ("o1" in model or "o3" in model):
+                params["max_tokens"] = max_tokens
+                params["temperature"] = temperature
+
+            response = client.chat.completions.create(**params)
             return response.choices[0].message.content
 
         # Release the API key after successful use
@@ -546,7 +609,7 @@ class Agent:
 if __name__ == "__main__":
     # Example Usage
     # Create an Agent instance (Gemini model)
-    agent = Agent("gemini-1.5-flash", "you are Jack101", memory_enabled=True)
+    agent = Agent("gemini-1.5-flash-openai", "you are Jack101", memory_enabled=True)
     
     # Add an image
     agent.add_image(image_path="example.png")

{llm_dialog_manager-0.4.4.dist-info → llm_dialog_manager-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm_dialog_manager
-Version: 0.4.4
+Version: 0.4.6
 Summary: A Python package for managing LLM chat conversation history
 Author-email: xihajun <work@2333.fun>
 License: MIT

llm_dialog_manager-0.4.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+llm_dialog_manager/__init__.py,sha256=klLFvHayR7ew1Oh9xyhAXdXnfs82YnFUEFzw0YvxKJI,86
+llm_dialog_manager/agent.py,sha256=NVQKIMebl4cYkqMaBceZ3qs1vYhq1bum9okAn8VcfCg,27680
+llm_dialog_manager/chat_history.py,sha256=DKKRnj_M6h-4JncnH6KekMTghX7vMgdN3J9uOwXKzMU,10347
+llm_dialog_manager/key_manager.py,sha256=shvxmn4zUtQx_p-x1EFyOmnk-WlhigbpKtxTKve-zXk,4421
+llm_dialog_manager-0.4.6.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
+llm_dialog_manager-0.4.6.dist-info/METADATA,sha256=-qTRYkfAJMJCQTkRqNrtHjUuN-xGLhLR4CJvSJURgeg,4194
+llm_dialog_manager-0.4.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+llm_dialog_manager-0.4.6.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
+llm_dialog_manager-0.4.6.dist-info/RECORD,,

llm_dialog_manager-0.4.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-llm_dialog_manager/__init__.py,sha256=J7qsuEH4NWFkTQVvCqHgxX1jOYnY79s9BMi02KTo3-A,86
-llm_dialog_manager/agent.py,sha256=ou9D8NtRt6fDXgrneXP5jZRil7XyKpCTUHCADPJmeeA,25332
-llm_dialog_manager/chat_history.py,sha256=DKKRnj_M6h-4JncnH6KekMTghX7vMgdN3J9uOwXKzMU,10347
-llm_dialog_manager/key_manager.py,sha256=shvxmn4zUtQx_p-x1EFyOmnk-WlhigbpKtxTKve-zXk,4421
-llm_dialog_manager-0.4.4.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
-llm_dialog_manager-0.4.4.dist-info/METADATA,sha256=Rjjs7I8JwbQ21QyMxTDrDrwzmAqMcdY30srUOJxYzWs,4194
-llm_dialog_manager-0.4.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-llm_dialog_manager-0.4.4.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
-llm_dialog_manager-0.4.4.dist-info/RECORD,,