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

gemini_agent/__init__.py

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

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.1.dist-info → gemini_agent_framework-0.1.2.dist-info}/METADATA

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,5 @@
+gemini_agent/__init__.py,sha256=-F0v5szfo7HJrUloNdX7J13qO1d3U2wAfxrwt1bJpUQ,71
+gemini_agent/agent.py,sha256=0slDSnf__jp8j7jxeow12O1XszdTweX2MDorr-JlAmc,20674
+gemini_agent_framework-0.1.2.dist-info/METADATA,sha256=savJnjAKvUPmN2rMRSohQzdxla1sIPfbmuEJ-YlrHU0,2386
+gemini_agent_framework-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gemini_agent_framework-0.1.2.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,,