fix: migration issues#32
Merged
Merged
Conversation
- Fix libs/Dockerfile to work with new monorepo structure - Remove erroneous parent file removal commands - Create Makefile for mcp-server with lint and test targets - Add basic test file for mcp-server - Fix poetry install process in libs Docker build All services now build and lint successfully.
- Introduced configuration for Flake8 with custom exclusions and settings. - Set up Black for code formatting with specified line length and exclusions. - Configured isort for import sorting, adhering to Black's profile. - Added Pylint configuration for line length. - Defined project metadata and dependencies using Poetry. - Included various Flake8 plugins for enhanced linting capabilities.
…builds
- Changed library paths from ../../libs/ to ../libs/ in service pyproject.toml files
- This fixes Docker builds where working directory is /app/{service} and libs are at /app/libs/
- Updated admin-backend, rag-backend, and document-extractor pyproject.toml files
…ration
- Fixed all service Dockerfiles to use consistent /app/services/{service-name} working directories
- Updated all ENV variables and file paths to match new structure
- Added Makefile copy to mcp-server Dockerfile to fix missing lint targets
- Ensured all services copy their complete directories for proper Makefile inclusion
- Fixed admin-backend, rag-backend, document-extractor, and mcp-server Dockerfiles
- Tested admin-backend builds successfully and Makefile targets work in container
- Remove duplicate files from infrastructure/ directory (CODE_OF_CONDUCT.md, CONTRIBUTING.md, LICENSE, package.json, release.config.js) - Remove empty README-MONOREPO.md file - Update main README.md to reflect monorepo structure: - Fix component paths (services/*, infrastructure/, libs/) - Update external library references to internal paths - Fix debugger configuration paths for services - Update build instructions and links - Update service README files with correct relative paths - Update libs README to reference correct project location - Ensure all documentation accurately reflects the new monorepo layout
…epos - Update libs/README.md to refer to 'directory' instead of 'repository' - Update infrastructure/README.md to refer to 'directory' instead of 'repository' - Clarify that these are folders within the monorepo, not separate repositories - Update references to better reflect the monorepo structure - Improve navigation by adding reference to services directory in libs README
- Created package.json in libs with devDependencies for semantic release tools. - Added release.config.js to configure semantic release with conventional commits preset and plugins for commit analysis, release notes generation, git, and GitHub integration.
MelvinKl
approved these changes
Jul 14, 2025
This pull request introduces a major restructuring of the repository to improve organization and streamline workflows. Key changes include migrating core libraries and services into separate `libs` and `services` directories, updating references across configuration files, and enhancing CI/CD workflows to support the new structure. ### Repository Restructuring: * Removed submodules for `rag-infrastructure` and `rag-core-library` from `.gitmodules`, consolidating their contents into `libs` and `services` directories. * Updated paths in `.vscode/launch.json` to reflect the new directory structure for `libs` and `services`. [[1]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L37-R47) [[2]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L68-R78) [[3]](diffhunk://#diff-bd5430ee7c51dc892a67b3f2829d1f5b6d223f0fd48b82322cfd45baf9f5e945L99-R109) * Adjusted Python analysis paths in `.vscode/settings.json` to point to the new `libs` directory. ### Workflow Enhancements: * Replaced the `update-submodules` job with `build-and-lint-services` and `build-and-lint-libs`, introducing matrix strategies for linting and testing individual services and libraries. ### Documentation Updates: * Updated `README.md` to reflect the new directory structure, replacing references to submodules with local paths and updating setup instructions. [[1]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L3-R3) [[2]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L47-R70) [[3]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L81-R102) [[4]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L108-R131) [[5]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L179-R208) [[6]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L234-R269) ### Build and Makefile Updates: * Updated `Makefile` to use the new `libs` and `services` directories for linting, testing, and Docker builds.
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 primarily focuses on restructuring the project to enhance consistency and simplify the codebase. Key changes include transitioning paths from
rag-core-librarytolibs, updating Docker build arguments, modifying workflows, and revising documentation to reflect the new structure.Project Restructuring
.vscode/launch.json: UpdatedlocalRootandremoteRootmappings to replacerag-core-librarywithlibsfor various components, ensuring consistency across debugger configurations. [1] [2] [3].vscode/settings.json: Adjusted Python analysis paths to use thelibsdirectory instead ofrag-core-library.Workflow Updates
.github/workflows/lint-and-test.yml: Added support for submodules in the checkout step and simplified Dockerfile paths by removing theservicesprefix. [1] [2]Documentation Revisions
README.md: Revised references to project structure, components, and submodules, replacing mentions ofrag-core-librarywithlibs. Updated links to point to the new directory structure and external repositories. [1] [2] [3] [4] [5]Build and Deployment Adjustments
Tiltfile: Updated commands and paths to align with the newlibsdirectory structure. Introduced conditional build arguments (TEST=1ordev=1) for Docker builds based on folder context. [1] [2] [3] [4] [5] [6]These changes collectively improve the maintainability and clarity of the codebase while aligning the project structure with modern conventions.