Skip to content

自动创建的vector_store 也支持去重，只要file_ids是一样的情况下 #259

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.

Sign up for GitHub

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

Merged
chenxizhang merged 1 commit into from
Jun 17, 2024
Merged

自动创建的vector_store 也支持去重，只要file_ids是一样的情况下 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code365scripts.openai/Public/New-ChatGPTConversation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ function New-ChatGPTConversation {
# if the parameter set is assistant_existing, then get the assistant from the existing assistant id
if ($PSCmdlet.ParameterSetName -eq "assistant_existing") {
$client = Get-OpenAIClient -api_key $api_key -model $model -endpoint $baseUrl
$client.assistants.get($assistant_id).chat()
$client.assistants.get($assistant_id).chat($false)
return
}

Expand All @@ -316,7 +316,7 @@ function New-ChatGPTConversation {
model = $model
instructions = $system
functions = $functions
}).chat()
}).chat($true)
return
}

Expand Down
48 changes: 35 additions & 13 deletions code365scripts.openai/Types/OpenAIClient.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ class Assistant:AssistantResource {

if ($files) {
# upload the files and create new vector store
$file_ids = $this.client.files.create(@{ "files" = $files }) | Select-Object -ExpandProperty id
$file_ids = $this.client.files.create(@{ "files" = $files }) | Select-Object -ExpandProperty id
$body.Add("tools", @(
@{
"type" = "file_search"
Expand All @@ -294,6 +294,7 @@ class Assistant:AssistantResource {
})
}
})

}

if ($vector_store_ids -and $vector_store_ids.Count -gt 0) {
Expand Down Expand Up @@ -355,26 +356,39 @@ class AssistantObject:AssistantResourceObject {

AssistantObject([psobject]$data):base($data) {}

[void]chat() {
[void]chat($clean = $false) {
if (-not $this.thread) {
# create a thread, and associate the assistant id
$this.thread = $this.client.threads.create($this.id)
}

while ($true) {
# ask use to input, until the user type 'q' or 'bye'
$prompt = Read-Host ">"
if ($prompt -eq "q" -or $prompt -eq "bye") {
break
}
try {
while ($true) {
# ask use to input, until the user type 'q' or 'bye'
$prompt = Read-Host ">"
if ($prompt -eq "q" -or $prompt -eq "bye") {
break
}

# send the message to the thread
$response = $this.thread.send($prompt).run().get_last_message()
# send the message to the thread
$response = $this.thread.send($prompt).run().get_last_message()

if ($response) {
Write-Host $response -ForegroundColor Green
if ($response) {
Write-Host $response -ForegroundColor Green
}
}
}
finally {
$this.client.threads.delete($this.thread.id)
if ($clean) {
Write-Host "clean up the thread, assistant, and vector_store..." -ForegroundColor Yellow
# clean up the thread, assistant, and vector_store
$vc_id = $this.tool_resources.file_search.vector_store_ids[0]
$this.client.vector_stores.delete($vc_id)
$this.client.assistants.delete($this.id)
}
}

}
}

Expand Down Expand Up @@ -476,8 +490,16 @@ class Thread:AssistantResource {
}
}

class Vector_storeObject:AssistantResourceObject {
Vector_storeObject([psobject]$data):base($data) {}

[string[]]file_ids() {
return $this.client.web("vector_stores/$($this.id)/files").data | Select-Object -ExpandProperty id
}
}

class Vector_store:AssistantResource {
Vector_store([OpenAIClient]$client): base($client, "vector_stores", $null) {}
Vector_store([OpenAIClient]$client): base($client, "vector_stores", "Vector_storeObject") {}

[psobject]create([hashtable]$body) {
<#
Expand Down