From adc129505c61e59497c0b9cd021756a9859568a3 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 12 Sep 2024 21:51:13 +0300
Subject: [PATCH] Switch from openai_api_rust via git repository to published
 etke_openai_api_rust crate

---
 Cargo.lock                                    | 29 ++++++++++---------
 Cargo.toml                                    |  2 +-
 .../provider/openai_compat/controller.rs      |  8 ++---
 src/agent/provider/openai_compat/utils.rs     |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4484b15..81571d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -303,10 +303,10 @@ dependencies = [
  "anyhow",
  "async-openai 0.24.0",
  "base64 0.22.1",
+ "etke_openai_api_rust",
  "matrix-sdk",
  "mxidwc",
  "mxlink",
- "openai_api_rust",
  "quick_cache",
  "regex",
  "serde",
@@ -919,6 +919,20 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "etke_openai_api_rust"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1499ac61bf9b9a5973a5830894cbf2016a96a4dab9eb2dab4a526c720632c93"
+dependencies = [
+ "log",
+ "mime",
+ "rand",
+ "serde",
+ "serde_json",
+ "ureq",
+]
+
 [[package]]
 name = "event-listener"
 version = "4.0.3"
@@ -2204,19 +2218,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
-[[package]]
-name = "openai_api_rust"
-version = "0.1.9"
-source = "git+https://github.com/etkecc/openai_api_rust.git?branch=next#a9183fc2e699c3d33c635c2aed3f9174f9d9cd74"
-dependencies = [
- "log",
- "mime",
- "rand",
- "serde",
- "serde_json",
- "ureq",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.66"
diff --git a/Cargo.toml b/Cargo.toml
index bc41958..d9d3ab5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ base64 = "0.22.*"
 matrix-sdk = { version = "0.7.1", default-features = false }
 mxidwc = "1.0.*"
 mxlink = "1.0.*"
-openai_api_rust = { git = "https://github.com/etkecc/openai_api_rust.git", branch = "next" }
+etke_openai_api_rust = "0.1.*"
 quick_cache = "0.6.*"
 regex = "1.10.*"
 serde = { version = "1.0.*", features = ["derive"], default-features = false }
diff --git a/src/agent/provider/openai_compat/controller.rs b/src/agent/provider/openai_compat/controller.rs
index bb071d6..13e1fcf 100644
--- a/src/agent/provider/openai_compat/controller.rs
+++ b/src/agent/provider/openai_compat/controller.rs
@@ -1,7 +1,7 @@
-use openai_api_rust::audio::{AudioApi, AudioBody};
-use openai_api_rust::chat::{ChatApi, ChatBody};
-use openai_api_rust::images::{ImagesApi, ImagesBody};
-use openai_api_rust::{Auth, Message, OpenAI};
+use etke_openai_api_rust::audio::{AudioApi, AudioBody};
+use etke_openai_api_rust::chat::{ChatApi, ChatBody};
+use etke_openai_api_rust::images::{ImagesApi, ImagesBody};
+use etke_openai_api_rust::{Auth, Message, OpenAI};
 
 use super::super::ControllerTrait;
 use crate::agent::utils::base64_decode;
diff --git a/src/agent/provider/openai_compat/utils.rs b/src/agent/provider/openai_compat/utils.rs
index bcf723c..b25b072 100644
--- a/src/agent/provider/openai_compat/utils.rs
+++ b/src/agent/provider/openai_compat/utils.rs
@@ -1,4 +1,4 @@
-use openai_api_rust::{Message, Role};
+use etke_openai_api_rust::{Message, Role};
 
 use crate::agent::provider::openai::Config as OpenAIConfig;