homura-runtime 0.3.8 → 0.3.10

data/exe/homura-build

@@ -8,6 +8,7 @@ require "fileutils"
 require "open3"
 require "optparse"
 require "pathname"
+
 require_relative "../lib/homura/runtime/build_support"
 
 module HomuraRuntimeBuild
@@ -55,6 +56,7 @@ OptionParser
     o.on("--root PATH", "Project root (default: cwd)") do |p|
       options[:root] = p
     end
+
     o.on(
       "--standalone",
       "Consumer app (skip inline-routes; use Gemfile-resolved load paths)"
@@ -62,6 +64,7 @@ OptionParser
     o.on("--with-db", "Include sequel-d1 on Opal load path (standalone)") do
       options[:with_db] = true
     end
+
     o.on("--input PATH", "Opal entry .rb") { |p| options[:opal_input] = p }
     o.on("--output PATH", "Opal bundle .mjs") { |p| options[:opal_output] = p }
     o.on(
@@ -71,9 +74,11 @@ OptionParser
     o.on("--setup-import PATH", "setup-node-crypto import in entrypoint") do |p|
       options[:setup_import] = p
     end
+
     o.on("--bundle-import PATH", "Opal bundle import in entrypoint") do |p|
       options[:bundle_import] = p
     end
+
     o.on(
       "--worker-module-import PATH",
       "worker_module.mjs import in entrypoint"
@@ -81,6 +86,7 @@ OptionParser
     o.on("--entrypoint-out PATH", "Where to write worker.entrypoint.mjs") do |p|
       options[:entrypoint_out] = p
     end
+
     o.on(
       "--templates-namespace NAME",
       "Standalone templates module name (default: project-derived)"
@@ -95,16 +101,13 @@ OptionParser
 options[:standalone] = true if options[:with_db]
 
 root = Pathname(options[:root]).expand_path
-options[
-  :templates_namespace
-] ||= HomuraRuntime::BuildSupport.standalone_namespace(
-  root,
-  "Templates"
-) if options[:standalone]
-options[:assets_namespace] ||= HomuraRuntime::BuildSupport.standalone_namespace(
-  root,
-  "Assets"
-) if options[:standalone]
+if options[:standalone]
+  options[:templates_namespace] ||= HomuraRuntime::BuildSupport.standalone_namespace(root, "Templates")
+end
+
+if options[:standalone]
+  options[:assets_namespace] ||= HomuraRuntime::BuildSupport.standalone_namespace(root, "Assets")
+end
 
 if options[:standalone]
   Dir.chdir(root) { require "bundler/setup" }
@@ -175,7 +178,7 @@ def run_opal_homura!(root, opal_input, opal_output)
   ]
   stderr_log = root.join("build/opal.stderr.log")
   FileUtils.mkdir_p(root.join("build"))
-  env = { "OPAL_PREFORK_DISABLE" => "1" }
+  env = {"OPAL_PREFORK_DISABLE" => "1"}
   out_err, status = Open3.capture2e(env, *argv, chdir: root.to_s)
   File.write(stderr_log, out_err)
   abort("homura build: opal failed (see #{stderr_log})") unless status.success?
@@ -186,18 +189,19 @@ def homura_vendor_from_gemfile(project_root)
 end
 
 def run_opal_standalone!(root, opal_input, opal_output, with_db:)
-  load_paths =
-    HomuraRuntime::BuildSupport.standalone_load_paths(root, with_db: with_db)
+  load_paths = HomuraRuntime::BuildSupport.standalone_load_paths(root, with_db: with_db)
+  opal_gems_prelude = root.join("build", "homura_opal_gems.rb")
 
   argv = %w[bundle exec opal -c -E --esm --no-source-map]
   load_paths.each { |p| argv.push("-I", p) }
-  argv +=
-    %w[-r opal_patches -r homura/runtime -r app_templates -r app_assets -o] +
-      [opal_output, opal_input]
+  argv += %w[-r opal_patches -r homura/runtime -r app_templates -r app_assets]
+  argv += %w[-r homura_opal_gems] if opal_gems_prelude.file?
+  argv += %w[-o] +
+    [opal_output, opal_input]
 
   stderr_log = root.join("build/opal.stderr.log")
   FileUtils.mkdir_p(root.join("build"))
-  env = { "OPAL_PREFORK_DISABLE" => "1" }
+  env = {"OPAL_PREFORK_DISABLE" => "1"}
   out_err, status = Open3.capture2e(env, *argv, chdir: root.to_s)
   File.write(stderr_log, out_err)
   abort("homura build: opal failed (see #{stderr_log})") unless status.success?
@@ -206,11 +210,58 @@ end
 def write_entrypoint!(root, out_path, setup:, bundle:, worker_mod:)
   out_file = root.join(out_path)
   out_dir = out_file.dirname
+  bundle_spec = relative_import_spec(out_dir, root.join(bundle))
+  worker_spec = relative_import_spec(out_dir, root.join(worker_mod))
   body = <<~JS
     // GENERATED by homura build — do not edit by hand.
     import "#{relative_import_spec(out_dir, root.join(setup))}";
-    import "#{relative_import_spec(out_dir, root.join(bundle))}";
-    export { default, HomuraCounterDO } from "#{relative_import_spec(out_dir, root.join(worker_mod))}";
+    import runtimeDefault, { HomuraCounterDO as RuntimeHomuraCounterDO } from "#{worker_spec}";
+
+    let opalBundleReady;
+
+    function ensureOpalBundle() {
+      opalBundleReady ||= import("#{bundle_spec}");
+      return opalBundleReady;
+    }
+
+    export default {
+      async fetch(request, env, ctx) {
+        await ensureOpalBundle();
+        return runtimeDefault.fetch(request, env, ctx);
+      },
+
+      async scheduled(event, env, ctx) {
+        await ensureOpalBundle();
+        return runtimeDefault.scheduled(event, env, ctx);
+      },
+
+      async queue(batch, env, ctx) {
+        await ensureOpalBundle();
+        return runtimeDefault.queue(batch, env, ctx);
+      }
+    };
+
+    export class HomuraCounterDO extends RuntimeHomuraCounterDO {
+      async fetch(request) {
+        await ensureOpalBundle();
+        return super.fetch(request);
+      }
+
+      async webSocketMessage(ws, message) {
+        await ensureOpalBundle();
+        return super.webSocketMessage(ws, message);
+      }
+
+      async webSocketClose(ws, code, reason, wasClean) {
+        await ensureOpalBundle();
+        return super.webSocketClose(ws, code, reason, wasClean);
+      }
+
+      async webSocketError(ws, err) {
+        await ensureOpalBundle();
+        return super.webSocketError(ws, err);
+      }
+    }
   JS
   File.write(out_file, body)
 end
@@ -367,7 +418,7 @@ else
       chdir: root
     )
   else
-    warn "homura build: no app/ directory or top-level app.rb — skipping auto-await"
+    warn("homura build: no app/ directory or top-level app.rb — skipping auto-await")
   end
 
   # Also run auto-await over every gem we ship to Opal:
@@ -399,6 +450,8 @@ else
       end
     end
 
+  HomuraRuntime::BuildSupport.write_opal_gems_prelude(root)
+
   opal_in = Pathname(resolve_opal_input(root, options[:opal_input]))
   opal_out = Pathname(options[:opal_output])
   opal_in = root.join(opal_in) unless opal_in.absolute?
@@ -435,4 +488,4 @@ write_entrypoint!(
   worker_mod: options[:worker_module_import]
 )
 
-$stderr.puts "homura build: ok"
+$stderr.puts("homura build: ok")

data/lib/homura/runtime/ai.rb

@@ -56,15 +56,21 @@ module Cloudflare
 
       def run(model, inputs = nil, options: nil, **input_options)
         payload = inputs || input_options
-        payload = payload.merge(input_options) if inputs.is_a?(Hash) &&
-          !input_options.empty?
+        if inputs.is_a?(Hash) &&
+            !input_options.empty?
+          payload = payload.merge(input_options)
+        end
+
         Cloudflare::AI.run(model, payload, binding: @js, options: options)
       end
 
       def run_stream(model, inputs = nil, **input_options)
         payload = inputs || input_options
-        payload = payload.merge(input_options) if inputs.is_a?(Hash) &&
-          !input_options.empty?
+        if inputs.is_a?(Hash) &&
+            !input_options.empty?
+          payload = payload.merge(input_options)
+        end
+
         run(model, payload.merge(stream: true))
       end
 
@@ -78,12 +84,11 @@ module Cloudflare
       )
         chat_options = Cloudflare::AI.chat_input_options(model, input_options)
         payload = {
-          messages:
-            Cloudflare::AI.build_messages(
-              prompt,
-              messages: messages,
-              system: system
-            )
+          messages: Cloudflare::AI.build_messages(
+            prompt,
+            messages: messages,
+            system: system
+          )
         }.merge(chat_options)
         run(model, payload, options: options)
       end
@@ -96,15 +101,14 @@ module Cloudflare
         options: nil,
         **input_options
       )
-        response =
-          chat(
-            prompt,
-            messages: messages,
-            system: system,
-            model: model,
-            options: options,
-            **input_options
-          )
+        response = chat(
+          prompt,
+          messages: messages,
+          system: system,
+          model: model,
+          options: options,
+          **input_options
+        )
         response = response.__await__ if Cloudflare.js_promise?(response)
         Cloudflare::AI.extract_text(response)
       end
@@ -115,7 +119,7 @@ module Cloudflare
         options: nil,
         **input_options
       )
-        payload = { audio: Cloudflare::AI.audio_input(audio) }.merge(
+        payload = {audio: Cloudflare::AI.audio_input(audio)}.merge(
           input_options
         )
         run(model, payload, options: options)
@@ -127,16 +131,14 @@ module Cloudflare
         options: nil,
         **input_options
       )
-        response =
-          transcribe(audio, model: model, options: options, **input_options)
+        response = transcribe(audio, model: model, options: options, **input_options)
         response = response.__await__ if Cloudflare.js_promise?(response)
         Cloudflare::AI.extract_text(response)
       end
 
       def speak(text, model: DEFAULT_SPEAK_MODEL, options: nil, **input_options)
-        payload = { text: text.to_s }.merge(input_options)
-        response =
-          Cloudflare::AI.speak(model, payload, binding: @js, options: options)
+        payload = {text: text.to_s}.merge(input_options)
+        response = Cloudflare::AI.speak(model, payload, binding: @js, options: options)
         response = response.__await__ if Cloudflare.js_promise?(response)
         response
       end
@@ -147,14 +149,13 @@ module Cloudflare
         options: nil,
         **input_options
       )
-        payload = { text: text.to_s }.merge(input_options)
-        response =
-          Cloudflare::AI.speak_data_url(
-            model,
-            payload,
-            binding: @js,
-            options: options
-          )
+        payload = {text: text.to_s}.merge(input_options)
+        response = Cloudflare::AI.speak_data_url(
+          model,
+          payload,
+          binding: @js,
+          options: options
+        )
         response = response.__await__ if Cloudflare.js_promise?(response)
         response.to_s
       end
@@ -169,14 +170,17 @@ module Cloudflare
     # @param binding [JS object] env.AI binding (required)
     # @param options [Hash] gateway / extra options forwarded as the 3rd arg
     def self.run(model, inputs, binding: nil, options: nil, raw_response: false)
-      binding = binding.js if defined?(Binding) &&
-        `(#{binding} != null && #{binding}.$$class === #{Binding})`
+      if defined?(Binding) &&
+          `(#{binding} != null && #{binding}.$$class === #{Binding})`
+        binding = binding.js
+      end
       # Use a JS-side null check because `binding` may be a raw JS object
       # (env.AI), which has no Ruby `#nil?` method on the prototype.
       bound = !`(#{binding} == null)`
       unless bound
         raise AIError.new("AI binding not bound (env.AI is null)", model: model)
       end
+
       js_inputs = ruby_to_js(inputs)
       js_options = options ? ruby_to_js(options) : `({})`
       ai_binding = binding
@@ -186,15 +190,10 @@ module Cloudflare
       # newer Workers AI shape) or `options: { stream: true }` (the
       # 3rd-arg "options" contract). Accept both so callers can use
       # whichever idiom matches the model docs they're following.
-      streaming =
-        (
-          inputs.is_a?(Hash) &&
-            (inputs[:stream] == true || inputs["stream"] == true)
-        ) ||
-          (
-            options.is_a?(Hash) &&
-              (options[:stream] == true || options["stream"] == true)
-          )
+      streaming = (inputs.is_a?(Hash) &&
+        (inputs[:stream] == true || inputs["stream"] == true)) ||
+        (options.is_a?(Hash) &&
+          (options[:stream] == true || options["stream"] == true))
       cf = Cloudflare
 
       # NOTE: multi-line backtick → Promise works HERE because the
@@ -204,8 +203,7 @@ module Cloudflare
       # or the Promise will be silently dropped (same pitfall
       # documented in lib/homura/runtime/{cache,queue}.rb —
       # Phase 11B audit).
-      js_promise =
-        `
+      js_promise = `
         (async function() {
           var out;
           try {
@@ -231,8 +229,11 @@ module Cloudflare
     end
 
     def self.speak(model, inputs, binding: nil, options: nil)
-      binding = binding.js if defined?(Binding) &&
-        `(#{binding} != null && #{binding}.$$class === #{Binding})`
+      if defined?(Binding) &&
+          `(#{binding} != null && #{binding}.$$class === #{Binding})`
+        binding = binding.js
+      end
+
       bound = !`(#{binding} == null)`
       unless bound
         raise AIError.new("AI binding not bound (env.AI is null)", model: model)
@@ -243,8 +244,7 @@ module Cloudflare
       ai_binding = binding
       err_klass = Cloudflare::AIError
 
-      js_response =
-        `
+      js_response = `
         (async function() {
           try {
             return await #{ai_binding}.run(#{model}, #{js_inputs}, #{js_options});
@@ -252,17 +252,20 @@ module Cloudflare
             #{Kernel}.$raise(#{err_klass}.$new(e && e.message ? e.message : String(e), Opal.hash({ model: #{model}, operation: 'speak' })));
           }
         })()
-      `.__await__
+      `
+        .__await__
 
-      content_type =
-        `#{js_response}.headers.get("content-type") || "application/octet-stream"`
+      content_type = `#{js_response}.headers.get("content-type") || "application/octet-stream"`
       cache_control = `#{js_response}.headers.get("cache-control")`
       BinaryBody.new(`#{js_response}.body`, content_type, cache_control)
     end
 
     def self.speak_data_url(model, inputs, binding: nil, options: nil)
-      binding = binding.js if defined?(Binding) &&
-        `(#{binding} != null && #{binding}.$$class === #{Binding})`
+      if defined?(Binding) &&
+          `(#{binding} != null && #{binding}.$$class === #{Binding})`
+        binding = binding.js
+      end
+
       bound = !`(#{binding} == null)`
       unless bound
         raise AIError.new("AI binding not bound (env.AI is null)", model: model)
@@ -273,8 +276,7 @@ module Cloudflare
       ai_binding = binding
       err_klass = Cloudflare::AIError
 
-      js_response =
-        `
+      js_response = `
         (async function() {
           try {
             return await #{ai_binding}.run(#{model}, #{js_inputs}, #{js_options});
@@ -282,10 +284,10 @@ module Cloudflare
             #{Kernel}.$raise(#{err_klass}.$new(e && e.message ? e.message : String(e), Opal.hash({ model: #{model}, operation: 'speak_data_url' })));
           }
         })()
-      `.__await__
+      `
+        .__await__
 
-      content_type =
-        `#{js_response}.headers.get("content-type") || "application/octet-stream"`
+      content_type = `#{js_response}.headers.get("content-type") || "application/octet-stream"`
       `
         (async function(resp, ct) {
           var buf = await resp.arrayBuffer();
@@ -294,19 +296,22 @@ module Cloudflare
           for (var i = 0; i < bytes.length; i++) bin += String.fromCharCode(bytes[i]);
           return 'data:' + ct + ';base64,' + globalThis.btoa(bin);
         })(#{js_response}, #{content_type})
-      `.__await__
+      `
+        .__await__
     end
 
     def self.build_messages(prompt = nil, messages: nil, system: nil)
       out = []
-      out << { role: "system", content: system.to_s } if system
+      out << {role: "system", content: system.to_s} if system
       if messages
         unless messages.is_a?(Array)
           raise ArgumentError, "messages must be an Array of chat messages"
         end
+
         out.concat(messages)
       end
-      out << { role: "user", content: prompt.to_s } unless prompt.nil?
+
+      out << {role: "user", content: prompt.to_s} unless prompt.nil?
       raise ArgumentError, "chat requires a prompt or messages" if out.empty?
       out
     end
@@ -316,10 +321,12 @@ module Cloudflare
         uint8 = audio.to_uint8_array
         return `Array.from(#{uint8})`
       end
+
       return audio if audio.is_a?(Array)
       if `typeof #{audio} !== 'undefined' && #{audio} instanceof Uint8Array`
         return `Array.from(#{audio})`
       end
+
       audio
     end
 
@@ -327,12 +334,12 @@ module Cloudflare
       return input_options unless model.to_s == DEFAULT_CHAT_MODEL
 
       options = input_options.dup
-      key =
-        if options.key?(:chat_template_kwargs)
-          :chat_template_kwargs
-        elsif options.key?("chat_template_kwargs")
-          "chat_template_kwargs"
-        end
+      key = if options.key?(:chat_template_kwargs)
+        :chat_template_kwargs
+      elsif options.key?("chat_template_kwargs")
+        "chat_template_kwargs"
+      end
+
       template_kwargs = key ? options[key] : nil
       if template_kwargs && !template_kwargs.is_a?(Hash)
         raise ArgumentError, "chat_template_kwargs must be a Hash"
@@ -354,18 +361,21 @@ module Cloudflare
         text = message_hash_text(msg)
         return text unless text.empty?
       end
+
       if out["messages"].is_a?(Array) && !out["messages"].empty?
-        msg =
-          out["messages"].find do |entry|
-            entry.is_a?(Hash) && entry["role"].to_s == "assistant"
-          end || out["messages"][0]
+        msg = out["messages"].find do |entry|
+          entry.is_a?(Hash) && entry["role"].to_s == "assistant"
+        end ||
+          out["messages"][0]
         text = message_hash_text(msg)
         return text unless text.empty?
       end
+
       %w[text transcription response result output].each do |key|
         value = message_content_text(out[key])
         return value unless value.empty?
       end
+
       nested = out["result"]
       return extract_text(nested) if nested.is_a?(Hash)
       ""
@@ -396,6 +406,7 @@ module Cloudflare
         text = message_content_text(value[key])
         return text unless text.empty?
       end
+
       ""
     end
 
@@ -405,6 +416,7 @@ module Cloudflare
       if `#{val} != null && typeof #{val} === 'object' && #{val}.$$class == null`
         return val
       end
+
       if val.is_a?(Hash)
         obj = `({})`
         val.each do |k, v|
@@ -412,6 +424,7 @@ module Cloudflare
           jv = ruby_to_js(v)
           `#{obj}[#{ks}] = #{jv}`
         end
+
         obj
       elsif val.is_a?(Array)
         arr = `([])`
@@ -419,6 +432,7 @@ module Cloudflare
           jv = ruby_to_js(v)
           `#{arr}.push(#{jv})`
         end
+
         arr
       elsif val.is_a?(Symbol)
         val.to_s
@@ -457,23 +471,23 @@ module Cloudflare
       # this file still loads if stream.rb hasn't been required yet
       # (Phase 11A load-order flip: ai.rb currently loads first).
       def response_headers
-        defaults =
-          (
-            if defined?(::Cloudflare::SSEStream)
-              ::Cloudflare::SSEStream::DEFAULT_HEADERS
-            else
-              {
-                "content-type" => "text/event-stream; charset=utf-8",
-                "cache-control" => "no-cache, no-transform",
-                "x-accel-buffering" => "no"
-              }
-            end
-          )
+        defaults = (
+          if defined?(::Cloudflare::SSEStream)
+            ::Cloudflare::SSEStream::DEFAULT_HEADERS
+          else
+            {
+              "content-type" => "text/event-stream; charset=utf-8",
+              "cache-control" => "no-cache, no-transform",
+              "x-accel-buffering" => "no"
+            }
+          end
+        )
         defaults.merge(@extra_headers)
       end
 
       def each
       end
+
       def close
       end
     end
@@ -487,6 +501,7 @@ module Cloudflare
     if `typeof #{js_val} === 'string' || typeof #{js_val} === 'number' || typeof #{js_val} === 'boolean'`
       return js_val
     end
+
     if `Array.isArray(#{js_val})`
       out = []
       len = `#{js_val}.length`
@@ -495,8 +510,10 @@ module Cloudflare
         out << js_to_ruby(`#{js_val}[#{i}]`)
         i += 1
       end
+
       return out
     end
+
     if `typeof #{js_val} === 'object'`
       h = {}
       keys = `Object.keys(#{js_val})`
@@ -507,8 +524,10 @@ module Cloudflare
         h[k] = js_to_ruby(`#{js_val}[#{k}]`)
         i += 1
       end
+
       return h
     end
+
     js_val
   end
 end