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

Merges changes for v0.5.3 #42

Merged
merged 2 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@

All notable changes to this project will be documented in this file.

## [Version 0.5.3] - 2024-09-16

### Fixes

- Handles Ollama servers using default ports (80 or 443)

## [Version 0.5.2] - 2024-09-15

### Added

[ok] - Adds custom application icon
- Adds custom application icon

### Fixes

[ok] - Handles Ollama version info not being correctly returned by the server
- Handles Ollama version info not being correctly returned by the server

## [Version 0.5.1] - 2024-07-10

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ollama-grid-search",
"private": true,
"version": "0.5.2",
"version": "0.5.3",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grid-search-desktop"
version = "0.5.2"
version = "0.5.3"
description = "A Tauri App to perform Grid Search and A/B testing experiments on LLMs"
authors = ["dezoito"]
license = "Whatever is in the repo"
Expand Down
9 changes: 8 additions & 1 deletion src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,16 @@ pub async fn wait_and_return(duration_seconds: u64) -> String {

pub fn split_host_port(url: &str) -> Result<(String, u16), ParseError> {
let some_url = Url::parse(url)?;
let port = some_url.port().unwrap_or_else(|| {
if some_url.scheme() == "https" {
443
} else {
80
}
});
Ok((
format!("{}://{}", some_url.scheme(), some_url.host_str().unwrap(),),
some_url.port().unwrap(),
port,
))
}

Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"package": {
"productName": "ollama-grid-search",
"version": "0.5.2"
"version": "0.5.3"
},
"tauri": {
"allowlist": {
Expand Down
3 changes: 3 additions & 0 deletions todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ https://github.com/tauri-apps/plugins-workspace/tree/v1/plugins/single-instance
[ok] - Adds custom application icon
[ok] - Handles Ollama version info not being correctly returned by the server

--- v0.5.3
[ok] - Handles Ollama servers using default ports (80 or 443)


---

Expand Down