Skip to content

refactor: update all path dependencies and build configurations for m… #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 15, 2025

Conversation

a-klos
Copy link
Member

@a-klos a-klos commented Jul 3, 2025

This pull request restructures the project by moving core libraries and service-specific files into dedicated libs and services directories, respectively. It updates paths across multiple files to reflect this new directory structure and ensures that build, lint, and test processes are aligned with the changes.

Directory Restructuring

  • .github/workflows/lint-and-test.yml: Updated Dockerfile paths in the lint image build step to use the new services directory structure.
  • Makefile: Modified commands for linting, updating lock files, formatting with black, and building Docker images to reflect the new libs and services directories.
  • Tiltfile: Updated context paths for Docker builds and live updates to point to the new libs and services directories. [1] [2] [3] [4] [5] [6]

Core Libraries

  • libs/Makefile: Added a new Makefile for managing linting, lock file updates, formatting, and testing for core libraries in the libs directory.

Dependency Updates

a-klos added 2 commits July 2, 2025 12:01
…onorepo

- Update Python path dependencies in all services to point to libs/ directory
- Update Docker build paths in Makefile and Tiltfile
- Create unified Makefile for libs directory
- Update CI/CD workflow to use new service paths
- Remove submodule dependencies from CI/CD

All services now correctly reference the consolidated shared libraries.
- Introduced a new pyproject.toml file to configure Flake8, Black, Isort, Pylint, and Poetry for the admin_api_lib project.
- Set up exclusions and rules for code quality checks and formatting.
- Added dependencies for various Flake8 plugins to enhance linting capabilities.

chore: add release configuration for semantic release

- Created release.config.js to configure semantic release with conventional commits.
- Set up plugins for commit analysis and release notes generation.

refactor: remove rag-core-library and rag-infrastructure submodules

- Deleted rag-core-library and rag-infrastructure submodules as they are no longer needed.

chore: remove rag-core-makefile

- Deleted the rag-core-makefile as its functionality is now handled by the new configuration files.
a-klos added 3 commits July 15, 2025 12:28
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`](diffhunk://#diff-fe7afb5c9c916e521401d3fcfb4277d5071798c3baf83baf11d6071742823584L1-L8):
Removed submodule definitions for `rag-infrastructure` and
`rag-core-library`, as these components are now integrated into the
monorepo.
*
[`README.md`](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L3-R25):
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]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L3-R25)
[[2]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L45-R98)
[[3]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L81-R109)

### Dockerfile Updates

#### General Updates Across Services:
* Updated `ENV POETRY_VIRTUALENVS_PATH` to reflect new paths within the
`services` directory for all Dockerfiles.
[[1]](diffhunk://#diff-cf35870e15ed0be6a47ea55d8edbb761fe538d085e1a53908e520657ac60728bL4-R4)
[[2]](diffhunk://#diff-155cd6a0b0260ebd5083f558ad74efaad1df57c35fccd00a474f07387b61bb0eL4-R4)
[[3]](diffhunk://#diff-319d5d10288f846604056f8343b020d8f594d75ae6ec68fd4b4cf93d3cc446ebL4-R4)
[[4]](diffhunk://#diff-7c465da557b2ce2393e237866279cf981aa92aea5c412fa7ecb66afc6db00fb6L4-R4)
* Adjusted `COPY` commands to reference libraries and service files
under the new `libs` and `services` directories.
[[1]](diffhunk://#diff-cf35870e15ed0be6a47ea55d8edbb761fe538d085e1a53908e520657ac60728bL13-R20)
[[2]](diffhunk://#diff-155cd6a0b0260ebd5083f558ad74efaad1df57c35fccd00a474f07387b61bb0eL18-R24)
[[3]](diffhunk://#diff-319d5d10288f846604056f8343b020d8f594d75ae6ec68fd4b4cf93d3cc446ebL16-R20)
[[4]](diffhunk://#diff-7c465da557b2ce2393e237866279cf981aa92aea5c412fa7ecb66afc6db00fb6L15-R19)
* Updated `WORKDIR` paths to match the new structure.
[[1]](diffhunk://#diff-cf35870e15ed0be6a47ea55d8edbb761fe538d085e1a53908e520657ac60728bL34-R45)
[[2]](diffhunk://#diff-155cd6a0b0260ebd5083f558ad74efaad1df57c35fccd00a474f07387b61bb0eL38-R50)
[[3]](diffhunk://#diff-319d5d10288f846604056f8343b020d8f594d75ae6ec68fd4b4cf93d3cc446ebL34-R42)
[[4]](diffhunk://#diff-7c465da557b2ce2393e237866279cf981aa92aea5c412fa7ecb66afc6db00fb6L36-R47)
* Modified log file paths to align with the new directory structure.
[[1]](diffhunk://#diff-cf35870e15ed0be6a47ea55d8edbb761fe538d085e1a53908e520657ac60728bL13-R20)
[[2]](diffhunk://#diff-155cd6a0b0260ebd5083f558ad74efaad1df57c35fccd00a474f07387b61bb0eL18-R24)
[[3]](diffhunk://#diff-319d5d10288f846604056f8343b020d8f594d75ae6ec68fd4b4cf93d3cc446ebL16-R20)
[[4]](diffhunk://#diff-7c465da557b2ce2393e237866279cf981aa92aea5c412fa7ecb66afc6db00fb6L15-R19)

#### Service-Specific Updates:
*
[`services/admin-backend/Dockerfile`](diffhunk://#diff-cf35870e15ed0be6a47ea55d8edbb761fe538d085e1a53908e520657ac60728bL13-R20):
Adjusted paths for `admin-api-lib` and `rag-core-lib` under `libs`.
*
[`services/document-extractor/Dockerfile`](diffhunk://#diff-155cd6a0b0260ebd5083f558ad74efaad1df57c35fccd00a474f07387b61bb0eL18-R24):
Updated paths for `extractor-api-lib` under `libs`.
*
[`services/mcp-server/Dockerfile`](diffhunk://#diff-319d5d10288f846604056f8343b020d8f594d75ae6ec68fd4b4cf93d3cc446ebL34-R42):
Updated paths for `src` and configuration files under
`services/mcp-server`.
*
[`services/rag-backend/Dockerfile`](diffhunk://#diff-7c465da557b2ce2393e237866279cf981aa92aea5c412fa7ecb66afc6db00fb6L15-R19):
Adjusted paths for `rag-core-lib` and `rag-core-api` under `libs`.

### Removal of Submodule References

* `rag-core-library` and `rag-infrastructure`: Removed submodule commit
references, as these components are now integrated directly into the
monorepo.
[[1]](diffhunk://#diff-8c1fb35ff5974f1dd400d5ff8de569996e0ade0ce6a55fe7cc10fc8225b53ed1L1)
[[2]](diffhunk://#diff-9951e53eb2866443e0cba7aab99738af3d87367c6b2b9e3f90948f40d3725ec2L1)
…/rag-template into feature/update-dependencies
@a-klos a-klos merged commit 26af137 into dev/monorepo-migration Jul 15, 2025
2 checks passed
@a-klos a-klos deleted the feature/update-dependencies branch July 15, 2025 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants