Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Docling models path (backport #362) #392

Closed
wants to merge 12 commits into from
Closed

Docling models path (backport #362) #392

wants to merge 12 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 15, 2024

#335

This is an automatic backport of pull request #362 done by Mergify.

aakankshaduggal and others added 12 commits November 15, 2024 16:24
@aakankshaduggal @mergify
Update generate_data.py to add docling model path
c2be3ea 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 9b8fb0b)
@aakankshaduggal @mergify
Update taxonomy.py to add docling model path
46dc46a 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 9de4d35)
@aakankshaduggal @mergify
Rebase
09df125 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 1b984e0)

# Conflicts:
#	src/instructlab/sdg/utils/chunkers.py
@aakankshaduggal @mergify
Update docling model path and move hf model download to chunkers
821dd40 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit a6b6454)
@aakankshaduggal @mergify
Remove extra import
3b467a9 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit ec4ff80)
@aakankshaduggal @mergify
Update artifacts path
0c1995e 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 1da59be)
@aakankshaduggal @mergify
Update src/instructlab/sdg/generate_data.py
0f71399 
Co-authored-by: Jaideep Rao <[email protected]>
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 01041bb)
@aakankshaduggal @mergify
Update src/instructlab/sdg/utils/chunkers.py
c37a37d 
Co-authored-by: Jaideep Rao <[email protected]>
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit f8f6959)

# Conflicts:
#	src/instructlab/sdg/utils/chunkers.py
@aakankshaduggal @mergify
Address mypy issues and small typos
b72cbb0 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 16c6f45)

# Conflicts:
#	src/instructlab/sdg/utils/chunkers.py
@aakankshaduggal @mergify
Update the way docling_model_path is passed to generate_data
7812075 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit 2a00cb3)
@aakankshaduggal @mergify
Fix ruff issues
5244929 
Signed-off-by: Aakanksha Duggal <[email protected]>
(cherry picked from commit b5733ab)
@bbrowning @mergify
Add two unit tests for docling model path
a6689e3 
These simple unit tests just test the cases where we found a
config.yaml to parse for the docling model path and where we didn't.

Signed-off-by: Ben Browning <[email protected]>
(cherry picked from commit 0e9d75d)
@mergify mergify bot added the conflicts label Nov 15, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Nov 15, 2024

Cherry-pick of 1b984e0 has failed:

On branch mergify/bp/release-v0.5/pr-362
Your branch is ahead of 'origin/release-v0.5' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1b984e0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/instructlab/sdg/utils/chunkers.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f8f6959 has failed:

On branch mergify/bp/release-v0.5/pr-362
Your branch is ahead of 'origin/release-v0.5' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f8f6959.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/instructlab/sdg/utils/chunkers.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 16c6f45 has failed:

On branch mergify/bp/release-v0.5/pr-362
Your branch is ahead of 'origin/release-v0.5' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 16c6f45.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/instructlab/sdg/generate_data.py
	modified:   src/instructlab/sdg/utils/taxonomy.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/instructlab/sdg/utils/chunkers.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Nov 15, 2024
Merged
@aakankshaduggal
Copy link
Member

Closing because not required.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ci-failure conflicts release-branch testing Relates to testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aakankshaduggal @bbrowning