Parse https://ollama.com/library/ syntax

[ericcurtin]

People search for ollama models using the web ui, this change allows one to copy the url from the browser and for it to be compatible with ramalama run.

Summary by Sourcery

New Features:

• Added support for parsing Ollama model URLs copied from the web UI.

[sourcery-ai]

Reviewer's Guide by Sourcery

This pull request introduces support for parsing Ollama model URLs from the ollama.com/library domain, enhancing the compatibility of llama-run with web UI searches. It also refactors the way model prefixes are handled, using a new rm_until_substring function to remove prefixes from model strings.

Class diagram showing model handling classes

classDiagram
    class Model {
        <<abstract>>
        +String model
        +String type
    }

    class Huggingface {
        +String type
        +__init__(model)
    }

    class Ollama {
        +String type
        +__init__(model)
        +_local(args)
    }

    class OCI {
        +String type
        +__init__(model, conman)
    }

    class URL {
        +String type
        +__init__(model)
    }

    Model <|-- Huggingface
    Model <|-- Ollama
    Model <|-- OCI
    Model <|-- URL

    note for Model "Base class for all model types"
    note for Ollama "Now supports ollama.com/library URLs"

Loading

File-Level Changes

Change	Details	Files
Added support for parsing Ollama model URLs from ollama.com/library.	Added a condition to check if the model starts with https://ollama.com/library/. Modified the conditional logic to prioritize local file paths and URLs over Ollama models. The default case now handles ollama:// or no prefix.	ramalama/cli.py
Refactored model prefix handling using rm_until_substring.	Introduced a new rm_until_substring function in ramalama/common.py to remove prefixes from model strings. Replaced multiple removeprefix calls with rm_until_substring in ramalama/oci.py. Replaced multiple removeprefix calls with rm_until_substring in ramalama/url.py. Replaced multiple removeprefix calls with rm_until_substring in ramalama/huggingface.py. Replaced multiple removeprefix calls with rm_until_substring in ramalama/ollama.py.	ramalama/oci.py ramalama/url.py ramalama/huggingface.py ramalama/ollama.py ramalama/common.py

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!
• Generate a plan of action for an issue: Comment @sourcery-ai plan on
  an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[ericcurtin]

@swarajpande5 PTAL

[sourcery-ai]

Hey @ericcurtin - I've reviewed your changes - here's some feedback:

Overall Comments:

• Critical bug in rm_until_substring: The function returns only one character after the substring instead of the remainder of the string. Change return string[index + len(substring)] to return string[index + len(substring):]

Here's what I looked at during the review

• 🟡 General issues: 1 issue found
• 🟢 Security: all looks good
• 🟢 Testing: all looks good
• 🟢 Complexity: all looks good
• 🟢 Documentation: all looks good

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

issue (bug_risk): Bug: Function returns only one character after the substring instead of the entire remaining string

The array indexing should be removed to return the full remaining string: return string[index + len(substring):]

[ericcurtin]

This is ready @rhatdan @swarajpande5

[rhatdan]

Why are you dropping hugginface://?

[ericcurtin]

It's not dropped, at this point of the code, we have already verified/validated the start of the protocol is fine, so we do a more generic:

model = rm_until_substring(model, "://")

[rhatdan]

Right thanks.

Just need tests.

[ericcurtin]

if model.startswith("huggingface://") or model.startswith("hf://") or model.startswith("hf.co/"):

[rhatdan]

Please add tests.

[ericcurtin]

Added test, also took the opportunity to change the test from tinyllama to smollm, has a much smaller pull size, will accelerate the test

[rhatdan]

LGTM, Merge once test pass.