Attempt to remove OCI Image if removing as Ollama or Huggingface fails

[rhatdan]

Summary by Sourcery

Implement a fallback mechanism to remove a model as an OCI Image if removal as Ollama or Huggingface fails, and update the system test accordingly.

Bug Fixes:

• Fix the issue where removing a model as Ollama or Huggingface fails by attempting to remove it as an OCI Image instead.

Tests:

• Update system test to correctly remove a model from the registry without the 'oci://' prefix.

[sourcery-ai]

Reviewer's Guide by Sourcery

This PR enhances the model removal functionality by adding a fallback mechanism. If removing a model as an Ollama or Huggingface model fails, the system will attempt to remove it as an OCI container image before raising the original error.

Sequence diagram for model removal process

sequenceDiagram
    participant User
    participant CLI as Ramalama CLI
    participant Model as Model
    participant OCI as OCI Image

    User->>CLI: Request to remove model
    CLI->>Model: Attempt to remove as Ollama/Huggingface
    alt Removal successful
        Model-->>CLI: Model removed
    else Removal fails
        CLI->>OCI: Attempt to remove as OCI Image
        alt OCI removal successful
            OCI-->>CLI: OCI Image removed
        else OCI removal fails
            CLI-->>User: Raise original error
        end
    end

Loading

File-Level Changes

Change	Details	Files
Added fallback logic for model removal	Wrapped model removal in try-except block Added fallback attempt to remove as OCI container image Original error is re-raised if both attempts fail	ramalama/cli.py
Updated system test for model removal	Modified model removal test to use simplified registry path format	test/system/050-pull.bats

---

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.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a 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. You can also use
  this command to specify where the summary should be inserted.

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.

[sourcery-ai]

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

Overall Comments:

• Consider improving error handling to preserve the OCI removal error instead of re-raising the original KeyError. This would make debugging easier when the fallback fails.

Here's what I looked at during the review

• 🟡 General issues: 1 issue found
• 🟢 Security: all looks good
• 🟡 Testing: 1 issue found
• 🟢 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]

suggestion (bug_risk): Consider preserving the OCI exception instead of re-raising the KeyError

When the OCI operation fails, re-raising the original KeyError could mask important error information. Consider either letting the OCI exception propagate or wrapping it with additional context.

            except Exception as oci_error:
                raise oci_error from e

[sourcery-ai]

issue (testing): Test coverage for new error handling path is missing

The PR adds new error handling logic to attempt OCI image removal as a fallback, but there are no tests verifying this behavior. Consider adding test cases that verify: 1) successful fallback to OCI removal, 2) proper error propagation when both attempts fail, and 3) verification that the original error is raised when OCI removal also fails.