Skip to content

Merge the 1.0.0-preview.3 release branch back to main #359

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

Merged
merged 3 commits into from
Mar 12, 2025
Merged

Merge the 1.0.0-preview.3 release branch back to main #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4583ba8
Minor style changes to `GPT.cs`
daxian-dbw Mar 12, 2025
ad5296b
Update version info for 1.0.0-preview.3 release
daxian-dbw Mar 12, 2025
db772a0
Include all agents in build by default
daxian-dbw Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions shell/AIShell.Integration/AIShell.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@{
RootModule = 'AIShell.psm1'
NestedModules = @("AIShell.Integration.dll")
ModuleVersion = '1.0.2'
ModuleVersion = '1.0.3'
GUID = 'ECB8BEE0-59B9-4DAE-9D7B-A990B480279A'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Expand All @@ -13,5 +13,5 @@
VariablesToExport = '*'
AliasesToExport = @('aish', 'askai', 'fixit')
HelpInfoURI = 'https://aka.ms/aishell-help'
PrivateData = @{ PSData = @{ Prerelease = 'preview2'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
PrivateData = @{ PSData = @{ Prerelease = 'preview3'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
}
10 changes: 5 additions & 5 deletions shell/agents/AIShell.OpenAI.Agent/GPT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class GPT
public string SystemPrompt { set; get; }

[JsonConverter(typeof(JsonStringEnumConverter<AuthType>))]
public AuthType AuthType { set; get; } = AuthType.ApiKey;
public AuthType AuthType { set; get; }

public GPT(
string name,
Expand Down Expand Up @@ -80,7 +80,7 @@ public GPT(
}

// EntraID authentication is only supported for Azure OpenAI
if (AuthType == AuthType.EntraID && Type != EndpointType.AzureOpenAI)
if (AuthType is AuthType.EntraID && Type is not EndpointType.AzureOpenAI)
{
throw new InvalidOperationException("EntraID authentication is only supported for Azure OpenAI service.");
}
Expand Down Expand Up @@ -165,22 +165,22 @@ private void ShowEndpointInfo(IHost host)
new(label: " Endpoint", m => m.Endpoint),
new(label: " Deployment", m => m.Deployment),
new(label: " Model", m => m.ModelName),
new(label: " Auth Type", m => m.AuthType.ToString()),
new(label: " AuthType", m => m.AuthType.ToString()),
},

EndpointType.OpenAI =>
[
new(label: " Type", m => m.Type.ToString()),
new(label: " Model", m => m.ModelName),
new(label: " Auth Type", m => m.AuthType.ToString()),
new(label: " AuthType", m => m.AuthType.ToString()),
],

EndpointType.CompatibleThirdParty =>
[
new(label: " Type", m => m.Type.ToString()),
new(label: " Endpoint", m => m.Endpoint),
new(label: " Model", m => m.ModelName),
new(label: " Auth Type", m => m.AuthType.ToString()),
new(label: " AuthType", m => m.AuthType.ToString()),
],

_ => throw new UnreachableException(),
Expand Down
2 changes: 1 addition & 1 deletion shell/shell.common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>12.0</LangVersion>
<Version>1.0.0-preview.2</Version>
<Version>1.0.0-preview.3</Version>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down