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

Aws bedrock llm support #1837

Merged
merged 76 commits into from
Apr 17, 2024
Merged

Aws bedrock llm support #1837

merged 76 commits into from
Apr 17, 2024

Commits on Feb 8, 2024

  1. WIP

    @jasonjkeller
    jasonjkeller committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    67fb59d View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. WIP

    @jasonjkeller
    jasonjkeller committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    e2e6381 View commit details
    Browse the repository at this point in the history

  2. Report Llm errors

    @jasonjkeller
    jasonjkeller committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3e08036 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Refactoring

    @jasonjkeller
    jasonjkeller committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5c994f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Refactoring

    @jasonjkeller
    jasonjkeller committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    170b360 View commit details
    Browse the repository at this point in the history

  2. Refactoring

    @jasonjkeller
    jasonjkeller committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    db6b359 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:newrelic/newrelic-java-agent into a… 

    …ws-bedrock-support
    @jasonjkeller
    jasonjkeller committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    dbdcaea View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Refactoring

    @jasonjkeller
    jasonjkeller committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    443b600 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:newrelic/newrelic-java-agent into a… 

    …ws-bedrock-support
    @jasonjkeller
    jasonjkeller committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    8087376 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Refactoring. Add llm custom attributes.

    @jasonjkeller
    jasonjkeller committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a2ba5e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Refactoring. Wire up async client.

    @jasonjkeller
    jasonjkeller committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a3c2f2a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Add config. Some cleanup.

    @jasonjkeller
    jasonjkeller committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    cfc5823 View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @jasonjkeller
    jasonjkeller committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    78b9166 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Cleanup

    @jasonjkeller
    jasonjkeller committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    a0ad252 View commit details
    Browse the repository at this point in the history

  2. Cleanup logging around parsing errors

    @jasonjkeller
    jasonjkeller committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    fe6268d View commit details
    Browse the repository at this point in the history

  3. Fix some async client issues

    @jasonjkeller
    jasonjkeller committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7c09a4d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Add support for Jurassic and Titan models. Some refactoring.

    @jasonjkeller
    jasonjkeller committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    549692c View commit details
    Browse the repository at this point in the history

  2. Add support for Cohere models

    @jasonjkeller
    jasonjkeller committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    48fbd7d View commit details
    Browse the repository at this point in the history

  3. Add support for Meta Llama 2 models

    @jasonjkeller
    jasonjkeller committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    842bcc2 View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @jasonjkeller
    jasonjkeller committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    bafd7cf View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Add readme for each model

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    9160fff View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    1c353e6 View commit details
    Browse the repository at this point in the history

  3. Add ai_monitoring stanza to default yaml config file

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    100f047 View commit details
    Browse the repository at this point in the history

  4. Cleanup readme

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    6b0b88c View commit details
    Browse the repository at this point in the history

  5. Remove logic for parsing input/output token counts

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    55b18ab View commit details
    Browse the repository at this point in the history

  6. Cleanup readme

    @jasonjkeller
    jasonjkeller committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    60b520a View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Refactor to handle cases that should generate multiple events

    @jasonjkeller
    jasonjkeller committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    7ac8568 View commit details
    Browse the repository at this point in the history

  2. Remove role from interface

    @jasonjkeller
    jasonjkeller committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c601590 View commit details
    Browse the repository at this point in the history

  3. End segment in case of exception

    @jasonjkeller
    jasonjkeller committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    3a8fb76 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Add config supportability metrics

    @jasonjkeller
    jasonjkeller committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    400b198 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Add ModelInvocation tests

    @jasonjkeller
    jasonjkeller committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    eccec66 View commit details
    Browse the repository at this point in the history

  2. Cleanup tests

    @jasonjkeller
    jasonjkeller committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    3a86c87 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:newrelic/newrelic-java-agent into a… 

    …ws-bedrock-support
    @jasonjkeller
    jasonjkeller committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    0a36968 View commit details
    Browse the repository at this point in the history

  4. Add tests for async Bedrock client

    @jasonjkeller
    jasonjkeller committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    09a64a9 View commit details
    Browse the repository at this point in the history

  5. Add copyright header

    @jasonjkeller
    jasonjkeller committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    cb7753d View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. add ai monitoring interface

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    db637ec View commit details
    Browse the repository at this point in the history

  2. added ai monitoring implementation

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    b22730e View commit details
    Browse the repository at this point in the history

  3. create builder class

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    440fce9 View commit details
    Browse the repository at this point in the history

  4. add test suite for builder class

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    cc31717 View commit details
    Browse the repository at this point in the history

  5. start test suite for feedbackEvent recorder class

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    8996831 View commit details
    Browse the repository at this point in the history

  6. add getAiMonitoring to Agent interface

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    5391ed5 View commit details
    Browse the repository at this point in the history

  7. update locations where Agent interface is implemented

    @deleonenriqueta
    deleonenriqueta committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    edec98e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'aws-bedrock-support' into aim-tokenCountCallback

    @deleonenriqueta
    deleonenriqueta committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    f8e1853 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. refactored naming of ai api implementation class

    @deleonenriqueta
    deleonenriqueta committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    40594b5 View commit details
    Browse the repository at this point in the history

  2. updated argument type for tokenCount

    @deleonenriqueta
    deleonenriqueta committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    e2b3808 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. created callback interface

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    bc9d7ef View commit details
    Browse the repository at this point in the history

  2. created singleton holder class to store the users callback method

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c68c478 View commit details
    Browse the repository at this point in the history

  3. added example for setting a tokenCount callback

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    eb4d421 View commit details
    Browse the repository at this point in the history

  4. name refactoring

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    cd0926c View commit details
    Browse the repository at this point in the history

  5. created callback interface

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c6d39e4 View commit details
    Browse the repository at this point in the history

  6. added setLlmTokenCountCallback method and a supportability metric

    @deleonenriqueta
    deleonenriqueta committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    cfa407b View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. added setUp with LlmTokenCountCallback and updated tokenCount

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f545f47 View commit details
    Browse the repository at this point in the history

  2. added assertions for token_count value

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a1cddff View commit details
    Browse the repository at this point in the history

  3. refactored builders to invoke getTokenCount

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    bc01907 View commit details
    Browse the repository at this point in the history

  4. update tests to include callback setting

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    8ee1646 View commit details
    Browse the repository at this point in the history

  5. refactored AiMonitoringImplTest

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e9bdf5b View commit details
    Browse the repository at this point in the history

  6. added getTokenCount method

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    1ba9614 View commit details
    Browse the repository at this point in the history

  7. updates for class movement

    @deleonenriqueta
    deleonenriqueta committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3ff383d View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. moved LlmTokenCountCallbackHolder to agent-bridge and AiMonitoringImpl 

    to newrelic-agent
    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    c2722bf View commit details
    Browse the repository at this point in the history

  2. added supportability metric to track when tokenCountCallbacks are set

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    6b9dabe View commit details
    Browse the repository at this point in the history

  3. implemented getTokenCount method to check for nulls and return token 

    calculation
    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    9e692ec View commit details
    Browse the repository at this point in the history

  4. updated imports

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    bee19fe View commit details
    Browse the repository at this point in the history

  5. updated return type and comments

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    1b4df47 View commit details
    Browse the repository at this point in the history

  6. refactored class

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    51e1285 View commit details
    Browse the repository at this point in the history

  7. moved classes to update callback accessibility

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    18827a6 View commit details
    Browse the repository at this point in the history

  8. refactored naming and initialized optional attrs to be null

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    9443c6b View commit details
    Browse the repository at this point in the history

  9. moved the ai-monitoring implementation, refactored imports and updated 

    tests
    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    088123d View commit details
    Browse the repository at this point in the history

  10. updated AiMonitoringImpl import

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    82fecfc View commit details
    Browse the repository at this point in the history

  11. added NoOpAiMonitoring, updated implementations

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    db09206 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into aim-tokenCountCallback

    @deleonenriqueta
    deleonenriqueta committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    89b4efe View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. update naming for attributes

    @deleonenriqueta
    deleonenriqueta committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    387e32f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:newrelic/newrelic-java-agent into a… 

    …ws-bedrock-llm-support
    @jasonjkeller
    jasonjkeller committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    fd730a8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'aim-tokenCountCallback' of github.com:newrelic/newrelic… 

    …-java-agent into aws-bedrock-llm-support
    @jasonjkeller
    jasonjkeller committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    c78d4fd View commit details
    Browse the repository at this point in the history

  4. update tests with refactored attribute names

    @deleonenriqueta
    deleonenriqueta committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    66fb720 View commit details
    Browse the repository at this point in the history

  5. Disable AIM if HSM is enabled

    @jasonjkeller
    jasonjkeller committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    434c355 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'aws-bedrock-llm-support' of github.com:newrelic/newreli… 

    …c-java-agent into aws-bedrock-llm-support
    @jasonjkeller
    jasonjkeller committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    70736f0 View commit details
    Browse the repository at this point in the history