dhisana 0.0.1.dev267__py3-none-any.whl → 0.0.1.dev268__py3-none-any.whl

dhisana/utils/generate_structured_output_internal.py

@@ -330,22 +330,12 @@ async def _get_structured_output_with_web_search(
         "- After gathering information, provide your response in the required JSON format."
     )
     
-    input_messages = [
+    # Build conversation history that we'll extend with tool calls/results
+    conversation_history = [
         {"role": "system", "content": system_content},
         {"role": "user", "content": prompt},
     ]
     
-    base_request = {
-        "input": input_messages,
-        "model": model,
-        "text": {"format": json_schema_format},
-        "tools": tools,
-        "store": False,
-    }
-    
-    if model.startswith("o"):
-        base_request["reasoning"] = {"effort": effort}
-    
     max_tool_iterations = 10
     tool_iteration = 0
     completion = None
@@ -353,10 +343,22 @@ async def _get_structured_output_with_web_search(
     while tool_iteration < max_tool_iterations:
         tool_iteration += 1
         
+        # Build request with current conversation history
+        request = {
+            "input": conversation_history,
+            "model": model,
+            "text": {"format": json_schema_format},
+            "tools": tools,
+            "store": False,
+        }
+        
+        if model.startswith("o"):
+            request["reasoning"] = {"effort": effort}
+        
         # Retry logic for rate limits
         for attempt in range(2):
             try:
-                completion = await client_async.responses.create(**base_request)
+                completion = await client_async.responses.create(**request)
                 break
             except (RateLimitError, OpenAIError) as e:
                 is_rl = (
@@ -386,46 +388,39 @@ async def _get_structured_output_with_web_search(
             # No tool calls, we have the final response
             break
         
-        # Execute tool calls and prepare for next iteration
+        # Execute tool calls and add to conversation history
         logging.info(f"Processing {len(tool_calls)} web search tool call(s) in iteration {tool_iteration}")
         
-        # Use previous_response_id for conversation threading
-        if hasattr(completion, "id") and completion.id:
-            base_request = {
-                "model": model,
-                "text": {"format": json_schema_format},
-                "tools": tools,
-                "store": False,
-                "previous_response_id": completion.id,
-                "input": [],
-            }
-            if model.startswith("o"):
-                base_request["reasoning"] = {"effort": effort}
+        for tc in tool_calls:
+            func_name = getattr(tc, "name", "")
+            call_id = getattr(tc, "call_id", "")
+            args_str = getattr(tc, "arguments", "{}")
             
-            for tc in tool_calls:
-                func_name = getattr(tc, "name", "")
-                call_id = getattr(tc, "call_id", "")
-                args_str = getattr(tc, "arguments", "{}")
-                
-                try:
-                    args = json.loads(args_str) if args_str else {}
-                except json.JSONDecodeError:
-                    args = {}
-                
-                # Execute the tool
-                tool_result = await _execute_web_search_tool(func_name, args, tool_config)
-                
-                # Add tool result to input
-                base_request["input"].append({
-                    "type": "function_call_output",
-                    "call_id": call_id,
-                    "output": tool_result
-                })
-                
-                logging.info(f"Executed web search tool {func_name}, result length: {len(tool_result)}")
-        else:
-            logging.warning("No response ID available, breaking tool call loop")
-            break
+            try:
+                args = json.loads(args_str) if args_str else {}
+            except json.JSONDecodeError:
+                args = {}
+            
+            # Add the tool call to conversation history
+            conversation_history.append({
+                "type": "function_call",
+                "id": call_id,
+                "call_id": call_id,
+                "name": func_name,
+                "arguments": args_str,
+            })
+            
+            # Execute the tool
+            tool_result = await _execute_web_search_tool(func_name, args, tool_config)
+            
+            # Add tool result to conversation history
+            conversation_history.append({
+                "type": "function_call_output",
+                "call_id": call_id,
+                "output": tool_result,
+            })
+            
+            logging.info(f"Executed web search tool {func_name}, result length: {len(tool_result)}")
     
     # Parse and return the final response
     return _parse_completion_response(completion, response_format, cache_key)

{dhisana-0.0.1.dev267.dist-info → dhisana-0.0.1.dev268.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev267
+Version: 0.0.1.dev268
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev267.dist-info → dhisana-0.0.1.dev268.dist-info}/RECORD

@@ -45,7 +45,7 @@ dhisana/utils/generate_flow.py,sha256=QMn6bWo0nH0fBvy2Ebub1XfH5udnVAqsPsbIqCtQPX
 dhisana/utils/generate_leads_salesnav.py,sha256=FG7q6GSm9IywZ9TgQnn5_N3QNfiI-Qk2gaO_3GS99nY,12236
 dhisana/utils/generate_linkedin_connect_message.py,sha256=QxsxDiT-3eQOqAAbW13d0HGJXV36WYPvC-7Zsw_2VTI,10208
 dhisana/utils/generate_linkedin_response_message.py,sha256=mWoSs5p2JSTIoFZFGm86x1kgs67J7dHPvGKZPzcdGdU,14569
-dhisana/utils/generate_structured_output_internal.py,sha256=N1C-LhczMiJhNaDECeFJIY1vc9ta6cwkLWKxvdK4v7M,31266
+dhisana/utils/generate_structured_output_internal.py,sha256=g3g685JxOnxoObvY_ILSiJ38584QmZJ9WofDBGBcSJ8,31056
 dhisana/utils/google_custom_search.py,sha256=5rQ4uAF-hjFpd9ooJkd6CjRvSmhZHhqM0jfHItsbpzk,10071
 dhisana/utils/google_oauth_tools.py,sha256=ReG5lCpXL3_e_s0yn6ai4U7B4-feOWHJVtbv_c0g0rE,28525
 dhisana/utils/google_workspace_tools.py,sha256=fuV0UcvAqF9drLzj7-p6D5zh7d5jMXl1jNJTICk4XOo,50224
@@ -95,8 +95,8 @@ dhisana/workflow/agent.py,sha256=esv7_i_XuMkV2j1nz_UlsHov_m6X5WZZiZm_tG4OBHU,565
 dhisana/workflow/flow.py,sha256=xWE3qQbM7j2B3FH8XnY3zOL_QXX4LbTW4ArndnEYJE0,1638
 dhisana/workflow/task.py,sha256=HlWz9mtrwLYByoSnePOemBUBrMEcj7KbgNjEE1oF5wo,1830
 dhisana/workflow/test.py,sha256=E7lRnXK0PguTNzyasHytLzTJdkqIPxG5_4qk4hMEeKc,3399
-dhisana-0.0.1.dev267.dist-info/METADATA,sha256=zAT6piCTBLFYagzP8-Vuogwo1s1meUG3ch_nk8yLiwg,1190
-dhisana-0.0.1.dev267.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev267.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev267.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev267.dist-info/RECORD,,
+dhisana-0.0.1.dev268.dist-info/METADATA,sha256=8qz6BDU9YaSqUcBCWrW30PB5Mc6io2BCalfA58uQA2s,1190
+dhisana-0.0.1.dev268.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev268.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev268.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev268.dist-info/RECORD,,