New bout page

server/config/config.exs

@@ -91,7 +91,7 @@ config :orcasite, Oban,
   repo: Orcasite.Repo,
   # 7 day job retention
   plugins: [{Oban.Plugins.Pruner, max_age: 7 * 24 * 60 * 60}],
-  queues: [default: 10, email: 10, feeds: 10]
+  queues: [default: 10, email: 10, feeds: 10, audio_images: 5]
 
 config :spark, :formatter,
   remove_parens?: true,

server/config/dev.exs

@@ -113,3 +113,5 @@ config :ex_aws,
 config :orcasite,
   audio_image_bucket: System.get_env("ORCASITE_AUDIO_IMAGE_BUCKET", "dev-audio-viz"),
   audio_image_bucket_region: System.get_env("ORCASITE_AUDIO_IMAGE_BUCKET_REGION", "us-west-2")
+
+config :orcasite, :env, :dev

server/config/prod.exs

@@ -80,3 +80,5 @@ else
   config :hammer,
     backend: {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}
 end
+
+config :orcasite, :env, :prod

server/config/runtime.exs

@@ -21,6 +21,8 @@ if System.get_env("PHX_SERVER") do
   config :orcasite, OrcasiteWeb.Endpoint, server: true
 end
 
+config :orcasite, :prod_host, System.get_env("HOST_URL", "live.orcasound.net")
+
 if config_env() == :prod do
   database_url =
     System.get_env("DATABASE_URL") ||
@@ -49,7 +51,7 @@ if config_env() == :prod do
       You can generate one by calling: mix phx.gen.secret
       """
 
-  host = System.get_env("HOST_URL") || "live.orcasite.com"
+  host = System.get_env("HOST_URL") || "live.orcasound.net"
   port = String.to_integer(System.get_env("PORT") || "4000")
 
   if System.get_env("FEED_STREAM_QUEUE_URL", "") != "" do

server/config/test.exs

@@ -51,3 +51,5 @@ config :ex_aws,
     :instance_role
   ],
   region: "us-west-2"
+
+config :orcasite, :env, :test

server/lib/orcasite/accounts/user.ex

@@ -110,7 +110,6 @@ defmodule Orcasite.Accounts.User do
   code_interface do
     domain Orcasite.Accounts
 
-    define :register_with_password
     define :sign_in_with_password
     define :by_email, args: [:email]
     define :request_password_reset_with_password

server/lib/orcasite/global_setup.ex

@@ -21,6 +21,7 @@ defmodule Orcasite.GlobalSetup do
     |> case do
       {:ok, %{timestamps: [_ | _] = timestamps}} ->
         timestamp = List.last(timestamps)
+
         {:ok, feed_stream} =
           Orcasite.Radio.FeedStream
           |> Ash.Changeset.for_create(:create, %{feed: feed, playlist_timestamp: timestamp})
@@ -34,4 +35,62 @@ defmodule Orcasite.GlobalSetup do
         :ok
     end
   end
+
+  def populate_latest_feed_streams(feed, minutes_ago \\ 10) do
+    now = DateTime.utc_now()
+    from_time = now |> DateTime.add(-minutes_ago, :minute)
+    populate_feed_streams_range(feed, from_time, now)
+  end
+
+  def populate_feed_streams_range(feed, from_time, to_time) do
+    if Application.get_env(:orcasite, :env) != :prod do
+      # Get prod feed id for feed
+      {:ok, feed_resp} = Orcasite.Radio.GraphqlClient.get_feed(feed.slug)
+
+      feed_resp
+      |> get_in(["data", "feed", "id"])
+      |> case do
+        nil ->
+          {:error, :feed_not_found}
+
+        feed_id ->
+          # Get stream for the last `minutes` minutes
+          {:ok, feed_streams_response} =
+            Orcasite.Radio.GraphqlClient.get_feed_streams_with_segments(
+              feed_id,
+              from_time,
+              to_time
+            )
+
+          feed_streams = get_in(feed_streams_response, ["data", "feedStreams", "results"])
+
+          feed_streams
+          |> Recase.Enumerable.convert_keys(&Recase.to_snake/1)
+          |> Enum.map(fn feed_stream ->
+            feed_stream
+            |> Map.drop(["id"])
+            |> Map.put("feed", feed)
+            |> Map.update(
+              "feed_segments",
+              [],
+              &Enum.map(&1, fn seg ->
+                seg
+                |> Map.drop(["id"])
+                |> Map.put("feed", feed)
+                |> Recase.Enumerable.atomize_keys()
+              end)
+            )
+            |> Recase.Enumerable.atomize_keys()
+          end)
+          |> Ash.bulk_create(
+            Orcasite.Radio.FeedStream,
+            :populate_with_segments,
+            return_errors?: true,
+            stop_on_error?: true,
+            upsert?: true,
+            upsert_identity: :playlist_m3u8_path
+          )
+      end
+    end
+  end
 end

server/lib/orcasite/notifications/workers/send_notification_email.ex

@@ -39,7 +39,7 @@ defmodule Orcasite.Notifications.Workers.SendNotificationEmail do
       end
       |> Enum.filter(&(&1.id != notification_id))
 
-    :ok = continue?()
+    :ok = Orcasite.RateLimiter.continue?("ses_email", 1_000, 14)
 
     %{meta: params}
     |> Map.merge(%{
@@ -95,14 +95,4 @@ defmodule Orcasite.Notifications.Workers.SendNotificationEmail do
     end)
   end
 
-  def continue?() do
-    case Hammer.check_rate("ses_email", 1_000, 14) do
-      {:allow, _count} ->
-        :ok
-
-      {:deny, _limit} ->
-        Process.sleep(250)
-        continue?()
-    end
-  end
 end

server/lib/orcasite/radio/audio_image.ex

@@ -78,6 +78,18 @@ defmodule Orcasite.Radio.AudioImage do
   actions do
     defaults [:read, :destroy, create: :*, update: :*]
 
+    read :for_feed do
+      argument :feed_id, :string, allow_nil?: false
+
+      pagination do
+        offset? true
+        countable true
+        default_limit 100
+      end
+
+      filter expr(feed_id == ^arg(:feed_id))
+    end
+
     create :for_feed_segment do
       upsert? true
       upsert_identity :unique_audio_image
@@ -170,55 +182,50 @@ defmodule Orcasite.Radio.AudioImage do
       require_atomic? false
       change set_attribute(:status, :processing)
 
-      change after_action(
-               fn _change, image, _context ->
-                 # Only one feed segment at a time for now
-                 [feed_segment] = image |> Ash.load!(:feed_segments) |> Map.get(:feed_segments)
-
-                 timeout = :timer.minutes(2)
-
-                 Task.Supervisor.async_nolink(
-                   Orcasite.TaskSupervisor,
-                   fn ->
-                     %{
-                       image_id: image.id,
-                       audio_bucket: feed_segment.bucket,
-                       audio_key: feed_segment.segment_path,
-                       image_bucket: image.bucket,
-                       image_key: image.object_path
-                     }
-                     |> Orcasite.Radio.AwsClient.generate_spectrogram()
-                     |> case do
-                       {:ok, %{file_size: image_size}} ->
-                         image
-                         |> Ash.Changeset.for_update(:update, %{
-                           status: :complete,
-                           image_size: image_size
-                         })
-                         |> Ash.Changeset.force_change_attribute(:last_error, nil)
-                         |> Ash.update(authorize?: false)
-
-                       {:error, error} ->
-                         image
-                         |> Ash.Changeset.for_update(:update, %{
-                           status: :failed
-                         })
-                         |> Ash.Changeset.force_change_attribute(:last_error, inspect(error))
-                         |> Ash.update(authorize?: false)
-                     end
-                   end,
-                   timeout: timeout
-                 )
-
-                 {:ok, image}
-               end,
-               prepend?: true
-             )
+      change after_action(fn _change, image, _context ->
+               # Only one feed segment at a time for now
+               [feed_segment] = image |> Ash.load!(:feed_segments) |> Map.get(:feed_segments)
+
+               %{
+                 image_id: image.id,
+                 audio_bucket: feed_segment.bucket,
+                 audio_key: feed_segment.segment_path,
+                 image_bucket: image.bucket,
+                 image_key: image.object_path
+               }
+               |> Orcasite.Radio.AwsClient.generate_spectrogram()
+               |> case do
+                 {:ok, %{file_size: image_size}} ->
+                   image
+                   |> Ash.Changeset.for_update(:update, %{
+                     status: :complete,
+                     image_size: image_size
+                   })
+                   |> Ash.Changeset.force_change_attribute(:last_error, nil)
+                   |> Ash.update(authorize?: false)
+
+                 {:error, error} ->
+                   image
+                   |> Ash.Changeset.for_update(:update, %{
+                     status: :errored
+                   })
+                   |> Ash.Changeset.force_change_attribute(:last_error, inspect(error))
+                   |> Ash.update(authorize?: false)
+               end
+             end)
+    end
+
+    update :set_failed do
+      change set_attribute(:status, :failed)
     end
   end
 
   graphql do
     type :audio_image
-    attribute_types [feed_id: :id]
+    attribute_types feed_id: :id
+
+    queries do
+      list :audio_images, :for_feed
+    end
   end
 end

server/lib/orcasite/radio/aws_client.ex

@@ -48,7 +48,7 @@ defmodule Orcasite.Radio.AwsClient do
             )
             |> ExAws.request(
               http_opts: [recv_timeout: :timer.minutes(2)],
-              retries: [max_attempts: 1]
+              retries: [max_attempts: 3]
             )
             |> case do
               {:ok, %{"image_size" => image_size, "sample_rate" => sample_rate}} ->

server/lib/orcasite/radio/bout.ex

@@ -20,13 +20,13 @@ defmodule Orcasite.Radio.Bout do
   attributes do
     uuid_attribute :id, prefix: "bout", public?: true
 
-    attribute :start_time, :utc_datetime_usec, public?: true
+    attribute :start_time, :utc_datetime_usec, public?: true, allow_nil?: false
     attribute :end_time, :utc_datetime_usec, public?: true
     attribute :duration, :decimal, public?: true
-    attribute :ongoing, :boolean, public?: true
 
     attribute :category, Orcasite.Types.AudioCategory do
       public? true
+      allow_nil? false
     end
 
     create_timestamp :inserted_at
@@ -36,11 +36,15 @@ defmodule Orcasite.Radio.Bout do
   relationships do
     belongs_to :created_by_user, Orcasite.Accounts.User
 
-    belongs_to :feed, Orcasite.Radio.Feed
+    belongs_to :feed, Orcasite.Radio.Feed do
+      public? true
+    end
+
     has_many :bout_feed_streams, Orcasite.Radio.BoutFeedStream
 
     many_to_many :feed_streams, Orcasite.Radio.FeedStream do
       through Orcasite.Radio.BoutFeedStream
+      public? true
     end
   end
 
@@ -63,7 +67,7 @@ defmodule Orcasite.Radio.Bout do
   end
 
   actions do
-    defaults [:read, :update, :destroy]
+    defaults [:read, :destroy]
 
     read :index do
       pagination do
@@ -74,11 +78,35 @@ defmodule Orcasite.Radio.Bout do
 
       argument :feed_id, :string
 
-      filter expr(if not is_nil(^arg(:feed_id), do: feed_id == ^arg(:feed_id)), else: true)
+      filter expr(if not is_nil(^arg(:feed_id)), do: feed_id == ^arg(:feed_id), else: true)
     end
 
     create :create do
       primary? true
+      accept [:category, :start_time, :end_time]
+
+      argument :feed_id, :string, allow_nil?: false
+
+      change fn changeset, _ ->
+        changeset
+        |> Ash.Changeset.manage_relationship(
+          :feed,
+          %{id: Ash.Changeset.get_argument(changeset, :feed_id)},
+          type: :append
+        )
+      end
+
+      change fn changeset, _ ->
+        end_time = Ash.Changeset.get_argument_or_attribute(changeset, :end_time)
+        start_time = Ash.Changeset.get_argument_or_attribute(changeset, :start_time)
+
+        if start_time && end_time do
+          changeset
+          |> Ash.Changeset.change_attribute(:duration, DateTime.diff(end_time, start_time, :millisecond) / 1000)
+        else
+          changeset
+        end
+      end
 
       change fn
         changeset, %{actor: %Orcasite.Accounts.User{} = actor} ->
@@ -89,17 +117,37 @@ defmodule Orcasite.Radio.Bout do
           changeset
       end
     end
+
+    update :update do
+      primary? true
+      accept [:category, :start_time, :end_time]
+
+      change fn changeset, _ ->
+        end_time = Ash.Changeset.get_argument_or_attribute(changeset, :end_time)
+        start_time = Ash.Changeset.get_argument_or_attribute(changeset, :start_time)
+
+        if start_time && end_time do
+          changeset
+          |> Ash.Changeset.change_attribute(:duration, DateTime.diff(end_time, start_time, :millisecond) / 1000)
+        else
+          changeset
+        end
+      end
+    end
   end
 
   graphql do
     type :bout
+    attribute_types [feed_id: :id, feed_stream_id: :id]
 
     queries do
       list :bouts, :index
+      get :bout, :read
     end
 
     mutations do
       create :create_bout, :create
+      update :update_bout, :update
     end
   end
 end