Compare commits

...
93 Commits
Author SHA1 Message Date
Mervin Praison 31bae3a231 chore: bump PraisonAI to 2.2.54 and update Gemini workflows 2025-07-13 21:49:21 +01:00
Mervin Praison 466bcfedd7 Merge pull request #863 from MervinPraison/gemini/issue-862-fix-async-loop
Fix #862: Agent gets stuck in infinite loop when running multiple async tasks
2025-07-13 20:46:57 +01:00
Mervin Praison c24bf80314 Merge pull request #858 from MervinPraison/gemini/issue-854-fix-ollama-sequential-1690000000
Fix #854: Ollama sequential still failing
2025-07-13 20:46:21 +01:00
Mervin Praison c36b3aee6e Merge pull request #865 from MervinPraison/gemini/issue-864-fix-parallel-task-loop
Fix #864: Fix parallel task loop
2025-07-13 20:45:55 +01:00
Mervin Praison 08512ba6d3 Merge pull request #861 from MervinPraison/gemini/issue-860-fix-hierarchical-llm-fallback
Fix #860: Hierarchical Process LLM Fallback
2025-07-13 20:43:53 +01:00
claude[bot]andMervin Praison 63ebfc0b54 fix: Complete removal of Ollama special handling for async method
This completes the fix for issue #854 by removing the Ollama special
handling from the async method (get_response_async) to match the sync
method fix. Also removes the now-unused _handle_ollama_model method.

The special handling was causing infinite loops in sequential tool
calling. By removing it, Ollama models now work correctly through
the standard litellm interface.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-13 19:21:40 +00:00
claude[bot]andMervin Praison b29269071d fix: properly handle parallel task reset logic to prevent infinite loops
- Uncommented the task reset logic that was causing issue #864
- Added check for async_execution to prevent resetting parallel tasks
- Preserves backward compatibility for non-parallel tasks that need rerun
- Fixes infinite loop issue while maintaining existing functionality

Co-authored-by: Mervin Praison <[email protected]>
2025-07-13 19:14:59 +00:00
Gemini Bot b6a86bf348 Gemini: [Issue #864] Fix parallel task loop 2025-07-13 12:49:40 +00:00
Gemini Bot 02ba71be3d Gemini: [Issue #862] Fix infinite loop in async workflow 2025-07-13 12:17:37 +00:00
Gemini Bot e60f1c1aa1 Gemini: [Issue #860] Fix hierarchical process LLM fallback 2025-07-13 11:31:08 +00:00
Mervin Praison 450f237805 feat: add description field to TaskOutput in validation feedback tests 2025-07-13 01:17:26 +01:00
Mervin Praison 66e53fc82e refactor: move validation test files to src directory and update LLM model references 2025-07-13 01:09:52 +01:00
Mervin Praison 7e6ee5f9f2 chore: enhance variable handling in PR review workflow for improved clarity 2025-07-13 01:04:41 +01:00
Mervin Praison b669b9815d fix: correct variable interpolation syntax in PR review workflow 2025-07-13 00:50:39 +01:00
Mervin Praison 6d89cd603e chore: remove debug workflow trigger step from Gemini PR review action 2025-07-13 00:44:38 +01:00
Mervin Praison 6e955b5941 feat: restrict Gemini PR review to repo owners, members and collaborators 2025-07-13 00:34:48 +01:00
Mervin Praison 87a67b5f5d refactor: improve PR checkout logic in Gemini review workflow using dedicated step 2025-07-13 00:25:08 +01:00
Mervin Praison baec9cd0a4 fix: update checkout ref to handle both PR and issue comment triggers 2025-07-13 00:23:16 +01:00
Mervin Praison e144dc497d feat: allow all users to trigger Gemini PR review and add debug logging 2025-07-13 00:19:06 +01:00
Gemini Bot 8a77ab0ab5 Gemini: [Issue #854] Fix Ollama sequential tool calling loop 2025-07-12 23:10:23 +00:00
Mervin Praison 0034b5c964 Merge branch 'main' of https://github.com/MervinPraison/PraisonAI 2025-07-13 00:04:14 +01:00
Mervin Praison 543c627374 feat: expand GitHub Actions permissions to include PR list and granular git commands 2025-07-13 00:04:13 +01:00
Mervin Praison 93154adf9e Merge pull request #857 from MervinPraison/gemini/issue-854-fix-ollama-sequential-fail
Fix #854: Ollama sequential tool calling failing
2025-07-13 00:03:55 +01:00
Gemini Bot 3ab2462d96 Gemini: [Issue #854] Fix Ollama sequential tool calling loop 2025-07-12 23:00:05 +00:00
Mervin Praison aecf65a130 Merge branch 'main' of https://github.com/MervinPraison/PraisonAI 2025-07-12 23:52:47 +01:00
Mervin Praison 0a453d30a2 chore: add .gemini and issue_details.json to gitignore 2025-07-12 23:52:46 +01:00
Mervin Praison 354a2c717b Merge pull request #856 from MervinPraison/gemini/issue-854-fix-ollama-sequential
Fix #854: Ollama sequential tool calling failing
2025-07-12 23:52:38 +01:00
Mervin Praison 62514fbef4 Delete issue_details.json 2025-07-12 23:51:43 +01:00
Mervin Praison f3c77a2e8b Delete .gemini/settings.json 2025-07-12 23:51:32 +01:00
Gemini Bot 50dde4fa02 Gemini: [Issue #854] Fix Ollama sequential tool calling 2025-07-12 22:45:09 +00:00
Mervin Praison bbc4530329 chore: bump version to 2.2.53 and update dependencies across package files 2025-07-12 23:43:01 +01:00
Mervin Praison aab975bec7 Merge pull request #851 from MervinPraison/claude/issue-846-20250712_220811
fix: handle None response_text in Ollama sequential tool calls
2025-07-12 23:28:38 +01:00
Mervin Praison 50c50fa567 Merge pull request #849 from MervinPraison/claude/issue-845-20250712_183232
fix: enable sequential tool execution in OpenAI client
2025-07-12 23:27:54 +01:00
claude[bot]andMervin Praison 68f280634a refactor: remove dead code from sequential tool execution logic
- Remove unused should_continue variable and related logic
- Simplify code by removing special handling for sequentialthinking tool
- Add clear comments explaining the sequential execution behavior

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 22:16:05 +00:00
Mervin Praison 346488fbec Delete test_sequential_fix.py 2025-07-12 23:15:10 +01:00
claude[bot]andMervin Praison 57b5a1fd8d fix: handle None response_text in Ollama sequential tool calls
- Add None checks before calling .strip() on response_text
- Fixes 'NoneType' object has no attribute 'strip' error with Ollama models
- Applied pattern: response_text.strip() if response_text else ""
- Fixed 14 locations where .strip() was called without None checks
- Ensures backward compatibility by returning empty string instead of None

Fixes issue #846

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 22:11:55 +00:00
claude[bot]andMervin Praison d75a5bb728 test: add assertions to test_sequential_fix.py for automated testing
- Add proper assertions to verify sequential tool execution results
- Improve multiply function docstring with complete Args and Returns sections
- Add success message when all assertions pass

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 22:10:09 +00:00
Mervin Praison 519ecc025a feat: update allowed commands in GitHub workflow files for Gemini reviews 2025-07-12 21:21:23 +01:00
Mervin Praison 8290b95132 refactor: update issue review prompt with clearer instructions and dynamic commands 2025-07-12 21:01:13 +01:00
Mervin Praison 3d95e1ff0e feat: add read_file permission to Gemini PR review workflow 2025-07-12 20:55:41 +01:00
Mervin Praison 74405d1bbe feat: add read_file permission to Gemini issue review workflow 2025-07-12 20:54:59 +01:00
Mervin Praison d307c3857c feat: add environment variables for Gemini CLI action in GitHub workflow 2025-07-12 20:54:31 +01:00
Mervin Praison fbe5dddaae chore: disable telemetry in GitHub workflow configurations 2025-07-12 20:45:20 +01:00
Mervin Praison 7e4108918d fix: move GH_TOKEN to local env scope in GitHub workflow 2025-07-12 20:40:04 +01:00
Mervin Praison da7e38100e feat: add GitHub workflow for automated issue review using Gemini AI 2025-07-12 20:36:37 +01:00
Mervin Praison 848459b816 feat: add edit, web-fetch, web-search and memoryTool permissions while removing telemetry setup 2025-07-12 20:35:19 +01:00
Mervin Praison cd63845398 feat: add git command to allowed shell commands in PR review workflow 2025-07-12 20:31:18 +01:00
Mervin Praison 7827427dc0 feat: move Gemini PR review action to dedicated directory with configuration 2025-07-12 20:16:47 +01:00
Mervin Praison 0e378d0754 feat: add GitHub workflows for Gemini issue triage and PR review automation 2025-07-12 20:03:05 +01:00
Mervin Praison 206022eb9c refactor: simplify auto-comment workflows by removing multi-agent review requirement 2025-07-12 19:48:23 +01:00
Mervin Praison 901ba8074d Delete test_sequential_fix.py 2025-07-12 19:40:42 +01:00
claude[bot]andMervin Praison 953ee6e7bd fix: enable sequential tool execution in OpenAI client
Removes premature loop termination after tool execution to allow
sequential tool calls. The model can now see tool results and make
additional tool calls as needed.

Fixes #845

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 18:36:00 +00:00
Mervin Praison 181d7e1ede feat: bump PraisonAI to v2.2.52 and add sequential agent examples for OpenAI/Ollama 2025-07-12 19:12:05 +01:00
Mervin Praison 4039878422 Merge pull request #842 from MervinPraison/claude/issue-839-20250712_075350
fix: allow agents to continue with sequential tool calls
2025-07-12 19:04:25 +01:00
Mervin Praison 461eba18d5 Delete src/praisonai/tests/unit/test_sequential_tool_calling.py 2025-07-12 19:03:44 +01:00
claude[bot]andMervin Praison 331a1de610 test: add comprehensive test suite for sequential tool calling
This test file validates the fix for issue #839, ensuring agents can:
- Execute multiple tools in sequence
- Pass results between tool calls
- Return final combined results without empty responses

Tests include:
- Sequential execution of 2 and 3 tools
- Multiple agents with sequential tools
- Mocked LLM responses
- Edge case prevention for empty responses

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 18:00:27 +00:00
claude[bot]andMervin Praison 91632eb5e4 fix: correct Ollama return statement and variable reference for sequential tool calling
- Replace early return with loop continuation in Ollama handling to match async behavior
- Fix variable reference from reasoning_content to stored_reasoning_content
- Ensures agents can perform sequential tool calls as intended

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 17:54:53 +00:00
Mervin Praison ad46225483 Rename src/praisonai/tests/unit/test_fix_comprehensive.py to src/praisonai-agents/tests/test_fix_comprehensive.py 2025-07-12 18:50:30 +01:00
Mervin Praison 9af6758eb6 Delete test_fix.py 2025-07-12 18:48:37 +01:00
Mervin Praison aac67a6572 Rename test_fix_comprehensive.py to src/praisonai/tests/unit/test_fix_comprehensive.py 2025-07-12 18:47:35 +01:00
claude[bot]andMervin Praison 2ceff9bfae fix: correct indentation error in async streaming code
Fixed SyntaxError caused by incorrect indentation in the async version of get_response_async method. The if/else blocks for streaming vs non-streaming approaches now have proper indentation.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 17:41:09 +00:00
claude[bot]andMervin Praison 3b7af02bea fix: correct indentation error in async streaming code
Fixed IndentationError at line 1325 where the async for loop was not properly
indented under the if verbose: block. Also corrected the indentation of the
else block for non-verbose streaming.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 17:33:23 +00:00
Mervin Praison 1ee7cfa2ef Merge pull request #844 from MervinPraison/claude/issue-840-20250712_172354
docs: add OLLAMA_HANDLING.md to explain ollama_handled flag usage
2025-07-12 18:32:16 +01:00
claude[bot]andMervin Praison b01bd41574 fix: add sequential tool calling support to async get_response_async method
- Add while loop structure with max_iterations and iteration_count
- Replace return statements with loop continuation after tool execution
- Store reasoning content across iterations for proper display
- Update final response handling to use stored values from iterations
- Ensure async behavior matches sync version for issue #839

This resolves the inconsistency where async agents would return empty
responses after first tool call instead of continuing with additional
required tool calls.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 17:27:37 +00:00
claude[bot]andMervin Praison 6570e445b8 docs: add OLLAMA_HANDLING.md to explain ollama_handled flag usage
Add documentation to clarify that ollama handling is correctly implemented
in llm.py and not in agent.py, addressing issue #840

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 17:25:07 +00:00
Mervin Praison b421bcf925 Merge pull request #843 from MervinPraison/claude/issue-841-20250712_080725
fix: add return_dict=True to fix TypeError in prompt_chaining tests
2025-07-12 18:24:24 +01:00
claude[bot]andMervin Praison 41d0998b76 fix: preserve reasoning_steps functionality with sequential tool calling
- Add stored_reasoning_content to capture reasoning after tool execution
- Restore reasoning_steps handling after tools while keeping loop continuation
- Update final response display to include stored reasoning when available
- Return reasoning content when reasoning_steps=True and content exists

This ensures backward compatibility while maintaining the sequential tool calling fix

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 08:41:06 +00:00
claude[bot]andMervin Praison 393e0ee33d fix: document async limitation and ensure consistent behavior
- Added clear documentation that async version doesn't support sequential tool calling
- Reverted incomplete async implementation to avoid breaking existing functionality
- Sync version retains the fix for sequential tool calling (issue #839)
- Created a known limitation that needs to be addressed in a future PR

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 08:40:25 +00:00
claude[bot]andMervin Praison 0dce4de4a4 fix: add return_dict=True to fix TypeError in prompt_chaining tests
The workflow.start() method returns a string by default (for backward compatibility),
but the test files were expecting a dictionary. Fixed by adding return_dict=True
parameter to get the expected dictionary format with task_results and task_status keys.

Fixes #841

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 08:23:56 +00:00
Mervin Praison 7fe4b48c6e fix: update LLM model and refine agent instruction
Changed the LLM model from "openai/gpt-4o-mini" to "gemini/gemini-2.5-pro" for improved performance. Updated the agent's instruction to provide clearer context for the task, enhancing user interaction.

Also, optimised the suggest_fixes function to handle both dictionary and string inputs, improving its flexibility in suggesting fixes based on issue type.

This minimal change aims to enhance the functionality while maintaining existing code integrity.
2025-07-12 09:22:33 +01:00
claude[bot]andMervin Praison 5286912f34 test: add test scripts for sequential tool calling fix
Add test scripts to verify the fix for issue #839 works correctly
with both Gemini and GPT-4 models.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 08:01:18 +00:00
claude[bot]andMervin Praison d6cb1c0165 fix: allow agents to continue with sequential tool calls
After executing tool calls, the agent now continues the iteration loop
instead of immediately trying to get a final response. This allows the
LLM to decide if more tools are needed to complete the task.

Fixes issue where agents would return empty responses after the first
tool call instead of continuing with additional required tool calls.

Resolves #839

Co-authored-by: Mervin Praison <[email protected]>
2025-07-12 08:01:10 +00:00
Mervin Praison 08ed3f94dc Merge pull request #836 from MervinPraison/claude/issue-835-20250711_234446
fix: capture final response after tool execution in LLM
2025-07-12 01:10:32 +01:00
Mervin Praison d3bfbc4b92 Delete test_issue_835.py 2025-07-12 01:00:19 +01:00
claude[bot]andMervin Praison af7081d294 fix: capture final response after tool execution in LLM
When an agent executes tools and the final iteration contains the answer
without additional tool calls, ensure the response text is properly captured
and returned instead of returning empty/None.

This fixes the issue where agents with multiple tools would return empty
responses after successfully executing tools.

Fixes #835

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 23:52:25 +00:00
Mervin Praison 3b2f26699e Merge pull request #834 from MervinPraison/claude/pr-832-20250711_232348
PR #832: Changes from Claude
2025-07-12 00:42:58 +01:00
claude[bot]andMervin Praison 7aa61b9155 fix: pass stream parameter from Agent to LLM
The Agent class was not passing the stream parameter to the LLM's get_response() method, causing the LLM to always use its default stream=True behavior regardless of the Agent's configuration.

This fix ensures that when an Agent is created with stream=False or when chat() is called with stream=False, this preference is properly passed to the LLM.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 23:31:50 +00:00
Mervin Praison 7e37c940d4 feat: upgrade praisonai to v2.2.51 and add aiohttp dependency to praisonaiagents v0.0.125 2025-07-12 00:28:17 +01:00
Mervin Praison 2199a57dfe Merge pull request #832 from MervinPraison/claude/issue-824-20250711_155141
fix: sequential tool calling for non-streaming responses
2025-07-12 00:19:42 +01:00
Mervin Praison d49f046322 Rename test_sequential_tool_calling.py to src/praisonai-agents/test_sequential_tool_calling.py 2025-07-12 00:14:28 +01:00
claude[bot]andMervin Praison c16c2e38af fix: improve sequential tool calling for non-streaming responses
- Fixed Ollama handling to properly separate streaming/non-streaming modes
- Added robust error handling for response extraction
- Fixed test file to use correct stream parameter
- Ensures tool outputs are processed by LLM in non-streaming mode

Addresses review feedback on PR #832

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 18:24:18 +00:00
Mervin Praison b5df9f323c Merge pull request #833 from MervinPraison/claude/issue-831-20250711_173321
fix: centralize logging configuration to respect LOGLEVEL environment variable
2025-07-11 19:05:06 +01:00
claude[bot]andMervin Praison 6e4abeef52 fix: ensure consistent logger levels across modules
- Change third-party logger levels from ERROR to WARNING in llm/__init__.py
  to match the centralized configuration
- Remove root logger override in knowledge.py that was ignoring LOGLEVEL
  environment variable

This ensures the LOGLEVEL environment variable is properly respected
throughout the application.

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 17:58:02 +00:00
claude[bot] 5656570172 chore: remove test_logging.py from root - should be in tests directory
The test script was helpful for verifying the fix but should not be in the package root.
2025-07-11 17:44:52 +00:00
claude[bot]andMervin Praison c08c7cfedf fix: centralize logging configuration to respect LOGLEVEL environment variable
- Move logging configuration to top of __init__.py to ensure it runs before any imports
- Remove duplicate logging.basicConfig from llm/__init__.py that was overriding settings
- Clean up main.py to remove redundant logging configuration
- Add test_logging.py script to verify the fix works correctly

This ensures that the LOGLEVEL environment variable (DEBUG, INFO, WARNING, ERROR) properly controls logging verbosity throughout the package.

Fixes #831

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 17:44:18 +00:00
Mervin Praison fbbe80fd4d Merge pull request #829 from MervinPraison/claude/issue-827-20250711_151456
fix: add validation feedback to workflow retry logic
2025-07-11 17:27:46 +01:00
claude[bot]andMervin Praison cabddd9a22 refactor: extract validation failure decisions to class constant
- Add VALIDATION_FAILURE_DECISIONS constant to avoid duplication
- Update all references to use the constant
- Improve maintainability for future additions

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 16:05:19 +00:00
claude[bot]andMervin Praison 20b838f36a fix: handle non-streaming responses after tool execution for sequential tool calling
- Fixed issue where tool outputs were returned directly to user when stream=False
- Added proper handling for non-streaming responses after tool calls
- Maintains backward compatibility with existing streaming behavior

Fixes #824

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 15:59:04 +00:00
claude[bot]andMervin Praison cf149a3c2d fix: add validation feedback to workflow retry logic
When validation fails, retry tasks now receive:
- The validation failure reason
- The rejected output that failed validation  
- Clear instructions to try a different approach

This allows context-dependent tasks to improve on retry instead of
repeating the same invalid output.

Fixes #827

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 15:24:52 +00:00
Mervin Praison 30f6f5706c Merge pull request #826 from MervinPraison/claude/issue-823-20250711_111524
feat: Implement MCP HTTP Stream transport
2025-07-11 16:05:43 +01:00
claude[bot]andMervin Praison 0423c9c4af fix: address code review issues in HTTP Stream implementation
- Fix error propagation in write_stream method
- Add proper shutdown handling in SSE listener to prevent resource leaks
- Implement proper type annotations based on schema types
- Add _closing flag to gracefully stop SSE listener
- Create basic test to verify transport selection logic

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 14:08:58 +00:00
claude[bot]andMervin Praison be82abfac3 feat: Implement MCP HTTP Stream transport
- Add HTTP Stream transport implementation with single endpoint architecture
- Support both batch (JSON) and stream (SSE) response modes
- Implement session management with Mcp-Session-Id header
- Maintain full backward compatibility with SSE transport
- Add aiohttp dependency for HTTP client functionality
- Create usage examples and test file

Closes #823

Co-authored-by: Mervin Praison <[email protected]>
2025-07-11 11:27:37 +00:00
Mervin Praison 4af6228f89 feat: add automated PR review comment workflow for Claude integration 2025-07-11 11:59:45 +01:00
49 changed files with 5418 additions and 3129 deletions

No files matched your search

+81
View File
@@ -0,0 +1,81 @@
name: 'Gemini CLI Action'
description: 'Uses the Gemini CLI to automate software development tasks.'
author: 'Gemini'
inputs:
prompt:
description: 'A specific prompt to guide Gemini.'
required: false
default: 'You are a helpful assistant.'
GEMINI_API_KEY:
description: 'Your Gemini API key.'
required: true
OTLP_GCP_WIF_PROVIDER:
description: 'The workload identity provider for GCP authentication.'
required: false
OTLP_GOOGLE_CLOUD_PROJECT:
description: 'The Google Cloud project for telemetry.'
required: false
settings_json:
description: |
A JSON string to configure the Gemini CLI. This will be written to .gemini/settings.json.
To enable observability with Google Cloud, include:
{"telemetry": {"enabled": true, "target": "gcp"}, "sandbox": false}
required: false
version:
description: |
The version of @google/gemini-cli to execute.
Can be a specific version from npm (e.g., '0.1.0', 'latest'), a branch name (e.g., 'main'), or a commit hash.
required: false
default: 'latest'
runs:
using: "composite"
steps:
- name: Configure Gemini CLI
if: inputs.settings_json != ''
run: |
mkdir -p .gemini
echo "$SETTINGS_JSON" > .gemini/settings.json
shell: bash
env:
SETTINGS_JSON: ${{ inputs.settings_json }}
- name: Authenticate to Google Cloud for Telemetry
if: inputs.OTLP_GCP_WIF_PROVIDER != ''
id: auth
uses: 'google-github-actions/auth@v2'
with:
project_id: ${{ inputs.OTLP_GOOGLE_CLOUD_PROJECT }}
workload_identity_provider: ${{ inputs.OTLP_GCP_WIF_PROVIDER }}
- name: Install Gemini CLI
id: install
run: |
if [[ "${{ inputs.version }}" == "latest" || "${{ inputs.version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9\.-]+)?(\+[a-zA-Z0-9\.-]+)?$ ]]; then
echo "Installing Gemini CLI from npm: @google/gemini-cli@${{ inputs.version }}"
npm install -g @google/gemini-cli@${{ inputs.version }}
else
echo "Installing Gemini CLI from GitHub: github:google-gemini/gemini-cli#${{ inputs.version }}"
npm install -g github:google-gemini/gemini-cli#${{ inputs.version }}
fi
echo "Verifying installation:"
if command -v gemini >/dev/null 2>&1; then
gemini --version || echo "Gemini CLI installed successfully (version command not available)"
else
echo "Error: Gemini CLI not found in PATH"
exit 1
fi
shell: bash
- name: Run Gemini CLI
run: |
gemini --yolo --prompt "$PROMPT"
shell: bash
env:
GEMINI_API_KEY: ${{ inputs.GEMINI_API_KEY }}
PROMPT: ${{ inputs.prompt }}
branding:
icon: 'terminal'
color: 'blue'
+1 -1
View File
@@ -19,5 +19,5 @@ jobs:
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '@claude review this issue and do a detailed analysis and fix this if the existing code doesn\'t have the solution implemented. Making sure it has backward compatibility, no existing features removed. After making those changes, again use multi agents to review the applied changes. Use @web to search if you dont know any information or to find the latest documentation or to find the latest version. Run the code if you think you need to run it to test it. Minimal code change to start with if required any changes.'
body: '@claude review this issue and do a detailed analysis and fix this if the existing code doesn\'t have the solution implemented. Making sure it has backward compatibility, no existing features removed. After making those changes, again review the applied changes. Use @web to search if you dont know any information or to find the latest documentation or to find the latest version. Run the code if you think you need to run it to test it. Minimal code change to start with if required any changes.'
})
+1 -1
View File
@@ -19,5 +19,5 @@ jobs:
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '@claude review this pull request and do a detailed analysis and fix this if the existing code doesn\'t have the solution implemented. Making sure it has backward compatibility, no existing features removed. After making those changes, again use multi agents to review the applied changes. Use @web to search if you dont know any information or to find the latest documentation or to find the latest version. Run the code if you think you need to run it to test it. Minimal code change to start with if required any changes.'
body: '@claude review this pull request and do a detailed analysis and fix this if the existing code doesn\'t have the solution implemented. Making sure it has backward compatibility, no existing features removed. After making those changes, again review the applied changes. Use @web to search if you dont know any information or to find the latest documentation or to find the latest version. Run the code if you think you need to run it to test it. Minimal code change to start with if required any changes.'
})
+83 -1
View File
@@ -36,4 +36,86 @@ jobs:
use_oauth: true
claude_access_token: ${{ secrets.CLAUDE_ACCESS_TOKEN }}
claude_refresh_token: ${{ secrets.CLAUDE_REFRESH_TOKEN }}
claude_expires_at: ${{ secrets.CLAUDE_EXPIRES_AT }}
claude_expires_at: ${{ secrets.CLAUDE_EXPIRES_AT }}
post-review-comment:
needs: claude
if: success() && needs.claude.result == 'success'
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
issues: write
steps:
- name: Check for existing review comment
id: check-comment
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GH_TOKEN }}
script: |
const reviewText = '@claude review if the changes made are as per the requirements';
let comments = [];
let issueNumber;
try {
// Determine issue/PR number based on event type
if (context.eventName === 'pull_request_review_comment' || context.eventName === 'pull_request_review') {
issueNumber = context.payload.pull_request?.number || context.issue.number;
} else if (context.eventName === 'issue_comment' && context.payload.issue.pull_request) {
// This is a comment on a PR (not an issue)
issueNumber = context.payload.issue.number;
} else {
// This is a regular issue
issueNumber = context.issue.number;
}
comments = await github.rest.issues.listComments({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issueNumber
});
const existingComment = comments.data.find(comment =>
comment.body.includes(reviewText)
);
const shouldPost = !existingComment;
core.setOutput('should-post', shouldPost);
console.log(`Should post comment: ${shouldPost}`);
} catch (error) {
console.log('Error checking comments:', error);
core.setOutput('should-post', true); // If we can't check, proceed with posting
}
- name: Wait 20 seconds before posting comment
if: steps.check-comment.outputs.should-post == 'true'
run: sleep 20
- name: Post review comment
if: steps.check-comment.outputs.should-post == 'true'
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GH_TOKEN }}
script: |
let issueNumber;
// Determine issue/PR number based on event type
if (context.eventName === 'pull_request_review_comment' || context.eventName === 'pull_request_review') {
issueNumber = context.payload.pull_request?.number || context.issue.number;
} else if (context.eventName === 'issue_comment' && context.payload.issue.pull_request) {
// This is a comment on a PR (not an issue)
issueNumber = context.payload.issue.number;
} else {
// This is a regular issue
issueNumber = context.issue.number;
}
console.log(`Posting review comment on issue/PR #${issueNumber}`);
await github.rest.issues.createComment({
issue_number: issueNumber,
owner: context.repo.owner,
repo: context.repo.repo,
body: '@claude review if the changes made are as per the requirements'
});
+1
View File
@@ -40,5 +40,6 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/Dockerfile
push: true
tags: ghcr.io/mervinpraison/praisonai:latest
@@ -0,0 +1,76 @@
name: Gemini Automated Issue Triage
on:
issue_comment:
types: [created]
jobs:
triage-issue:
if: >
github.event_name == 'issue_comment' &&
!github.event.issue.pull_request &&
contains(github.event.comment.body, '@gemini triage') &&
(github.event.comment.author_association == 'OWNER' ||
github.event.comment.author_association == 'MEMBER' ||
github.event.comment.author_association == 'COLLABORATOR')
timeout-minutes: 5
permissions:
issues: write
contents: read
id-token: write
concurrency:
group: ${{ github.workflow }}-${{ github.event.issue.number }}
cancel-in-progress: true
runs-on: ubuntu-latest
steps:
- name: Generate GitHub App Token
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
- name: Checkout repository
uses: actions/checkout@v4
with:
token: ${{ steps.generate_token.outputs.token }}
- name: Run Gemini Issue Triage
uses: google-gemini/gemini-cli-action@main
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
ISSUE_TITLE: ${{ github.event.issue.title }}
ISSUE_BODY: ${{ github.event.issue.body }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY: ${{ github.repository }}
with:
version: 0.1.8-rc.0
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
OTLP_GCP_WIF_PROVIDER: ${{ secrets.OTLP_GCP_WIF_PROVIDER }}
OTLP_GOOGLE_CLOUD_PROJECT: ${{ secrets.OTLP_GOOGLE_CLOUD_PROJECT }}
settings_json: |
{
"coreTools": [
"run_shell_command(gh label list)",
"run_shell_command(gh issue edit)"
],
"telemetry": {
"enabled": true,
"target": "gcp"
},
"sandbox": false
}
prompt: |
You are an issue triage assistant. Analyze the current GitHub issue and apply the most appropriate existing labels.
Steps:
1. Run: `gh label list --limit 100` to get all available labels.
2. Review the issue title and body provided in the environment variables.
3. Select the most relevant labels from the existing labels, focusing on kind/*, area/*, and priority/*.
4. Apply the selected labels to this issue using: `gh issue edit ISSUE_NUMBER --add-label "label1,label2"`
Guidelines:
- Only use labels that already exist in the repository.
- Do not add comments or modify the issue content.
- Triage only the current issue.
- Assign all applicable kind/*, area/*, and priority/* labels based on the issue content.
+197
View File
@@ -0,0 +1,197 @@
name: Gemini Issue Review
on:
workflow_dispatch:
issue_comment:
types: [created]
permissions:
contents: write
issues: write
pull-requests: read
jobs:
review-issue:
if: >
github.event_name == 'workflow_dispatch' ||
(github.event_name == 'issue_comment' &&
!github.event.issue.pull_request &&
contains(github.event.comment.body, '@gemini review') &&
(github.event.comment.author_association == 'OWNER' ||
github.event.comment.author_association == 'MEMBER' ||
github.event.comment.author_association == 'COLLABORATOR'))
runs-on: ubuntu-latest
env:
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
steps:
- name: Generate token
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
- name: Checkout repository
uses: actions/checkout@v4
with:
token: ${{ steps.generate_token.outputs.token }}
- name: Set up Git
run: |
git config --local user.email "[email protected]"
git config --local user.name "Gemini Bot"
- name: Get issue data
id: issue_data
env:
GH_TOKEN: ${{ steps.generate_token.outputs.token }}
run: |
# Get issue number from event or context
if [ "${{ github.event_name }}" = "issue_comment" ]; then
ISSUE_NUMBER="${{ github.event.issue.number }}"
elif [ "${{ github.event_name }}" = "issues" ]; then
ISSUE_NUMBER="${{ github.event.issue.number }}"
else
echo "Unable to determine issue number"
exit 1
fi
# Get issue details
gh issue view $ISSUE_NUMBER --json title,body,labels,assignees > issue_details.json
# Extract additional instructions from comment if triggered by comment
ADDITIONAL_INSTRUCTIONS=""
if [ "${{ github.event_name }}" = "issue_comment" ]; then
COMMENT_BODY="${{ github.event.comment.body }}"
ADDITIONAL_INSTRUCTIONS=$(echo "$COMMENT_BODY" | sed -n 's/.*@gemini[[:space:]]*\(.*\)/\1/p' | head -1)
fi
echo "ISSUE_NUMBER=$ISSUE_NUMBER" >> $GITHUB_OUTPUT
echo "ADDITIONAL_INSTRUCTIONS=$ADDITIONAL_INSTRUCTIONS" >> $GITHUB_OUTPUT
- name: Run Gemini CLI
uses: ./.github/actions/gemini
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
ISSUE_NUMBER: ${{ steps.issue_data.outputs.ISSUE_NUMBER }}
ADDITIONAL_INSTRUCTIONS: ${{ steps.issue_data.outputs.ADDITIONAL_INSTRUCTIONS }}
REPOSITORY: ${{ github.repository }}
with:
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
OTLP_GCP_WIF_PROVIDER: ${{ secrets.OTLP_GCP_WIF_PROVIDER }}
OTLP_GOOGLE_CLOUD_PROJECT: ${{ secrets.OTLP_GOOGLE_CLOUD_PROJECT }}
prompt: |
You are a helpful GitHub issue assistant. Your task is to analyze and help with GitHub issues.
**Issue Details:**
- Issue Number: #${ISSUE_NUMBER}
- Repository: ${REPOSITORY}
- Issue URL: ${{ github.event.issue.html_url }}
**Additional Instructions:** ${ADDITIONAL_INSTRUCTIONS}
**CRITICAL: When making code modifications, follow this EXACT workflow:**
**STEP 1: Analyze the Issue**
- Use: `gh issue view ${ISSUE_NUMBER} --json title,body,labels,assignees`
- Analyze issue content thoroughly
- Search codebase for related files using `glob`, `search_file_content`, `list_directory`
**STEP 2: If Code Changes Are Needed**
Create a new branch with 'gemini/' prefix:
- Use: `git checkout -b gemini/issue-${ISSUE_NUMBER}-description`
- Example: `git checkout -b gemini/issue-123-fix-sequential-tools`
**STEP 3: Make Code Modifications**
- Use `read_file` to examine existing code
- Use `write_file` or `replace` to make changes
- Use `search_file_content` to find related code
- Make focused, targeted changes to fix the issue
**STEP 4: Test Changes (if applicable)**
- Run relevant tests if test files exist
- Use `run_shell_command` to execute test commands
**STEP 5: Commit and Push Changes**
- Use: `git add .` (or specific files)
- Use: `git commit -m "Gemini: [Issue #${ISSUE_NUMBER}] Brief description of fix"`
- Use: `git push -u origin gemini/issue-${ISSUE_NUMBER}-description`
**STEP 6: Create Pull Request**
- Use: `gh pr create --title "Fix #${ISSUE_NUMBER}: Issue description" --body "Fixes #${ISSUE_NUMBER}\n\nSummary of changes:\n- Change 1\n- Change 2" --head gemini/issue-${ISSUE_NUMBER}-description --base main`
- This will return a PR URL like: https://github.com/repo/pull/123
**STEP 7: Comment on Issue with Results**
Use: `gh issue comment ${ISSUE_NUMBER} -b "MESSAGE"`
**Your final comment MUST include:**
- Summary of what was analyzed
- What changes were made (if any)
- Link to the created PR (if applicable)
- Brief explanation of the solution
**Example final comment:**
```
Hi! I've analyzed and fixed this issue.
**Problem:** Sequential tool calling was getting stuck after first tool call.
**Solution:** Added proper prompt handling after each tool call in the Ollama model integration.
**Changes Made:**
- Modified `src/praisonai-agents/ollama-sequential.py`
- Added continuation prompts for multi-step tool execution
**Pull Request:** https://github.com/MervinPraison/PraisonAI/pull/856
The fix is ready for review. Please test and let me know if you encounter any issues!
```
**IMPORTANT NOTES:**
- Always create branches with 'gemini/' prefix
- Always include issue number in branch name and commit message
- Always create PR that references the issue
- Always provide PR link in your final response
- Use the GITHUB_TOKEN environment variable for authentication
Please proceed with helping resolve this issue following this exact workflow.
settings_json: |
{
"coreTools": [
"run_shell_command(echo)",
"run_shell_command(gh issue view)",
"run_shell_command(gh issue comment)",
"run_shell_command(gh issue list)",
"run_shell_command(gh issue edit)",
"run_shell_command(gh pr create)",
"run_shell_command(gh pr view)",
"run_shell_command(gh pr list)",
"run_shell_command(cat)",
"run_shell_command(head)",
"run_shell_command(tail)",
"run_shell_command(grep)",
"run_shell_command(find)",
"run_shell_command(git checkout)",
"run_shell_command(git add)",
"run_shell_command(git commit)",
"run_shell_command(git push)",
"run_shell_command(git status)",
"run_shell_command(git branch)",
"list_directory",
"read_file",
"read_many_files",
"write_file",
"replace",
"glob",
"search_file_content",
"web_fetch",
"google_web_search",
"save_memory"
],
"telemetry": {
"enabled": false,
"otlpGcpWifProvider": "${{ secrets.OTLP_GCP_WIF_PROVIDER }}",
"googleCloudProject": "${{ secrets.OTLP_GOOGLE_CLOUD_PROJECT }}"
}
}
+242
View File
@@ -0,0 +1,242 @@
name: Gemini PR Review
on:
issue_comment:
types: [created]
workflow_dispatch:
inputs:
pr_number:
description: 'PR number to review'
required: true
type: number
jobs:
review-pr:
if: >
github.event_name == 'workflow_dispatch' ||
(github.event_name == 'issue_comment' &&
github.event.issue.pull_request &&
contains(github.event.comment.body, '@gemini') &&
(github.event.comment.author_association == 'OWNER' ||
github.event.comment.author_association == 'MEMBER' ||
github.event.comment.author_association == 'COLLABORATOR'))
timeout-minutes: 15
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
pull-requests: write
issues: write
steps:
- name: Generate GitHub App Token
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
- name: Determine checkout ref
id: checkout_ref
run: |
if [ "${{ github.event_name }}" = "issue_comment" ]; then
echo "ref=refs/pull/${{ github.event.issue.number }}/head" >> "$GITHUB_OUTPUT"
else
echo "ref=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_OUTPUT"
fi
- name: Checkout PR code
uses: actions/checkout@v4
with:
token: ${{ steps.generate_token.outputs.token }}
ref: ${{ steps.checkout_ref.outputs.ref }}
fetch-depth: 0
- name: Get PR details
id: get_pr
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
PR_NUMBER=${{ github.event.inputs.pr_number }}
elif [ "${{ github.event_name }}" = "issue_comment" ]; then
PR_NUMBER=${{ github.event.issue.number }}
else
PR_NUMBER=${{ github.event.pull_request.number }}
fi
echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
# Extract additional instructions from comment (if triggered by comment)
ADDITIONAL_INSTRUCTIONS=""
if [ "${{ github.event_name }}" = "issue_comment" ]; then
COMMENT_BODY="${{ github.event.comment.body }}"
ADDITIONAL_INSTRUCTIONS=$(echo "$COMMENT_BODY" | sed 's/.*@gemini//' | xargs)
fi
echo "additional_instructions=$ADDITIONAL_INSTRUCTIONS" >> "$GITHUB_OUTPUT"
# Get PR details
PR_DATA=$(gh pr view $PR_NUMBER --json title,body,additions,deletions,changedFiles,baseRefName,headRefName)
echo "pr_data=$PR_DATA" >> "$GITHUB_OUTPUT"
# Get file changes
CHANGED_FILES=$(gh pr diff $PR_NUMBER --name-only)
echo "changed_files<<EOF" >> "$GITHUB_OUTPUT"
echo "$CHANGED_FILES" >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: Run Gemini PR Review
uses: ./.github/actions/gemini
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
PR_NUMBER: ${{ steps.get_pr.outputs.pr_number }}
PR_DATA: ${{ steps.get_pr.outputs.pr_data }}
CHANGED_FILES: ${{ steps.get_pr.outputs.changed_files }}
ADDITIONAL_INSTRUCTIONS: ${{ steps.get_pr.outputs.additional_instructions }}
REPOSITORY: ${{ github.repository }}
with:
version: 0.1.8-rc.0
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
OTLP_GCP_WIF_PROVIDER: ${{ secrets.OTLP_GCP_WIF_PROVIDER }}
OTLP_GOOGLE_CLOUD_PROJECT: ${{ secrets.OTLP_GOOGLE_CLOUD_PROJECT }}
settings_json: |
{
"coreTools": [
"run_shell_command(echo)",
"run_shell_command(gh pr view)",
"run_shell_command(gh pr diff)",
"run_shell_command(gh pr comment)",
"run_shell_command(gh pr list)",
"run_shell_command(cat)",
"run_shell_command(head)",
"run_shell_command(tail)",
"run_shell_command(grep)",
"run_shell_command(find)",
"run_shell_command(git checkout)",
"run_shell_command(git add)",
"run_shell_command(git commit)",
"run_shell_command(git push)",
"run_shell_command(git status)",
"run_shell_command(git branch)",
"run_shell_command(git fetch)",
"list_directory",
"read_file",
"read_many_files",
"write_file",
"replace",
"glob",
"search_file_content",
"web_fetch",
"google_web_search",
"save_memory"
],
"telemetry": {
"enabled": false,
"target": "gcp"
},
"sandbox": false
}
prompt: |
You are an expert code reviewer and AI assistant for Pull Requests. You can review code AND make modifications to improve the PR.
**PR Details:**
- PR Number: #$PR_NUMBER
- Repository: $REPOSITORY
- Additional Instructions: $ADDITIONAL_INSTRUCTIONS
**CRITICAL: When making code modifications, follow this EXACT workflow:**
**STEP 1: Analyze the PR**
- Use: `echo "$PR_DATA"` to get PR details (JSON format)
- Use: `echo "$CHANGED_FILES"` to get changed files list
- Use: `gh pr diff ${PR_NUMBER}` to see the full diff
- Use: `gh pr view ${PR_NUMBER} --json title,body,headRefName` to get PR info
- Analyze the code changes thoroughly
**STEP 2: If Code Improvements Are Needed**
**IMPORTANT:** DO NOT create a new branch! Work on the EXISTING PR branch.
- Use: `git fetch origin` to get latest changes
- Get PR branch name: `gh pr view ${PR_NUMBER} --json headRefName`
- Switch to PR branch: `git checkout BRANCH_NAME` (use actual branch name from PR)
- Use: `git pull origin BRANCH_NAME` to get latest PR changes
**STEP 3: Make Code Modifications**
- Use `read_file` to examine existing code
- Use `write_file` or `replace` to make improvements
- Use `search_file_content` to find related code
- Make focused, targeted improvements to the PR
**STEP 4: Test Changes (if applicable)**
- Run relevant tests if test files exist
- Use `run_shell_command` to execute test commands
**STEP 5: Commit and Push Changes to EXISTING PR Branch**
- Use: `git add .` (or specific files)
- Use: `git commit -m "Gemini: [PR #${PR_NUMBER}] Brief description of improvements"`
- Use: `git push origin BRANCH_NAME` (push to EXISTING PR branch)
**STEP 6: Review and Comment on PR**
Write comprehensive review and post comment with your analysis and any improvements made.
Use: `gh pr comment ${PR_NUMBER} -b "MESSAGE"`
Review Guidelines:
- Focus on code quality, security, performance, and maintainability
- Check for common issues: potential bugs, security vulnerabilities, performance bottlenecks
- Verify error handling and edge cases
- Look for code style and best practices
- Comment on architecture and design decisions if significant
- Be constructive and specific in feedback
- Highlight both issues and positive aspects
- Suggest improvements with examples when possible
Review Areas:
- **Security**: Authentication, authorization, input validation, data sanitization
- **Performance**: Algorithms, database queries, caching, resource usage
- **Reliability**: Error handling, logging, testing coverage, edge cases
- **Maintainability**: Code structure, documentation, naming conventions
- **Functionality**: Logic correctness, requirements fulfillment
Output Format:
Structure your review using this exact format with markdown:
## 📋 Review Summary
Provide a brief 2-3 sentence overview of the PR and overall assessment.
## 🔍 General Feedback
- List general observations about code quality
- Mention overall patterns or architectural decisions
- Highlight positive aspects of the implementation
- Note any recurring themes across files
## 🎯 Specific Feedback
Only include sections below that have actual issues. If there are no issues in a priority category, omit that entire section.
### 🔴 Critical
(Only include this section if there are critical issues)
Issues that must be addressed before merging (security vulnerabilities, breaking changes, major bugs):
- **File: `filename:line`** - Description of critical issue with specific recommendation
### 🟡 High
(Only include this section if there are high priority issues)
Important issues that should be addressed (performance problems, design flaws, significant bugs):
- **File: `filename:line`** - Description of high priority issue with suggested fix
### 🟢 Medium
(Only include this section if there are medium priority issues)
Improvements that would enhance code quality (style issues, minor optimizations, better practices):
- **File: `filename:line`** - Description of medium priority improvement
### 🔵 Low
(Only include this section if there are suggestions)
Nice-to-have improvements and suggestions (documentation, naming, minor refactoring):
- **File: `filename:line`** - Description of suggestion or enhancement
**Note**: If no specific issues are found in any category, simply state "No specific issues identified in this review."
## ✅ Highlights
(Only include this section if there are positive aspects to highlight)
- Mention specific good practices or implementations
- Acknowledge well-written code sections
- Note improvements from previous versions
---
*Review completed by Gemini CLI*
+3 -1
View File
@@ -75,4 +75,6 @@ agents/praisonaiagents/praisonaiagents.egg-info
# Local Netlify folder
.netlify
.qodo
CopilotKit*
CopilotKit*
.gemini
issue_details.json
+1 -1
View File
@@ -16,7 +16,7 @@ RUN mkdir -p /root/.praison
# Install Python packages (using latest versions)
RUN pip install --no-cache-dir \
flask \
"praisonai>=2.2.50" \
"praisonai>=2.2.54" \
"praisonai[api]" \
gunicorn \
markdown
+1 -1
View File
@@ -16,7 +16,7 @@ RUN mkdir -p /root/.praison
# Install Python packages (using latest versions)
RUN pip install --no-cache-dir \
praisonai_tools \
"praisonai>=2.2.50" \
"praisonai>=2.2.54" \
"praisonai[chat]" \
"embedchain[github,youtube]"
+1 -1
View File
@@ -20,7 +20,7 @@ RUN mkdir -p /root/.praison
# Install Python packages (using latest versions)
RUN pip install --no-cache-dir \
praisonai_tools \
"praisonai>=2.2.50" \
"praisonai>=2.2.54" \
"praisonai[ui]" \
"praisonai[chat]" \
"praisonai[realtime]" \
+1 -1
View File
@@ -16,7 +16,7 @@ RUN mkdir -p /root/.praison
# Install Python packages (using latest versions)
RUN pip install --no-cache-dir \
praisonai_tools \
"praisonai>=2.2.50" \
"praisonai>=2.2.54" \
"praisonai[ui]" \
"praisonai[crewai]"
+2 -2
View File
@@ -121,7 +121,7 @@ healthcheck:
## 📦 Package Versions
All Docker images use consistent, up-to-date versions:
- PraisonAI: `>=2.2.50`
- PraisonAI: `>=2.2.54`
- PraisonAI Agents: `>=0.0.92`
- Python: `3.11-slim`
@@ -218,7 +218,7 @@ docker-compose up -d
### Version Pinning
To use specific versions, update the Dockerfile:
```dockerfile
RUN pip install "praisonai==2.2.50" "praisonaiagents==0.0.92"
RUN pip install "praisonai==2.2.54" "praisonaiagents==0.0.92"
```
## 🌐 Production Deployment
+1 -1
View File
@@ -72,7 +72,7 @@ workflow = PraisonAIAgents(
)
# Run the workflow
results = workflow.start()
results = workflow.start(return_dict=True)
# Print results
print("\nWorkflow Results:")
+30
View File
@@ -0,0 +1,30 @@
from praisonaiagents import Agent
def get_stock_price(company_name: str) -> str:
"""
Get the stock price of a company
Args:
company_name (str): The name of the company
Returns:
str: The stock price of the company
"""
return f"The stock price of {company_name} is 100"
def multiply(a: int, b: int) -> int:
"""
Multiply two numbers
"""
return a * b
agent = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="gemini/gemini-2.5-pro",
tools=[get_stock_price, multiply]
)
result = agent.start("what is the stock price of Google? multiply the Google stock price with 2")
print(result)
+179
View File
@@ -0,0 +1,179 @@
from praisonaiagents import Agent
from praisonaiagents.agent.handoff import handoff, handoff_filters
from pydantic import BaseModel
from typing import Dict, Any
import logging
# Mock data for testing
MOCK_ORDERS = {
"12345": {
"id": "12345",
"status": "shipped",
"items": ["Widget A", "Widget B"],
"total": 99.99,
"tracking_number": "TRK123456789",
"shipping_address": "123 Main St, City, ST 12345"
},
"67890": {
"id": "67890",
"status": "processing",
"items": ["Gadget X"],
"total": 149.99,
"tracking_number": None,
"shipping_address": "456 Oak Ave, Town, ST 67890"
}
}
MOCK_SHIPMENTS = {
"TRK123456789": {
"tracking_number": "TRK123456789",
"status": "in_transit",
"location": "Distribution Center - Chicago",
"estimated_delivery": "2024-01-15",
"updates": [
{"date": "2024-01-10", "status": "picked_up", "location": "Warehouse"},
{"date": "2024-01-12", "status": "in_transit", "location": "Chicago"}
]
}
}
MOCK_TICKETS = []
# Mock tool functions
def check_order_status(order_id: str) -> Dict[str, Any]:
"""Check the status of an order"""
if order_id in MOCK_ORDERS:
return {"success": True, "order": MOCK_ORDERS[order_id]}
return {"success": False, "error": f"Order {order_id} not found"}
def track_shipment(tracking_number: str) -> Dict[str, Any]:
"""Track a shipment by tracking number"""
if tracking_number in MOCK_SHIPMENTS:
return {"success": True, "shipment": MOCK_SHIPMENTS[tracking_number]}
return {"success": False, "error": f"Tracking number {tracking_number} not found"}
def process_refund(order_id: str, reason: str = "customer_request") -> Dict[str, Any]:
"""Process a refund for an order"""
if order_id in MOCK_ORDERS:
order = MOCK_ORDERS[order_id]
return {
"success": True,
"refund_id": f"REF{order_id}",
"amount": order["total"],
"status": "processing",
"estimated_days": 3-5
}
return {"success": False, "error": f"Order {order_id} not found"}
def check_refund_policy(item_type: str = "general") -> Dict[str, Any]:
"""Check refund policy for different item types"""
policies = {
"general": {"days": 30, "condition": "unopened", "shipping": "customer_pays"},
"electronics": {"days": 15, "condition": "original_packaging", "shipping": "free"},
"clothing": {"days": 60, "condition": "tags_attached", "shipping": "customer_pays"}
}
return {"success": True, "policy": policies.get(item_type, policies["general"])}
def diagnose_issue(description: str) -> Dict[str, Any]:
"""Diagnose a technical issue"""
common_solutions = {
"login": "Clear cookies and cache, try password reset",
"payment": "Check card details, try different payment method",
"loading": "Check internet connection, try different browser",
"mobile": "Update app, restart device, check storage space"
}
# Simple keyword matching for demo
for issue_type, solution in common_solutions.items():
if issue_type in description.lower():
return {"success": True, "diagnosis": solution, "severity": "low"}
return {"success": True, "diagnosis": "Please provide more details", "severity": "medium"}
def create_ticket(issue_description: str, priority: str = "medium") -> Dict[str, Any]:
"""Create a support ticket"""
ticket_id = f"TICK{len(MOCK_TICKETS) + 1001}"
ticket = {
"id": ticket_id,
"description": issue_description,
"priority": priority,
"status": "open",
"created_at": "2024-01-13T10:00:00Z"
}
MOCK_TICKETS.append(ticket)
return {"success": True, "ticket": ticket}
def log_escalation(source_agent: str, escalation_data: Dict[str, Any]) -> None:
"""Log escalation for audit purposes"""
logging.info(f"Escalation from {source_agent}: {escalation_data}")
# Escalation with structured input
class EscalationRequest(BaseModel):
issue_type: str
severity: str
description: str
# Specialist agents
order_agent = Agent(
name="Order Management",
instructions="You help with order status and tracking.",
tools=[check_order_status, track_shipment]
)
refund_agent = Agent(
name="Refund Specialist",
instructions="You process refunds and handle return requests.",
tools=[process_refund, check_refund_policy]
)
technical_agent = Agent(
name="Technical Support",
instructions="You solve technical issues and provide guidance.",
tools=[diagnose_issue, create_ticket]
)
escalation_agent = Agent(
name="Senior Manager",
instructions="You handle escalated issues requiring management attention."
)
# Main triage agent
triage_agent = Agent(
name="Customer Service",
instructions="""You are the first point of contact. Route customers to the right specialist:
- Order issues → Order Management
- Refunds → Refund Specialist
- Technical problems → Technical Support
- Complex issues → Escalate to management
""",
handoffs=[
order_agent,
refund_agent,
technical_agent,
handoff(
escalation_agent,
tool_name_override="escalate_to_management",
input_type=EscalationRequest,
on_handoff=lambda src, data: log_escalation(src.name, data)
)
]
)
# Start the service
if __name__ == "__main__":
print("Customer Service Handoff System Demo")
print("=" * 40)
# Test different scenarios
test_queries = [
"I need a refund for order #12345",
"What's the status of order #67890?",
"I'm having trouble logging into my account",
"This is urgent - I need to speak to a manager about a serious billing issue"
]
for query in test_queries:
print(f"\nCustomer: {query}")
response = triage_agent.chat(query)
print(f"Response: {response}")
print("-" * 40)
+30
View File
@@ -0,0 +1,30 @@
from praisonaiagents import Agent
def get_stock_price(company_name: str) -> str:
"""
Get the stock price of a company
Args:
company_name (str): The name of the company
Returns:
str: The stock price of the company
"""
return f"The stock price of {company_name} is 100"
def multiply(a: int, b: int) -> int:
"""
Multiply two numbers
"""
return a * b
agent = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="ollama/llama3.2",
tools=[get_stock_price, multiply]
)
result = agent.start("what is the stock price of Google? multiply the Google stock price with 2")
print(result)
+30
View File
@@ -0,0 +1,30 @@
from praisonaiagents import Agent
def get_stock_price(company_name: str) -> str:
"""
Get the stock price of a company
Args:
company_name (str): The name of the company
Returns:
str: The stock price of the company
"""
return f"The stock price of {company_name} is 100"
def multiply(a: int, b: int) -> int:
"""
Multiply two numbers
"""
return a * b
agent = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="gpt-4o",
tools=[get_stock_price, multiply]
)
result = agent.start("what is the stock price of Google? multiply the Google stock price with 2")
print(result)
@@ -2,6 +2,30 @@
Praison AI Agents - A package for hierarchical AI agent task execution
"""
# Configure logging before any other imports
import os
import logging
from rich.logging import RichHandler
# Get log level from environment variable
LOGLEVEL = os.environ.get('LOGLEVEL', 'INFO').upper()
# Configure root logger
logging.basicConfig(
level=getattr(logging, LOGLEVEL, logging.INFO),
format="%(asctime)s %(filename)s:%(lineno)d %(levelname)s %(message)s",
datefmt="[%X]",
handlers=[RichHandler(rich_tracebacks=True)]
)
# Suppress specific noisy loggers
logging.getLogger("litellm").setLevel(logging.WARNING)
logging.getLogger("litellm.utils").setLevel(logging.WARNING)
logging.getLogger("markdown_it").setLevel(logging.WARNING)
logging.getLogger("rich.markdown").setLevel(logging.WARNING)
logging.getLogger("httpx").setLevel(logging.WARNING)
logging.getLogger("httpcore").setLevel(logging.WARNING)
from .agent.agent import Agent
from .agent.image_agent import ImageAgent
from .agents.agents import PraisonAIAgents
@@ -1235,7 +1235,8 @@ Your Goal: {self.goal}"""
agent_role=self.role,
agent_tools=[t.__name__ if hasattr(t, '__name__') else str(t) for t in (tools if tools is not None else self.tools)],
execute_tool_fn=self.execute_tool, # Pass tool execution function
reasoning_steps=reasoning_steps
reasoning_steps=reasoning_steps,
stream=stream # Pass the stream parameter from chat method
)
self.chat_history.append({"role": "assistant", "content": response_text})
@@ -480,24 +480,22 @@ Context:
)
if self.process == "workflow":
# Collect all tasks that should run in parallel
parallel_tasks = []
tasks_to_run = []
async for task_id in process.aworkflow():
if self.tasks[task_id].async_execution and self.tasks[task_id].is_start:
parallel_tasks.append(task_id)
elif parallel_tasks:
# Execute collected parallel tasks
await asyncio.gather(*[self.arun_task(t) for t in parallel_tasks])
parallel_tasks = []
# Run the current non-parallel task
if self.tasks[task_id].async_execution:
await self.arun_task(task_id)
else:
self.run_task(task_id)
# Execute any remaining parallel tasks
if parallel_tasks:
await asyncio.gather(*[self.arun_task(t) for t in parallel_tasks])
if self.tasks[task_id].async_execution:
tasks_to_run.append(self.arun_task(task_id))
else:
# If we encounter a sync task, we must wait for the previous async tasks to finish.
if tasks_to_run:
await asyncio.gather(*tasks_to_run)
tasks_to_run = []
# Run sync task in an executor to avoid blocking the event loop
loop = asyncio.get_event_loop()
await loop.run_in_executor(None, self.run_task, task_id)
if tasks_to_run:
await asyncio.gather(*tasks_to_run)
elif self.process == "sequential":
async for task_id in process.asequential():
@@ -136,7 +136,7 @@ class AutoAgents(PraisonAIAgents):
completion_checker=completion_checker,
max_retries=max_retries,
process=process,
manager_llm=manager_llm
manager_llm=manager_llm or self.llm
)
def _display_agents_and_tasks(self, agents: List[Agent], tasks: List[Task]):
@@ -67,9 +67,6 @@ class Knowledge:
# Disable OpenAI API request logging
logging.getLogger('openai').setLevel(logging.WARNING)
# Set root logger to warning to catch any uncategorized logs
logging.getLogger().setLevel(logging.WARNING)
@cached_property
def _deps(self):
@@ -0,0 +1,25 @@
# Ollama Handling in LLM.py
The `ollama_handled` flag is used in `llm.py` (not in `agent.py`) to track whether special Ollama model handling has been applied for tool results. Here's what I found:
## Where it's used in llm.py:
- **Line 863**: `ollama_handled = False` - initialized at the beginning of the tool execution loop
- **Line 864**: Special handling logic via `_handle_ollama_model()` method
- **Line 907**: `ollama_handled = True` - set when Ollama special handling is applied
- **Line 928 & 959**: Checks `if not ollama_handled` to avoid duplicate processing
## Why it's needed:
The flag prevents duplicate processing when Ollama models require special handling. Some Ollama models return only the tool call JSON without processing the results, requiring a follow-up prompt to get the final answer. The `ollama_handled` flag ensures this special handling happens only once.
## Does this contradict the requirement?
**No, it doesn't.** The issue states:
> "ollama/xxxx model is already handled via llm.py via litellm, so no special condition or handling required for ollama inside agent.py"
✅ **Current implementation is correct:**
- `agent.py` has NO ollama-specific conditions (only one documentation mention as an example)
- All ollama handling is contained within `llm.py` as intended
- The `ollama_handled` flag is an internal implementation detail within `llm.py`
The codebase already follows the desired pattern where ollama models are handled through the generic LLM interface via litellm without special conditions in agent.py.
@@ -5,19 +5,16 @@ import os
# Disable litellm telemetry before any imports
os.environ["LITELLM_TELEMETRY"] = "False"
# Suppress all relevant logs at module level
logging.getLogger("litellm").setLevel(logging.ERROR)
logging.getLogger("openai").setLevel(logging.ERROR)
logging.getLogger("httpx").setLevel(logging.ERROR)
logging.getLogger("httpcore").setLevel(logging.ERROR)
logging.getLogger("pydantic").setLevel(logging.ERROR)
# Suppress all relevant logs at module level - consistent with main __init__.py
logging.getLogger("litellm").setLevel(logging.WARNING)
logging.getLogger("openai").setLevel(logging.WARNING)
logging.getLogger("httpx").setLevel(logging.WARNING)
logging.getLogger("httpcore").setLevel(logging.WARNING)
logging.getLogger("pydantic").setLevel(logging.WARNING)
# Suppress pydantic warnings
warnings.filterwarnings("ignore", category=UserWarning, module="pydantic")
# Configure logging to suppress all INFO messages
logging.basicConfig(level=logging.WARNING)
# Import after suppressing warnings
from .llm import LLM, LLMContextLengthExceededException
from .openai_client import (
+190 -371
View File
@@ -680,6 +680,7 @@ class LLM:
max_iterations = 10 # Prevent infinite loops
iteration_count = 0
final_response_text = ""
stored_reasoning_content = None # Store reasoning content from tool execution
while iteration_count < max_iterations:
try:
@@ -771,7 +772,7 @@ class LLM:
if formatted_tools and self._supports_streaming_tools():
tool_calls = self._process_tool_calls_from_stream(delta, tool_calls)
response_text = response_text.strip()
response_text = response_text.strip() if response_text else "" if response_text else "" if response_text else "" if response_text else ""
# Create a mock final_response with the captured data
final_response = {
@@ -857,140 +858,15 @@ class LLM:
iteration_count += 1
continue
# If we reach here, no more tool calls needed - get final response
# Make one more call to get the final summary response
# Special handling for Ollama models that don't automatically process tool results
ollama_handled = False
ollama_params = self._handle_ollama_model(response_text, tool_results, messages, original_prompt)
if ollama_params:
# Get response with streaming
if verbose:
with Live(display_generating("", start_time), console=console, refresh_per_second=4) as live:
response_text = ""
for chunk in litellm.completion(
**self._build_completion_params(
messages=ollama_params["follow_up_messages"],
temperature=temperature,
stream=stream
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
content = chunk.choices[0].delta.content
response_text += content
live.update(display_generating(response_text, start_time))
else:
response_text = ""
for chunk in litellm.completion(
**self._build_completion_params(
messages=ollama_params["follow_up_messages"],
temperature=temperature,
stream=stream
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
response_text += chunk.choices[0].delta.content
# Set flag to indicate Ollama was handled
ollama_handled = True
final_response_text = response_text.strip()
logging.debug(f"[OLLAMA_DEBUG] Ollama follow-up response: {final_response_text[:200]}...")
# Display the response if we got one
if final_response_text and verbose:
display_interaction(
ollama_params["original_prompt"],
final_response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
# Return the final response after processing Ollama's follow-up
if final_response_text:
return final_response_text
else:
logging.warning("[OLLAMA_DEBUG] Ollama follow-up returned empty response")
# If reasoning_steps is True and we haven't handled Ollama already, do a single non-streaming call
if reasoning_steps and not ollama_handled:
resp = litellm.completion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=False, # force non-streaming
**{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
)
)
reasoning_content = resp["choices"][0]["message"].get("provider_specific_fields", {}).get("reasoning_content")
response_text = resp["choices"][0]["message"]["content"]
# Optionally display reasoning if present
if verbose and reasoning_content:
display_interaction(
original_prompt,
f"Reasoning:\n{reasoning_content}\n\nAnswer:\n{response_text}",
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
else:
display_interaction(
original_prompt,
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
# Otherwise do the existing streaming approach if not already handled
elif not ollama_handled:
# Get response after tool calls with streaming
if verbose:
with Live(display_generating("", current_time), console=console, refresh_per_second=4) as live:
final_response_text = ""
for chunk in litellm.completion(
**self._build_completion_params(
messages=messages,
tools=formatted_tools,
temperature=temperature,
stream=True,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
content = chunk.choices[0].delta.content
final_response_text += content
live.update(display_generating(final_response_text, current_time))
else:
final_response_text = ""
for chunk in litellm.completion(
**self._build_completion_params(
messages=messages,
tools=formatted_tools,
temperature=temperature,
stream=stream,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
final_response_text += chunk.choices[0].delta.content
final_response_text = final_response_text.strip()
# Display final response
if verbose:
display_interaction(
original_prompt,
final_response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
return final_response_text
# After tool execution, continue the loop to check if more tools are needed
# instead of immediately trying to get a final response
iteration_count += 1
continue
else:
# No tool calls, we're done with this iteration
# If we've executed tools in previous iterations, this response contains the final answer
if iteration_count > 0:
final_response_text = response_text.strip() if response_text else ""
break
except Exception as e:
@@ -1003,15 +879,29 @@ class LLM:
# No tool calls were made in this iteration, return the response
if verbose:
display_interaction(
original_prompt,
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
# If we have stored reasoning content from tool execution, display it
if stored_reasoning_content:
display_interaction(
original_prompt,
f"Reasoning:\n{stored_reasoning_content}\n\nAnswer:\n{response_text}",
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
else:
display_interaction(
original_prompt,
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
response_text = response_text.strip()
response_text = response_text.strip() if response_text else ""
# Return reasoning content if reasoning_steps is True and we have it
if reasoning_steps and stored_reasoning_content:
return stored_reasoning_content
# Handle output formatting
if output_json or output_pydantic:
@@ -1027,8 +917,8 @@ class LLM:
display_interaction(original_prompt, response_text, markdown=markdown,
generation_time=time.time() - start_time, console=console)
# Return reasoning content if reasoning_steps is True
if reasoning_steps and reasoning_content:
return reasoning_content
if reasoning_steps and stored_reasoning_content:
return stored_reasoning_content
return response_text
# Handle self-reflection loop
@@ -1169,7 +1059,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
if chunk and chunk.choices and chunk.choices[0].delta.content:
response_text += chunk.choices[0].delta.content
response_text = response_text.strip()
response_text = response_text.strip() if response_text else "" if response_text else ""
continue
except json.JSONDecodeError:
@@ -1291,118 +1181,126 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
# Format tools for LiteLLM using the shared helper
formatted_tools = self._format_tools_for_litellm(tools)
response_text = ""
if reasoning_steps:
# Non-streaming call to capture reasoning
resp = await litellm.acompletion(
**self._build_completion_params(
messages=messages,
# Initialize variables for iteration loop
max_iterations = 10 # Prevent infinite loops
iteration_count = 0
final_response_text = ""
stored_reasoning_content = None # Store reasoning content from tool execution
while iteration_count < max_iterations:
response_text = ""
reasoning_content = None
tool_calls = []
if reasoning_steps and iteration_count == 0:
# Non-streaming call to capture reasoning
resp = await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=False, # force non-streaming
**{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
)
)
reasoning_content = resp["choices"][0]["message"].get("provider_specific_fields", {}).get("reasoning_content")
response_text = resp["choices"][0]["message"]["content"]
if verbose and reasoning_content:
display_interaction(
"Initial reasoning:",
f"Reasoning:\n{reasoning_content}\n\nAnswer:\n{response_text}",
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
elif verbose:
display_interaction(
"Initial response:",
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
else:
# Determine if we should use streaming based on tool support
use_streaming = stream
if formatted_tools and not self._supports_streaming_tools():
# Provider doesn't support streaming with tools, use non-streaming
use_streaming = False
if use_streaming:
# Streaming approach (with or without tools)
tool_calls = []
reasoning_content = resp["choices"][0]["message"].get("provider_specific_fields", {}).get("reasoning_content")
response_text = resp["choices"][0]["message"]["content"]
if verbose:
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=True,
tools=formatted_tools,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta:
delta = chunk.choices[0].delta
response_text, tool_calls = self._process_stream_delta(
delta, response_text, tool_calls, formatted_tools
)
if delta.content:
print("\033[K", end="\r")
print(f"Generating... {time.time() - start_time:.1f}s", end="\r")
else:
# Non-verbose streaming
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=True,
tools=formatted_tools,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta:
delta = chunk.choices[0].delta
if delta.content:
response_text += delta.content
# Capture tool calls from streaming chunks if provider supports it
if formatted_tools and self._supports_streaming_tools():
tool_calls = self._process_tool_calls_from_stream(delta, tool_calls)
response_text = response_text.strip()
# We already have tool_calls from streaming if supported
# No need for a second API call!
else:
# Non-streaming approach (when tools require it or streaming is disabled)
tool_response = await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=False,
tools=formatted_tools,
**{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
)
)
response_text = tool_response.choices[0].message.get("content", "")
tool_calls = tool_response.choices[0].message.get("tool_calls", [])
if verbose:
# Display the complete response at once
if verbose and reasoning_content:
display_interaction(
original_prompt,
"Initial reasoning:",
f"Reasoning:\n{reasoning_content}\n\nAnswer:\n{response_text}",
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
elif verbose:
display_interaction(
"Initial response:",
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
else:
# Determine if we should use streaming based on tool support
use_streaming = stream
if formatted_tools and not self._supports_streaming_tools():
# Provider doesn't support streaming with tools, use non-streaming
use_streaming = False
if use_streaming:
# Streaming approach (with or without tools)
tool_calls = []
if verbose:
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=True,
tools=formatted_tools,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta:
delta = chunk.choices[0].delta
response_text, tool_calls = self._process_stream_delta(
delta, response_text, tool_calls, formatted_tools
)
if delta.content:
print("\033[K", end="\r")
print(f"Generating... {time.time() - start_time:.1f}s", end="\r")
# Now handle tools if we have them (either from streaming or non-streaming)
if tools and execute_tool_fn and tool_calls:
if tool_calls:
else:
# Non-verbose streaming
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=True,
tools=formatted_tools,
**kwargs
)
):
if chunk and chunk.choices and chunk.choices[0].delta:
delta = chunk.choices[0].delta
if delta.content:
response_text += delta.content
# Capture tool calls from streaming chunks if provider supports it
if formatted_tools and self._supports_streaming_tools():
tool_calls = self._process_tool_calls_from_stream(delta, tool_calls)
response_text = response_text.strip() if response_text else "" if response_text else "" if response_text else ""
# We already have tool_calls from streaming if supported
# No need for a second API call!
else:
# Non-streaming approach (when tools require it or streaming is disabled)
tool_response = await litellm.acompletion(
**self._build_completion_params(
messages=messages,
temperature=temperature,
stream=False,
tools=formatted_tools,
**{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
)
)
response_text = tool_response.choices[0].message.get("content", "")
tool_calls = tool_response.choices[0].message.get("tool_calls", [])
if verbose:
# Display the complete response at once
display_interaction(
original_prompt,
response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
# Now handle tools if we have them (either from streaming or non-streaming)
if tools and execute_tool_fn and tool_calls:
# Convert tool_calls to a serializable format for all providers
serializable_tool_calls = self._serialize_tool_calls(tool_calls)
messages.append({
@@ -1436,61 +1334,8 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
# Get response after tool calls
response_text = ""
# Special handling for Ollama models that don't automatically process tool results
ollama_handled = False
ollama_params = self._handle_ollama_model(response_text, tool_results, messages, original_prompt)
if ollama_params:
# Get response with streaming
if verbose:
response_text = ""
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=ollama_params["follow_up_messages"],
temperature=temperature,
stream=stream
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
content = chunk.choices[0].delta.content
response_text += content
print("\033[K", end="\r")
print(f"Processing results... {time.time() - start_time:.1f}s", end="\r")
else:
response_text = ""
async for chunk in await litellm.acompletion(
**self._build_completion_params(
messages=ollama_params["follow_up_messages"],
temperature=temperature,
stream=stream
)
):
if chunk and chunk.choices and chunk.choices[0].delta.content:
response_text += chunk.choices[0].delta.content
# Set flag to indicate Ollama was handled
ollama_handled = True
final_response_text = response_text.strip()
logging.debug(f"[OLLAMA_DEBUG] Ollama follow-up response: {final_response_text[:200]}...")
# Display the response if we got one
if final_response_text and verbose:
display_interaction(
ollama_params["original_prompt"],
final_response_text,
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
# Return the final response after processing Ollama's follow-up
if final_response_text:
return final_response_text
else:
logging.warning("[OLLAMA_DEBUG] Ollama follow-up returned empty response")
# If no special handling was needed or if it's not an Ollama model
if reasoning_steps and not ollama_handled:
# If no special handling was needed
if reasoning_steps:
# Non-streaming call to capture reasoning
resp = await litellm.acompletion(
**self._build_completion_params(
@@ -1520,7 +1365,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
generation_time=time.time() - start_time,
console=console
)
elif not ollama_handled:
else:
# Get response after tool calls with streaming if not already handled
if verbose:
async for chunk in await litellm.acompletion(
@@ -1550,7 +1395,28 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
if chunk and chunk.choices and chunk.choices[0].delta.content:
response_text += chunk.choices[0].delta.content
response_text = response_text.strip()
response_text = response_text.strip() if response_text else "" if response_text else ""
# After tool execution, update messages and continue the loop
if response_text:
messages.append({
"role": "assistant",
"content": response_text
})
# Store reasoning content if captured
if reasoning_steps and reasoning_content:
stored_reasoning_content = reasoning_content
# Continue the loop to check if more tools are needed
iteration_count += 1
continue
else:
# No tool calls, we're done with this iteration
# If we've executed tools in previous iterations, this response contains the final answer
if iteration_count > 0:
final_response_text = response_text.strip()
break
# Handle output formatting
if output_json or output_pydantic:
@@ -1562,13 +1428,27 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
return response_text
if not self_reflect:
# Use final_response_text if we went through tool iterations
display_text = final_response_text if final_response_text else response_text
# Display with stored reasoning content if available
if verbose:
display_interaction(original_prompt, response_text, markdown=markdown,
generation_time=time.time() - start_time, console=console)
# Return reasoning content if reasoning_steps is True
if reasoning_steps and reasoning_content:
return reasoning_content
return response_text
if stored_reasoning_content:
display_interaction(
original_prompt,
f"Reasoning:\n{stored_reasoning_content}\n\nAnswer:\n{display_text}",
markdown=markdown,
generation_time=time.time() - start_time,
console=console
)
else:
display_interaction(original_prompt, display_text, markdown=markdown,
generation_time=time.time() - start_time, console=console)
# Return reasoning content if reasoning_steps is True and we have it
if reasoning_steps and stored_reasoning_content:
return stored_reasoning_content
return display_text
# Handle self-reflection
reflection_prompt = f"""
@@ -1754,67 +1634,6 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
litellm.callbacks = events
def _handle_ollama_model(self, response_text: str, tool_results: List[Any], messages: List[Dict], original_prompt: Union[str, List[Dict]]) -> Optional[Dict[str, Any]]:
"""
Handle special Ollama model requirements when processing tool results.
Args:
response_text: The initial response text from the model
tool_results: List of tool execution results
messages: The conversation messages list
original_prompt: The original user prompt
Returns:
Dict with follow-up parameters if Ollama needs special handling, None otherwise
"""
if not self._is_ollama_provider() or not tool_results:
return None
# Check if the response is just a JSON tool call
try:
json_response = json.loads(response_text.strip())
if not (('name' in json_response or 'function' in json_response) and
not any(word in response_text.lower() for word in ['summary', 'option', 'result', 'found'])):
return None
logging.debug("Detected Ollama returning only tool call JSON, preparing follow-up call to process results")
# Extract the original user query from messages
original_query = ""
for msg in reversed(messages): # Look from the end to find the most recent user message
if msg.get("role") == "user":
content = msg.get("content", "")
# Handle list content (multimodal)
if isinstance(content, list):
for item in content:
if isinstance(item, dict) and item.get("type") == "text":
original_query = item.get("text", "")
break
else:
original_query = content
if original_query:
break
# Create a shorter follow-up prompt with all tool results
# If there's only one result, use it directly; otherwise combine them
if len(tool_results) == 1:
results_text = json.dumps(tool_results[0], indent=2)
else:
results_text = json.dumps(tool_results, indent=2)
follow_up_prompt = f"Results:\n{results_text}\nProvide Answer to this Original Question based on the above results: '{original_query}'"
logging.debug(f"[OLLAMA_DEBUG] Original query extracted: {original_query}")
logging.debug(f"[OLLAMA_DEBUG] Follow-up prompt: {follow_up_prompt[:200]}...")
# Return parameters for follow-up call
return {
"follow_up_messages": [{"role": "user", "content": follow_up_prompt}],
"original_prompt": original_prompt
}
except (json.JSONDecodeError, KeyError):
# Not a JSON response or not a tool call format
return None
def _build_completion_params(self, **override_params) -> Dict[str, Any]:
"""Build parameters for litellm completion calls with all necessary config"""
@@ -2030,7 +1849,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
response_text += content
else:
response = litellm.completion(**completion_params)
response_text = response.choices[0].message.content.strip()
response_text = response.choices[0].message.content.strip() if response.choices[0].message.content else ""
if verbose:
display_interaction(
@@ -2041,7 +1860,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
console=console or self.console
)
return response_text.strip()
return response_text.strip() if response_text else ""
except Exception as error:
display_error(f"Error in response: {str(error)}")
@@ -2118,7 +1937,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
response_text += content
else:
response = await litellm.acompletion(**completion_params)
response_text = response.choices[0].message.content.strip()
response_text = response.choices[0].message.content.strip() if response.choices[0].message.content else ""
if verbose:
display_interaction(
@@ -2129,7 +1948,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
console=console or self.console
)
return response_text.strip()
return response_text.strip() if response_text else ""
except Exception as error:
display_error(f"Error in response_async: {str(error)}")
@@ -890,45 +890,8 @@ class OpenAIClient:
"content": results_str
})
# Check if we should continue (for tools like sequential thinking)
should_continue = False
for tool_call in tool_calls:
# Handle both ToolCall dataclass and OpenAI object
if isinstance(tool_call, ToolCall):
function_name = tool_call.function["name"]
arguments = json.loads(tool_call.function["arguments"])
else:
function_name = tool_call.function.name
arguments = json.loads(tool_call.function.arguments)
# For sequential thinking tool, check if nextThoughtNeeded is True
if function_name == "sequentialthinking" and arguments.get("nextThoughtNeeded", False):
should_continue = True
break
if not should_continue:
# Get final response after tool calls
if stream:
final_response = self.process_stream_response(
messages=messages,
model=model,
temperature=temperature,
tools=formatted_tools,
start_time=start_time,
console=console,
display_fn=display_fn,
reasoning_steps=reasoning_steps,
**kwargs
)
else:
final_response = self.create_completion(
messages=messages,
model=model,
temperature=temperature,
stream=False,
**kwargs
)
break
# Continue the loop to allow more tool calls
# The model will see tool results and can make additional tool calls
iteration_count += 1
else:
@@ -1067,45 +1030,8 @@ class OpenAIClient:
"content": results_str
})
# Check if we should continue (for tools like sequential thinking)
should_continue = False
for tool_call in tool_calls:
# Handle both ToolCall dataclass and OpenAI object
if isinstance(tool_call, ToolCall):
function_name = tool_call.function["name"]
arguments = json.loads(tool_call.function["arguments"])
else:
function_name = tool_call.function.name
arguments = json.loads(tool_call.function.arguments)
# For sequential thinking tool, check if nextThoughtNeeded is True
if function_name == "sequentialthinking" and arguments.get("nextThoughtNeeded", False):
should_continue = True
break
if not should_continue:
# Get final response after tool calls
if stream:
final_response = await self.process_stream_response_async(
messages=messages,
model=model,
temperature=temperature,
tools=formatted_tools,
start_time=start_time,
console=console,
display_fn=display_fn,
reasoning_steps=reasoning_steps,
**kwargs
)
else:
final_response = await self.acreate_completion(
messages=messages,
model=model,
temperature=temperature,
stream=False,
**kwargs
)
break
# Continue the loop to allow more tool calls
# The model will see tool results and can make additional tool calls
iteration_count += 1
else:
+1 -18
View File
@@ -9,32 +9,15 @@ from rich.console import Console
from rich.panel import Panel
from rich.text import Text
from rich.markdown import Markdown
from rich.logging import RichHandler
from rich.live import Live
import asyncio
# # Configure root logger
# logging.basicConfig(level=logging.WARNING)
# Suppress litellm logs
# Logging is already configured in __init__.py, just clean up handlers for litellm
logging.getLogger("litellm").handlers = []
logging.getLogger("litellm.utils").handlers = []
logging.getLogger("litellm").propagate = False
logging.getLogger("litellm.utils").propagate = False
LOGLEVEL = os.environ.get('LOGLEVEL', 'INFO').upper()
logging.basicConfig(
level=getattr(logging, LOGLEVEL, logging.INFO),
format="%(asctime)s %(filename)s:%(lineno)d %(levelname)s %(message)s",
datefmt="[%X]",
handlers=[RichHandler(rich_tracebacks=True)]
)
# Add these lines to suppress markdown parser debug logs
logging.getLogger('markdown_it').setLevel(logging.WARNING)
logging.getLogger('rich.markdown').setLevel(logging.WARNING)
# Global list to store error logs
error_logs = []
@@ -187,15 +187,45 @@ class MCP:
self.timeout = timeout
self.debug = debug
# Check if this is an SSE URL
# Check if this is an HTTP URL
if isinstance(command_or_string, str) and re.match(r'^https?://', command_or_string):
# Import the SSE client implementation
from .mcp_sse import SSEMCPClient
self.sse_client = SSEMCPClient(command_or_string, debug=debug, timeout=timeout)
self._tools = list(self.sse_client.tools)
self.is_sse = True
self.is_npx = False
return
# Determine transport type based on URL or kwargs
if command_or_string.endswith('/sse') and 'transport_type' not in kwargs:
# Legacy SSE URL - use SSE transport for backward compatibility
from .mcp_sse import SSEMCPClient
self.sse_client = SSEMCPClient(command_or_string, debug=debug, timeout=timeout)
self._tools = list(self.sse_client.tools)
self.is_sse = True
self.is_http_stream = False
self.is_npx = False
return
else:
# Use HTTP Stream transport for all other HTTP URLs
from .mcp_http_stream import HTTPStreamMCPClient
# Extract transport options from kwargs
transport_options = {}
if 'responseMode' in kwargs:
transport_options['responseMode'] = kwargs.pop('responseMode')
if 'headers' in kwargs:
transport_options['headers'] = kwargs.pop('headers')
if 'cors' in kwargs:
transport_options['cors'] = kwargs.pop('cors')
if 'session' in kwargs:
transport_options['session'] = kwargs.pop('session')
if 'resumability' in kwargs:
transport_options['resumability'] = kwargs.pop('resumability')
self.http_stream_client = HTTPStreamMCPClient(
command_or_string,
debug=debug,
timeout=timeout,
options=transport_options
)
self._tools = list(self.http_stream_client.tools)
self.is_sse = False
self.is_http_stream = True
self.is_npx = False
return
# Handle the single string format for stdio client
if isinstance(command_or_string, str) and args is None:
@@ -219,6 +249,7 @@ class MCP:
# Set up stdio client
self.is_sse = False
self.is_http_stream = False
# Ensure UTF-8 encoding in environment for Docker compatibility
env = kwargs.get('env', {})
@@ -275,6 +306,9 @@ class MCP:
"""
if self.is_sse:
return list(self.sse_client.tools)
if self.is_http_stream:
return list(self.http_stream_client.tools)
tool_functions = []
@@ -448,6 +482,10 @@ class MCP:
if self.is_sse and hasattr(self, 'sse_client') and self.sse_client.tools:
# Return all tools from SSE client
return self.sse_client.to_openai_tools()
if self.is_http_stream and hasattr(self, 'http_stream_client') and self.http_stream_client.tools:
# Return all tools from HTTP Stream client
return self.http_stream_client.to_openai_tools()
# For simplicity, we'll convert the first tool only if multiple exist
# More complex implementations could handle multiple tools
@@ -0,0 +1,466 @@
"""
HTTP Stream client implementation for MCP (Model Context Protocol).
This module provides the necessary classes and functions to connect to an MCP server
over HTTP Stream transport, implementing the Streamable HTTP transport protocol.
"""
import asyncio
import logging
import threading
import inspect
import json
import time
import uuid
from typing import List, Dict, Any, Optional, Callable, Iterable, Union
from urllib.parse import urlparse, urljoin
from mcp import ClientSession
try:
import aiohttp
except ImportError:
raise ImportError("aiohttp is required for HTTP Stream transport. Install with: pip install praisonaiagents[mcp]")
logger = logging.getLogger("mcp-http-stream")
# Global event loop for async operations
_event_loop = None
def get_event_loop():
"""Get or create a global event loop."""
global _event_loop
if _event_loop is None or _event_loop.is_closed():
_event_loop = asyncio.new_event_loop()
asyncio.set_event_loop(_event_loop)
return _event_loop
class HTTPStreamMCPTool:
"""A wrapper for an MCP tool that can be used with praisonaiagents."""
def __init__(self, name: str, description: str, session: ClientSession, input_schema: Optional[Dict[str, Any]] = None, timeout: int = 60):
self.name = name
self.__name__ = name # Required for Agent to recognize it as a tool
self.__qualname__ = name # Required for Agent to recognize it as a tool
self.__doc__ = description # Required for Agent to recognize it as a tool
self.description = description
self.session = session
self.input_schema = input_schema or {}
self.timeout = timeout
# Create a signature based on input schema
params = []
if input_schema and 'properties' in input_schema:
for param_name, prop_schema in input_schema['properties'].items():
# Determine type annotation based on schema
prop_type = prop_schema.get('type', 'string') if isinstance(prop_schema, dict) else 'string'
if prop_type == 'string':
annotation = str
elif prop_type == 'integer':
annotation = int
elif prop_type == 'number':
annotation = float
elif prop_type == 'boolean':
annotation = bool
elif prop_type == 'array':
annotation = list
elif prop_type == 'object':
annotation = dict
else:
annotation = Any
params.append(
inspect.Parameter(
name=param_name,
kind=inspect.Parameter.POSITIONAL_OR_KEYWORD,
default=inspect.Parameter.empty if param_name in input_schema.get('required', []) else None,
annotation=annotation
)
)
self.__signature__ = inspect.Signature(params)
def __call__(self, **kwargs):
"""Synchronous wrapper for the async call."""
logger.debug(f"Tool {self.name} called with args: {kwargs}")
# Use the global event loop
loop = get_event_loop()
# Run the async call in the event loop
future = asyncio.run_coroutine_threadsafe(self._async_call(**kwargs), loop)
try:
# Wait for the result with a timeout
return future.result(timeout=self.timeout)
except Exception as e:
logger.error(f"Error calling tool {self.name}: {e}")
return f"Error: {str(e)}"
async def _async_call(self, **kwargs):
"""Call the tool with the provided arguments."""
logger.debug(f"Async calling tool {self.name} with args: {kwargs}")
try:
result = await self.session.call_tool(self.name, kwargs)
# Extract text from result
if hasattr(result, 'content') and result.content:
if hasattr(result.content[0], 'text'):
return result.content[0].text
return str(result.content[0])
return str(result)
except Exception as e:
logger.error(f"Error in _async_call for {self.name}: {e}")
raise
def _fix_array_schemas(self, schema):
"""
Fix array schemas by adding missing 'items' attribute required by OpenAI.
This ensures compatibility with OpenAI's function calling format which
requires array types to specify the type of items they contain.
Args:
schema: The schema dictionary to fix
Returns:
dict: The fixed schema
"""
if not isinstance(schema, dict):
return schema
# Create a copy to avoid modifying the original
fixed_schema = schema.copy()
# Fix array types at the current level
if fixed_schema.get("type") == "array" and "items" not in fixed_schema:
# Add a default items schema for arrays without it
fixed_schema["items"] = {"type": "string"}
# Recursively fix nested schemas
if "properties" in fixed_schema:
fixed_properties = {}
for prop_name, prop_schema in fixed_schema["properties"].items():
fixed_properties[prop_name] = self._fix_array_schemas(prop_schema)
fixed_schema["properties"] = fixed_properties
# Fix items schema if it exists
if "items" in fixed_schema:
fixed_schema["items"] = self._fix_array_schemas(fixed_schema["items"])
return fixed_schema
def to_openai_tool(self):
"""Convert the tool to OpenAI format."""
# Fix array schemas to include 'items' attribute
fixed_schema = self._fix_array_schemas(self.input_schema)
return {
"type": "function",
"function": {
"name": self.name,
"description": self.description,
"parameters": fixed_schema
}
}
class HTTPStreamTransport:
"""
HTTP Stream Transport implementation for MCP.
This transport provides a single endpoint for all MCP communication,
supporting both batch (JSON) and streaming (SSE) response modes.
"""
def __init__(self, base_url: str, session_id: Optional[str] = None, options: Optional[Dict[str, Any]] = None):
self.base_url = base_url
self.session_id = session_id
self.options = options or {}
self.response_mode = self.options.get('responseMode', 'batch')
self.headers = {
'Content-Type': 'application/json',
'Accept': 'application/json, text/event-stream'
}
if session_id:
self.headers['Mcp-Session-Id'] = session_id
# Add custom headers if provided
if 'headers' in self.options:
self.headers.update(self.options['headers'])
self._session = None
self._sse_task = None
self._message_queue = asyncio.Queue()
self._pending_requests = {}
self._closing = False
async def __aenter__(self):
self._session = aiohttp.ClientSession()
return self
async def __aexit__(self, exc_type, exc_val, exc_tb):
# Set closing flag to stop listener gracefully
self._closing = True
if self._sse_task:
self._sse_task.cancel()
try:
await self._sse_task
except asyncio.CancelledError:
pass
if self._session:
await self._session.close()
async def send_request(self, request: Dict[str, Any]) -> Union[Dict[str, Any], None]:
"""Send a request to the HTTP Stream endpoint."""
if not self._session:
raise RuntimeError("Transport not initialized. Use async context manager.")
try:
async with self._session.post(self.base_url, json=request, headers=self.headers) as response:
# Update session ID if provided in response
if 'Mcp-Session-Id' in response.headers:
self.session_id = response.headers['Mcp-Session-Id']
self.headers['Mcp-Session-Id'] = self.session_id
# Handle different response types
content_type = response.headers.get('Content-Type', '')
if 'text/event-stream' in content_type:
# Stream mode - process SSE events
return await self._process_sse_response(response)
else:
# Batch mode - return JSON response
return await response.json()
except Exception as e:
logger.error(f"Error sending request: {e}")
raise
async def _process_sse_response(self, response):
"""Process SSE response stream."""
buffer = ""
async for chunk in response.content:
buffer += chunk.decode('utf-8')
# Process complete SSE events
while "\n\n" in buffer:
event, buffer = buffer.split("\n\n", 1)
lines = event.strip().split("\n")
# Parse SSE event
data = None
for line in lines:
if line.startswith("data: "):
data = line[6:] # Remove "data: " prefix
if data:
try:
message = json.loads(data)
# Process the message
if 'id' in message and message['id'] in self._pending_requests:
# This is a response to a pending request
self._pending_requests[message['id']].set_result(message)
else:
# This is a server-initiated message
await self._message_queue.put(message)
except json.JSONDecodeError:
logger.error(f"Failed to parse SSE event: {data}")
async def start_sse_listener(self):
"""Start listening for SSE events from the server."""
if self._sse_task is None or self._sse_task.done():
self._sse_task = asyncio.create_task(self._sse_listener())
async def _sse_listener(self):
"""Background task to listen for SSE events."""
while True:
try:
# Check if we should stop
if hasattr(self, '_closing') and self._closing:
break
url = self.base_url
if self.session_id:
# Add session as query parameter for SSE connection
url = f"{url}?session={self.session_id}"
headers = {
'Accept': 'text/event-stream',
'Cache-Control': 'no-cache'
}
if self.session_id:
headers['Mcp-Session-Id'] = self.session_id
async with self._session.get(url, headers=headers) as response:
buffer = ""
async for chunk in response.content:
# Check if we should stop
if hasattr(self, '_closing') and self._closing:
break
buffer += chunk.decode('utf-8')
# Process complete SSE events
while "\n\n" in buffer:
event, buffer = buffer.split("\n\n", 1)
lines = event.strip().split("\n")
# Parse SSE event
data = None
for line in lines:
if line.startswith("data: "):
data = line[6:] # Remove "data: " prefix
if data:
try:
message = json.loads(data)
await self._message_queue.put(message)
except json.JSONDecodeError:
logger.error(f"Failed to parse SSE event: {data}")
except asyncio.CancelledError:
# Proper shutdown
break
except Exception as e:
if not (hasattr(self, '_closing') and self._closing):
logger.error(f"SSE listener error: {e}")
await asyncio.sleep(1) # Reconnect after 1 second
else:
break
def read_stream(self):
"""Create a read stream for the ClientSession."""
async def _read():
while True:
message = await self._message_queue.get()
yield message
return _read()
def write_stream(self):
"""Create a write stream for the ClientSession."""
async def _write(message):
if hasattr(message, 'to_dict'):
message = message.to_dict()
response = await self.send_request(message)
return response
return _write
class HTTPStreamMCPClient:
"""A client for connecting to an MCP server over HTTP Stream transport."""
def __init__(self, server_url: str, debug: bool = False, timeout: int = 60, options: Optional[Dict[str, Any]] = None):
"""
Initialize an HTTP Stream MCP client.
Args:
server_url: The URL of the HTTP Stream MCP server
debug: Whether to enable debug logging
timeout: Timeout in seconds for operations (default: 60)
options: Additional configuration options for the transport
"""
# Parse URL to extract base URL and endpoint
parsed = urlparse(server_url)
# If the URL already has a path, use it; otherwise use default /mcp endpoint
if parsed.path and parsed.path != '/':
self.base_url = server_url
else:
# Default endpoint is /mcp
self.base_url = urljoin(server_url, '/mcp')
self.debug = debug
self.timeout = timeout
self.options = options or {}
self.session = None
self.tools = []
self.transport = None
# Set up logging
if debug:
logger.setLevel(logging.DEBUG)
else:
# Set to WARNING by default to hide INFO messages
logger.setLevel(logging.WARNING)
self._initialize()
def _initialize(self):
"""Initialize the connection and tools."""
# Use the global event loop
loop = get_event_loop()
# Start a background thread to run the event loop
def run_event_loop():
asyncio.set_event_loop(loop)
loop.run_forever()
self.loop_thread = threading.Thread(target=run_event_loop, daemon=True)
self.loop_thread.start()
# Run the initialization in the event loop
future = asyncio.run_coroutine_threadsafe(self._async_initialize(), loop)
self.tools = future.result(timeout=self.timeout)
async def _async_initialize(self):
"""Asynchronously initialize the connection and tools."""
logger.debug(f"Connecting to MCP server at {self.base_url}")
# Create HTTP Stream transport
self.transport = HTTPStreamTransport(self.base_url, options=self.options)
await self.transport.__aenter__()
# Create read and write streams
read_stream = self.transport.read_stream()
write_stream = self.transport.write_stream()
# Start SSE listener if in stream mode
if self.options.get('responseMode', 'batch') == 'stream':
await self.transport.start_sse_listener()
# Create client session
self._session_context = ClientSession(read_stream, write_stream)
self.session = await self._session_context.__aenter__()
# Initialize
await self.session.initialize()
# List available tools
logger.debug("Listing tools...")
response = await self.session.list_tools()
tools_data = response.tools
logger.debug(f"Found {len(tools_data)} tools: {[tool.name for tool in tools_data]}")
# Create tool wrappers
tools = []
for tool in tools_data:
input_schema = tool.inputSchema if hasattr(tool, 'inputSchema') else None
wrapper = HTTPStreamMCPTool(
name=tool.name,
description=tool.description if hasattr(tool, 'description') else f"Call the {tool.name} tool",
session=self.session,
input_schema=input_schema,
timeout=self.timeout
)
tools.append(wrapper)
return tools
def __iter__(self):
"""Return an iterator over the tools."""
return iter(self.tools)
def to_openai_tools(self):
"""Convert all tools to OpenAI format."""
return [tool.to_openai_tool() for tool in self.tools]
async def __aenter__(self):
"""Async context manager entry."""
return self
async def __aexit__(self, exc_type, exc_val, exc_tb):
"""Async context manager exit."""
if self.transport:
await self.transport.__aexit__(exc_type, exc_val, exc_tb)
if hasattr(self, '_session_context') and self._session_context:
await self._session_context.__aexit__(exc_type, exc_val, exc_tb)
@@ -44,13 +44,30 @@ class SSEMCPTool:
# Create a signature based on input schema
params = []
if input_schema and 'properties' in input_schema:
for param_name in input_schema['properties']:
for param_name, prop_schema in input_schema['properties'].items():
# Determine type annotation based on schema
prop_type = prop_schema.get('type', 'string') if isinstance(prop_schema, dict) else 'string'
if prop_type == 'string':
annotation = str
elif prop_type == 'integer':
annotation = int
elif prop_type == 'number':
annotation = float
elif prop_type == 'boolean':
annotation = bool
elif prop_type == 'array':
annotation = list
elif prop_type == 'object':
annotation = dict
else:
annotation = str # Default to string for SSE
params.append(
inspect.Parameter(
name=param_name,
kind=inspect.Parameter.POSITIONAL_OR_KEYWORD,
default=inspect.Parameter.empty if param_name in input_schema.get('required', []) else None,
annotation=str # Default to string
annotation=annotation
)
)
@@ -16,6 +16,7 @@ class LoopItems(BaseModel):
class Process:
DEFAULT_RETRY_LIMIT = 3 # Predefined retry limit in a common place
VALIDATION_FAILURE_DECISIONS = ["invalid", "retry", "failed", "error", "unsuccessful", "fail", "errors", "reject", "rejected", "incomplete"] # Decision strings that trigger validation feedback
def __init__(self, tasks: Dict[str, Task], agents: List[Agent], manager_llm: Optional[str] = None, verbose: bool = False, max_iter: int = 10):
logging.debug(f"=== Initializing Process ===")
@@ -33,12 +34,38 @@ class Process:
self.task_retry_counter: Dict[str, int] = {} # Initialize retry counter
self.workflow_finished = False # ADDED: Workflow finished flag
def _create_loop_subtasks(self, loop_task: Task):
"""Create subtasks for a loop task from input file."""
logging.warning(f"_create_loop_subtasks called for {loop_task.name} but method not fully implemented")
# TODO: Implement loop subtask creation from input file
# This should read loop_task.input_file and create subtasks
pass
def _build_task_context(self, current_task: Task) -> str:
"""Build context for a task based on its retain_full_context setting"""
if not (current_task.previous_tasks or current_task.context):
return ""
# Check if we have validation feedback to include
if current_task.validation_feedback:
feedback = current_task.validation_feedback
context = f"\nPrevious attempt failed validation with reason: {feedback['validation_response']}"
if feedback.get('validated_task'):
context += f"\nValidated task: {feedback['validated_task']}"
if feedback.get('validation_details'):
context += f"\nValidation feedback: {feedback['validation_details']}"
if feedback.get('rejected_output'):
context += f"\nRejected output: {feedback['rejected_output']}"
context += "\nPlease try again with a different approach based on this feedback.\n"
# Clear the feedback after including it to prevent it from persisting
current_task.validation_feedback = None
context = "\nInput data from previous tasks:"
# If we have validation feedback but no previous tasks context, return just the feedback
if not (current_task.previous_tasks or current_task.context):
return context
# Otherwise, append the regular context
context += "\nInput data from previous tasks:"
elif not (current_task.previous_tasks or current_task.context):
return ""
else:
context = "\nInput data from previous tasks:"
if current_task.retain_full_context:
# Original behavior: include all previous tasks
@@ -442,16 +469,18 @@ Subtask: {st.name}
logging.debug(f"Task type: {task_to_check.task_type}")
logging.debug(f"Task status before reset check: {task_to_check.status}")
logging.debug(f"Task rerun: {getattr(task_to_check, 'rerun', True)}") # default to True if not set
logging.debug(f"Task async_execution: {task_to_check.async_execution}")
if (getattr(task_to_check, 'rerun', True) and # Corrected condition - reset only if rerun is True (or default True)
task_to_check.task_type != "loop" and # Removed "decision" from exclusion
not any(t.task_type == "loop" and subtask_name.startswith(t.name + "_")
for t in self.tasks.values())):
logging.debug(f"=== Resetting non-loop, non-decision task {subtask_name} to 'not started' ===")
for t in self.tasks.values()) and
not task_to_check.async_execution): # Don't reset async parallel tasks
logging.debug(f"=== Resetting non-loop, non-decision, non-parallel task {subtask_name} to 'not started' ===")
self.tasks[task_id].status = "not started"
logging.debug(f"Task status after reset: {self.tasks[task_id].status}")
else:
logging.debug(f"=== Skipping reset for loop/decision/subtask or rerun=False: {subtask_name} ===")
logging.debug(f"=== Skipping reset for loop/decision/subtask/parallel or rerun=False: {subtask_name} ===")
logging.debug(f"Keeping status as: {self.tasks[task_id].status}")
# Handle loop progression
@@ -496,6 +525,35 @@ Subtask: {st.name}
next_task = next((t for t in self.tasks.values() if t.name == task_value), None)
if next_task:
next_task.status = "not started" # Reset status to allow execution
# Capture validation feedback for retry scenarios
if decision_str in Process.VALIDATION_FAILURE_DECISIONS:
if current_task and current_task.result:
# Get the rejected output from the task that was validated
validated_task = None
# Find the task that produced the output being validated
if current_task.previous_tasks:
# For validation tasks, typically validate the most recent previous task
prev_task_name = current_task.previous_tasks[-1]
validated_task = next((t for t in self.tasks.values() if t.name == prev_task_name), None)
elif current_task.context:
# If no previous_tasks, check context for the validated task
# Use the most recent task with a result from context
for ctx_task in reversed(current_task.context):
if ctx_task.result and ctx_task.name != current_task.name:
validated_task = ctx_task
break
feedback = {
'validation_response': decision_str,
'validation_details': current_task.result.raw,
'rejected_output': validated_task.result.raw if validated_task and validated_task.result else None,
'validator_task': current_task.name,
'validated_task': validated_task.name if validated_task else None
}
next_task.validation_feedback = feedback
logging.debug(f"Added validation feedback to {next_task.name}: {feedback['validation_response']} (validated task: {feedback.get('validated_task', 'None')})")
logging.debug(f"Routing to {next_task.name} based on decision: {decision_str}")
# Don't mark workflow as finished when following condition path
self.workflow_finished = False
@@ -1043,16 +1101,18 @@ Subtask: {st.name}
logging.debug(f"Task type: {task_to_check.task_type}")
logging.debug(f"Task status before reset check: {task_to_check.status}")
logging.debug(f"Task rerun: {getattr(task_to_check, 'rerun', True)}") # default to True if not set
logging.debug(f"Task async_execution: {task_to_check.async_execution}")
if (getattr(task_to_check, 'rerun', True) and # Corrected condition - reset only if rerun is True (or default True)
task_to_check.task_type != "loop" and # Removed "decision" from exclusion
not any(t.task_type == "loop" and subtask_name.startswith(t.name + "_")
for t in self.tasks.values())):
logging.debug(f"=== Resetting non-loop, non-decision task {subtask_name} to 'not started' ===")
for t in self.tasks.values()) and
not task_to_check.async_execution): # Don't reset async parallel tasks
logging.debug(f"=== Resetting non-loop, non-decision, non-parallel task {subtask_name} to 'not started' ===")
self.tasks[task_id].status = "not started"
logging.debug(f"Task status after reset: {self.tasks[task_id].status}")
else:
logging.debug(f"=== Skipping reset for loop/decision/subtask or rerun=False: {subtask_name} ===")
logging.debug(f"=== Skipping reset for loop/decision/subtask/parallel or rerun=False: {subtask_name} ===")
logging.debug(f"Keeping status as: {self.tasks[task_id].status}")
@@ -1098,6 +1158,35 @@ Subtask: {st.name}
next_task = next((t for t in self.tasks.values() if t.name == task_value), None)
if next_task:
next_task.status = "not started" # Reset status to allow execution
# Capture validation feedback for retry scenarios
if decision_str in Process.VALIDATION_FAILURE_DECISIONS:
if current_task and current_task.result:
# Get the rejected output from the task that was validated
validated_task = None
# Find the task that produced the output being validated
if current_task.previous_tasks:
# For validation tasks, typically validate the most recent previous task
prev_task_name = current_task.previous_tasks[-1]
validated_task = next((t for t in self.tasks.values() if t.name == prev_task_name), None)
elif current_task.context:
# If no previous_tasks, check context for the validated task
# Use the most recent task with a result from context
for ctx_task in reversed(current_task.context):
if ctx_task.result and ctx_task.name != current_task.name:
validated_task = ctx_task
break
feedback = {
'validation_response': decision_str,
'validation_details': current_task.result.raw,
'rejected_output': validated_task.result.raw if validated_task and validated_task.result else None,
'validator_task': current_task.name,
'validated_task': validated_task.name if validated_task else None
}
next_task.validation_feedback = feedback
logging.debug(f"Added validation feedback to {next_task.name}: {feedback['validation_response']} (validated task: {feedback.get('validated_task', 'None')})")
logging.debug(f"Routing to {next_task.name} based on decision: {decision_str}")
# Don't mark workflow as finished when following condition path
self.workflow_finished = False
@@ -88,6 +88,7 @@ class Task:
self.max_retries = max_retries
self.retry_count = retry_count
self._guardrail_fn = None
self.validation_feedback = None # Store validation failure feedback for retry attempts
# Set logger level based on config verbose level
verbose = self.config.get("verbose", 0)
+3 -2
View File
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "praisonaiagents"
version = "0.0.124"
version = "0.0.128"
description = "Praison AI agents for completing complex tasks with Self Reflection Agents"
requires-python = ">=3.10"
authors = [
@@ -15,7 +15,8 @@ dependencies = [
"rich",
"openai",
"mcp>=1.6.0",
"posthog>=3.0.0"
"posthog>=3.0.0",
"aiohttp>=3.8.0"
]
[project.optional-dependencies]
@@ -0,0 +1,49 @@
"""Test sequential tool calling fix"""
from praisonaiagents import Agent
def get_stock_price(company_name: str) -> str:
"""
Get the stock price of a company
Args:
company_name (str): The name of the company
Returns:
str: The stock price of the company
"""
print(f"Tool called: get_stock_price({company_name})")
return f"The stock price of {company_name} is 100"
def multiply(a: int, b: int) -> int:
"""
Multiply two numbers
"""
print(f"Tool called: multiply({a}, {b})")
return a * b
# Test with streaming disabled to verify the fix
print("Testing sequential tool calling with stream=False...")
agent = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="gemini/gemini-2.5-flash-lite-preview-06-17",
self_reflect=False,
verbose=True,
tools=[get_stock_price, multiply],
stream=False # Force non-streaming mode - use stream parameter directly
)
result = agent.chat("Get the stock price of Google and multiply it by 2")
print(f"\nFinal result: {result}")
# Test with default streaming mode
print("\n\nTesting sequential tool calling with default streaming...")
agent2 = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="gemini/gemini-2.5-flash-lite-preview-06-17",
self_reflect=False,
verbose=True,
tools=[get_stock_price, multiply]
)
result2 = agent2.chat("Get the stock price of Google and multiply it by 2")
print(f"\nFinal result: {result2}")
@@ -0,0 +1,161 @@
#!/usr/bin/env python3
"""Test script for validation feedback in workflow retry logic"""
import sys
import os
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src/praisonai-agents'))
from praisonaiagents import Agent, Task, PraisonAIAgents
def test_example_one():
"""Test the philosopher quotes example"""
print("=" * 80)
print("Testing Example 1: Philosopher Quotes with Validation")
print("=" * 80)
validator_agent = Agent(
name="validator_agent",
instructions="You are a helpful assistant",
llm="gemini/gemini-2.5-flash",
self_reflect=False,
verbose=True
)
quote_agent = Agent(
name="quote_agent",
instructions="You are a helpful assistant who is a pro at quoting philosophers",
llm="gemini/gemini-2.5-flash",
self_reflect=False,
verbose=False
)
collect_task = Task(
description="Quote Aristotle",
expected_output="List of Quotes from Aristotle",
agent=quote_agent,
name="collect_data",
is_start=True,
next_tasks=["validate_data"]
)
validate_task = Task(
description="""Validate the collected data. Check if:
1. At least 25 results are returned.
2. Each is a quote from Aristotle.
Return validation_result as 'valid' or 'invalid' only no other text.""",
expected_output="Validation result indicating if data is valid or invalid.",
agent=validator_agent,
name="validate_data",
task_type="decision",
condition={
"valid": [], # End the workflow on valid data
"invalid": ["collect_data"] # Retry data collection on invalid data
},
)
# Workflow
agents = PraisonAIAgents(
agents=[quote_agent, validator_agent],
tasks=[collect_task, validate_task],
verbose=1,
process="workflow",
max_iter=3 # Limit iterations to prevent infinite loops
)
try:
agents.start()
print("\nExample 1 completed successfully!")
except Exception as e:
print(f"\nExample 1 failed with error: {e}")
def test_example_two():
"""Test the web search example"""
print("\n" + "=" * 80)
print("Testing Example 2: Web Search with Validation (Mock)")
print("=" * 80)
# Mock web search tool for testing
def mock_web_search(query: str) -> str:
"""Mock web search that returns limited results initially"""
# Simulate returning too few results on first attempt
return "Found 3 results:\n1. https://example.com/kenya1\n2. https://example.com/kenya2\n3. https://example.com/kenya3"
agent = Agent(
name="agent",
instructions="You are a helpful assistant",
llm="gemini/gemini-2.5-flash",
self_reflect=False,
verbose=True
)
web_search_agent = Agent(
name="web_search_agent",
role="Web Search Specialist",
goal="Search the web for relevant information",
instructions="You are a helpful assistant. You can use the tools provided to you to help the user.",
llm="gemini/gemini-2.5-flash",
self_reflect=False,
verbose=False,
tools=[mock_web_search]
)
# Tasks
collect_task = Task(
description="Perform an internet search using the query: 'Kenya protests in 2024 and 2025'",
expected_output="List of URLs of the articles that are relevant to the search",
agent=web_search_agent,
name="collect_data",
is_start=True,
next_tasks=["validate_data"]
)
validate_task = Task(
description="""Validate the collected data. Check if:
1. At least 12 results are returned.
2. Each result contains a valid URL.
Return validation_result as 'valid' or 'invalid' only no other text.""",
expected_output="Validation result indicating if data is valid or invalid.",
agent=agent,
name="validate_data",
task_type="decision",
condition={
"valid": [], # End the workflow on valid data
"invalid": ["collect_data"] # Retry data collection on invalid data
},
)
# Workflow
agents = PraisonAIAgents(
agents=[web_search_agent, agent],
tasks=[collect_task, validate_task],
verbose=1,
process="workflow",
max_iter=3 # Limit iterations
)
try:
agents.start()
print("\nExample 2 completed successfully!")
except Exception as e:
print(f"\nExample 2 failed with error: {e}")
if __name__ == "__main__":
print("Testing Validation Feedback Implementation")
print("This test demonstrates that retry tasks now receive validation feedback\n")
# Run example 1 (without actual API calls, just structure test)
try:
# We'll just test the structure is valid
test_example_one()
except Exception as e:
print(f"Note: Example 1 requires actual LLM API access: {e}")
# Run example 2 with mock
try:
test_example_two()
except Exception as e:
print(f"Note: Example 2 test setup issue: {e}")
print("\nTest script completed. The implementation adds validation feedback to retry tasks.")
+21 -8
View File
@@ -11,14 +11,30 @@ def analyze_code_changes():
]
return issues[int(time.time()) % 3]
def suggest_fixes(issue: Dict):
def suggest_fixes(issue):
"""Simulates fix suggestions"""
fixes = {
"style": "Apply PEP 8 formatting",
"security": "Implement input validation",
"security": "Implement input validation",
"performance": "Use list comprehension"
}
return fixes.get(issue["type"], "Review manually")
# Handle both dict and string inputs
if isinstance(issue, dict):
issue_type = issue.get("type", "unknown")
else:
# If it's a string, try to extract the type
issue_str = str(issue).lower()
if "security" in issue_str:
issue_type = "security"
elif "style" in issue_str:
issue_type = "style"
elif "performance" in issue_str:
issue_type = "performance"
else:
issue_type = "unknown"
return fixes.get(issue_type, "Review manually")
def apply_automated_fix(fix: str):
"""Simulates applying automated fixes"""
@@ -98,11 +114,8 @@ def main():
# Print results
print("\nCode Review Results:")
print("=" * 50)
for task_id, result in results["task_results"].items():
if result:
print(f"\nTask: {task_id}")
print(f"Result: {result.raw}")
print("-" * 50)
print(f"Results: {results}")
print("-" * 50)
if __name__ == "__main__":
main()
@@ -0,0 +1,88 @@
#!/usr/bin/env python
"""
Example of using MCP with HTTP Stream transport.
This demonstrates how to connect to an MCP server using the new HTTP Stream transport.
"""
from praisonaiagents import Agent
from praisonaiagents.mcp import MCP
# Example 1: Basic HTTP Stream connection (defaults to /mcp endpoint)
print("Example 1: Basic HTTP Stream connection")
try:
# This will use HTTP Stream transport automatically
tools = MCP("http://localhost:8080", debug=True)
print(f"Connected! Found {len(list(tools))} tools")
for tool in tools:
print(f" - {tool.name}: {tool.description}")
except Exception as e:
print(f"Connection failed: {e}")
print("\n" + "="*50 + "\n")
# Example 2: HTTP Stream with custom endpoint
print("Example 2: HTTP Stream with custom endpoint")
try:
# This will use HTTP Stream transport with custom endpoint
tools = MCP("http://localhost:8080/custom-mcp", debug=True)
print(f"Connected! Found {len(list(tools))} tools")
except Exception as e:
print(f"Connection failed: {e}")
print("\n" + "="*50 + "\n")
# Example 3: HTTP Stream with stream response mode
print("Example 3: HTTP Stream with stream response mode")
try:
# This will use HTTP Stream transport with streaming responses
tools = MCP("http://localhost:8080", responseMode="stream", debug=True)
print(f"Connected! Found {len(list(tools))} tools")
except Exception as e:
print(f"Connection failed: {e}")
print("\n" + "="*50 + "\n")
# Example 4: Backward compatibility - SSE transport
print("Example 4: Backward compatibility - SSE transport")
try:
# URLs ending with /sse will still use SSE transport
tools = MCP("http://localhost:8080/sse", debug=True)
print(f"Connected using SSE! Found {len(list(tools))} tools")
except Exception as e:
print(f"Connection failed: {e}")
print("\n" + "="*50 + "\n")
# Example 5: Using with an agent
print("Example 5: Using HTTP Stream tools with an agent")
try:
agent = Agent(
name="Weather Assistant",
instructions="You are a helpful weather assistant.",
tools=MCP("http://localhost:8080"), # HTTP Stream transport
llm="gpt-4o-mini"
)
print("Agent created successfully with HTTP Stream tools!")
# Example usage (commented out to avoid actual API calls)
# result = agent.execute("What's the weather in Paris?")
# print(f"Result: {result}")
except Exception as e:
print(f"Agent creation failed: {e}")
print("\n" + "="*50 + "\n")
# Example 6: HTTP Stream with custom headers and CORS
print("Example 6: HTTP Stream with custom configuration")
try:
tools = MCP(
"http://localhost:8080",
headers={"X-API-Key": "my-api-key"},
cors={"allowOrigin": "*"},
debug=True
)
print(f"Connected with custom config! Found {len(list(tools))} tools")
except Exception as e:
print(f"Connection failed: {e}")
print("\nNote: These examples require an HTTP Stream MCP server running on localhost:8080")
@@ -69,7 +69,7 @@ workflow = PraisonAIAgents(
)
# Run the workflow
results = workflow.start()
results = workflow.start(return_dict=True)
# Print results
print("\nWorkflow Results:")
@@ -0,0 +1,75 @@
"""
Test script to verify the fix for sequential tool calling.
The agent should:
1. Call get_stock_price to get Google's stock price (100)
2. Call multiply to multiply 100 by 2
3. Return the final result (200)
"""
from praisonaiagents import Agent
def get_stock_price(company_name: str) -> str:
"""
Get the stock price of a company
Args:
company_name (str): The name of the company
Returns:
str: The stock price of the company
"""
print(f"[Tool Called] get_stock_price({company_name})")
return f"The stock price of {company_name} is 100"
def multiply(a: int, b: int) -> int:
"""
Multiply two numbers
Args:
a (int): First number
b (int): Second number
Returns:
int: Product of a and b
"""
print(f"[Tool Called] multiply({a}, {b})")
return a * b
# Test with Gemini
print("=" * 60)
print("Testing with Gemini model")
print("=" * 60)
agent_gemini = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user. When asked to multiply a stock price, first get the stock price, then multiply it.",
llm="gemini/gemini-2.5-pro",
tools=[get_stock_price, multiply],
verbose=True
)
result_gemini = agent_gemini.start("what is the stock price of Google? multiply the Google stock price with 2")
print(f"\nFinal Result (Gemini): {result_gemini}")
# Test with GPT-4
print("\n" + "=" * 60)
print("Testing with GPT-4 model")
print("=" * 60)
agent_gpt4 = Agent(
instructions="You are a helpful assistant. You can use the tools provided to you to help the user. When asked to multiply a stock price, first get the stock price, then multiply it.",
llm="gpt-4o",
tools=[get_stock_price, multiply],
verbose=True
)
result_gpt4 = agent_gpt4.start("what is the stock price of Google? multiply the Google stock price with 2")
print(f"\nFinal Result (GPT-4): {result_gpt4}")
# Verify results
print("\n" + "=" * 60)
print("Test Results Summary")
print("=" * 60)
print(f"Gemini result contains '200': {'200' in str(result_gemini) if result_gemini else False}")
print(f"GPT-4 result contains '200': {'200' in str(result_gpt4) if result_gpt4 else False}")
print(f"Gemini returned empty: {not result_gemini or result_gemini == ''}")
print(f"GPT-4 returned empty: {not result_gpt4 or result_gpt4 == ''}")
@@ -0,0 +1,58 @@
#!/usr/bin/env python
"""
Basic test to verify HTTP Stream implementation is working correctly.
"""
import sys
import os
# Add parent directory to path for imports
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from praisonaiagents.mcp import MCP
def test_transport_selection():
"""Test that URLs are correctly routed to appropriate transports."""
print("Testing transport selection logic...")
# Test 1: SSE URL should use SSE transport
try:
mcp_sse = MCP("http://localhost:8080/sse")
assert mcp_sse.is_sse == True
assert mcp_sse.is_http_stream == False
print("✓ SSE URL correctly uses SSE transport")
except Exception as e:
print(f"✗ SSE URL test failed: {e}")
# Test 2: Regular HTTP URL should use HTTP Stream transport
try:
mcp_http = MCP("http://localhost:8080")
assert mcp_http.is_sse == False
assert mcp_http.is_http_stream == True
print("✓ HTTP URL correctly uses HTTP Stream transport")
except Exception as e:
print(f"✗ HTTP URL test failed: {e}")
# Test 3: Custom endpoint should use HTTP Stream transport
try:
mcp_custom = MCP("http://localhost:8080/custom")
assert mcp_custom.is_sse == False
assert mcp_custom.is_http_stream == True
print("✓ Custom endpoint correctly uses HTTP Stream transport")
except Exception as e:
print(f"✗ Custom endpoint test failed: {e}")
# Test 4: Stdio transport should still work
try:
mcp_stdio = MCP("/Users/praison/miniconda3/envs/mcp/bin/python /Users/praison/stockprice/app.py")
assert mcp_stdio.is_sse == False
assert mcp_stdio.is_http_stream == False
print("✓ Stdio transport still works")
except Exception as e:
print(f"✗ Stdio transport test failed: {e}")
print("\nAll transport selection tests completed!")
if __name__ == "__main__":
test_transport_selection()
@@ -0,0 +1,252 @@
"""Unit tests for validation feedback in workflow retry logic"""
import pytest
from unittest.mock import Mock, patch
from praisonaiagents import Agent, Task, TaskOutput
from praisonaiagents.process import Process
class TestValidationFeedback:
"""Test validation feedback functionality"""
def test_task_has_validation_feedback_field(self):
"""Test that Task class has validation_feedback field"""
task = Task(
name="test_task",
description="Test task",
expected_output="Test output"
)
assert hasattr(task, 'validation_feedback')
assert task.validation_feedback is None
def test_validation_feedback_captured_on_invalid_decision(self):
"""Test that validation feedback is captured when decision is invalid"""
# Create mock agents
agent1 = Mock(spec=Agent)
agent2 = Mock(spec=Agent)
# Create tasks
collect_task = Task(
name="collect_data",
description="Collect data",
expected_output="Data",
agent=agent1,
is_start=True,
next_tasks=["validate_data"]
)
validate_task = Task(
name="validate_data",
description="Validate data",
expected_output="Validation result",
agent=agent2,
task_type="decision",
condition={
"valid": [],
"invalid": ["collect_data"]
}
)
# Set up task relationships
validate_task.previous_tasks = ["collect_data"]
# Create process
process = Process(
agents={"agent1": agent1, "agent2": agent2},
tasks={"collect_data": collect_task, "validate_data": validate_task},
verbose=0
)
# Simulate task execution results
collect_task.result = TaskOutput(
raw="Collected only 3 items",
agent="agent1"
)
collect_task.status = "completed"
validate_task.result = TaskOutput(
raw="Not enough results, need at least 10",
agent="agent2"
)
validate_task.status = "completed"
# Simulate workflow routing with invalid decision
# This would normally happen in the workflow execution
decision_str = "invalid"
current_task = validate_task
target_tasks = current_task.condition.get(decision_str, [])
if target_tasks:
task_value = target_tasks[0]
next_task = collect_task # This is the retry task
# The implementation should add validation feedback
if decision_str in Process.VALIDATION_FAILURE_DECISIONS:
if current_task and current_task.result:
validated_task = collect_task # The task that was validated
feedback = {
'validation_response': decision_str,
'validation_details': current_task.result.raw,
'rejected_output': validated_task.result.raw if validated_task and validated_task.result else None,
'validator_task': current_task.name
}
next_task.validation_feedback = feedback
# Verify feedback was captured
assert collect_task.validation_feedback is not None
assert collect_task.validation_feedback['validation_response'] == 'invalid'
assert collect_task.validation_feedback['validation_details'] == "Not enough results, need at least 10"
assert collect_task.validation_feedback['rejected_output'] == "Collected only 3 items"
assert collect_task.validation_feedback['validator_task'] == "validate_data"
def test_validation_feedback_included_in_context(self):
"""Test that validation feedback is included in task context"""
# Create a task with validation feedback
task = Task(
name="retry_task",
description="Original description",
expected_output="Expected output"
)
task.validation_feedback = {
'validation_response': 'invalid',
'validation_details': 'Not enough results',
'rejected_output': 'Previous output',
'validator_task': 'validator'
}
# Create process to test context building
process = Process(
agents={},
tasks={"retry_task": task},
verbose=0
)
# Build context
context = process._build_task_context(task)
# Verify feedback is in context
assert "Previous attempt failed validation with reason: invalid" in context
assert "Validation feedback: Not enough results" in context
assert "Rejected output: Previous output" in context
assert "Please try again with a different approach based on this feedback." in context
# Verify feedback was cleared after use
assert task.validation_feedback is None
def test_validation_feedback_backward_compatibility(self):
"""Test that tasks without validation feedback work normally"""
task = Task(
name="normal_task",
description="Normal task",
expected_output="Normal output"
)
process = Process(
agents={},
tasks={"normal_task": task},
verbose=0
)
# Build context without validation feedback
context = process._build_task_context(task)
# Should return empty string for task with no context
assert context == ""
# Task should still work normally
assert task.validation_feedback is None
def test_multiple_retry_decisions_supported(self):
"""Test that various failure decision strings trigger feedback capture"""
# Import the constant from Process class
from praisonaiagents.process import Process
failure_decisions = Process.VALIDATION_FAILURE_DECISIONS
for decision in failure_decisions:
task = Task(
name="test_task",
description="Test",
expected_output="Test"
)
# Simulate the decision routing logic
if decision in Process.VALIDATION_FAILURE_DECISIONS:
task.validation_feedback = {
'validation_response': decision,
'validation_details': f"Failed with {decision}",
'rejected_output': "Previous output",
'validator_task': "validator"
}
assert task.validation_feedback is not None
assert task.validation_feedback['validation_response'] == decision
def test_validation_feedback_with_context_tasks(self):
"""Test that validation feedback works when validated task is in context"""
# Create mock agents
agent1 = Mock(spec=Agent)
agent2 = Mock(spec=Agent)
# Create tasks
data_task = Task(
name="data_task",
description="Generate data",
expected_output="Data",
agent=agent1
)
validate_task = Task(
name="validate_data",
description="Validate data",
expected_output="Validation result",
agent=agent2,
task_type="decision",
context=[data_task], # Data task is in context, not previous_tasks
condition={
"valid": [],
"invalid": ["data_task"]
}
)
# Create process
process = Process(
agents={"agent1": agent1, "agent2": agent2},
tasks={"data_task": data_task, "validate_data": validate_task},
verbose=0
)
# Simulate task execution results
data_task.result = TaskOutput(
raw="Generated data with errors",
agent="agent1"
)
data_task.status = "completed"
validate_task.result = TaskOutput(
raw="Data has errors, please fix",
agent="agent2"
)
validate_task.status = "completed"
# Test the improved validation feedback logic
decision_str = "invalid"
current_task = validate_task
# This simulates the improved logic that checks context when no previous_tasks
validated_task = None
if current_task.previous_tasks:
prev_task_name = current_task.previous_tasks[-1]
validated_task = data_task if data_task.name == prev_task_name else None
elif current_task.context:
# Check context for the validated task
for ctx_task in reversed(current_task.context):
if ctx_task.result and ctx_task.name != current_task.name:
validated_task = ctx_task
break
# Verify the context-based task was found
assert validated_task is not None
assert validated_task.name == "data_task"
assert validated_task.result.raw == "Generated data with errors"
+3 -1
View File
@@ -2375,9 +2375,10 @@ wheels = [
[[package]]
name = "praisonaiagents"
version = "0.0.124"
version = "0.0.128"
source = { editable = "." }
dependencies = [
{ name = "aiohttp" },
{ name = "mcp" },
{ name = "openai" },
{ name = "posthog" },
@@ -2431,6 +2432,7 @@ telemetry = [
[package.metadata]
requires-dist = [
{ name = "aiohttp", specifier = ">=3.8.0" },
{ name = "chonkie", marker = "extra == 'knowledge'", specifier = ">=1.0.2" },
{ name = "chromadb", marker = "extra == 'graph'", specifier = ">=1.0.0" },
{ name = "chromadb", marker = "extra == 'knowledge'", specifier = ">=1.0.0" },
+2 -2
View File
@@ -3,8 +3,8 @@ class Praisonai < Formula
desc "AI tools for various AI applications"
homepage "https://github.com/MervinPraison/PraisonAI"
url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/v2.2.50.tar.gz"
sha256 `curl -sL https://github.com/MervinPraison/PraisonAI/archive/refs/tags/v2.2.50.tar.gz | shasum -a 256`.split.first
url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/v2.2.54.tar.gz"
sha256 `curl -sL https://github.com/MervinPraison/PraisonAI/archive/refs/tags/v2.2.54.tar.gz | shasum -a 256`.split.first
license "MIT"
depends_on "[email protected]"
+1 -1
View File
@@ -57,7 +57,7 @@ class CloudDeployer:
file.write("FROM python:3.11-slim\n")
file.write("WORKDIR /app\n")
file.write("COPY . .\n")
file.write("RUN pip install flask praisonai==2.2.50 gunicorn markdown\n")
file.write("RUN pip install flask praisonai==2.2.54 gunicorn markdown\n")
file.write("EXPOSE 8080\n")
file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
+4 -4
View File
@@ -1,6 +1,6 @@
[project]
name = "PraisonAI"
version = "2.2.50"
version = "2.2.54"
description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
readme = "README.md"
license = ""
@@ -12,7 +12,7 @@ dependencies = [
"rich>=13.7",
"markdown>=3.5",
"pyparsing>=3.0.0",
"praisonaiagents>=0.0.124",
"praisonaiagents>=0.0.128",
"python-dotenv>=0.19.0",
"instructor>=1.3.3",
"PyYAML>=6.0",
@@ -95,7 +95,7 @@ autogen = ["pyautogen>=0.2.19", "praisonai-tools>=0.0.15", "crewai"]
[tool.poetry]
name = "PraisonAI"
version = "2.2.50"
version = "2.2.54"
description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
authors = ["Mervin Praison"]
license = ""
@@ -113,7 +113,7 @@ python = ">=3.10,<3.13"
rich = ">=13.7"
markdown = ">=3.5"
pyparsing = ">=3.0.0"
praisonaiagents = ">=0.0.124"
praisonaiagents = ">=0.0.128"
python-dotenv = ">=0.19.0"
instructor = ">=1.3.3"
PyYAML = ">=6.0"
@@ -0,0 +1,256 @@
"""Unit tests for validation feedback in workflow retry logic"""
import pytest
from unittest.mock import Mock, patch
from praisonaiagents import Agent, Task, TaskOutput
from praisonaiagents.process import Process
class TestValidationFeedback:
"""Test validation feedback functionality"""
def test_task_has_validation_feedback_field(self):
"""Test that Task class has validation_feedback field"""
task = Task(
name="test_task",
description="Test task",
expected_output="Test output"
)
assert hasattr(task, 'validation_feedback')
assert task.validation_feedback is None
def test_validation_feedback_captured_on_invalid_decision(self):
"""Test that validation feedback is captured when decision is invalid"""
# Create mock agents
agent1 = Mock(spec=Agent)
agent2 = Mock(spec=Agent)
# Create tasks
collect_task = Task(
name="collect_data",
description="Collect data",
expected_output="Data",
agent=agent1,
is_start=True,
next_tasks=["validate_data"]
)
validate_task = Task(
name="validate_data",
description="Validate data",
expected_output="Validation result",
agent=agent2,
task_type="decision",
condition={
"valid": [],
"invalid": ["collect_data"]
}
)
# Set up task relationships
validate_task.previous_tasks = ["collect_data"]
# Create process
process = Process(
agents={"agent1": agent1, "agent2": agent2},
tasks={"collect_data": collect_task, "validate_data": validate_task},
verbose=0
)
# Simulate task execution results
collect_task.result = TaskOutput(
raw="Collected only 3 items",
description="Collected data items",
agent="agent1"
)
collect_task.status = "completed"
validate_task.result = TaskOutput(
raw="Not enough results, need at least 10",
description="Validation result",
agent="agent2"
)
validate_task.status = "completed"
# Simulate workflow routing with invalid decision
# This would normally happen in the workflow execution
decision_str = "invalid"
current_task = validate_task
target_tasks = current_task.condition.get(decision_str, [])
if target_tasks:
task_value = target_tasks[0]
next_task = collect_task # This is the retry task
# The implementation should add validation feedback
if decision_str in Process.VALIDATION_FAILURE_DECISIONS:
if current_task and current_task.result:
validated_task = collect_task # The task that was validated
feedback = {
'validation_response': decision_str,
'validation_details': current_task.result.raw,
'rejected_output': validated_task.result.raw if validated_task and validated_task.result else None,
'validator_task': current_task.name
}
next_task.validation_feedback = feedback
# Verify feedback was captured
assert collect_task.validation_feedback is not None
assert collect_task.validation_feedback['validation_response'] == 'invalid'
assert collect_task.validation_feedback['validation_details'] == "Not enough results, need at least 10"
assert collect_task.validation_feedback['rejected_output'] == "Collected only 3 items"
assert collect_task.validation_feedback['validator_task'] == "validate_data"
def test_validation_feedback_included_in_context(self):
"""Test that validation feedback is included in task context"""
# Create a task with validation feedback
task = Task(
name="retry_task",
description="Original description",
expected_output="Expected output"
)
task.validation_feedback = {
'validation_response': 'invalid',
'validation_details': 'Not enough results',
'rejected_output': 'Previous output',
'validator_task': 'validator'
}
# Create process to test context building
process = Process(
agents={},
tasks={"retry_task": task},
verbose=0
)
# Build context
context = process._build_task_context(task)
# Verify feedback is in context
assert "Previous attempt failed validation with reason: invalid" in context
assert "Validation feedback: Not enough results" in context
assert "Rejected output: Previous output" in context
assert "Please try again with a different approach based on this feedback." in context
# Verify feedback was cleared after use
assert task.validation_feedback is None
def test_validation_feedback_backward_compatibility(self):
"""Test that tasks without validation feedback work normally"""
task = Task(
name="normal_task",
description="Normal task",
expected_output="Normal output"
)
process = Process(
agents={},
tasks={"normal_task": task},
verbose=0
)
# Build context without validation feedback
context = process._build_task_context(task)
# Should return empty string for task with no context
assert context == ""
# Task should still work normally
assert task.validation_feedback is None
def test_multiple_retry_decisions_supported(self):
"""Test that various failure decision strings trigger feedback capture"""
# Import the constant from Process class
from praisonaiagents.process import Process
failure_decisions = Process.VALIDATION_FAILURE_DECISIONS
for decision in failure_decisions:
task = Task(
name="test_task",
description="Test",
expected_output="Test"
)
# Simulate the decision routing logic
if decision in Process.VALIDATION_FAILURE_DECISIONS:
task.validation_feedback = {
'validation_response': decision,
'validation_details': f"Failed with {decision}",
'rejected_output': "Previous output",
'validator_task': "validator"
}
assert task.validation_feedback is not None
assert task.validation_feedback['validation_response'] == decision
def test_validation_feedback_with_context_tasks(self):
"""Test that validation feedback works when validated task is in context"""
# Create mock agents
agent1 = Mock(spec=Agent)
agent2 = Mock(spec=Agent)
# Create tasks
data_task = Task(
name="data_task",
description="Generate data",
expected_output="Data",
agent=agent1
)
validate_task = Task(
name="validate_data",
description="Validate data",
expected_output="Validation result",
agent=agent2,
task_type="decision",
context=[data_task], # Data task is in context, not previous_tasks
condition={
"valid": [],
"invalid": ["data_task"]
}
)
# Create process
process = Process(
agents={"agent1": agent1, "agent2": agent2},
tasks={"data_task": data_task, "validate_data": validate_task},
verbose=0
)
# Simulate task execution results
data_task.result = TaskOutput(
raw="Generated data with errors",
description="Generated data",
agent="agent1"
)
data_task.status = "completed"
validate_task.result = TaskOutput(
raw="Data has errors, please fix",
description="Data validation result",
agent="agent2"
)
validate_task.status = "completed"
# Test the improved validation feedback logic
decision_str = "invalid"
current_task = validate_task
# This simulates the improved logic that checks context when no previous_tasks
validated_task = None
if current_task.previous_tasks:
prev_task_name = current_task.previous_tasks[-1]
validated_task = data_task if data_task.name == prev_task_name else None
elif current_task.context:
# Check context for the validated task
for ctx_task in reversed(current_task.context):
if ctx_task.result and ctx_task.name != current_task.name:
validated_task = ctx_task
break
# Verify the context-based task was found
assert validated_task is not None
assert validated_task.name == "data_task"
assert validated_task.result.raw == "Generated data with errors"
+2585 -2582
View File
File diff suppressed because it is too large. Load diff