mirror of
https://github.com/kevinthedang/discord-ollama.git
synced 2025-12-13 20:06:07 -05:00
Update: Use built-in catch method for logging
This commit is contained in:
@@ -22,7 +22,6 @@ export const DeleteModel: SlashCommand = {
|
|||||||
// defer reply to avoid timeout
|
// defer reply to avoid timeout
|
||||||
await interaction.deferReply()
|
await interaction.deferReply()
|
||||||
const modelInput: string = interaction.options.get('model-name')!!.value as string
|
const modelInput: string = interaction.options.get('model-name')!!.value as string
|
||||||
let modelExists: boolean
|
|
||||||
|
|
||||||
// fetch channel and message
|
// fetch channel and message
|
||||||
const channel = await client.channels.fetch(interaction.channelId)
|
const channel = await client.channels.fetch(interaction.channelId)
|
||||||
@@ -38,17 +37,21 @@ export const DeleteModel: SlashCommand = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// check if model exists
|
// check if model exists
|
||||||
try {
|
const modelExists = await ollama.list()
|
||||||
modelExists = await ollama.list()
|
.then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
|
||||||
.then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
|
.catch(error => {
|
||||||
} catch (error) {
|
console.error(`[Command: delete-model] Failed to connect with Ollama service. Error: ${error.message}`)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Validate for any issue or if service is running
|
||||||
|
if (!modelExists) {
|
||||||
interaction.editReply({
|
interaction.editReply({
|
||||||
content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
|
content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// call ollama to delete model
|
// call ollama to delete model
|
||||||
if (modelExists) {
|
if (modelExists) {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ export const PullModel: SlashCommand = {
|
|||||||
// defer reply to avoid timeout
|
// defer reply to avoid timeout
|
||||||
await interaction.deferReply()
|
await interaction.deferReply()
|
||||||
const modelInput: string = interaction.options.get('model-to-pull')!!.value as string
|
const modelInput: string = interaction.options.get('model-to-pull')!!.value as string
|
||||||
let modelExists: boolean
|
|
||||||
|
|
||||||
// fetch channel and message
|
// fetch channel and message
|
||||||
const channel = await client.channels.fetch(interaction.channelId)
|
const channel = await client.channels.fetch(interaction.channelId)
|
||||||
@@ -38,10 +37,14 @@ export const PullModel: SlashCommand = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// check if model was already pulled, if the ollama service isn't running throw error
|
// check if model was already pulled, if the ollama service isn't running throw error
|
||||||
try {
|
const modelExists = await ollama.list()
|
||||||
modelExists = await ollama.list()
|
.then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
|
||||||
.then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
|
.catch(error => {
|
||||||
} catch (error) {
|
console.error(`[Command: pull-model] Failed to connect with Ollama service. Error: ${error.message}`)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Validate for any issue or if service is running
|
||||||
|
if (!modelExists) {
|
||||||
interaction.editReply({
|
interaction.editReply({
|
||||||
content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
|
content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ export const SwitchModel: SlashCommand = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error(`[Command: switch-model] Failed to connect with Ollama service. Error: ${error.message}`)
|
||||||
|
})
|
||||||
// todo: problem can be here if async messes up
|
// todo: problem can be here if async messes up
|
||||||
if (switchSuccess) {
|
if (switchSuccess) {
|
||||||
// set model now that it exists
|
// set model now that it exists
|
||||||
|
|||||||
Reference in New Issue
Block a user