gemini-agent-framework 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

gemini_agent/agent.py

@@ -4,6 +4,7 @@ import inspect
 from functools import wraps
 from typing import List, Callable, Dict, Any, Optional
 from dotenv import load_dotenv
+from datetime import datetime
 
 load_dotenv()
 
@@ -31,6 +32,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 +50,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 +63,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,7 +75,9 @@ 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
+        self._stored_variables: Dict[str, Dict[str, Any]] = {}  # Store variables with metadata
 
         if tools:
             self._process_tools(tools)
@@ -90,6 +95,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 +113,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,10 +139,53 @@ class Agent:
                 del declaration_json["parameters"]
 
             self._registered_tools_json.append(declaration_json)
-            self._tool_functions[tool_name] = metadata['function_ref']
+
+    def set_variable(self, name: str, value: Any, description: str = "", type_hint: type = None) -> None:
+        """
+        Stores a variable in the agent's memory with metadata.
+
+        Args:
+            name: The name of the variable
+            value: The actual value to store
+            description: A description of what the variable represents
+            type_hint: Optional type hint for the variable
+        """
+        self._stored_variables[name] = {
+            'value': value,
+            'description': description,
+            'type': type_hint or type(value).__name__,
+            'created_at': datetime.now().isoformat()
+        }
+
+    def get_variable(self, name: str) -> Any:
+        """
+        Retrieves a stored variable's value.
+
+        Args:
+            name: The name of the variable to retrieve
+
+        Returns:
+            The stored value or None if not found
+        """
+        return self._stored_variables.get(name, {}).get('value')
+
+    def list_variables(self) -> Dict[str, Dict[str, Any]]:
+        """
+        Returns information about all stored variables.
+
+        Returns:
+            Dictionary of variable names to their metadata
+        """
+        return {name: {k: v for k, v in data.items() if k != 'value'} 
+                for name, data in self._stored_variables.items()}
 
     def _get_system_prompt(self) -> str:
         """Returns a system prompt that guides the model in breaking down complex operations."""
+        variables_info = "\n".join([
+            f"- {name}: {data['description']} (Type: {data['type']})"
+            for name, data in self._stored_variables.items()
+        ])
+        
         return """You are an AI assistant that can break down complex tasks into sequential steps using available tools.
         When faced with a complex request:
         1. Analyze the request to identify which tools can be used
@@ -141,13 +198,49 @@ class Agent:
         Available tools:
         {tools_list}
         
+        Available variables:
+        {variables_list}
+        
+        IMPORTANT - Variable Usage:
+        When you need to use a stored variable in a function call, you MUST use the following syntax:
+        - For function arguments: {{"variable": "variable_name"}}
+        - For example, if you want to use the 'current_user' variable in a function call:
+          {{"user_id": {{"variable": "current_user"}}}}
+        
         Remember:
         - Always perform one operation at a time
         - Use intermediate results from previous steps
         - If a step requires multiple tools, execute them sequentially
         - If you're unsure about the next step, explain your reasoning
-        """.format(tools_list="\n".join([f"- {name}: {desc}" for name, desc in 
-            [(tool['name'], tool['description']) for tool in self._registered_tools_json]]))
+        - You can use both stored variables and values from the prompt
+        - When using stored variables, ALWAYS use the {{"variable": "variable_name"}} syntax
+        """.format(
+            tools_list="\n".join([f"- {name}: {desc}" for name, desc in 
+                [(tool['name'], tool['description']) for tool in self._registered_tools_json]]),
+            variables_list=variables_info
+        )
+
+    def _substitute_variables(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Substitutes stored variable values in function arguments.
+
+        Args:
+            args: Dictionary of argument names to values
+
+        Returns:
+            Dictionary with variable values substituted where applicable
+        """
+        substituted_args = {}
+        for name, value in args.items():
+            if isinstance(value, dict) and "variable" in value:
+                var_name = value["variable"]
+                if var_name in self._stored_variables:
+                    substituted_args[name] = self._stored_variables[var_name]['value']
+                else:
+                    substituted_args[name] = value
+            else:
+                substituted_args[name] = value
+        return substituted_args
 
     def _call_gemini_api(self, payload: Dict[str, Any]) -> Dict[str, Any]:
         """Makes a POST request to the Gemini generateContent endpoint."""
@@ -192,14 +285,14 @@ 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:
             current_contents.append({'role': 'user', 'parts': [{'text': system_prompt}]})
-            current_contents.append({'role': 'model', 'parts': [{'text': "I understand I should break down complex tasks into sequential steps using the available tools."}]})
+            current_contents.append({'role': 'model', 'parts': [{'text': "I understand I should break down complex tasks into sequential steps using the available tools and variables."}]})
 
         current_contents.append({'role': 'user', 'parts': [{'text': user_prompt}]})
         payload: Dict[str, Any] = {"contents": current_contents}
@@ -214,6 +307,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
@@ -223,7 +324,6 @@ class Agent:
 
         while True:
             response_data = self._call_gemini_api(payload)
-
             if "error" in response_data:
                 print(f"API call failed: {response_data['error'].get('message', 'Unknown API error')}")
                 return response_data
@@ -266,13 +366,17 @@ class Agent:
                             tool_function = self._tool_functions[tool_name]
                             print(f"--- Calling Function: {tool_name}({args}) ---")
                             
+                            # Substitute both stored variables and intermediate results
+                            args = self._substitute_variables(args)
                             for key, value in args.items():
                                 if isinstance(value, str) and value.startswith('$'):
                                     result_key = value[1:]
                                     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.1.dist-info → gemini_agent_framework-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-agent-framework
-Version: 0.1.1
+Version: 0.1.3
 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.3.dist-info/RECORD

@@ -0,0 +1,5 @@
+gemini_agent/__init__.py,sha256=2AgrBW0ePFgOvwoNNqRcZaMPdbOaKPoNHXUo_VlFX-M,71
+gemini_agent/agent.py,sha256=_jHx3ELxP2XmHPDiPqZs_1nH2OPdK8p_8AvLwlUGrz8,24045
+gemini_agent_framework-0.1.3.dist-info/METADATA,sha256=DPXkQScmKbTIT4QYqDh4U5iVFFiwy7R1IKzcwRI3R3c,2386
+gemini_agent_framework-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gemini_agent_framework-0.1.3.dist-info/RECORD,,

gemini_agent_framework-0.1.1.dist-info/RECORD

@@ -1,5 +0,0 @@
-gemini_agent/__init__.py,sha256=2AgrBW0ePFgOvwoNNqRcZaMPdbOaKPoNHXUo_VlFX-M,71
-gemini_agent/agent.py,sha256=DqbUBsiI3qzEVAeKAMvlTp0yC0HuK8RAgpmxIJWbPYM,19552
-gemini_agent_framework-0.1.1.dist-info/METADATA,sha256=glzOEjvwQP2wswyz_NPzPjdQYfaMOooDCMU3ewbGMBs,2386
-gemini_agent_framework-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gemini_agent_framework-0.1.1.dist-info/RECORD,,