Skip to content

Small fixes for chat template #5839

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 6 commits into from
Feb 4, 2025
Merged

Small fixes for chat template #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae1c56a
Small fixes
MackinnonBuck Feb 3, 2025
50a7705
Fix comment spacing in .gitignore
MackinnonBuck Feb 4, 2025
e678e0a
PR feedback
MackinnonBuck Feb 4, 2025
35de0c0
Merge branch 'mbuck/small-template-fixes' of https://github.com/dotne…
MackinnonBuck Feb 4, 2025
47f72dd
Hide HTTP(S) port options
MackinnonBuck Feb 4, 2025
b127ed1
Merge branch 'main' into mbuck/small-template-fixes
MackinnonBuck Feb 4, 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
3 changes: 3 additions & 0 deletions src/ProjectTemplates/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
package-lock.json

*/src/**/*.csproj

# launchSettings.json files are required for the templates.
!launchSettings.json
14 changes: 14 additions & 0 deletions ...osoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"kestrelHttpPort": {
"isHidden": true
},
"kestrelHttpsPort": {
"isHidden": true
}
},
"usageExamples": [
""
]
}
54 changes: 49 additions & 5 deletions ...s/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
]
}],
"symbols":{
"symbols": {
"framework": {
"type": "parameter",
"description": "The target framework for the project.",
Expand Down Expand Up @@ -145,14 +145,14 @@
"description": "Model/deployment for embeddings. Example: text-embedding-3-small"
},
"OpenAiChatModelDefault": {
"type": "generated",
"type": "generated",
"generator": "constant",
"parameters": {
"value": "gpt-4o-mini"
}
},
"OpenAiEmbeddingModelDefault": {
"type": "generated",
"type": "generated",
"generator": "constant",
"parameters": {
"value": "text-embedding-3-small"
Expand All @@ -177,14 +177,14 @@
"replaces": "text-embedding-3-small"
},
"OllamaChatModelDefault": {
"type": "generated",
"type": "generated",
"generator": "constant",
"parameters": {
"value": "llama3.1"
}
},
"OllamaEmbeddingModelDefault": {
"type": "generated",
"type": "generated",
"generator": "constant",
"parameters": {
"value": "all-minilm"
Expand All @@ -207,6 +207,50 @@
"fallbackVariableName": "OllamaEmbeddingModelDefault"
},
"replaces": "all-minilm"
},
"kestrelHttpPort": {
"type": "parameter",
"datatype": "integer",
"description": "Port number to use for the HTTP endpoint in launchSettings.json."
},
"kestrelHttpPortGenerated": {
"type": "generated",
"generator": "port",
"parameters": {
"low": 5000,
"high": 5300
}
},
"kestrelHttpPortReplacer": {
"type": "generated",
"generator": "coalesce",
"parameters": {
"sourceVariableName": "kestrelHttpPort",
"fallbackVariableName": "kestrelHttpPortGenerated"
},
"replaces": "5000"
},
"kestrelHttpsPort": {
"type": "parameter",
"datatype": "integer",
"description": "Port number to use for the HTTPS endpoint in launchSettings.json."
},
"kestrelHttpsPortGenerated": {
"type": "generated",
"generator": "port",
"parameters": {
"low": 7000,
"high": 7300
}
},
"kestrelHttpsPortReplacer": {
"type": "generated",
"generator": "coalesce",
"parameters": {
"sourceVariableName": "kestrelHttpsPort",
"fallbackVariableName": "kestrelHttpsPortGenerated"
},
"replaces": "5001"
}
}
}
23 changes: 23 additions & 0 deletions ...AI.Templates/src/ChatWithCustomData/ChatWithCustomData.Web/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
10 changes: 6 additions & 4 deletions ...ft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData.Web/Tailwind.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
Exclude="$(IntermediateOutputPath)\**; $(TailwindCssOutput)" />
</ItemGroup>

<Target Name="TailwindBuild" BeforeTargets="PrepareForBuild"
AfterTargets="BuildNpmDependencies"
Inputs="@(TailwindFileInputs)" Outputs="$(TailwindCssOutput)"
Condition="'$(DesignTimeBuild)' != 'true'">
<Target Name="TailwindBuild"
BeforeTargets="PrepareForBuild"
DependsOnTargets="BuildNpmDependencies"
Inputs="@(TailwindFileInputs)"
Outputs="$(TailwindCssOutput)"
Condition="'$(DesignTimeBuild)' != 'true'">
<Exec Command="npx tailwindcss -i $(TailwindCssInput) -o $(TailwindCssOutput)" />
<Touch Files="$(TailwindCssOutput)" />
<ItemGroup>
Expand Down