Skip to content

Conversation

cdoern
Copy link
Contributor

@cdoern cdoern commented Apr 24, 2024

add the following groups to ilab:

model
config
data
taxonomy

inside of these commands, there are groups commands that relate to the sub-command. For example ilab model list lists all models known to the system.

a full list of the commands in this PR is:

model

  • convert
  • download
  • train
  • chat
  • serve
  • evaluate

data

  • generate

config

  • init

taxonomy

  • diff

the goal of this is to make ilab commands more logical. ilab generate for example is vague. also, adding structure allows for natural expansion of the project and makes the repo more digestible to new contributors.

Grouping ilab commands under common resources which the cli deals with makes sense as the role of instructlab grows. This is the first step in making ilab a model engine in which the cli will be a tool for full blown LLM management and deployment

@cdoern cdoern added this to the Release - 5/30 milestone Apr 25, 2024
@mergify mergify bot added the needs-rebase This Pull Request needs to be rebased label Apr 29, 2024
Copy link
Contributor

mergify bot commented Apr 29, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. @cdoern please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added container Affects containization aspects testing Relates to testing labels May 16, 2024
Copy link
Member

@hickeyma hickeyma left a comment

Choose a reason for hiding this comment

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

This PR should be driven by design doc and not be merged until the design merges first.

@cdoern cdoern force-pushed the engine branch 2 times, most recently from 790b995 to 6c052ec Compare May 17, 2024 13:42
@cdoern cdoern force-pushed the engine branch 2 times, most recently from 883eea0 to b96d96a Compare May 23, 2024 19:21
@mergify mergify bot added ci-failure PR has at least one CI failure and removed needs-rebase This Pull Request needs to be rebased labels May 23, 2024
@cdoern cdoern marked this pull request as ready for review May 23, 2024 19:23
@hickeyma hickeyma added hold In-progress PR. Tag should be removed before merge. enhancement New feature or request UX Affects the User Experience labels May 24, 2024
@hickeyma
Copy link
Member

Add hold waiting on design doc

@hickeyma hickeyma removed the hold In-progress PR. Tag should be removed before merge. label May 24, 2024
@hickeyma
Copy link
Member

Removed hold as design doc was merged.

@hickeyma
Copy link
Member

https://github.com/Mergifyio rebase

Copy link
Contributor

mergify bot commented May 24, 2024

rebase

☑️ Nothing to do

  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]

Copy link
Member

@hickeyma hickeyma left a comment

Choose a reason for hiding this comment

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

@cdoern are you good to return to this now that the design doc is merged?

@nathan-weinberg nathan-weinberg self-requested a review May 28, 2024 16:45
@russellb russellb self-requested a review May 29, 2024 11:22
Copy link
Contributor

mergify bot commented May 29, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. @cdoern please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase This Pull Request needs to be rebased label May 29, 2024
@cdoern
Copy link
Contributor Author

cdoern commented Jun 11, 2024

thanks for catching the prettytable dependency @russellb , this should be all set now

Copy link
Member

@russellb russellb left a comment

Choose a reason for hiding this comment

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

You have shown an impressive level of diligence as you worked through feedback. Thank you for sticking through this and pushing so hard to the end. Very nice work!

I'm good with merging this now!

@mergify mergify bot added the one-approval PR has one approval from a maintainer label Jun 11, 2024
@mergify mergify bot removed the one-approval PR has one approval from a maintainer label Jun 11, 2024
@alimaredia
Copy link
Contributor

@leseb @markstur If your changes requested are still relevant can you point them out or if not remove the changes requested. It's the only thing standing in the way of merging the PR.

@cdoern cdoern dismissed stale reviews from leseb and markstur June 11, 2024 22:11

I went through seb's review, and made issues out of the ones that are still remaining. Namely add something to the CHANGELOG. I opted not to do this in the current PR because it is huge as is. I will be making a follow up right after this merges. All other reviews were taken into consideration.

@cdoern cdoern removed request for leseb and markstur June 11, 2024 22:13
@mergify mergify bot merged commit 1a9c856 into instructlab:main Jun 11, 2024
@russellb russellb added the hold In-progress PR. Tag should be removed before merge. label Jun 11, 2024
@russellb
Copy link
Member

I tried to apply hold to catch the merge before it went in but just missed it.

I talked with @cdoern about the merge process and how we have Mergify configured to explicitly NOT merge when someone has previously requested changes and not come back and explicitly ACKed that they have been resolved. My preference would have been to ping both @markstur and @leseb to give them a chance to give that ACK. Only if they didn't respond would I consider dismissing the review.

I know @cdoern had all the best of intentions here and genuinely felt that it was acceptable to dismiss the reviews if the feedback was addressed. In his defense, this is not documented anywhere! As I think about it, that's probably fine when the feedback in the review was simple enough. @leseb at least was doing more in depth review and has been very responsive on this.

@cdoern has offered to revert the PR to give a chance for the final review responses. I told him I did not feel it was worth the churn in this case.

@markstur @leseb would you both be OK taking another look at this PR (post-merge) to see if there was anything else you'd like to see addressed? If it's something not captured in a follow-up issue, please raise it. If you have any more significant concerns, we can consider reverting whatever portion is affected, but I'd rather hold off on that churn unless it's justified.

Hopefully that makes sense to everyone! Let me know if I can help discuss anything further.

@markstur
Copy link
Member

I tried to apply hold to catch the merge before it went in but just missed it.

I talked with @cdoern about the merge process and how we have Mergify configured to explicitly NOT merge when someone has previously requested changes and not come back and explicitly ACKed that they have been resolved. My preference would have been to ping both @markstur and @leseb to give them a chance to give that ACK. Only if they didn't respond would I consider dismissing the review.

I know @cdoern had all the best of intentions here and genuinely felt that it was acceptable to dismiss the reviews if the feedback was addressed. In his defense, this is not documented anywhere! As I think about it, that's probably fine when the feedback in the review was simple enough. @leseb at least was doing more in depth review and has been very responsive on this.

@cdoern has offered to revert the PR to give a chance for the final review responses. I told him I did not feel it was worth the churn in this case.

@markstur @leseb would you both be OK taking another look at this PR (post-merge) to see if there was anything else you'd like to see addressed? If it's something not captured in a follow-up issue, please raise it. If you have any more significant concerns, we can consider reverting whatever portion is affected, but I'd rather hold off on that churn unless it's justified.

Hopefully that makes sense to everyone! Let me know if I can help discuss anything further.

yeah I was trying to ACK those when it merged. Now I'm looking at main. So far the concerns seem to be fixed or no longer relevant in what was merged

@cdoern
Copy link
Contributor Author

cdoern commented Jun 11, 2024

@markstur @leseb I am really sorry for not letting you guys ACK the PR before merging it, it was an honest mistake as I genuinely thought stale reviews which I had either made follow up issues for or addressed in the PR, could be dismissed. I did not realize this was not a normal practice and will be careful doing it in the future. Please feel free to be honest with me and let me know if you'd like this reverted, I really apologize.

@markstur
Copy link
Member

@markstur @leseb I am really sorry for not letting you guys ACK the PR before merging it, it was an honest mistake as I genuinely thought stale reviews which I had either made follow up issues for or addressed in the PR, could be dismissed. I did not realize this was not a normal practice and will be careful doing it in the future. Please feel free to be honest with me and let me know if you'd like this reverted, I really apologize.

@cdoern No worries. No revert needed for any of mine. Just double-checking to make sure they are resolved or no longer relevant in main. So far, so good.

@leseb
Copy link
Contributor

leseb commented Jun 12, 2024

@markstur @leseb I am really sorry for not letting you guys ACK the PR before merging it, it was an honest mistake as I genuinely thought stale reviews which I had either made follow up issues for or addressed in the PR, could be dismissed. I did not realize this was not a normal practice and will be careful doing it in the future. Please feel free to be honest with me and let me know if you'd like this reverted, I really apologize.

@cdoern No worries, I'm not offended by how things have unfolded. There's no need to revert; we have follow-ups in place, and any missed items will be addressed.

@nathan-weinberg nathan-weinberg removed the hold In-progress PR. Tag should be removed before merge. label Jun 12, 2024
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
leseb added a commit to leseb/instructlab that referenced this pull request Jun 13, 2024
This is a follow-up to instructlab#990.

This PR created a directory - src/instructlab/configuration/, but it would be
more consistent with other new directories if it was called
src/instructlab/config/.

Closes: instructlab#1332
Signed-off-by: Sébastien Han <seb@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
container Affects containization aspects enhancement New feature or request testing Relates to testing UX Affects the User Experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make ilab more of a model engine
8 participants