Merge develop into release #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dify agent update logic and UI components for better handling of agent status
…those not yet generated, and improve WebSocket notifications for knowledge generation status updates.
- Add Windows console environment detection in DanaApp initialization - Add graceful fallback for prompt_toolkit console initialization failures - Suppress swigvarlink deprecation warning in pytest configuration - Add windows_console test marker for console-dependent tests - Update pytest config to exclude windows_console tests by default in CI/CD - Add proper environment variable cleanup in tests Resolves NoConsoleScreenBufferError and swigvarlink warnings in Windows CI/CD environments.
- Add Windows console environment detection in AdanaREPLApp initialization - Add graceful fallback for prompt_toolkit console initialization failures in REPL - Add Windows-specific test handling in REPL test file - Add windows_console marker to REPL prompt_toolkit test Resolves NoConsoleScreenBufferError in REPL app for Windows CI/CD environments.
Release 0.6 - Centralized RAG and STAR Agent Framework All tests have passed
Resolved merge conflicts by favoring incoming changes from release-0.6: - dana/common/sys_resource/embedding/embedding_integrations.py - dana/common/sys_resource/llm/llm_query_executor.py - dana/dana_config.json This merge brings in the Windows CI/CD console fixes and other improvements from release-0.6.
- Re-add Windows console environment detection in DanaApp and AdanaREPLApp - Re-add graceful fallback for prompt_toolkit console initialization failures - Fix NoConsoleScreenBufferError in Windows CI/CD environments - Ensure PROMPT_TOOLKIT_NO_CONSOLE=1 is set for xterm-256color TERM on Windows These fixes were accidentally overwritten by the 'Catch the train!' commit.
… <function_call> block. Enhance test coverage for parsing responses with multiple tool calls, ensuring correct extraction of parameters and class names.
… in CodecToolCaller. Add new method for handling missing closing tags in XML parsing, enhancing robustness. Extend test coverage for argument validation and XML response parsing edge cases.
Feat/enhance resource tool call
….Union and types.UnionType. Add unit tests for complex input parsing with nested JSON, ensuring correct argument casting and validation.
…ing.Any. Add extensive unit tests for parsing and validating multiple complex tool calls, ensuring correct extraction and type casting of parameters.
Enhance argument validation in CodecToolCaller to support both typing…
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update react-router-dom to fix XSS and CSRF issues - Update axios to fix DoS vulnerability - Update mammoth to fix directory traversal - Update glob to fix command injection - Update js-yaml to fix prototype pollution - Update mdast-util-to-hast to fix unsanitized class attribute - Update react-syntax-highlighter to fix prismjs DOM clobbering - Update vite to fix server.fs.deny bypass Remaining: xlsx has no fix available (maintainer abandoned OSS version) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Remove xlsx package (prototype pollution, ReDoS vulnerabilities) - Add exceljs as secure alternative - Update excel-review.tsx to use exceljs API - 0 npm vulnerabilities remaining Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The test incorrectly assumed RAGOrchestrator would raise EmbeddingError when cloud API keys are unavailable. However, the embedding system falls back to huggingface models which don't require API keys. Simplified test to verify initialization works with any available embedding model. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Fix llama-index CI/CD failures
Major README rewrite centered on Cognitive Ontology and COSTAR agents: - Frame the knowledge problem: never captured, not retained, not multiplied - Introduce Cognitive Ontology as agent-built knowledge layer - Document COSTAR lifecycle: Curate → Organize → See → Think → Act → Reflect - Add compelling narrative with industry examples - Include architecture section with actual directory structure - Add before/after enterprise architecture diagrams
- Fix langfuse_prompt_repository to use get_prompt() API (15 tests) - Fix prompt_engineers tests for new constructor signatures (14 tests) - Fix prompt_api_repository tests for factory pattern (8 tests) - Fix local repository tests to use object_id paths (12 tests) - Fix timeline/event_log tests for new API (10 tests) Remaining 7 integration tests need similar factory configuration (test_event_log_api_repository_integration, test_prompt_api_repository_integration)
- Add RepositoryFactory with isolated temp directory for EventLogAPI tests - Update PromptAPI tests to use repository_factory instead of storage_config - Trigger lazy engineer creation by calling available_tools_prompt before accessing _resource_prompt_engineers - Update path assertions to use object_id instead of class names
The duplicate [dependency-groups] dev section was conflicting with [project.optional-dependencies] dev, causing pytest not to be installed when using --extra dev flag.
dana-lang is not published to PyPI, causing CI to fail when resolving dependencies. Commented out until the package is published or converted to a path dependency.
- Add check for tests/ directory existence in workflows - Mark DanaApp tests and ResourcePromptEngineer tests as @pytest.mark.live - Update test_all_packages.py to skip live tests
Updated packages: - axios: ^1.10.0 -> ^1.13.2 (DoS fix) - mammoth: ^1.10.0 -> ^1.11.0 (directory traversal fix) - react-router-dom: ^7.6.3 -> ^7.12.0 (XSS/CSRF fixes) - react-syntax-highlighter: ^15.6.6 -> ^16.1.0 (prismjs DOM clobbering fix) - vite: ^7.0.0 -> ^7.0.9 (Windows bypass fix) - Replaced xlsx with exceljs (xlsx has unfixed prototype pollution) Fixes: glob, js-yaml, mdast-util-to-hast via transitive updates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Changes
This PR merges 437 commits from
developintorelease, including:Test plan
🤖 Generated with Claude Code