llm-dialog-manager 0.1.2480__py3-none-any.whl → 0.2.4__py3-none-any.whl

llm_dialog_manager/__init__.py

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

llm_dialog_manager/agent.py

@@ -113,27 +113,53 @@ def completion(model: str, messages: List[Dict[str, str]], max_tokens: int = 100
                 return response.content[0].text
 
             elif "gemini" in model:
-                client = openai.OpenAI(
-                    api_key=api_key,
-                    base_url="https://generativelanguage.googleapis.com/v1beta/"
-                )
-                print(api_key)
-                # Remove any system message from the beginning if present
-                if messages and messages[0]["role"] == "system":
-                    system_msg = messages.pop(0)
-                    # Prepend system message to first user message if exists
-                    if messages:
-                        messages[0]["content"] = f"{system_msg['content']}\n\n{messages[0]['content']}"
-                
-                response = client.chat.completions.create(
-                    model=model,
-                    messages=messages,
-                    # max_tokens=max_tokens,
-                    temperature=temperature
-                )
-                print(len(response.choices))
-                
-                return response.choices[0].message.content
+                try:
+                    # First try OpenAI-style API
+                    client = openai.OpenAI(
+                        api_key=api_key,
+                        base_url="https://generativelanguage.googleapis.com/v1beta/"
+                    )
+                    # Remove any system message from the beginning if present
+                    if messages and messages[0]["role"] == "system":
+                        system_msg = messages.pop(0)
+                        # Prepend system message to first user message if exists
+                        if messages:
+                            messages[0]["content"] = f"{system_msg['content']}\n\n{messages[0]['content']}"
+                    
+                    response = client.chat.completions.create(
+                        model=model,
+                        messages=messages,
+                        temperature=temperature
+                    )
+                    
+                    return response.choices[0].message.content
+                    
+                except Exception as e:
+                    # If OpenAI-style API fails, fall back to Google's genai library
+                    logger.info("Falling back to Google's genai library")
+                    genai.configure(api_key=api_key)
+                    
+                    # Convert messages to Gemini format
+                    gemini_messages = []
+                    for msg in messages:
+                        if msg["role"] == "system":
+                            # Prepend system message to first user message if exists
+                            if gemini_messages:
+                                gemini_messages[0].parts[0].text = f"{msg['content']}\n\n{gemini_messages[0].parts[0].text}"
+                        else:
+                            gemini_messages.append({"role": msg["role"], "parts": [{"text": msg["content"]}]})
+                    
+                    # Create Gemini model and generate response
+                    model = genai.GenerativeModel(model_name=model)
+                    response = model.generate_content(
+                        gemini_messages,
+                        generation_config=genai.types.GenerationConfig(
+                            temperature=temperature,
+                            max_output_tokens=max_tokens
+                        )
+                    )
+                    
+                    return response.text
 
             elif "grok" in model:
                 # Randomly choose between OpenAI and Anthropic SDK
@@ -256,7 +282,7 @@ if __name__ == "__main__":
     # information_detector_agent.add_message("user", text)
     # response = information_detector_agent.generate_response()
     # print(response)
-    agent = Agent("claude-3-5-sonnet-20241022", "you are an assistant", memory_enabled=True)
+    agent = Agent("gemini-1.5-pro-002", "you are an assistant", memory_enabled=True)
     
     # Format the prompt to check if the section is the last one in the outline
     prompt = f"Say: {text}\n"
@@ -265,8 +291,8 @@ if __name__ == "__main__":
     agent.add_message("user", prompt)
     agent.add_message("assistant", "the answer")
 
-    print(agent.generate_response(max_tokens=20, temperature=0.0))
+    print(agent.generate_response())
     print(agent.history[:])
-    a = agent.history.pop()
-    print(a)
+    last_message = agent.history.pop()
+    print(last_message)
     print(agent.history[:])

{llm_dialog_manager-0.1.2480.dist-info → llm_dialog_manager-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llm_dialog_manager
-Version: 0.1.2480
+Version: 0.2.4
 Summary: A Python package for managing LLM chat conversation history
 Author-email: xihajun <work@2333.fun>
 License: MIT
@@ -25,25 +25,25 @@ Requires-Dist: google-generativeai>=0.1.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: typing-extensions>=4.0.0
 Requires-Dist: uuid>=1.30
-Provides-Extra: all
-Requires-Dist: pytest>=8.0.0; extra == "all"
-Requires-Dist: pytest-asyncio>=0.21.1; extra == "all"
-Requires-Dist: pytest-cov>=4.1.0; extra == "all"
-Requires-Dist: black>=23.9.1; extra == "all"
-Requires-Dist: isort>=5.12.0; extra == "all"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.1; extra == "dev"
 Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
 Requires-Dist: black>=23.9.1; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
-Provides-Extra: lint
-Requires-Dist: black>=22.0; extra == "lint"
-Requires-Dist: isort>=5.0; extra == "lint"
 Provides-Extra: test
 Requires-Dist: pytest>=6.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.14.0; extra == "test"
 Requires-Dist: pytest-cov>=2.0; extra == "test"
+Provides-Extra: lint
+Requires-Dist: black>=22.0; extra == "lint"
+Requires-Dist: isort>=5.0; extra == "lint"
+Provides-Extra: all
+Requires-Dist: pytest>=8.0.0; extra == "all"
+Requires-Dist: pytest-asyncio>=0.21.1; extra == "all"
+Requires-Dist: pytest-cov>=4.1.0; extra == "all"
+Requires-Dist: black>=23.9.1; extra == "all"
+Requires-Dist: isort>=5.12.0; extra == "all"
 
 # LLM Dialog Manager
 

llm_dialog_manager-0.2.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+llm_dialog_manager/__init__.py,sha256=Ki4WpdLEEIJ_fi9daYLWSsbxWmp_gmIllCRZH8xgTBw,86
+llm_dialog_manager/agent.py,sha256=aST_n9jU1tuHjMUK0ytCmWq3wYkZp9VHLcg4Q4Y7Tcw,11731
+llm_dialog_manager/chat_history.py,sha256=xKA-oQCv8jv_g8EhXrG9h1S8Icbj2FfqPIhbty5vra4,6033
+llm_dialog_manager/key_manager.py,sha256=shvxmn4zUtQx_p-x1EFyOmnk-WlhigbpKtxTKve-zXk,4421
+llm_dialog_manager-0.2.4.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
+llm_dialog_manager-0.2.4.dist-info/METADATA,sha256=n6l6z8jf4kqgEhqkRIZPhF9CuM9Q6OU0aj_5fQIEY84,5193
+llm_dialog_manager-0.2.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+llm_dialog_manager-0.2.4.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
+llm_dialog_manager-0.2.4.dist-info/RECORD,,

{llm_dialog_manager-0.1.2480.dist-info → llm_dialog_manager-0.2.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

llm_dialog_manager-0.1.2480.dist-info/RECORD

@@ -1,9 +0,0 @@
-llm_dialog_manager/__init__.py,sha256=AfSsuE8ty-luFdLkdgQ98oQfbOYqYM8SO6p4tMDcDZ4,89
-llm_dialog_manager/agent.py,sha256=dExW-pfPpRLedi-iJsn5S_iImMmWGI1ixztVqWCmMHE,10303
-llm_dialog_manager/chat_history.py,sha256=xKA-oQCv8jv_g8EhXrG9h1S8Icbj2FfqPIhbty5vra4,6033
-llm_dialog_manager/key_manager.py,sha256=shvxmn4zUtQx_p-x1EFyOmnk-WlhigbpKtxTKve-zXk,4421
-llm_dialog_manager-0.1.2480.dist-info/LICENSE,sha256=vWGbYgGuWpWrXL8-xi6pNcX5UzD6pWoIAZmcetyfbus,1064
-llm_dialog_manager-0.1.2480.dist-info/METADATA,sha256=1MvkDLGrjfAsNe8HTAK0_BNNTMLO_UPZEmi27pGujkY,5196
-llm_dialog_manager-0.1.2480.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-llm_dialog_manager-0.1.2480.dist-info/top_level.txt,sha256=u2EQEXW0NGAt0AAHT7jx1odXZ4rZfjcgbmJhvKFuMkI,19
-llm_dialog_manager-0.1.2480.dist-info/RECORD,,