Skip to content

Fix requirements.txt conflicts and regenerate poetry.lock to sync with pyproject.toml#121

Closed
mithun50 wants to merge 8 commits intoAOSSIE-Org:mainfrom
mithun50:main
Closed

Fix requirements.txt conflicts and regenerate poetry.lock to sync with pyproject.toml#121
mithun50 wants to merge 8 commits intoAOSSIE-Org:mainfrom
mithun50:main

Conversation

@mithun50
Copy link
Contributor

@mithun50 mithun50 commented Aug 5, 2025

Closes #120

📝 Description

This PR addresses the following issues:

Resolved dependency conflicts in requirements.txt to ensure compatibility with the overall project.

Regenerated poetry.lock using poetry lock to reflect the updated dependencies in pyproject.toml.

Ensures all environments (Poetry + pip-based) are consistent and reproducible.

🔧 Changes Made

Fixed dependency conflicts in requirements.txt:

Manually resolved version mismatches or incompatible packages.

Cleaned up or reordered lines (if applicable) for clarity.

Regenerated poetry.lock file:

Ran poetry lock to sync the lockfile with the current pyproject.toml.

Ensures reproducible installs and proper resolution of transitive dependencies.

Verified consistency between:

pyproject.toml

poetry.lock

Ensured no unintended version upgrades/downgrades by reviewing diffs in poetry.lock.

✅ Checklist

  • I have read the contributing guidelines.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added necessary documentation (if applicable).
  • Any dependent changes have been merged and published in downstream modules.

Summary by CodeRabbit

  • Documentation

    • Updated the installation guide to include a step for regenerating the Poetry lock file before installing dependencies.
  • Chores

    • Adjusted version constraints for backend dependencies to enhance compatibility and stability without adding or removing packages.

Added `poetry lock` command to sync the both `pyproject.toml` and `poetry.lock`
Deleting this due to it has conflict
This file is not synced with pyproject.toml
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Aug 5, 2025

Walkthrough

The changes update dependency version constraints in backend/requirements.txt, primarily adjusting protobuf and opentelemetry packages to resolve conflicts. Additionally, the installation guide (docs/INSTALL_GUIDE.md) now instructs users to run poetry lock after setting the Python version, ensuring the lock file is synchronized before installation.

Changes

Cohort / File(s) Change Summary
Dependency Version Updates
backend/requirements.txt
Adjusted version constraints for protobuf and opentelemetry packages; reformatted dependency list.
Installation Guide Update
docs/INSTALL_GUIDE.md
Added explicit poetry lock step after setting Python version to ensure lock file is up to date.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Poetry
    participant System

    User->>Poetry: poetry env use python3.10
    User->>Poetry: poetry lock --no-update
    Poetry->>System: Update poetry.lock without updating dependencies
    User->>Poetry: poetry install --with dev
    Poetry->>System: Install dependencies per lock file
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~7 minutes

Assessment against linked issues

Objective Addressed Explanation
Resolve dependency conflict with protobuf in requirements.txt (#120)
Ensure poetry.lock is synced with pyproject.toml and installation steps are updated (#120)

Poem

In the warren, dependencies align,
Protobuf’s version now fits just fine.
With poetry lock, our guide is clear—
No more install errors to fear!
🐇✨
Hop along, the code is bright,
Everything’s working—what a delight!

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9c33dbd and a687ead.

📒 Files selected for processing (1)
  • backend/requirements.txt (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • backend/requirements.txt
✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
docs/INSTALL_GUIDE.md (1)

32-37: Use poetry lock --no-update to avoid inadvertent upgrades

Running plain poetry lock (Line 35) regenerates the lock file and may pull newer versions than the ones committed, defeating reproducibility.
Recommend the safer variant:

-poetry lock
+poetry lock --no-update   # regenerate hashes without bumping versions

Add a short rationale so newcomers understand the difference.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a1159d7 and bb9a63d.

⛔ Files ignored due to path filters (1)
  • poetry.lock is excluded by !**/*.lock
📒 Files selected for processing (2)
  • backend/requirements.txt (1 hunks)
  • docs/INSTALL_GUIDE.md (1 hunks)
🔇 Additional comments (1)
backend/requirements.txt (1)

123-124: Ignore outdated protobuf constraint for onnxruntime==1.22.0

PyPI metadata for onnxruntime 1.22.0 shows its only Requires-Dist entry is "protobuf" (no version cap), so pinning protobuf>=6.30.0,<6.32.0 does not conflict.

No changes required:

  • backend/requirements.txt lines 123–124 (onnxruntime==1.22.0)
  • backend/requirements.txt line 153 (protobuf>=6.30.0,<6.32.0)

Likely an incorrect or invalid review comment.

@mithun50
Copy link
Contributor Author

mithun50 commented Aug 5, 2025

Review required @smokeyScraper

@smokeyScraper
Copy link
Contributor

smokeyScraper commented Aug 5, 2025

Hey @mithun50,
just to ensure a clean commit history. Could please restructure a few of commits and make changes. This keeps the commit history clean. I'm preferring "'n' commits for edits" + at max "1 commit for coderabbit fix" (Easiest is to use editor's (VS Code/Cursor) GitHub section for this). A few of your commit are intersecting, could you please merge them.

Refer -> #106 (comment)

@mithun50
Copy link
Contributor Author

mithun50 commented Aug 6, 2025

Hey @smokeyScraper
Thanks for pointing that out!

I'll go ahead and restructure the commits to keep the history clean — combining the edit-related ones and keeping a single commit for the CodeRabbit fix as suggested. Will use the editor's Git tools to make it neat. Appreciate the heads-up!

@mithun50 mithun50 closed this by deleting the head repository Aug 6, 2025
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.

BUG:Dependency conflict with protobuf in requirements.txt poetry.lock is not synced with pyproject.toml

2 participants