Skip to content

Commit

Permalink
fix: ollama deps
Browse files Browse the repository at this point in the history
  • Loading branch information
louis030195 committed Jul 29, 2024
1 parent 35a2262 commit 788ae74
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { ChatMessage } from "./chat-message-v2";
import { Message, generateText, nanoid, streamText, tool } from "ai";
import { createOpenAI, openai } from "@ai-sdk/openai";
import { ollama } from "ollama-ai-provider";
import { ollama } from "ollama-ai-provider-fix"; // ! HACK TEMPORARY

import { IconOpenAI } from "./ui/icons";
import { spinner } from "./spinner";
Expand Down
6 changes: 5 additions & 1 deletion examples/apps/screenpipe-app-tauri/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ reqwest = { version = "0.12", features = ["json"] }
uuid = { version = "1.10.0", features = ["v4"] }

# Sentry
sentry = "0.34.0"
sentry = { version = "0.34.0", features = ["tracing"] }
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
# broken not compatible w tauri2?
# sentry-tauri = "0.2"

# Autostart
tauri-plugin-autostart = "2.0.0-beta.9"
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6078,6 +6078,13 @@
"window:allow-set-size"
]
},
{
"description": "window:allow-set-size-constraints -> Enables the set_size_constraints command without any pre-configured scope.",
"type": "string",
"enum": [
"window:allow-set-size-constraints"
]
},
{
"description": "window:allow-set-skip-taskbar -> Enables the set_skip_taskbar command without any pre-configured scope.",
"type": "string",
Expand Down Expand Up @@ -6526,6 +6533,13 @@
"window:deny-set-size"
]
},
{
"description": "window:deny-set-size-constraints -> Denies the set_size_constraints command without any pre-configured scope.",
"type": "string",
"enum": [
"window:deny-set-size-constraints"
]
},
{
"description": "window:deny-set-skip-taskbar -> Denies the set_skip_taskbar command without any pre-configured scope.",
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6078,6 +6078,13 @@
"window:allow-set-size"
]
},
{
"description": "window:allow-set-size-constraints -> Enables the set_size_constraints command without any pre-configured scope.",
"type": "string",
"enum": [
"window:allow-set-size-constraints"
]
},
{
"description": "window:allow-set-skip-taskbar -> Enables the set_skip_taskbar command without any pre-configured scope.",
"type": "string",
Expand Down Expand Up @@ -6526,6 +6533,13 @@
"window:deny-set-size"
]
},
{
"description": "window:deny-set-size-constraints -> Denies the set_size_constraints command without any pre-configured scope.",
"type": "string",
"enum": [
"window:deny-set-size-constraints"
]
},
{
"description": "window:deny-set-skip-taskbar -> Denies the set_skip_taskbar command without any pre-configured scope.",
"type": "string",
Expand Down
6 changes: 5 additions & 1 deletion examples/apps/screenpipe-app-tauri/src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ fn get_base_dir(custom_path: Option<String>) -> anyhow::Result<PathBuf> {
#[tokio::main]
async fn main() {
let _ = fix_path_env::fix();
let _guard = sentry::init(("https://cf682877173997afc8463e5ca2fbe3c7@o4507617161314304.ingest.us.sentry.io/4507617170161664", sentry::ClientOptions {

let _guard = sentry::init((
"https://cf682877173997afc8463e5ca2fbe3c7@o4507617161314304.ingest.us.sentry.io/4507617170161664", sentry::ClientOptions {
release: sentry::release_name!(),
traces_sample_rate: 0.2,
..Default::default()
}));

let sidecar_state = SidecarState(Arc::new(Mutex::new(None)));

let app = tauri::Builder::default()
Expand Down

0 comments on commit 788ae74

Please sign in to comment.