Skip to content

Commit a019ae5

Browse files
LayoricLayoric
committed
Merge remote-tracking branch 'origin/main'
2 parents b93f3ea + bc27043 commit a019ae5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+379
-223
lines changed

‎MyApp/Pages/Shared/AsciiCinemaIncludes.cshtml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
11
<link rel="stylesheet" href="/css/asciinema-player.css">
22
<script src="/lib/js/asciinema-player.js"></script>
3-
<script>
4-
document.addEventListener("DOMContentLoaded", () => {
5-
document.querySelectorAll('[data-asciicinema]').forEach(el => {
6-
const path = el.dataset.asciicinema
7-
const options = el.dataset.options
8-
? new Function(`return (${el.dataset.options})`)()
9-
: { loop: true, poster:'npt:00:01' }
10-
AsciinemaPlayer.create(path, el, options)
11-
})
12-
})
13-
</script>

‎MyApp/Pages/Shared/DocsPage.cshtml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,13 @@ if (document.querySelector('.hide-title')) {
273273
}
274274
</script>
275275

276+
@*Only load additional deps for pages with custom .mjs*@
277+
@if (docMjs != null)
278+
{
279+
@await Html.PartialAsync("MermaidIncludes")
280+
@await Html.PartialAsync("AsciiCinemaIncludes")
281+
}
282+
276283
<script type="module">
277284
import { ref } from "vue"
278285
import { mount } from "app.mjs"

‎MyApp/_includes/ai-server/cs/ai-server-compatible-1.cs.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
```csharp
2-
var apiClient = GetLocalApiClient("https://localhost:5005");
3-
apiClient.BearerToken = Environment.GetEnvironmentVariable("AI_SERVER_API_KEY");
2+
var client = GetLocalApiClient(AiServerUrl);
43

5-
var response = await apiClient.PostAsync(new OpenAiChatCompletion {
6-
Model = "llama3:8b",
7-
Messages = new List<OpenAiMessage>
8-
{
9-
new OpenAiMessage { Role = "system", Content = "You are a helpful AI assistant." },
10-
new OpenAiMessage { Role = "user", Content = "How do LLMs work?" }
11-
},
4+
var response = client.Post(new OpenAiChatCompletion {
5+
Model = "llama3.1:8b",
6+
Messages =
7+
[
8+
new() { Role = "system", Content = "You are a helpful AI assistant." },
9+
new() { Role = "user", Content = "How do LLMs work?" }
10+
],
1211
MaxTokens = 50
1312
});
14-
Console.WriteLine(response.Choices[0].Message.Content);
13+
var answer = response.Choices[0].Message.Content;
1514
```

‎MyApp/_includes/ai-server/cs/convert-image-1.cs.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new ConvertImage {
2+
using var fsImage = File.OpenRead("files/test_image.jpg");
3+
var response = client.PostFileWithRequest(new ConvertImage {
34
OutputFormat = ImageOutputFormat.Gif
45
},
5-
[new UploadFile("test_image.jpg", File.OpenRead("files/test_image.jpg"), "image")]
6-
);
6+
new UploadFile("test_image.jpg", fsImage, "image"));
77

8-
var videoUrl = response.Outputs[0].Url;
9-
videoUrl.DownloadFileTo(outputFileName);
8+
File.WriteAllBytes(saveToPath, response.Results[0].Url.GetBytesFromUrl());
109
```

‎MyApp/_includes/ai-server/cs/convert-video-1.cs.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new ConvertVideo {
2+
using var fsVideo = File.OpenRead("files/test_video.webm");
3+
var response = client.PostFileWithRequest(new ConvertVideo {
34
OutputFormat = ConvertVideoOutputFormat.MOV
45
},
5-
[new UploadFile("test_video.webm", File.OpenRead("files/test_video.webm"), "video")]
6-
);
6+
new UploadFile("test_video.webm", fsVideo, "video"));
77

8-
var videoUrl = response.Outputs[0].Url;
9-
videoUrl.DownloadFileTo(outputFileName);
8+
File.WriteAllBytes(saveToPath, response.Results[0].Url.GetBytesFromUrl());
109
```

‎MyApp/_includes/ai-server/cs/crop-image-1.cs.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new CropImage {
2+
using var fsImage = File.OpenRead("files/test_image.jpg");
3+
var response = client.PostFileWithRequest(new CropImage {
34
X = 50,
45
Y = 50,
56
Width = 150,
67
Height = 150
78
},
8-
[new UploadFile("test_image.jpg", File.OpenRead("files/test_image.jpg"), "image")]
9-
);
9+
new UploadFile("test_image.jpg", fsImage, "image"));
1010

11-
var videoUrl = response.Outputs[0].Url;
12-
videoUrl.DownloadFileTo(outputFileName);
11+
var videoUrl = response.Results[0].Url;
12+
videoUrl.DownloadFileTo(saveToPath);
1313
```

‎MyApp/_includes/ai-server/cs/crop-video-1.cs.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new CropVideo {
2+
using var fsVideo = File.OpenRead("files/test_video.mp4");
3+
var response = client.PostFileWithRequest(new CropVideo {
34
X = 100,
45
Y = 100,
56
Width = 500,
67
Height = 300
78
},
8-
[new UploadFile("test_video.mp4", File.OpenRead("files/test_video.mp4"), "video")]
9-
);
9+
new UploadFile("test_video.mp4", fsVideo, "video"));
1010

11-
var videoUrl = response.Outputs[0].Url;
12-
videoUrl.DownloadFileTo(outputFileName);
11+
File.WriteAllBytes(saveToPath, response.Results[0].Url.GetBytesFromUrl());
1312
```

‎MyApp/_includes/ai-server/cs/image-to-image-1.cs.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new ImageToImage {
2+
using var fsImage = File.OpenRead("files/comfyui_upload_test.png");
3+
var response = client.PostFileWithRequest(new ImageToImage {
34
PositivePrompt = "A beautiful sunset over the ocean",
45
NegativePrompt = "A pixelated, low-quality image"
56
},
6-
[new UploadFile("image", File.OpenRead("files/comfyui_upload_test.png"), "image")]
7-
);
8-
response.Outputs[0].Url.DownloadFileTo(outputFileName);
7+
new UploadFile("image", fsImage, "image"));
8+
9+
response.Results[0].Url.DownloadFileTo(outputFileName);
910
```

‎MyApp/_includes/ai-server/cs/image-to-text-1.cs.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new ImageToText(),
3-
[new UploadFile("image", File.OpenRead("files/test_image.jpg"), "image")]
4-
);
2+
using var fsImage = File.OpenRead("files/test_image.jpg");
3+
var response = client.PostFileWithRequest(new ImageToText(),
4+
new UploadFile("image", fsImage, "image"));
55
```

‎MyApp/_includes/ai-server/cs/image-upscale-1.cs.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
```csharp
2-
var response = client.PostFilesWithRequest(new ImageUpscale(),
3-
[new UploadFile("image", File.OpenRead("files/test_image.jpg"), "image")]
4-
);
5-
response.Outputs[0].Url.DownloadFileTo(outputFileName);
2+
using var fsImage = File.OpenRead("files/test_image.jpg");
3+
var response = client.PostFileWithRequest(new ImageUpscale(),
4+
new UploadFile("image", fsImage, "image"));
5+
6+
File.WriteAllBytes(saveToPath, response.Results[0].Url.GetBytesFromUrl());
67
```

0 commit comments

Comments
 (0)