Merge pull request #41 from dezoito/dev

Merge changes for v0.5.2
dezoito · Sep 15, 2024 · 6280ba2 · 6280ba2
2 parents 1069d86 + d0a52d0
commit 6280ba2
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [Version 0.5.2] - 2024-09-15
+
+### Added
+
+[ok] - Adds custom application icon
+
+### Fixes
+
+[ok] - Handles Ollama version info not being correctly returned by the server
+
 ## [Version 0.5.1] - 2024-07-10
 
 ### Added

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ollama-grid-search",
   "private": true,
-  "version": "0.5.1",
+  "version": "0.5.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grid-search-desktop"
-version = "0.5.1"
+version = "0.5.2"
 description = "A Tauri App to perform Grid Search and A/B testing experiments on LLMs"
 authors = ["dezoito"]
 license = "Whatever is in the repo"

diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/[email protected] b/src-tauri/icons/[email protected]
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
@@ -1,4 +1,5 @@
 use reqwest::Client;
+use serde_json::json;
 use std::fs;
 use tokio::time::{self, Duration};
 
@@ -53,7 +54,10 @@ pub async fn get_ollama_version(config: IDefaultConfigs) -> Result<String, Error
 
     dbg!(&response);
 
-    Ok(response.text().await.unwrap())
+    Ok(response
+        .text()
+        .await
+        .unwrap_or(json!({"version": "_(Version Unavailable)"}).to_string()))
 }
 
 #[tauri::command]

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "ollama-grid-search",
-    "version": "0.5.1"
+    "version": "0.5.2"
   },
   "tauri": {
     "allowlist": {

diff --git a/todo.md b/todo.md
@@ -96,6 +96,9 @@ https://github.com/tauri-apps/plugins-workspace/tree/v1/plugins/single-instance
 [ok] - Fixed padding in "Expand/Hide" buttons for params and metadate
 [ok] - Improved UI for component that displays inference parameters with collapsible prompts
 
+--- v0.5.2
+[ok] - Adds custom application icon
+[ok] - Handles Ollama version info not being correctly returned by the server
 
 
 ---