gemini-agent-framework 0.1.15__py3-none-any.whl → 0.2.2__py3-none-any.whl

gemini_agent/__init__.py

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

gemini_agent/agent.py

@@ -274,40 +274,56 @@ class Agent:
         """Substitutes variable references in arguments with their actual values."""
         result = {}
         for key, value in args.items():
-            print("substituting variables", key, value)
             if isinstance(value, str) and value.startswith("$"):
-                print("is string and starts with $")
                 # Handle $ prefixed variables
                 var_name = value[1:]
                 if var_name in self._stored_variables:
-                    print("substituted")
 
                     result[key] = self._stored_variables[var_name]["value"]
                 else:
                     result[key] = value
             elif isinstance(value, dict) and "variable" in value:
-                print("is dict and has variable")
                 # Handle dictionary-style variable references
                 var_name = value["variable"]
                 if var_name in self._stored_variables:
-                    print("substituted")
                     result[key] = self._stored_variables[var_name]["value"]
                 else:
-                    print("substituted")
                     result[key] = value
             else:
                 result[key] = value
         return result
 
-    def _call_gemini_api(self, payload: Dict[str, Any]) -> Dict[str, Any]:
+    def _call_gemini_api(self, payload: Dict[str, Any], debug_scope: Optional[str] = None) -> Dict[str, Any]:
         """Makes a call to the Gemini API."""
         response = requests.post(
             f"{self.base_url}:generateContent?key={self.api_key}",
             headers=self.headers,
             json=payload,
         )
-        response.raise_for_status()
-        return response.json()
+        response_data = response.json()
+        self._log_text(response_data, debug_scope)
+        
+        if not response.ok:
+            error_details = response_data.get('error', {})
+            error_message = f"Gemini API Error: {error_details.get('message', 'Unknown error')}"
+            if 'details' in error_details:
+                error_message += f"\nDetails: {error_details['details']}"
+            raise requests.exceptions.HTTPError(error_message, response=response)
+            
+        return response_data
+    
+    def _log_json(self, json_data: Dict[str, Any], file_name: str, debug_scope: Optional[str] = None) -> None:
+        """Logs the JSON data to a file."""
+        print("in log json")
+        if "json" not in debug_scope:
+            return
+        with open(file_name, "w") as f:
+            json.dump(json_data, f)
+    def _log_text(self, text: str, debug_scope: Optional[str] = None) -> None:
+        """Logs the text to a file."""
+        if "text" not in debug_scope:
+            return
+        print(text)
 
     def prompt(
         self,
@@ -315,6 +331,7 @@ class Agent:
         system_prompt: Optional[str] = None,
         response_structure: Optional[Dict[str, Any]] = None,
         conversation_history: Optional[List[Dict[str, Any]]] = None,
+        debug_scope: Optional[str] = [],
     ) -> Any:
         """
         Sends a prompt to the Gemini model and processes the response.
@@ -331,7 +348,6 @@ class Agent:
         self._intermediate_results = {}
 
 
-
         current_contents = conversation_history if conversation_history else []
         
         # Add system instruction to payload
@@ -367,13 +383,16 @@ class Agent:
             }
             final_mime_type = "application/json"
             final_response_schema = response_structure
-      
+        count = 0
         while True:
-      
-            response_data = self._call_gemini_api(payload)
+            self._log_json(payload, f"payload_{count}.json", debug_scope)
+            count += 1
+            response_data = self._call_gemini_api(payload, debug_scope)
+            print("response data " , response_data)
             if "error" in response_data:
-                print(
+                self._log_text(
                     f"API call failed: {response_data['error'].get('message', 'Unknown API error')}"
+                    , debug_scope
                 )
                 return response_data
 
@@ -384,24 +403,26 @@ class Agent:
                 error_msg = f"Request blocked by API. Reason: {block_reason}."
                 if safety_ratings:
                     error_msg += f" Details: {json.dumps(safety_ratings)}"
-                print(error_msg)
+                
+                self._log_text(error_msg, debug_scope)
                 return {"error": {"message": error_msg, "details": feedback}}
-
+            
             try:
                 candidate = response_data["candidates"][0]
                 content = candidate["content"]
 
                 for part in content["parts"]:
-                    payload["contents"].append({"role": "model", "parts": [part]})
+                    
 
                     if "functionCall" in part:
+                        payload["contents"].append({"role": "model", "parts": [part]})
                         fc = part["functionCall"]
                         tool_name = fc["name"]
                         args = fc.get("args", {})
 
                         if tool_name not in self._tool_functions:
                             error_msg = f"Model attempted to call unknown function '{tool_name}'."
-                            print(f"Error: {error_msg}")
+                            self._log_text(f"Error: {error_msg}", debug_scope)
                             error_response_part = {
                                 "functionResponse": {
                                     "name": tool_name,
@@ -415,7 +436,7 @@ class Agent:
 
                         try:
                             tool_function = self._tool_functions[tool_name]
-                            print(f"--- Calling Function: {tool_name}({args}) ---")
+                            self._log_text(f"--- Calling Function: {tool_name}({args}) ---", debug_scope)
 
                             # Substitute both stored variables and intermediate results
                             args = self._substitute_variables(args)
@@ -428,7 +449,7 @@ class Agent:
                             # Call the function directly - it's already bound if it's a method
                             function_result = tool_function(**args)
 
-                            print(f"--- Function Result: {function_result} ---")
+                            self._log_text(f"--- Function Result: {function_result} ---", debug_scope)
 
                             result_key = f"result_{len(self._intermediate_results)}"
                             self._intermediate_results[result_key] = function_result
@@ -465,7 +486,7 @@ class Agent:
                             )
 
                         except Exception as e:
-                            print(f"Error executing function {tool_name}: {e}")
+                            self._log_text(f"Error executing function {tool_name}: {e}", debug_scope)
                             error_msg = f"Error during execution of tool '{tool_name}': {e}"
                             error_response_part = {
                                 "functionResponse": {
@@ -490,8 +511,9 @@ class Agent:
                                 ):
                                     return structured_output
                             except json.JSONDecodeError as e:
-                                print(
-                                    f"Warning: Failed to parse initially structured output: {e}. Continuing with raw text."
+                                self._log_text(
+                                    f"Warning: Failed to parse initially structured output: {e}. Continuing with raw text.",
+                                    debug_scope
                                 )
 
                         elif apply_structure_later:
@@ -499,14 +521,15 @@ class Agent:
                                 "functionCall" in p
                                 for p in content["parts"][content["parts"].index(part) + 1 :]
                             ):
-                                print("--- Attempting final structuring call ---")
+                                self._log_text("--- Attempting final structuring call ---", debug_scope)
+                                # Include the full conversation history in the formatting payload
                                 formatting_payload = {
-                                    "contents": [
+                                    "contents": payload["contents"] + [
                                         {
                                             "role": "user",
                                             "parts": [
                                                 {
-                                                    "text": f"Please format the following information according to the requested JSON structure:\n\n{final_text}"
+                                                    "text": f"Based on our conversation above, please format the following information according to the requested JSON structure:\n\n{final_text}"
                                                 }
                                             ],
                                         }
@@ -516,11 +539,14 @@ class Agent:
                                         "response_schema": response_structure,
                                     },
                                 }
-                                structured_response_data = self._call_gemini_api(formatting_payload)
+                                self._log_json(formatting_payload, f"formatting_payload_{count}.json", debug_scope)
+                                count += 1
+                                structured_response_data = self._call_gemini_api(formatting_payload, debug_scope)
 
                                 if "error" in structured_response_data:
-                                    print(
-                                        f"Structuring call failed: {structured_response_data['error']}. Returning intermediate text."
+                                    self._log_text(
+                                        f"Structuring call failed: {structured_response_data['error']}. Returning intermediate text.",
+                                        debug_scope
                                     )
                                     return final_text
 
@@ -531,8 +557,9 @@ class Agent:
                                     structured_output = json.loads(structured_text)
                                     return structured_output
                                 except (KeyError, IndexError, json.JSONDecodeError) as e:
-                                    print(
-                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text."
+                                    self._log_text(
+                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text.",
+                                        debug_scope
                                     )
                                     return final_text
 
@@ -541,7 +568,7 @@ class Agent:
                             for p in content["parts"][content["parts"].index(part) + 1 :]
                         ):
                             if response_structure and not apply_structure_later:
-                                print("--- Attempting final structuring call ---")
+                                self._log_text("--- Attempting final structuring call ---", debug_scope)
                                 formatting_payload = {
                                     "contents": [
                                         {
@@ -558,11 +585,14 @@ class Agent:
                                         "response_schema": response_structure,
                                     },
                                 }
-                                structured_response_data = self._call_gemini_api(formatting_payload)
+                                self._log_json(formatting_payload, f"formatting_payload_{count}.json", debug_scope)
+                                count += 1
+                                structured_response_data = self._call_gemini_api(formatting_payload, debug_scope)
 
                                 if "error" in structured_response_data:
-                                    print(
+                                    self._log_text(
                                         f"Structuring call failed: {structured_response_data['error']}. Returning intermediate text."
+                                        , debug_scope
                                     )
                                     return final_text
 
@@ -573,15 +603,16 @@ class Agent:
                                     structured_output = json.loads(structured_text)
                                     return structured_output
                                 except (KeyError, IndexError, json.JSONDecodeError) as e:
-                                    print(
-                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text."
+                                    self._log_text(
+                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text.",
+                                        debug_scope
                                     )
                                     return final_text
                             return final_text
                 continue
 
             except (KeyError, IndexError) as e:
-                print(f"Error parsing API response structure: {e}. Response: {response_data}")
+                self._log_text(f"Error parsing API response structure: {e}. Response: {response_data}", debug_scope)
                 return {
                     "error": {
                         "message": f"Error parsing API response: {e}",

{gemini_agent_framework-0.1.15.dist-info → gemini_agent_framework-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemini-agent-framework
-Version: 0.1.15
+Version: 0.2.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://m7mdony.github.io/gemini-agent-framework

gemini_agent_framework-0.2.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+gemini_agent/__init__.py,sha256=2220VPV3WqLMo3kDIRmbjzxzY3O_kd0fkkbjjBWJ0-o,68
+gemini_agent/agent.py,sha256=ymZLfcB_0W4pcnu8pFQwFRLUR2RpfMtOPTa51lb9gvg,28538
+gemini_agent_framework-0.2.2.dist-info/METADATA,sha256=2Nk-YfrwziO79Al0yy2sidfpmBMx1qu4se7osek8mDo,5032
+gemini_agent_framework-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gemini_agent_framework-0.2.2.dist-info/licenses/LICENSE,sha256=NHp9eKeWbB-Fp6Ff24BXSemJOa6UEZa9IAp9U7O9oBM,1073
+gemini_agent_framework-0.2.2.dist-info/RECORD,,

gemini_agent_framework-0.1.15.dist-info/RECORD

@@ -1,6 +0,0 @@
-gemini_agent/__init__.py,sha256=LFX-2Emo9kXG9rmleXchzu7GyCiwMpXLoxGETOEeKi8,69
-gemini_agent/agent.py,sha256=gdtr6GDKZJxq6_rgbDxvdkZmMB75vUcMop1eBrQ1adY,26527
-gemini_agent_framework-0.1.15.dist-info/METADATA,sha256=T9RiY-0KCOFbHkFazezxcD6-2NQdEwJPeirO_96OU64,5033
-gemini_agent_framework-0.1.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gemini_agent_framework-0.1.15.dist-info/licenses/LICENSE,sha256=NHp9eKeWbB-Fp6Ff24BXSemJOa6UEZa9IAp9U7O9oBM,1073
-gemini_agent_framework-0.1.15.dist-info/RECORD,,