Repository navigation
Add settings retrieval through properties file and env vars - #1361
Merged
Mark Wallace (markwallace-microsoft) merged 14 commits intoJun 7, 2023
Merged
Mark Wallace (markwallace-microsoft) merged 14 commits into
Mark Wallace (markwallace-microsoft) merged 14 commits into
Conversation
### 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 <[email protected]> Co-authored-by: Luigi96 <[email protected]> Co-authored-by: Mark Wallace <[email protected]>
### 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 <[email protected]>
### 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 <[email protected]>
### 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 <[email protected]>
Milder Hernandez (milderhc)
changed the title
Mark Wallace (markwallace-microsoft)
force-pushed
the
experimental-java
branch
from
June 7, 2023 17:45
842184f to
95412ab
Compare
Contributor
Author
|
The previous PR stopped updating. Link to the conversation: #1176 |
Mark Wallace (markwallace-microsoft)
approved these changes
Jun 7, 2023
Mark Wallace (markwallace-microsoft)
merged commit Jun 7, 2023
1714c25
into
microsoft:experimental-java
This was referenced Aug 1, 2023
John (johnoliver)
added a commit
to johnoliver/semantic-kernel
that referenced
this pull request
Jun 5, 2024
…t#1361) ### Motivation and Context Add settings retrieval through properties file and env vars ### Description <!-- Describe your changes, the overall approach, the underlying design. These notes will help understanding how your code works. Thanks! --> Adds util.Settings to load settings values from a properties file or from the environment. Also, the ability to have different client settings in the properties file and load them by their specific schema Id: ```yaml client.azureopenai.key: "AZURE_OPEN_AI_KEY" client.azureopenai.endpoint: "AZURE_OPEN_AI_ENDPOINT" client.azureopenai.deploymentname: "AZURE_OPEN_AI_DEPLOYMENT_NAME" client.myazureopenai.key: "AZURE_OPEN_AI_KEY" client.myazureopenai.endpoint: "AZURE_OPEN_AI_ENDPOINT" client.myazureopenai.deploymentname: "AZURE_OPEN_AI_DEPLOYMENT_NAME" ``` By calling `Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES)` the user would be able to load the Azure settings using the default schema id, as shown in the block at the top. By calling `Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES, "myazureopenai")` the user would be able to load a different Azure configuration by just adding the second block to the properties file. ### 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: Luigi Montoya <[email protected]> Co-authored-by: joe-braley <[email protected]> Co-authored-by: Luigi96 <[email protected]> Co-authored-by: Mark Wallace <[email protected]> Co-authored-by: John Oliver <[email protected]> Co-authored-by: David Grieve <[email protected]>
John (johnoliver)
added a commit
to johnoliver/semantic-kernel
that referenced
this pull request
Jun 5, 2024
…t#1361) ### Motivation and Context Add settings retrieval through properties file and env vars ### Description <!-- Describe your changes, the overall approach, the underlying design. These notes will help understanding how your code works. Thanks! --> Adds util.Settings to load settings values from a properties file or from the environment. Also, the ability to have different client settings in the properties file and load them by their specific schema Id: ```yaml client.azureopenai.key: "AZURE_OPEN_AI_KEY" client.azureopenai.endpoint: "AZURE_OPEN_AI_ENDPOINT" client.azureopenai.deploymentname: "AZURE_OPEN_AI_DEPLOYMENT_NAME" client.myazureopenai.key: "AZURE_OPEN_AI_KEY" client.myazureopenai.endpoint: "AZURE_OPEN_AI_ENDPOINT" client.myazureopenai.deploymentname: "AZURE_OPEN_AI_DEPLOYMENT_NAME" ``` By calling `Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES)` the user would be able to load the Azure settings using the default schema id, as shown in the block at the top. By calling `Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES, "myazureopenai")` the user would be able to load a different Azure configuration by just adding the second block to the properties file. ### 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: Luigi Montoya <[email protected]> Co-authored-by: joe-braley <[email protected]> Co-authored-by: Luigi96 <[email protected]> Co-authored-by: Mark Wallace <[email protected]> Co-authored-by: John Oliver <[email protected]> Co-authored-by: David Grieve <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Add settings retrieval through properties file and env vars
Description
Adds util.Settings to load settings values from a properties file or from the environment.
Also, the ability to have different client settings in the properties file and load them by their specific schema Id:
By calling
Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES)the user would be able to load the Azure settings using the default schema id, as shown in the block at the top.By calling
Settings.getAzureOpenAISettingsFromFile(CONF_PROPERTIES, "myazureopenai")the user would be able to load a different Azure configuration by just adding the second block to the properties file.Contribution Checklist
dotnet format