gemini-agent-framework 0.1.1__tar.gz → 0.1.2__tar.gz

{gemini_agent_framework-0.1.1 → gemini_agent_framework-0.1.2}/.gitignore

@@ -2,4 +2,4 @@ __pycache__
 llama.log
 localllm.exe
 .env
-llm_test
+llm_test

{gemini_agent_framework-0.1.1 → gemini_agent_framework-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-agent-framework
-Version: 0.1.1
+Version: 0.1.2
 Summary: A framework for building agents that use Gemini's function calling capabilities
 Project-URL: Homepage, https://github.com/m7mdony/gemini-agent-framework
 Project-URL: Documentation, https://github.com/m7mdony/gemini-agent-framework#readme

{gemini_agent_framework-0.1.1 → gemini_agent_framework-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gemini-agent-framework"
-version = "0.1.1"
+version = "0.1.2"
 description = "A framework for building agents that use Gemini's function calling capabilities"
 readme = "README.md"
 requires-python = ">=3.8"

gemini_agent_framework-0.1.2/src/gemini_agent/__init__.py

@@ -0,0 +1,4 @@
+from .agent import Agent
+
+__version__ = "0.1.2"
+__all__ = ["Agent"] 

{gemini_agent_framework-0.1.1 → gemini_agent_framework-0.1.2}/src/gemini_agent/agent.py

@@ -31,6 +31,7 @@ class Agent:
             Agent._tools_registry[func.__name__]['description'] = desc
             Agent._tools_registry[func.__name__]['signature'] = inspect.signature(func)
             Agent._tools_registry[func.__name__]['function_ref'] = func
+            Agent._tools_registry[func.__name__]['is_method'] = inspect.ismethod(func)
             @wraps(func)
             def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
@@ -48,6 +49,7 @@ class Agent:
                 Agent._tools_registry[func.__name__]['signature'] = inspect.signature(func)
             if 'function_ref' not in Agent._tools_registry[func.__name__]:
                 Agent._tools_registry[func.__name__]['function_ref'] = func
+            Agent._tools_registry[func.__name__]['is_method'] = inspect.ismethod(func)
             @wraps(func)
             def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
@@ -60,7 +62,7 @@ class Agent:
 
         Args:
             api_key: Your Google Generative AI API key.
-            tools: A list of Python functions decorated as tools.
+            tools: A list of Python functions or class methods decorated as tools.
             model_name: The name of the Gemini model to use.
         """
         if not api_key:
@@ -72,6 +74,7 @@ class Agent:
 
         self._registered_tools_json: List[Dict[str, Any]] = []  # Store JSON representation
         self._tool_functions: Dict[str, Callable] = {}  # Map name to actual function
+        self._tool_instances: Dict[str, Any] = {}  # Store instances for class methods
         self._intermediate_results: Dict[str, Any] = {}  # Store intermediate results
 
         if tools:
@@ -90,6 +93,12 @@ class Agent:
                 print(f"Warning: Function '{tool_name}' is missing @Agent.description. Skipping.")
                 continue
 
+            # Store the bound method directly if it's a class method
+            if inspect.ismethod(func):
+                self._tool_functions[tool_name] = func
+            else:
+                self._tool_functions[tool_name] = metadata['function_ref']
+
             # Build the parameters schema JSON
             gemini_params_schema = {
                 "type": "OBJECT",
@@ -102,6 +111,9 @@ class Agent:
             if not params_def and signature:
                 params_def = {}
                 for name, param in signature.parameters.items():
+                    # Skip 'self' parameter for class methods
+                    if name == 'self' and inspect.ismethod(func):
+                        continue
                     py_type = param.annotation if param.annotation != inspect.Parameter.empty else str
                     params_def[name] = {'type': py_type, 'description': f'Parameter {name}'}
 
@@ -125,7 +137,6 @@ class Agent:
                 del declaration_json["parameters"]
 
             self._registered_tools_json.append(declaration_json)
-            self._tool_functions[tool_name] = metadata['function_ref']
 
     def _get_system_prompt(self) -> str:
         """Returns a system prompt that guides the model in breaking down complex operations."""
@@ -192,9 +203,9 @@ class Agent:
         self._intermediate_results = {}
         
         if not system_prompt:
-            system_prompt = self._get_system_prompt() + system_prompt
-        else:
             system_prompt = self._get_system_prompt()
+        else:
+            system_prompt = self._get_system_prompt() + system_prompt
 
         current_contents = conversation_history if conversation_history else []
         if system_prompt and not current_contents:
@@ -214,6 +225,14 @@ class Agent:
 
         if response_structure and not self._registered_tools_json:
             apply_structure_later = False
+            # If response_structure is a string type, make it more flexible
+            if response_structure.get("type") == "string":
+                response_structure = {
+                    "type": ["string", "object"],
+                    "properties": {
+                        "value": {"type": "string"}
+                    }
+                }
             payload["generationConfig"] = {
                 "response_mime_type": "application/json",
                 "response_schema": response_structure
@@ -272,7 +291,9 @@ class Agent:
                                     if result_key in self._intermediate_results:
                                         args[key] = self._intermediate_results[result_key]
                             
+                            # Call the function directly - it's already bound if it's a method
                             function_result = tool_function(**args)
+                            
                             print(f"--- Function Result: {function_result} ---")
                             
                             result_key = f"result_{len(self._intermediate_results)}"

gemini_agent_framework-0.1.2/tests/test_agent.py

@@ -0,0 +1,66 @@
+import os
+from dotenv import load_dotenv
+from gemini_agent import Agent
+
+load_dotenv()
+
+def test_basic_operations():
+    # Define some basic math operations
+    @Agent.description("Multiplies two numbers.")
+    @Agent.parameters({
+        'a': {'type': int, 'description': 'The first number'},
+        'b': {'type': int, 'description': 'The second number'}
+    })
+    def multiply(a: int, b: int) -> int:
+        return a * b
+
+    @Agent.description("Adds two numbers.")
+    @Agent.parameters({
+        'a': {'type': int, 'description': 'The first number'},
+        'b': {'type': int, 'description': 'The second number'}
+    })
+    def add(a: int, b: int) -> int:
+        return a + b
+
+    # Create an agent with the math tools
+    agent = Agent(
+        api_key=os.getenv("GEMINI_API_KEY"),
+        tools=[multiply, add]
+    )
+
+    # Test a simple multiplication
+    response = agent.prompt("Multiply 3 and 7")
+    print(f"Multiplication result: {response}")  # Should be 21
+
+    # Use the agent
+    response = agent.prompt(user_prompt="multiply 3 and 7 then add 5 to the result" ,
+    system_prompt="You are a helpful assistant give your response always with ❤️ at the start of the line. in your response you should mention the function you used." ,
+    response_structure=
+    {
+        "type": "object",
+        "properties": {
+            "used_functions": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "function_name": {"type": "string"},
+                        "parameters": {
+                            "type": "object",
+                            "properties": {
+                                "a": {"type": "integer"},
+                                "b": {"type": "integer"}
+                            }
+                        }
+                    }
+                }
+            },
+            "answer": {"type": "string"}
+            
+        }
+    }
+    )
+    print(response)  # Should output 21
+
+if __name__ == "__main__":
+    test_basic_operations() 

gemini_agent_framework-0.1.2/tests/test_class_methods.py

@@ -0,0 +1,67 @@
+import os
+from dotenv import load_dotenv
+from gemini_agent import Agent
+
+load_dotenv()
+
+class Calculator:
+    def __init__(self):
+        self.memory = 0
+
+    @Agent.description("Multiplies a number by the stored memory value.")
+    @Agent.parameters({
+        'number': {'type': int, 'description': 'The number to multiply with memory'}
+    })
+    def multiply_with_memory(self, number: int) -> int:
+        result = self.memory * number
+        self.memory = result
+        return result
+
+    @Agent.description("Adds a number to the stored memory value.")
+    @Agent.parameters({
+        'number': {'type': int, 'description': 'The number to add to memory'}
+    })
+    def add_to_memory(self, number: int) -> int:
+        result = self.memory + number
+        self.memory = result
+        return result
+
+def test_class_methods():
+    # Create a calculator instance
+    calculator = Calculator()
+    
+    # Create an agent with the calculator methods
+    agent = Agent(
+        api_key=os.getenv("GEMINI_API_KEY"),
+        tools=[calculator.multiply_with_memory, calculator.add_to_memory]
+    )
+
+    # Test using class methods
+    response = agent.prompt(
+        "Multiply 5 with memory (starting at 0), then add 10 to the result",
+        response_structure={
+            "type": "object",
+            "properties": {
+                "used_functions": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "function_name": {"type": "string"},
+                            "parameters": {
+                                "type": "object",
+                                "properties": {
+                                    "number": {"type": "integer"}
+                                }
+                            }
+                        }
+                    }
+                },
+                "answer": {"type": "string"}
+            }
+        }
+    )
+    print(response)
+
+if __name__ == "__main__":
+    test_class_methods() 

gemini_agent_framework-0.1.1/src/gemini_agent/__init__.py

@@ -1,4 +0,0 @@
-from .agent import Agent
-
-__version__ = "0.1.1"
-__all__ = ["Agent"] 

gemini_agent_framework-0.1.1/tests/test_agent.py

@@ -1,48 +0,0 @@
-import os
-from dotenv import load_dotenv
-from src.gemini_agent import Agent
-
-load_dotenv()
-
-def test_basic_operations():
-    # Define some basic math operations
-    @Agent.description("Multiplies two numbers.")
-    @Agent.parameters({
-        'a': {'type': int, 'description': 'The first number'},
-        'b': {'type': int, 'description': 'The second number'}
-    })
-    def multiply(a: int, b: int) -> int:
-        return a * b
-
-    @Agent.description("Adds two numbers.")
-    @Agent.parameters({
-        'a': {'type': int, 'description': 'The first number'},
-        'b': {'type': int, 'description': 'The second number'}
-    })
-    def add(a: int, b: int) -> int:
-        return a + b
-
-    # Create an agent with the math tools
-    agent = Agent(
-        api_key=os.getenv("GEMINI_API_KEY"),
-        tools=[multiply, add]
-    )
-
-    # Test a simple multiplication
-    response = agent.prompt("Multiply 3 and 7")
-    print(f"Multiplication result: {response}")  # Should be 21
-
-    # Test a complex operation
-    response = agent.prompt(
-        "Multiply 3 and 7, then add 4 to the result",
-        response_structure={
-            "type": "object",
-            "properties": {
-                "result": {"type": "number"}
-            }
-        }
-    )
-    print(f"Complex operation result: {response}")  # Should be {"result": 25}
-
-if __name__ == "__main__":
-    test_basic_operations()