From d0f1579b7aec81a505f415cfe99a66ce2f92b6a1 Mon Sep 17 00:00:00 2001 From: Lanius Trolling Date: Mon, 13 May 2024 18:50:22 -0400 Subject: [PATCH] Fix OpenAI file updating --- src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt | 3 ++- src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt | 6 +++--- src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt index 76a2cb2..efd41e7 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt @@ -3,6 +3,7 @@ package info.mechyrdia.lore import info.mechyrdia.MainDomainName import info.mechyrdia.data.* import java.time.Instant +import java.time.ZoneId import java.time.format.DateTimeFormatter private val AVERAGE_FACTBOOK_INTRO_CHANGEFREQ = SitemapChangeFrequency.DAILY @@ -24,7 +25,7 @@ val SitemapChangeFrequency.xmlValue: String get() = name.lowercase() val Instant.xmlValue: String - get() = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this) + get() = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(atZone(ZoneId.of("Z"))) val Double.xmlValue: String get() = "%f".format(this) diff --git a/src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt b/src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt index becd998..627e522 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt @@ -34,15 +34,15 @@ value class RobotClient( "https://api.openai.com/v1/files/${fileId.id}" ).body() - suspend fun downloadFile(fileId: RobotFileId) = client.delete( - "https://api.openai.com/v1/files/${fileId.id}" + suspend fun downloadFile(fileId: RobotFileId) = client.get( + "https://api.openai.com/v1/files/${fileId.id}/content" ).body() suspend fun createVectorStore(request: RobotCreateVectorStoreRequest) = client.post("https://api.openai.com/v1/vector_stores") { setJsonBody(request) }.body() - suspend fun addFileToVectorStore(vsId: RobotVectorStoreId, fileId: RobotFileId) = client.post("https://api.openai.com/v1/vector_stores/${vsId.id}") { + suspend fun addFileToVectorStore(vsId: RobotVectorStoreId, fileId: RobotFileId) = client.post("https://api.openai.com/v1/vector_stores/${vsId.id}/files") { setJsonBody(RobotAddFileToVectorStoreRequest(fileId)) }.body() diff --git a/src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt b/src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt index ce01519..80f640c 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt @@ -184,7 +184,7 @@ class RobotService( robotGlobals = robotGlobals.copy( assistantId = robotClient.createAssistant( RobotCreateAssistantRequest( - model = "gpt-4-turbo", + model = "gpt-4o", name = "Natural-language Universal Knowledge Engine", instructions = "You are a helpful interactive encyclopedia, able to answer questions with information from the provided files", tools = listOf( -- 2.25.1