refactor: consolidate tooling#31
Merged
Merged
Conversation
…o migration - Update all Dockerfiles to use new monorepo paths (services/, libs/) - Copy missing Dockerfile from rag-core-library to tools/ - Copy root pyproject.toml and poetry.lock files from rag-core-library - Copy GitHub PR template - Update all POETRY_VIRTUALENVS_PATH variables for new structure All services now correctly build with the new monorepo structure.
- Update all Dockerfiles to use new monorepo paths - Copy missing files from submodules (Dockerfile, configs, PR template) - Update README.md to reflect new monorepo structure - Add comprehensive monorepo organization documentation - Update component descriptions with new service/library paths All services now properly reference libs/ directory and use services/ paths. The monorepo is fully functional with consolidated shared libraries.
- Remove rag-core-library and rag-infrastructure submodule directories - Delete .gitmodules file (no longer needed) - Remove update-submodules.sh script - Clean up duplicate README file The repository is now a complete monorepo without any submodule dependencies.
- Introduced a new pyproject.toml file to configure Flake8, Black, Isort, Pylint, and Poetry for the admin_api_lib. - Set up exclusions and rules for code quality tools to maintain consistency across the project. - Added dependencies for various Flake8 plugins to enhance linting capabilities. chore: add release configuration for semantic-release - Created a release.config.js file to configure semantic-release for automated versioning and changelog generation. - Set up plugins for commit analysis and release notes generation based on conventional commits. refactor: remove rag-core-makefile - Deleted the rag-core-makefile as its functionality is now handled by the new pyproject.toml and semantic-release configuration.
MelvinKl
approved these changes
Jul 14, 2025
This pull request primarily focuses on restructuring the project to enhance consistency and simplify the codebase. Key changes include transitioning paths from `rag-core-library` to `libs`, updating Docker build arguments, modifying workflows, and revising documentation to reflect the new structure. ### Project Restructuring * [`.vscode/launch.json`](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L37-R47): Updated `localRoot` and `remoteRoot` mappings to replace `rag-core-library` with `libs` for various components, ensuring consistency across debugger configurations. [[1]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L37-R47) [[2]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L68-R78) [[3]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L99-R109) * [`.vscode/settings.json`](diffhunk://#diff-a5de3e5871ffcc383a2294845bd3df25d3eeff6c29ad46e3a396577c413bf357L3-R8): Adjusted Python analysis paths to use the `libs` directory instead of `rag-core-library`. ### Workflow Updates * [`.github/workflows/lint-and-test.yml`](diffhunk://#diff-9a979a1e38ba79e2c75e54c4bf21fe1a2a1b935e1736666565f992e634dadd0fR73): Added support for submodules in the checkout step and simplified Dockerfile paths by removing the `services` prefix. [[1]](diffhunk://#diff-9a979a1e38ba79e2c75e54c4bf21fe1a2a1b935e1736666565f992e634dadd0fR73) [[2]](diffhunk://#diff-9a979a1e38ba79e2c75e54c4bf21fe1a2a1b935e1736666565f992e634dadd0fL81-R82) ### Documentation Revisions * [`README.md`](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L3-R3): Revised references to project structure, components, and submodules, replacing mentions of `rag-core-library` with `libs`. Updated links to point to the new directory structure and external repositories. [[1]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L3-R3) [[2]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L67-R70) [[3]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L109-R81) [[4]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L136-R108) [[5]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L433) ### Build and Deployment Adjustments * [`Tiltfile`](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425R17-R24): Updated commands and paths to align with the new `libs` directory structure. Introduced conditional build arguments (`TEST=1` or `dev=1`) for Docker builds based on folder context. [[1]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425R17-R24) [[2]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425R33-R40) [[3]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425L45-R59) [[4]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425L82-R90) [[5]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425L94-R102) [[6]](diffhunk://#diff-c2ee8653e1d6b85f0aadf87cd438a9250806c052877248442be4d434cbc52425L105-R113) These changes collectively improve the maintainability and clarity of the codebase while aligning the project structure with modern conventions.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull request re-organizes the repository into a monorepo structure, consolidating services and libraries under unified directories and updating references accordingly. It also removes submodule dependencies and adjusts Dockerfiles to align with the new structure.
Repository Reorganization
.gitmodules: Removed submodule definitions forrag-infrastructureandrag-core-library, as these components are now integrated into the monorepo.README.md: Updated documentation to reflect the new monorepo structure, including reorganized components and updated paths to services and libraries. Added a detailed directory structure overview. [1] [2] [3]Dockerfile Updates
General Updates Across Services:
ENV POETRY_VIRTUALENVS_PATHto reflect new paths within theservicesdirectory for all Dockerfiles. [1] [2] [3] [4]COPYcommands to reference libraries and service files under the newlibsandservicesdirectories. [1] [2] [3] [4]WORKDIRpaths to match the new structure. [1] [2] [3] [4]Service-Specific Updates:
services/admin-backend/Dockerfile: Adjusted paths foradmin-api-libandrag-core-libunderlibs.services/document-extractor/Dockerfile: Updated paths forextractor-api-libunderlibs.services/mcp-server/Dockerfile: Updated paths forsrcand configuration files underservices/mcp-server.services/rag-backend/Dockerfile: Adjusted paths forrag-core-libandrag-core-apiunderlibs.Removal of Submodule References
rag-core-libraryandrag-infrastructure: Removed submodule commit references, as these components are now integrated directly into the monorepo. [1] [2]