Remove deprecated "use Tesla" macro usage
This commit is contained in:
parent
4b01c0f165
commit
3c36bcfaa6
2 changed files with 45 additions and 16 deletions
|
|
@ -157,26 +157,55 @@ defmodule Pleroma.Search.QdrantSearch do
|
||||||
end
|
end
|
||||||
|
|
||||||
defmodule Pleroma.Search.QdrantSearch.OpenAIClient do
|
defmodule Pleroma.Search.QdrantSearch.OpenAIClient do
|
||||||
use Tesla
|
|
||||||
alias Pleroma.Config.Getting, as: Config
|
alias Pleroma.Config.Getting, as: Config
|
||||||
|
|
||||||
plug(Tesla.Middleware.BaseUrl, Config.get([Pleroma.Search.QdrantSearch, :openai_url]))
|
def post(path, body) do
|
||||||
plug(Tesla.Middleware.JSON)
|
Tesla.post(client(), path, body)
|
||||||
|
end
|
||||||
|
|
||||||
plug(Tesla.Middleware.Headers, [
|
defp client do
|
||||||
{"Authorization",
|
Tesla.client(middleware())
|
||||||
"Bearer #{Pleroma.Config.get([Pleroma.Search.QdrantSearch, :openai_api_key])}"}
|
end
|
||||||
])
|
|
||||||
|
defp middleware do
|
||||||
|
[
|
||||||
|
{Tesla.Middleware.BaseUrl, Config.get([Pleroma.Search.QdrantSearch, :openai_url])},
|
||||||
|
Tesla.Middleware.JSON,
|
||||||
|
{Tesla.Middleware.Headers,
|
||||||
|
[
|
||||||
|
{"Authorization", "Bearer #{Config.get([Pleroma.Search.QdrantSearch, :openai_api_key])}"}
|
||||||
|
]}
|
||||||
|
]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defmodule Pleroma.Search.QdrantSearch.QdrantClient do
|
defmodule Pleroma.Search.QdrantSearch.QdrantClient do
|
||||||
use Tesla
|
|
||||||
alias Pleroma.Config.Getting, as: Config
|
alias Pleroma.Config.Getting, as: Config
|
||||||
|
|
||||||
plug(Tesla.Middleware.BaseUrl, Config.get([Pleroma.Search.QdrantSearch, :qdrant_url]))
|
def delete(path) do
|
||||||
plug(Tesla.Middleware.JSON)
|
Tesla.delete(client(), path)
|
||||||
|
end
|
||||||
|
|
||||||
plug(Tesla.Middleware.Headers, [
|
def post(path, body) do
|
||||||
{"api-key", Pleroma.Config.get([Pleroma.Search.QdrantSearch, :qdrant_api_key])}
|
Tesla.post(client(), path, body)
|
||||||
])
|
end
|
||||||
|
|
||||||
|
def put(path, body) do
|
||||||
|
Tesla.put(client(), path, body)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp client do
|
||||||
|
Tesla.client(middleware())
|
||||||
|
end
|
||||||
|
|
||||||
|
defp middleware do
|
||||||
|
[
|
||||||
|
{Tesla.Middleware.BaseUrl, Config.get([Pleroma.Search.QdrantSearch, :qdrant_url])},
|
||||||
|
Tesla.Middleware.JSON,
|
||||||
|
{Tesla.Middleware.Headers,
|
||||||
|
[
|
||||||
|
{"api-key", Pleroma.Config.get([Pleroma.Search.QdrantSearch, :qdrant_api_key])}
|
||||||
|
]}
|
||||||
|
]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
|
||||||
})
|
})
|
||||||
|
|
||||||
Config
|
Config
|
||||||
|> expect(:get, 3, fn
|
|> expect(:get, 4, fn
|
||||||
[Pleroma.Search, :module], nil ->
|
[Pleroma.Search, :module], nil ->
|
||||||
QdrantSearch
|
QdrantSearch
|
||||||
|
|
||||||
|
|
@ -93,7 +93,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
|
||||||
})
|
})
|
||||||
|
|
||||||
Config
|
Config
|
||||||
|> expect(:get, 3, fn
|
|> expect(:get, 4, fn
|
||||||
[Pleroma.Search, :module], nil ->
|
[Pleroma.Search, :module], nil ->
|
||||||
QdrantSearch
|
QdrantSearch
|
||||||
|
|
||||||
|
|
@ -158,7 +158,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Config
|
Config
|
||||||
|> expect(:get, 6, fn
|
|> expect(:get, 7, fn
|
||||||
[Pleroma.Search, :module], nil ->
|
[Pleroma.Search, :module], nil ->
|
||||||
QdrantSearch
|
QdrantSearch
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue