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.

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

Revert "Switch to llama-simple-chat" #477

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Nov 21, 2024

The llama-simple-chat does not work properly yet.

This reverts commit 1db401d.

Summary by Sourcery

Revert the integration of 'llama-simple-chat' and restore 'llama-cli' as the command-line interface for executing models due to unresolved issues with 'llama-simple-chat'. Update the system test to align with this change.

Enhancements:

  • Revert the command-line interface from 'llama-simple-chat' back to 'llama-cli' due to issues with the former.

Tests:

  • Update system test to reflect the change from 'llama-simple-chat' to 'llama-cli'.

The llama-simple-chat does not work properly yet.

This reverts commit 1db401d.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Copy link
Contributor

sourcery-ai bot commented Nov 21, 2024

Reviewer's Guide by Sourcery

This PR reverts a previous change that switched from llama-cli to llama-simple-chat. The implementation restores the original llama-cli command with its specific argument structure and command-line options.

Sequence diagram for reverting to llama-cli

sequenceDiagram
    actor User
    participant System
    User->>System: Execute model
    alt Using llama-cli
        System->>System: Prepare exec_args with llama-cli
        System->>System: Add --in-prefix, --in-suffix, --no-display-prompt
        System->>System: Add prompt and common_params
        opt GPU enabled
            System->>System: Add GPU arguments
        end
    end
    Note right of System: Reverted from llama-simple-chat to llama-cli
Loading

Class diagram for changes in model execution

classDiagram
    class Model {
        -exec_args: List
        -exec_model_path: String
        +run(args)
    }
    note for Model "Reverted exec_args to use llama-cli with specific options"
    class Args {
        +container: bool
        +debug: bool
        +gpu: bool
        +ARGS: List
    }
    Model --> Args : uses
    note for Args "Arguments used to configure model execution"
Loading

File-Level Changes

Change Details Files
Reverted command-line interface from llama-simple-chat back to llama-cli
  • Restored llama-cli command with its original arguments structure
  • Re-added --in-prefix and --in-suffix empty string parameters
  • Re-implemented --no-display-prompt option for non-debug mode
  • Restored -cnv flag for non-argument, interactive terminal sessions
  • Updated command construction logic with original parameter ordering
ramalama/model.py
Updated system test to match reverted CLI command
  • Modified test assertion to check for llama-cli command instead of llama-simple-chat
  • Updated expected command string pattern in test case
test/system/030-run.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

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

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

Overall Comments:

  • Please provide more specific details in the commit message about what issues were encountered with llama-simple-chat. This helps track the history of changes and prevents similar problems in the future.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 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 ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@rhatdan rhatdan merged commit b6c9492 into containers:main Nov 21, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant