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

OpenAI connector: send default model for "other" openAI provider #204934

Merged

Conversation

pgayvallet
Copy link
Contributor

@pgayvallet pgayvallet commented Dec 19, 2024

Summary

Part of #204116

When model is not present in the payload, use the default model as specified in the connector configuration.

We were already doing that for OpenAI-OpenAI, but not for "Other"-OpenAI.

Some section because I downloaded ollama just for that issue

Screenshot 2024-12-19 at 13 53 48 Screenshot 2024-12-19 at 13 54 54

@pgayvallet pgayvallet added release_note:skip Skip the PR/issue when compiling release notes backport:version Backport to applied version labels Team:AI Infra AppEx AI Infrastructure Team v8.18.0 labels Dec 19, 2024
@pgayvallet
Copy link
Contributor Author

/ci

@pgayvallet pgayvallet marked this pull request as ready for review December 23, 2024 09:39
@pgayvallet pgayvallet requested review from a team as code owners December 23, 2024 09:39
@elasticmachine
Copy link
Contributor

Pinging @elastic/appex-ai-infra (Team:AI Infra)

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

@pgayvallet pgayvallet merged commit d4bc9be into elastic:main Dec 23, 2024
8 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12469750633

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 23, 2024
…stic#204934)

## Summary

Part of elastic#204116

When model is not present in the payload, use the default model as
specified in the connector configuration.

We were already doing that for OpenAI-OpenAI, but not for
"Other"-OpenAI.

### Some section because I downloaded ollama just for that issue

<img width="950" alt="Screenshot 2024-12-19 at 13 53 48"
src="https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8"
/>

<img width="769" alt="Screenshot 2024-12-19 at 13 54 54"
src="https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c"
/>

(cherry picked from commit d4bc9be)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Dec 23, 2024
…AI provider (#204934) (#205107)

# Backport

This will backport the following commits from `main` to `8.x`:
- [OpenAI connector: send default model for &quot;other&quot; openAI
provider (#204934)](#204934)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Pierre
Gayvallet","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-23T16:16:33Z","message":"OpenAI
connector: send default model for \"other\" openAI provider
(#204934)\n\n## Summary\r\n\r\nPart of
https://github.com/elastic/kibana/issues/204116\r\n\r\nWhen model is not
present in the payload, use the default model as\r\nspecified in the
connector configuration.\r\n\r\nWe were already doing that for
OpenAI-OpenAI, but not for\r\n\"Other\"-OpenAI.\r\n\r\n### Some section
because I downloaded ollama just for that issue\r\n\r\n<img
width=\"950\" alt=\"Screenshot 2024-12-19 at 13 53
48\"\r\nsrc=\"https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8\"\r\n/>\r\n\r\n<img
width=\"769\" alt=\"Screenshot 2024-12-19 at 13 54
54\"\r\nsrc=\"https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c\"\r\n/>","sha":"d4bc9befdef02a80545e65507c15780fcf6933f5","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:version","Team:AI
Infra","v8.18.0"],"title":"OpenAI connector: send default model for
\"other\" openAI
provider","number":204934,"url":"https://github.com/elastic/kibana/pull/204934","mergeCommit":{"message":"OpenAI
connector: send default model for \"other\" openAI provider
(#204934)\n\n## Summary\r\n\r\nPart of
https://github.com/elastic/kibana/issues/204116\r\n\r\nWhen model is not
present in the payload, use the default model as\r\nspecified in the
connector configuration.\r\n\r\nWe were already doing that for
OpenAI-OpenAI, but not for\r\n\"Other\"-OpenAI.\r\n\r\n### Some section
because I downloaded ollama just for that issue\r\n\r\n<img
width=\"950\" alt=\"Screenshot 2024-12-19 at 13 53
48\"\r\nsrc=\"https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8\"\r\n/>\r\n\r\n<img
width=\"769\" alt=\"Screenshot 2024-12-19 at 13 54
54\"\r\nsrc=\"https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c\"\r\n/>","sha":"d4bc9befdef02a80545e65507c15780fcf6933f5"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204934","number":204934,"mergeCommit":{"message":"OpenAI
connector: send default model for \"other\" openAI provider
(#204934)\n\n## Summary\r\n\r\nPart of
https://github.com/elastic/kibana/issues/204116\r\n\r\nWhen model is not
present in the payload, use the default model as\r\nspecified in the
connector configuration.\r\n\r\nWe were already doing that for
OpenAI-OpenAI, but not for\r\n\"Other\"-OpenAI.\r\n\r\n### Some section
because I downloaded ollama just for that issue\r\n\r\n<img
width=\"950\" alt=\"Screenshot 2024-12-19 at 13 53
48\"\r\nsrc=\"https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8\"\r\n/>\r\n\r\n<img
width=\"769\" alt=\"Screenshot 2024-12-19 at 13 54
54\"\r\nsrc=\"https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c\"\r\n/>","sha":"d4bc9befdef02a80545e65507c15780fcf6933f5"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Pierre Gayvallet <[email protected]>
stratoula pushed a commit to stratoula/kibana that referenced this pull request Jan 2, 2025
…stic#204934)

## Summary

Part of elastic#204116

When model is not present in the payload, use the default model as
specified in the connector configuration.

We were already doing that for OpenAI-OpenAI, but not for
"Other"-OpenAI.

### Some section because I downloaded ollama just for that issue

<img width="950" alt="Screenshot 2024-12-19 at 13 53 48"
src="https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8"
/>

<img width="769" alt="Screenshot 2024-12-19 at 13 54 54"
src="https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c"
/>
benakansara pushed a commit to benakansara/kibana that referenced this pull request Jan 2, 2025
…stic#204934)

## Summary

Part of elastic#204116

When model is not present in the payload, use the default model as
specified in the connector configuration.

We were already doing that for OpenAI-OpenAI, but not for
"Other"-OpenAI.

### Some section because I downloaded ollama just for that issue

<img width="950" alt="Screenshot 2024-12-19 at 13 53 48"
src="https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8"
/>

<img width="769" alt="Screenshot 2024-12-19 at 13 54 54"
src="https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c"
/>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Jan 13, 2025
…stic#204934)

## Summary

Part of elastic#204116

When model is not present in the payload, use the default model as
specified in the connector configuration.

We were already doing that for OpenAI-OpenAI, but not for
"Other"-OpenAI.

### Some section because I downloaded ollama just for that issue

<img width="950" alt="Screenshot 2024-12-19 at 13 53 48"
src="https://github.com/user-attachments/assets/4a6e4b35-a0c5-46e5-9372-677e99d070f8"
/>

<img width="769" alt="Screenshot 2024-12-19 at 13 54 54"
src="https://github.com/user-attachments/assets/a0a5a12a-ea1e-42b7-8fa1-6531bef5ae6c"
/>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:AI Infra AppEx AI Infrastructure Team v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants