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.

Sign up for GitHub

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

Jump to bottom

feat(enterprise): allow multiple models for enterprise customers #4780

Merged
merged 45 commits into from
Jul 12, 2024
Merged

feat(enterprise): allow multiple models for enterprise customers #4780

merged 45 commits into from
Jul 12, 2024

Commits on Jul 3, 2024

  1. WIP

    @jamesmcnamara
    jamesmcnamara committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e7a420b View commit details
    Browse the repository at this point in the history

  2. refactor: add model tags and remove deprecated models 

    - Add ModelTag enum to categorize models
- Remove deprecated models from model options
- Update ModelSelectField to only show non-deprecated models

TODO:

- replace uiGroup with tags
- remove codyProOnly & uiGroupfields & usage from Model class
    @abeatrix
    abeatrix committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e5bf7d8 View commit details
    Browse the repository at this point in the history

  3. remove codyProOnly and uiGroup

    @abeatrix
    abeatrix committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0f50258 View commit details
    Browse the repository at this point in the history

  4. Update bindings

    @abeatrix
    abeatrix committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e412283 View commit details
    Browse the repository at this point in the history

  5. Update bindings

    @abeatrix
    abeatrix committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a7c02d5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'bee/tags-model' into jsm/cody-enterprise-models

    @jamesmcnamara
    jamesmcnamara committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3741398 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0580d74 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. removed getModel and setModel

    @jamesmcnamara
    jamesmcnamara committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    ee4ba56 View commit details
    Browse the repository at this point in the history

  2. spring cleaning

    @jamesmcnamara
    jamesmcnamara committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    52e954e View commit details
    Browse the repository at this point in the history

  3. spring cleaning pt. ii

    @jamesmcnamara
    jamesmcnamara committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    0a4076c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    4e0179f View commit details
    Browse the repository at this point in the history

  5. fixed some tests

    @jamesmcnamara
    jamesmcnamara committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    b59d717 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. fixes for tests

    @jamesmcnamara
    jamesmcnamara committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    34d53ba View commit details
    Browse the repository at this point in the history

  2. fixed type error

    @jamesmcnamara
    jamesmcnamara committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3333b8d View commit details
    Browse the repository at this point in the history

  3. fixed type error

    @jamesmcnamara
    jamesmcnamara committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    db80ff8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'jsm/cody-enterprise-models' of github.com:sourcegraph/c… 

    …ody into jsm/cody-enterprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3e26028 View commit details
    Browse the repository at this point in the history

  5. removed console

    @jamesmcnamara
    jamesmcnamara committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    bd7d289 View commit details
    Browse the repository at this point in the history

  6. refactor: add utility functions to identify model types 

    - Add `isCodyProModel`, `isCustomModel`, `isLocalModel`, and `isOllamaModel` utility functions to identify different types of models
- Update model tags to include `Local` and provide more context around the meaning of different tags
- Update usage of these utility functions in the codebase
    @abeatrix
    abeatrix committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    028eac7 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. Reverted missing file

    @jamesmcnamara
    jamesmcnamara committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    ff5cbbe View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'bee/cody-enterprise-models' of github.com:sourcegraph/c… 

    …ody into jsm/cody-enterprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3a49cad View commit details
    Browse the repository at this point in the history

  2. updated recordings

    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    81099b3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b2ecc25 View commit details
    Browse the repository at this point in the history

  4. updated recordings

    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7a9c556 View commit details
    Browse the repository at this point in the history

  5. added free model

    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e89f8cd View commit details
    Browse the repository at this point in the history

  6. ModelsService only accepts a valid model as default

    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    8ecbb10 View commit details
    Browse the repository at this point in the history

  7. Added an e2e test for enterprise model selection

    @jamesmcnamara
    jamesmcnamara committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    caaa209 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. added unit tests for ModelsService.setDefaultModel

    @jamesmcnamara
    jamesmcnamara committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0679437 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into jsm/cody-enterprise-models

    @abeatrix
    abeatrix committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0ff7798 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    702551b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Update lib/shared/src/models/dotcom.ts 

    Co-authored-by: Beatrix <68532117+abeatrix@users.noreply.github.com>
    @jamesmcnamara @abeatrix
    jamesmcnamara and abeatrix authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d19007b View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Beatrix <68532117+abeatrix@users.noreply.github.com>
    @jamesmcnamara @abeatrix
    jamesmcnamara and abeatrix authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    65db69b View commit details
    Browse the repository at this point in the history

  3. regenerated and fixed type errors

    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2aebb13 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    dbd57ca View commit details
    Browse the repository at this point in the history

  5. updated recording

    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0cbffb1 View commit details
    Browse the repository at this point in the history

  6. switched e2e tests to use new server-sent models config

    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fad1402 View commit details
    Browse the repository at this point in the history

  7. Removed stub models and updated changelog

    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b8a3862 View commit details
    Browse the repository at this point in the history

  8. review comments

    @jamesmcnamara
    jamesmcnamara committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f5b3fb4 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    c28cbc1 View commit details
    Browse the repository at this point in the history

  2. test(e2e): refactor command-core test to use focusSidebar helper func… 

    …tion
    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    c71f385 View commit details
    Browse the repository at this point in the history

  3. fixed type error

    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    98fbd94 View commit details
    Browse the repository at this point in the history

  4. only set default model if the user took an action

    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    bec077f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of github.com:sourcegraph/cody into jsm/cody-ente… 

    …rprise-models
    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    82dd424 View commit details
    Browse the repository at this point in the history

  6. fixed callsite

    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    d7be1fa View commit details
    Browse the repository at this point in the history

  7. swapped ordering of setting default models

    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    b85268d View commit details
    Browse the repository at this point in the history

  8. added comment

    @jamesmcnamara
    jamesmcnamara committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    47cd1fe View commit details
    Browse the repository at this point in the history