Skip to content

✨ support ecto 3.12 #2

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

Open
rparcus wants to merge 1 commit into
base: update_req
Choose a base branch
from
Open

✨ support ecto 3.12 #2

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
12 changes: 6 additions & 6 deletions lib/instructor.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ defmodule Instructor do
defp do_streaming_partial_array_chat_completion(response_model, params, config) do
wrapped_model = %{
value:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{cardinality: :many, related: response_model}}
{:parameterized,
{Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: response_model}}}
}

params = Keyword.put(params, :response_model, wrapped_model)
Expand Down Expand Up @@ -334,8 +334,8 @@ defmodule Instructor do
defp do_streaming_partial_chat_completion(response_model, params, config) do
wrapped_model = %{
value:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{cardinality: :one, related: response_model}}
{:parameterized,
{Ecto.Embedded, %Ecto.Embedded{cardinality: :one, related: response_model}}}
}

params = Keyword.put(params, :response_model, wrapped_model)
Expand Down Expand Up @@ -382,8 +382,8 @@ defmodule Instructor do
defp do_streaming_array_chat_completion(response_model, params, config) do
wrapped_model = %{
value:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{cardinality: :many, related: response_model}}
{:parameterized,
{Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: response_model}}}
}

params = Keyword.put(params, :response_model, wrapped_model)
Expand Down
12 changes: 6 additions & 6 deletions lib/instructor/json_schema.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ defmodule Instructor.JSONSchema do
required = Map.keys(properties) |> Enum.sort()

embedded_schemas =
for {_field, {:parameterized, Ecto.Embedded, %Ecto.Embedded{related: related}}} <-
for {_field, {:parameterized, {Ecto.Embedded, %Ecto.Embedded{related: related}}}} <-
ecto_types,
is_ecto_schema(related) do
related
Expand Down Expand Up @@ -226,7 +226,7 @@ defmodule Instructor.JSONSchema do
defp for_type(:utc_datetime_usec), do: %{type: "string", format: "date-time"}

defp for_type(
{:parameterized, Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: related}}
{:parameterized, {Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: related}}}
)
when is_ecto_schema(related) do
title = title_for(related)
Expand All @@ -239,7 +239,7 @@ defmodule Instructor.JSONSchema do
end

defp for_type(
{:parameterized, Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: related}}
{:parameterized, {Ecto.Embedded, %Ecto.Embedded{cardinality: :many, related: related}}}
)
when is_ecto_types(related) do
properties =
Expand All @@ -260,14 +260,14 @@ defmodule Instructor.JSONSchema do
end

defp for_type(
{:parameterized, Ecto.Embedded, %Ecto.Embedded{cardinality: :one, related: related}}
{:parameterized, {Ecto.Embedded, %Ecto.Embedded{cardinality: :one, related: related}}}
)
when is_ecto_schema(related) do
%{"$ref": "#/$defs/#{title_for(related)}"}
end

defp for_type(
{:parameterized, Ecto.Embedded, %Ecto.Embedded{cardinality: :one, related: related}}
{:parameterized, {Ecto.Embedded, %Ecto.Embedded{cardinality: :one, related: related}}}
)
when is_ecto_types(related) do
properties =
Expand All @@ -284,7 +284,7 @@ defmodule Instructor.JSONSchema do
}
end

defp for_type({:parameterized, Ecto.Enum, %{mappings: mappings}}) do
defp for_type({:parameterized, {Ecto.Enum, %{mappings: mappings}}}) do
%{
type: "string",
enum: Keyword.keys(mappings)
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ defmodule Instructor.MixProject do
# Run "mix help deps" to learn about dependencies.
defp deps do
[
{:ecto, "~> 3.11"},
{:ecto, "~> 3.12"},
{:jason, "~> 1.4.0"},
{:req, "~> 0.5 or ~> 1.0"},
{:jaxon, "~> 2.0"},
Expand Down
4 changes: 2 additions & 2 deletions mix.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"castore": {:hex, :castore, "1.0.8", "dedcf20ea746694647f883590b82d9e96014057aff1d44d03ec90f36a5c0dc6e", [:mix], [], "hexpm", "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1"},
"decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
"earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
"ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
"ecto": {:hex, :ecto, "3.12.2", "bae2094f038e9664ce5f089e5f3b6132a535d8b018bd280a485c2f33df5c0ce1", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "492e67c70f3a71c6afe80d946d3ced52ecc57c53c9829791bfff1830ff5a1f0c"},
"elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
"ex_doc": {:hex, :ex_doc, "0.31.0", "06eb1dfd787445d9cab9a45088405593dd3bb7fe99e097eaa71f37ba80c7a676", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"},
"finch": {:hex, :finch, "0.18.0", "944ac7d34d0bd2ac8998f79f7a811b21d87d911e77a786bc5810adb75632ada4", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"},
Expand All @@ -19,5 +19,5 @@
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
"nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
"req": {:hex, :req, "0.5.6", "8fe1eead4a085510fe3d51ad854ca8f20a622aae46e97b302f499dfb84f726ac", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cfaa8e720945d46654853de39d368f40362c2641c4b2153c886418914b372185"},
"telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
"telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
}
17 changes: 9 additions & 8 deletions test/gbnf_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,15 @@ defmodule GBNFTest do
test "nested inline objects" do
ecto_schema = %{
value:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{
cardinality: :one,
related: %{
name: :string,
birth_date: :date
}
}}
{:parameterized,
{Ecto.Embedded,
%Ecto.Embedded{
cardinality: :one,
related: %{
name: :string,
birth_date: :date
}
}}}
}

gbnf =
Expand Down
28 changes: 15 additions & 13 deletions test/json_schema_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,19 +328,21 @@ defmodule JSONSchemaTest do
test "handles ecto types with embeds recursively" do
schema = %{
value:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{
cardinality: :one,
related: %{
name: :string,
children:
{:parameterized, Ecto.Embedded,
%Ecto.Embedded{
cardinality: :many,
related: %{name: :string}
}}
}
}}
{:parameterized,
{Ecto.Embedded,
%Ecto.Embedded{
cardinality: :one,
related: %{
name: :string,
children:
{:parameterized,
{Ecto.Embedded,
%Ecto.Embedded{
cardinality: :many,
related: %{name: :string}
}}}
}
}}}
}

json_schema =
Expand Down