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

Make use of OpenAI SDK directly #1197

Merged
merged 32 commits into from
Jun 9, 2023
Merged

Make use of OpenAI SDK directly #1197

merged 32 commits into from
Jun 9, 2023

Conversation

brunoborges
Copy link
Member

@brunoborges brunoborges commented May 24, 2023

This PR removes the Azure Open AI Client wrapper originally created as a workaround.

This reduces confusion with the Azure OpenAI SDK.
@brunoborges
Copy link
Member Author

@johnoliver there it goes.

@markwallace-microsoft markwallace-microsoft added the java Issue or PR regarding Java code label May 24, 2023
@johnoliver
Copy link
Member

All fine, just need to resolve conflicts and update the samples

Copy link
Member

@markwallace-microsoft markwallace-microsoft left a comment

Choose a reason for hiding this comment

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

LGTM

johnoliver
johnoliver previously approved these changes May 25, 2023
@johnoliver
Copy link
Member

@brunoborges has merge conflicts

Luigi96 and others added 2 commits June 2, 2023 08:24
### Motivation and Context

### Description
Opening a PR with initial CI changes to build and run tests against Java
packages.

### Contribution Checklist
<!-- Before submitting this PR, please make sure: -->
- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows SK Contribution Guidelines
(https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
- [ ] The code follows the .NET coding conventions
(https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions)
verified with `dotnet format`
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

---------

Co-authored-by: joe-braley <joebraley@microsoft.com>
Co-authored-by: Luigi96 <luiseduardom@microsoft.com>
Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
### Motivation and Context
<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->


### Description
<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->


### Contribution Checklist
<!-- Before submitting this PR, please make sure: -->
- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows SK Contribution Guidelines
(https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
- [ ] The code follows the .NET coding conventions
(https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions)
verified with `dotnet format`
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
@markwallace-microsoft markwallace-microsoft added the PR: ready to merge PR has been approved by all reviewers, and is ready to merge. label Jun 2, 2023
dsgrieve and others added 2 commits June 2, 2023 08:38
### Motivation and Context
<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->
Complete the implementation of VolatileMemoryStoreTests


### Description
<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->
Complete the implementation of VolatileMemoryStoreTests. Make
implementation consistent with tests.

Please note that I added equals and hashCode methods to Embedding,
MemoryRecord, and MemoryRecordMetadata because these unit tests use
assertEquals. Alternatively, I could have created methods in
VolatileMemoryStoreTests to check equality. I'm good with either way.

### Contribution Checklist
<!-- Before submitting this PR, please make sure: -->
- [x] The code builds clean without any errors or warnings
- [x] The PR follows SK Contribution Guidelines
(https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
- [x] ~The code follows the .NET coding conventions
(https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions)
verified with `dotnet format`~ Java code follows AOSP style
- [x] All unit tests pass, and I have added new tests where possible
- [x] I didn't break anyone 😄

---------

Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
### Motivation and Context

### Description
Add command to PRs to properly format Java code.

### Contribution Checklist
<!-- Before submitting this PR, please make sure: -->
- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows SK Contribution Guidelines
(https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
- [ ] The code follows the .NET coding conventions
(https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/coding-conventions)
verified with `dotnet format`
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

---------

Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
…nel into refactor-openai-sdk

# Conflicts:
#	java/samples/pom.xml
#	java/semantickernel-connectors-parent/semantickernel-connectors/src/main/java/com/microsoft/semantickernel/connectors/ai/openai/textcompletion/OpenAITextCompletionBuilder.java
#	java/semantickernel-connectors-parent/semantickernel-connectors/src/main/java/com/microsoft/semantickernel/connectors/ai/openai/textembeddings/OpenAITextEmbeddingGenerationBuilder.java
@brunoborges
Copy link
Member Author

@markwallace-microsoft @johnoliver @milderhc hey folks, this PR is 100% ready to go.

johnoliver
johnoliver previously approved these changes Jun 6, 2023
@github-actions github-actions bot removed python Pull requests for the Python Semantic Kernel samples kernel Issues or pull requests impacting the core kernel .NET Issue or Pull requests regarding .NET code labels Jun 7, 2023
@brunoborges brunoborges changed the title Moves OpenAI clients to an SK module and package. Make use of OpenAI SDK directly Jun 7, 2023
@markwallace-microsoft markwallace-microsoft merged commit 70d49fe into microsoft:experimental-java Jun 9, 2023
6 checks passed
markwallace-microsoft pushed a commit that referenced this pull request Jun 12, 2023
johnoliver added a commit to johnoliver/semantic-kernel that referenced this pull request Jun 5, 2024
This PR removes the Azure Open AI Client wrapper originally created as a
workaround.

---------

Co-authored-by: Luigi Montoya <yayodelta@gmail.com>
Co-authored-by: joe-braley <joebraley@microsoft.com>
Co-authored-by: Luigi96 <luiseduardom@microsoft.com>
Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
Co-authored-by: John Oliver <1615532+johnoliver@users.noreply.github.com>
Co-authored-by: David Grieve <dsgrieve@yahoo.com>
johnoliver pushed a commit to johnoliver/semantic-kernel that referenced this pull request Jun 5, 2024
johnoliver added a commit to johnoliver/semantic-kernel that referenced this pull request Jun 5, 2024
This PR removes the Azure Open AI Client wrapper originally created as a
workaround.

---------

Co-authored-by: Luigi Montoya <yayodelta@gmail.com>
Co-authored-by: joe-braley <joebraley@microsoft.com>
Co-authored-by: Luigi96 <luiseduardom@microsoft.com>
Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
Co-authored-by: John Oliver <1615532+johnoliver@users.noreply.github.com>
Co-authored-by: David Grieve <dsgrieve@yahoo.com>
johnoliver pushed a commit to johnoliver/semantic-kernel that referenced this pull request Jun 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
java Issue or PR regarding Java code PR: ready to merge PR has been approved by all reviewers, and is ready to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants