llm-dialog-manager 0.4.1__py3-none-any.whl → 0.4.3__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.1" 
+__version__ = "0.4.3" 

llm_dialog_manager/agent.py

@@ -74,7 +74,10 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
     """
     try:
         service = ""
-        if "claude" in model:
+        if "openai" in model:
+            service = "openai"
+            model
+        elif "claude" in model:
             service = "anthropic"
         elif "gemini" in model:
             service = "gemini"
@@ -92,7 +95,7 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
 
         def format_messages_for_api(model, messages):
             """Convert ChatHistory messages to the format required by the specific API."""
-            if "claude" in model:
+            if "claude" in model and "openai" not in model:
                 formatted = []
                 system_msg = ""
                 if messages and messages[0]["role"] == "system":
@@ -141,7 +144,7 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
                         formatted.append({"role": msg["role"], "content": combined_content})
                 return system_msg, formatted
 
-            elif "gemini" in model or "gpt" in model or "grok" in model:
+            elif ("gemini" in model or "gpt" in model or "grok" in model) and "openai" not in model:
                 formatted = []
                 for msg in messages:
                     content = msg["content"]
@@ -191,7 +194,7 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
 
         system_msg, formatted_messages = format_messages_for_api(model, messages.copy())
 
-        if "claude" in model:
+        if "claude" in model and "openai" not in model:
             # Check for Vertex configuration
             vertex_project_id = os.getenv('VERTEX_PROJECT_ID')
             vertex_region = os.getenv('VERTEX_REGION')
@@ -232,7 +235,7 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
 
             return response.completion
 
-        elif "gemini" in model:
+        elif "gemini" in model and "openai" not in model:
             try:
                 # First try OpenAI-style API
                 client = openai.OpenAI(
@@ -284,7 +287,7 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
 
                 return response.text
 
-        elif "grok" in model:
+        elif "grok" in model and "openai" not in model:
             # Randomly choose between OpenAI and Anthropic SDK
             use_anthropic = random.choice([True, False])
 
@@ -326,6 +329,8 @@ def completion(model: str, messages: List[Dict[str, Union[str, List[Union[str, I
                 return response.choices[0].message.content
 
         else:  # OpenAI models
+            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"}
@@ -384,7 +389,7 @@ class Agent:
         if image_path:
             if not os.path.exists(image_path):
                 raise FileNotFoundError(f"Image file {image_path} does not exist.")
-            if "gemini" in self.model_name:
+            if "gemini" in self.model_name and "openai" not in self.model_name:
                 # For Gemini, load as PIL.Image
                 image_pil = Image.open(image_path)
                 image_block = image_pil
@@ -401,7 +406,7 @@ class Agent:
                 }
         else:
             # If image_url is provided
-            if "gemini" in self.model_name:
+            if "gemini" in self.model_name and "openai" not in self.model_name:
                 # For Gemini, you can pass image URLs directly
                 image_block = {"type": "image_url", "image_url": {"url": image_url}}
             else:

{llm_dialog_manager-0.4.1.dist-info → llm_dialog_manager-0.4.3.dist-info}/METADATA

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

llm_dialog_manager-0.4.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+llm_dialog_manager/__init__.py,sha256=VVVbwGXF9QXgGJSFY23fzwk-WD2zXY1pCIiMQsJ01Q4,86
+llm_dialog_manager/agent.py,sha256=hnMJ0scLZ2QA0wSm_EufID1IHdCo9AyOu1nnWKD9dl4,24333
+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.3.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
+llm_dialog_manager-0.4.3.dist-info/METADATA,sha256=z1Idh3H29Ws4ea2qgiO68VAaGAfCBJcnuXZbZ1RaskA,4194
+llm_dialog_manager-0.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+llm_dialog_manager-0.4.3.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
+llm_dialog_manager-0.4.3.dist-info/RECORD,,

llm_dialog_manager-0.4.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-llm_dialog_manager/__init__.py,sha256=hTHvsXzvD5geKgv2XERYcp2f-T3LoVVc3arXfPtNS1k,86
-llm_dialog_manager/agent.py,sha256=ZKO3eKHTKcbmYpVRRIpzDy7Tlp_VgQ90ewr1758Ozgs,23931
-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.1.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
-llm_dialog_manager-0.4.1.dist-info/METADATA,sha256=LER5FN6lFQFPs_8A-fIM7VYmqN-fh0nCD6Dt8vslsiY,4194
-llm_dialog_manager-0.4.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-llm_dialog_manager-0.4.1.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
-llm_dialog_manager-0.4.1.dist-info/RECORD,,