more db fixes

2026-03-13 13:18:03 -06:00
parent 04103dbfbd
commit 59a8ad9635
6 changed files with 131 additions and 83 deletions
--- a/assets/tailwind.config.js
+++ b/assets/tailwind.config.js
@@ -1,21 +1,30 @@
 // See the Tailwind configuration guide for advanced usage
 // https://tailwindcss.com/docs/configuration

-const plugin = require("tailwindcss/plugin")
-const fs = require("fs")
-const path = require("path")
+const plugin = require("tailwindcss/plugin");
+const fs = require("fs");
+const path = require("path");

 module.exports = {
  content: [
    "./js/**/*.js",
    "../lib/elixir_ai_web.ex",
-    "../lib/elixir_ai_web/**/*.*ex"
+    "../lib/elixir_ai_web/**/*.*ex",
+  ],
+  safelist: [
+    "bg-cyan-950/30",
+    "bg-red-950/30",
+    "bg-green-950/30",
+    "bg-blue-950/30",
+    "bg-yellow-950/30",
+    "bg-purple-950/30",
+    "bg-pink-950/30",
  ],
  theme: {
    extend: {
      colors: {
        brand: "#FD4F00",
-      }
+      },
    },
  },
  plugins: [
@@ -25,50 +34,71 @@ module.exports = {
    //
    //     <div class="phx-click-loading:animate-ping">
    //
-    plugin(({addVariant}) => addVariant("phx-click-loading", [".phx-click-loading&", ".phx-click-loading &"])),
-    plugin(({addVariant}) => addVariant("phx-submit-loading", [".phx-submit-loading&", ".phx-submit-loading &"])),
-    plugin(({addVariant}) => addVariant("phx-change-loading", [".phx-change-loading&", ".phx-change-loading &"])),
+    plugin(({ addVariant }) =>
+      addVariant("phx-click-loading", [
+        ".phx-click-loading&",
+        ".phx-click-loading &",
+      ]),
+    ),
+    plugin(({ addVariant }) =>
+      addVariant("phx-submit-loading", [
+        ".phx-submit-loading&",
+        ".phx-submit-loading &",
+      ]),
+    ),
+    plugin(({ addVariant }) =>
+      addVariant("phx-change-loading", [
+        ".phx-change-loading&",
+        ".phx-change-loading &",
+      ]),
+    ),

    // Embeds Heroicons (https://heroicons.com) into your app.css bundle
    // See your `CoreComponents.icon/1` for more information.
    //
    plugin(function ({ matchComponents, theme }) {
-      let iconsDir = path.join(__dirname, "../deps/heroicons/optimized")
-      let values = {}
+      let iconsDir = path.join(__dirname, "../deps/heroicons/optimized");
+      let values = {};
      let icons = [
        ["", "/24/outline"],
        ["-solid", "/24/solid"],
        ["-mini", "/20/solid"],
-        ["-micro", "/16/solid"]
-      ]
+        ["-micro", "/16/solid"],
+      ];
      icons.forEach(([suffix, dir]) => {
-        fs.readdirSync(path.join(iconsDir, dir)).forEach(file => {
-          let name = path.basename(file, ".svg") + suffix
-          values[name] = {name, fullPath: path.join(iconsDir, dir, file)}
-        })
-      })
-      matchComponents({
-        "hero": ({name, fullPath}) => {
-          let content = fs.readFileSync(fullPath).toString().replace(/\r?\n|\r/g, "")
-          let size = theme("spacing.6")
+        fs.readdirSync(path.join(iconsDir, dir)).forEach((file) => {
+          let name = path.basename(file, ".svg") + suffix;
+          values[name] = { name, fullPath: path.join(iconsDir, dir, file) };
+        });
+      });
+      matchComponents(
+        {
+          hero: ({ name, fullPath }) => {
+            let content = fs
+              .readFileSync(fullPath)
+              .toString()
+              .replace(/\r?\n|\r/g, "");
+            let size = theme("spacing.6");
            if (name.endsWith("-mini")) {
-            size = theme("spacing.5")
+              size = theme("spacing.5");
            } else if (name.endsWith("-micro")) {
-            size = theme("spacing.4")
+              size = theme("spacing.4");
            }
            return {
              [`--hero-${name}`]: `url('data:image/svg+xml;utf8,${content}')`,
              "-webkit-mask": `var(--hero-${name})`,
-            "mask": `var(--hero-${name})`,
+              mask: `var(--hero-${name})`,
              "mask-repeat": "no-repeat",
              "background-color": "currentColor",
              "vertical-align": "middle",
-            "display": "inline-block",
-            "width": size,
-            "height": size
-          }
-        }
-      }, {values})
-    })
-  ]
-}
+              display: "inline-block",
+              width: size,
+              height: size,
+            };
+          },
+        },
+        { values },
+      );
+    }),
+  ],
+};
--- a/lib/elixir_ai/conversation_manager.ex
+++ b/lib/elixir_ai/conversation_manager.ex
@@ -109,6 +109,11 @@ defmodule ElixirAi.ConversationManager do
    {:reply, Map.get(conversations, name, []), state}
  end

+  def handle_info({:db_error, reason}, state) do
+    Logger.error("ConversationManager received db_error: #{inspect(reason)}")
+    {:noreply, state}
+  end
+
  def handle_info({:store_message, name, message}, %{conversations: conversations} = state) do
    case Conversation.find_id(name) do
      {:ok, conv_id} ->
--- a/lib/elixir_ai/data/db_helpers.ex
+++ b/lib/elixir_ai/data/db_helpers.ex
@@ -7,19 +7,23 @@ defmodule ElixirAi.Data.DbHelpers do
  end

  def run_sql(sql, params, topic) do
+    original_sql = sql
+    original_params = params
    {sql, params} = named_params_to_positional_params(sql, params)

    try do
      result = Ecto.Adapters.SQL.query!(ElixirAi.Repo, sql, params)

      # Transform rows to maps with column names as keys
-      Enum.map(result.rows, fn row ->
+      Enum.map(result.rows || [], fn row ->
        Enum.zip(result.columns, row)
        |> Enum.into(%{})
      end)
    rescue
      exception ->
        Logger.error("Database error: #{Exception.message(exception)}")
+        Logger.error("Failed SQL: #{original_sql}")
+        Logger.error("SQL params: #{inspect(original_params, pretty: true)}")

        Phoenix.PubSub.broadcast(
          ElixirAi.PubSub,
--- a/lib/elixir_ai/data/message.ex
+++ b/lib/elixir_ai/data/message.ex
@@ -73,7 +73,7 @@ defmodule ElixirAi.Message do
      $(role),
      $(content),
      $(reasoning_content),
-      $(tool_calls),
+      $(tool_calls)::jsonb,
      $(tool_call_id),
      $(inserted_at)
    )
--- a/lib/elixir_ai_web/live/home_live.ex
+++ b/lib/elixir_ai_web/live/home_live.ex
@@ -24,6 +24,20 @@ defmodule ElixirAiWeb.HomeLive do
      <div>
        <h1 class="text-lg font-semibold text-cyan-300 mb-8">Conversations</h1>

+        <.conversation_list conversations={@conversations} />
+
+        <.create_conversation_form new_name={@new_name} ai_providers={@ai_providers} />
+
+        <%= if @error do %>
+          <p class="mt-2 text-sm text-red-400">{@error}</p>
+        <% end %>
+      </div>
+    </div>
+    """
+  end
+
+  defp conversation_list(assigns) do
+    ~H"""
    <ul class="mb-8 space-y-2">
      <%= if @conversations == [] do %>
        <li class="text-sm text-cyan-700">No conversations yet.</li>
@@ -39,16 +53,21 @@ defmodule ElixirAiWeb.HomeLive do
        </li>
      <% end %>
    </ul>
+    """
+  end

+  defp create_conversation_form(assigns) do
+    ~H"""
    <form phx-submit="create" class="space-y-2">
      <.input type="text" name="name" value={@new_name} label="Conversation Name" />
      <select
        name="ai_provider_id"
        class="w-full rounded px-3 py-2 text-sm bg-cyan-950/20 border border-cyan-900/40 text-cyan-100 focus:outline-none focus:ring-1 focus:ring-cyan-700"
      >
-            <option value="">Select AI Provider</option>
-            <%= for provider <- @ai_providers do %>
-              <option value={provider.id}>{provider.name} - {provider.model_name}</option>
+        <%= for {provider, index} <- Enum.with_index(@ai_providers) do %>
+          <option value={provider.id} selected={index == 0}>
+            {provider.name} - {provider.model_name}
+          </option>
        <% end %>
      </select>
      <button
@@ -58,16 +77,6 @@ defmodule ElixirAiWeb.HomeLive do
        Create
      </button>
    </form>
-
-        <%= if @error do %>
-          <p class="mt-2 text-sm text-red-400">{@error}</p>
-        <% end %>
-      </div>
-
-      <%!-- <div>
-        <.live_component module={ElixirAiWeb.AiProvidersLive} id="ai-providers" />
-      </div> --%>
-    </div>
    """
  end

--- a/mix.exs
+++ b/mix.exs
@@ -32,7 +32,7 @@ defmodule ElixirAi.MixProject do
  # Type `mix help deps` for examples and options.
  defp deps do
    [
-      {:phoenix, "~> 1.7.18"},
+      {:phoenix, "~> 1.7.21"},
      {:phoenix_html, "~> 4.1"},
      {:phoenix_live_reload, "~> 1.2", only: :dev},
      {:phoenix_live_view, "~> 1.0.0"},