gemini-agent-framework 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

gemini_agent/__init__.py

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

gemini_agent/agent.py

@@ -328,7 +328,7 @@ class Agent:
         self,
         user_prompt: str,
         system_prompt: Optional[str] = None,
-        response_structure: Optional[Dict[str, Any]] = None,
+        json_format: bool = False,
         conversation_history: Optional[List[Dict[str, Any]]] = None,
         debug_scope: Optional[str] = [],
     ) -> Any:
@@ -338,15 +338,14 @@ class Agent:
         Args:
             user_prompt: The user's input prompt
             system_prompt: Optional system prompt to override the default
-            response_structure: Optional structure to enforce on the response
+            json_format: If True, response will be formatted as JSON. Default is False (plain text)
             conversation_history: Optional list of previous conversation turns
 
         Returns:
-            The model's response, processed according to the response structure if provided
+            The model's response, formatted as JSON if json_format is True, otherwise plain text
         """
         self._intermediate_results = {}
 
-
         current_contents = conversation_history if conversation_history else []
         
         # Add system instruction to payload
@@ -364,24 +363,16 @@ class Agent:
             payload["tools"] = [{"functionDeclarations": self._registered_tools_json}]
             payload["toolConfig"] = {"functionCallingConfig": {"mode": "AUTO"}}
 
-        apply_structure_later = bool(response_structure) and bool(self._registered_tools_json)
-        final_response_schema = None
-        final_mime_type = None
-
-        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"}},
-                }
+        # Don't set JSON formatting initially if tools are available
+        # We'll apply it later after tool calls are completed
+        apply_json_format_later = json_format and bool(self._registered_tools_json)
+        
+        # Set JSON formatting immediately if no tools are involved
+        if json_format and not self._registered_tools_json:
             payload["generationConfig"] = {
-                "response_mime_type": "application/json",
-                "response_schema": response_structure,
+                "response_mime_type": "application/json"
             }
-            final_mime_type = "application/json"
-            final_response_schema = response_structure
+
         count = 0
         while True:
             self._log_json(payload, f"payload_{count}.json", debug_scope)
@@ -410,8 +401,6 @@ class Agent:
                 content = candidate["content"]
 
                 for part in content["parts"]:
-                    
-
                     if "functionCall" in part:
                         payload["contents"].append({"role": "model", "parts": [part]})
                         fc = part["functionCall"]
@@ -500,41 +489,32 @@ class Agent:
                     elif "text" in part:
                         final_text = part["text"]
 
-                        if final_mime_type == "application/json" and final_response_schema:
-                            try:
-                                structured_output = json.loads(final_text)
-                                if not any(
-                                    "functionCall" in p
-                                    for p in content["parts"][content["parts"].index(part) + 1 :]
-                                ):
-                                    return structured_output
-                            except json.JSONDecodeError as e:
-                                self._log_text(
-                                    f"Warning: Failed to parse initially structured output: {e}. Continuing with raw text.",
-                                    debug_scope
-                                )
-
-                        elif apply_structure_later:
-                            if not any(
-                                "functionCall" in p
-                                for p in content["parts"][content["parts"].index(part) + 1 :]
-                            ):
-                                self._log_text("--- Attempting final structuring call ---", debug_scope)
-                                # Include the full conversation history in the formatting payload
+                        # Check if there are more function calls coming
+                        has_more_function_calls = any(
+                            "functionCall" in p
+                            for p in content["parts"][content["parts"].index(part) + 1 :]
+                        )
+
+                        if not has_more_function_calls:
+                            # If JSON format is requested and we have tools, make a final formatting call
+                            if apply_json_format_later:
+                                self._log_text("--- Making final JSON formatting call ---", debug_scope)
                                 formatting_payload = {
+                                    "system_instruction": {
+                                        "parts": [{"text": system_prompt if system_prompt else ""},{"text": self._get_system_prompt()}]
+                                    },
                                     "contents": payload["contents"] + [
                                         {
                                             "role": "user",
                                             "parts": [
                                                 {
-                                                    "text": f"Based on our conversation above, please format the following information according to the requested JSON structure:\n\n{final_text}"
+                                                    "text": f"Based on our conversation above, please format your response as JSON. Here is the current response: {final_text}"
                                                 }
                                             ],
                                         }
                                     ],
                                     "generationConfig": {
-                                        "response_mime_type": "application/json",
-                                        "response_schema": response_structure,
+                                        "response_mime_type": "application/json"
                                     },
                                 }
                                 self._log_json(formatting_payload, f"formatting_payload_{count}.json", debug_scope)
@@ -543,7 +523,7 @@ class Agent:
 
                                 if "error" in structured_response_data:
                                     self._log_text(
-                                        f"Structuring call failed: {structured_response_data['error']}. Returning intermediate text.",
+                                        f"JSON formatting call failed: {structured_response_data['error']}. Returning raw text.",
                                         debug_scope
                                     )
                                     return final_text
@@ -556,57 +536,24 @@ class Agent:
                                     return structured_output
                                 except (KeyError, IndexError, json.JSONDecodeError) as e:
                                     self._log_text(
-                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text.",
+                                        f"Warning: Failed to parse JSON response after formatting call: {e}. Returning raw text.",
                                         debug_scope
                                     )
                                     return final_text
-
-                        elif not any(
-                            "functionCall" in p
-                            for p in content["parts"][content["parts"].index(part) + 1 :]
-                        ):
-                            if response_structure and not apply_structure_later:
-                                self._log_text("--- Attempting final structuring call ---", debug_scope)
-                                formatting_payload = {
-                                    "contents": [
-                                        {
-                                            "role": "user",
-                                            "parts": [
-                                                {
-                                                    "text": f"Please format the following information according to the requested JSON structure:\n\n{final_text}"
-                                                }
-                                            ],
-                                        }
-                                    ],
-                                    "generationConfig": {
-                                        "response_mime_type": "application/json",
-                                        "response_schema": response_structure,
-                                    },
-                                }
-                                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:
-                                    self._log_text(
-                                        f"Structuring call failed: {structured_response_data['error']}. Returning intermediate text."
-                                        , debug_scope
-                                    )
-                                    return final_text
-
+                            elif json_format:
+                                # Direct JSON formatting (no tools involved)
                                 try:
-                                    structured_text = structured_response_data["candidates"][0][
-                                        "content"
-                                    ]["parts"][0]["text"]
-                                    structured_output = json.loads(structured_text)
+                                    structured_output = json.loads(final_text)
                                     return structured_output
-                                except (KeyError, IndexError, json.JSONDecodeError) as e:
+                                except json.JSONDecodeError as e:
                                     self._log_text(
-                                        f"Warning: Failed to parse structured output after formatting call: {e}. Returning intermediate text.",
+                                        f"Warning: Failed to parse JSON response: {e}. Returning raw text.",
                                         debug_scope
                                     )
                                     return final_text
-                            return final_text
+                            else:
+                                # Return plain text response
+                                return final_text
                 continue
 
             except (KeyError, IndexError) as e:

{gemini_agent_framework-0.2.3.dist-info → gemini_agent_framework-0.2.5.dist-info}/METADATA

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

@@ -0,0 +1,6 @@
+gemini_agent/__init__.py,sha256=Tcxm0JI2xVBpQHTcqHwiUK4O8C8OigEV36zQXbqau6s,68
+gemini_agent/agent.py,sha256=IzD4Pts5Emodzupc9Sum9VvgCBU0DNHXPT1j0Dl_W2Y,25436
+gemini_agent_framework-0.2.5.dist-info/METADATA,sha256=sWG9_1It_7AP8hs3TguaEzCxilzh7QhvmsCDpkAVvUs,5032
+gemini_agent_framework-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gemini_agent_framework-0.2.5.dist-info/licenses/LICENSE,sha256=NHp9eKeWbB-Fp6Ff24BXSemJOa6UEZa9IAp9U7O9oBM,1073
+gemini_agent_framework-0.2.5.dist-info/RECORD,,

gemini_agent_framework-0.2.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-gemini_agent/__init__.py,sha256=oQVInJJsdELQRFQPmj5oFTcxcP7gxj3kTPC66a7ZMZE,68
-gemini_agent/agent.py,sha256=0MxUrVt91hHCpHqe-eCkLAlTYS9bec2VNwX-3Q3gNXo,28457
-gemini_agent_framework-0.2.3.dist-info/METADATA,sha256=2ksoadA6mTEd3xM2611j46fiUvfX9pmkapZV_uKe1XQ,5032
-gemini_agent_framework-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gemini_agent_framework-0.2.3.dist-info/licenses/LICENSE,sha256=NHp9eKeWbB-Fp6Ff24BXSemJOa6UEZa9IAp9U7O9oBM,1073
-gemini_agent_framework-0.2.3.dist-info/RECORD,,