Repository navigation
Conversation
A derived model's own license was missing from the Modelfile that show writes, so ollaya create -f on it went back to the parent's license. Write it as a """ block, since a one-line LICENSE value is read as a path. A license the model shares with its parent stays inherited, as CALIBRATION does.
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
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.
/api/createtakes alicensefor a derived model and stores it as the model's own license layer, andshowreturns it inlicense. The Modelfile fromollaya show --modelfileleaves it out, though:So
ollaya create -fon that Modelfile builds a model with the parent's license instead ofMIT. This is the same round-trip loss that #57 fixed forDESCRIPTIONand #55 fixed forCALIBRATION.Change: in
views::show, a derived model whose license layer differs from its parent's gets aLICENSE """ ... """block. It's always a block:modelfile::parsereads a one-lineLICENSEvalue as a path to a license file, soLICENSE MITwould look for a file namedMIT. A license the model shares with its parent stays out of the Modelfile, the same digest rule #55 uses for calibration. The parent manifest is now read once for both checks.Test:
show_modelfile_keeps_a_custom_licenseincrates/ollaya-server/tests/http.rscreates two derived models, one withMITand one with a multi-line license, and checks for theLICENSEblock in eachshow. Then it creates a child of the second one and checks that the child's Modelfile has noLICENSE. It fails onmainand passes with this change.I couldn't link
ollayaandollaya-runneron this machine: the prebuilt ONNX Runtime needs a newer glibc than it has. This change doesn't touch either crate, and clippy checked both.