lex-ollama 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8657f3e11e11fcd2ee34e12317bf7698bcfea1e907006c76f9a07326996c7a69
-  data.tar.gz: d1c1bbb05dc6a3a0071b4474a45a074b0d4929cd4b48b7488b5aa10539a9a6ee
+  metadata.gz: '086cd0d9744893c480b69c7b9fc6a10229af627344d316cafbccbd72d01cdafe'
+  data.tar.gz: e88f7893305401d36d8a3d48a7fb057e831fb6edeb245a5691c3d1e2527e1f1f
 SHA512:
-  metadata.gz: e2a8622a2914cdfbc04b365d1ca7a9e8d35b4daa656931fd23a6e010b25b5a8ed6699246bffdbe0bfe064757ad26cad8f3664fe8c1dd2d1c606220dc932af45f
-  data.tar.gz: ea975e9ac1c89621d41c274b6040bb92760672f9d4a2db223ea6c08371f7ed8e8a2dc810417b9b5b2beb9ce30fccb64544f24c11ae815422e5b99f5a43a48517
+  metadata.gz: f6154fee6005bb96262961342983f01c5d4e5f2747c2cd11a33afbebc1f5ffa00ea64e4f39ef63758620524a5c6690b1a81856c1658371acc040fdd2295c8731
+  data.tar.gz: 0dda701fb81e1f084bc3cc4404d8014d6e2b6ecc68153fcdb42009c10a337f4a078ff11890a4032d95d516a5c1bc5177f4a8e1492db4caea47e9da1641fe6669

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.3.3] - 2026-04-16
+
+### Added
+- `Actor::ModelSync` — once actor; runs 5s after extension load; reads `legion.ollama.default_models` and `legion.ollama.s3` from settings; calls `import_from_s3` for any configured model not already present on disk; no-op if either setting is absent
+
+### Fixed
+- `Transport::Queues::ModelRequest` deleted — the framework auto-discovers every file in `transport/queues/` and calls `.new` with no arguments at startup, which crashed because `ModelRequest` required `request_type:` and `model:`; the queue definition is now an anonymous class created inline by `Actor::ModelWorker#build_queue_class`
+- `Actor::ModelWorker#queue` now returns a CLASS instead of an instance — `Subscription#initialize` calls `queue.new`, so returning an instance caused a silent `NoMethodError` on `NilClass#new`; the anonymous queue class has `queue_name`, `queue_options`, `dlx_enabled`, and `initialize` (exchange bind) defined inline via `define_method`
+
 ## [0.3.2] - 2026-04-08
 
 ### Changed

data/CLAUDE.md

@@ -13,7 +13,7 @@ reporting, and **fleet queue subscription** for receiving routed LLM requests fr
 **GitHub**: https://github.com/LegionIO/lex-ollama
 **License**: MIT
 **Version**: 0.3.2
-**Specs**: 82 examples (12 spec files) — fleet additions add ~35 more
+**Specs**: 166 examples (17 spec files)
 
 ---
 
@@ -181,8 +181,9 @@ message_context:
 A subset (`conversation_id`, `message_id`, `request_id`) is promoted to AMQP headers
 (`x-legion-llm-conversation-id`, etc.) for filtering without body parsing.
 
-See: `docs/plans/2026-04-08-fleet-wire-protocol.md` for full AMQP property mapping,
-platform-wide standard, and per-message-type specifications.
+The wire protocol spec (AMQP property mapping, platform-wide standard, per-message-type
+specifications) was developed during the fleet design phase and is maintained in the
+legion-llm repository alongside the implementation.
 
 ---
 
@@ -210,4 +211,4 @@ bundle exec rubocop
 ---
 
 **Maintained By**: Matthew Iverson (@Esity)
-**Last Updated**: 2026-04-08
+**Last Updated**: 2026-04-10

data/README.md

@@ -44,6 +44,36 @@ gem install lex-ollama
 ### Version
 - `server_version` - Retrieve the Ollama server version (GET /api/version)
 
+### Fleet Queue Subscription
+- `handle_request` - Dispatch inbound fleet AMQP messages to the appropriate runner (chat/embed/generate)
+
+When `Legion::Extensions::Core` is present, lex-ollama subscribes to model-scoped queues on the
+`llm.request` topic exchange, accepting routed LLM inference work from other Legion fleet members.
+
+Each configured `(type, model)` pair gets its own auto-delete queue with routing key
+`llm.request.ollama.<type>.<model>`. Multiple nodes serving the same model compete fairly
+via RabbitMQ round-robin with consumer priority.
+
+```yaml
+legion:
+  ollama:
+    host: "http://localhost:11434"
+    fleet:
+      consumer_priority: 10        # H100: 10, Mac Studio: 5, MacBook: 1
+    subscriptions:
+      - type: embed
+        model: nomic-embed-text
+      - type: chat
+        model: "qwen3.5:27b"
+```
+
+Fleet messages use the wire protocol defined in `legion-llm`: typed AMQP messages
+(`llm.fleet.request` / `llm.fleet.response` / `llm.fleet.error`) with `message_context`
+propagation for end-to-end tracing.
+
+Without `Legion::Extensions::Core`, the gem works as a pure HTTP client library with no
+AMQP dependency.
+
 ## Standalone Client
 
 ```ruby
@@ -85,21 +115,21 @@ Pull models from an internal S3 mirror instead of the public Ollama registry:
 client = Legion::Extensions::Ollama::Client.new
 
 # List available models in S3
-client.list_s3_models(bucket: 'legion', endpoint: 'https://mesh.s3api-core.optum.com')
+client.list_s3_models(bucket: 'legion', endpoint: 'https://s3.example.internal')
 
 # Import directly to filesystem (works without Ollama running)
 client.import_from_s3(model: 'llama3:latest', bucket: 'legion',
-                      endpoint: 'https://mesh.s3api-core.optum.com')
+                      endpoint: 'https://s3.example.internal')
 
 # Push through Ollama API (requires Ollama running)
 client.sync_from_s3(model: 'llama3:latest', bucket: 'legion',
-                    endpoint: 'https://mesh.s3api-core.optum.com')
+                    endpoint: 'https://s3.example.internal')
 
 # Provision fleet with default models
 client.import_default_models(
   default_models: %w[llama3:latest nomic-embed-text:latest],
   bucket: 'legion',
-  endpoint: 'https://mesh.s3api-core.optum.com'
+  endpoint: 'https://s3.example.internal'
 )
 ```
 
@@ -121,7 +151,7 @@ result[:usage]  # => { input_tokens: 1, output_tokens: 5, total_duration: ..., .
 
 ## Version
 
-0.3.1
+0.3.2
 
 ## License
 

data/lib/legion/extensions/ollama/actors/model_sync.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Legion
+  module Extensions
+    module Ollama
+      module Actor
+        # Once actor — runs once shortly after extension load.
+        # Reads legion.ollama.s3 and legion.ollama.default_models from settings
+        # and calls import_from_s3 for any model not already present locally.
+        #
+        # Settings example:
+        #   {
+        #     "legion": {
+        #       "ollama": {
+        #         "s3": {
+        #           "bucket": "legion",
+        #           "prefix": "ollama/models",
+        #           "endpoint": "https://s3.example.internal"
+        #         },
+        #         "default_models": ["qwen3.5:4b", "nomic-embed-text:latest"]
+        #       }
+        #     }
+        #   }
+        class ModelSync < Legion::Extensions::Actors::Once
+          include Legion::Logging::Helper
+
+          # Run 5 seconds after extension load to allow the rest of startup to complete.
+          def delay
+            5.0
+          end
+
+          def use_runner?
+            false
+          end
+
+          def runner_class
+            self.class
+          end
+
+          def enabled?
+            return false unless defined?(Legion::Settings)
+
+            models = Legion::Settings.dig(:ollama, :default_models)
+            s3_cfg = Legion::Settings.dig(:ollama, :s3)
+            models.is_a?(Array) && !models.empty? && s3_cfg.is_a?(Hash) && s3_cfg[:bucket]
+          rescue StandardError => e
+            handle_exception(e, level: :warn, handled: true)
+            false
+          end
+
+          def manual
+            models = Legion::Settings.dig(:ollama, :default_models) || []
+            s3_cfg = Legion::Settings.dig(:ollama, :s3)
+            bucket = s3_cfg[:bucket]
+            s3_opts = s3_cfg.except(:bucket)
+
+            client = Object.new.extend(Legion::Extensions::Ollama::Runners::S3Models)
+            models_path = ENV.fetch('OLLAMA_MODELS', File.join(Dir.home, '.ollama', 'models'))
+
+            models.each do |model|
+              if model_present_locally?(model, models_path)
+                log.debug "[ModelSync] #{model} already present locally, skipping"
+                next
+              end
+
+              log.info "[ModelSync] importing #{model} from S3"
+              result = client.import_from_s3(model: model, bucket: bucket, models_path: models_path, **s3_opts)
+              if result[:status] == 200
+                log.info "[ModelSync] imported #{model} (blobs_downloaded=#{result[:blobs_downloaded]}, blobs_skipped=#{result[:blobs_skipped]})"
+              else
+                log.warn "[ModelSync] failed to import #{model}: #{result.inspect}"
+              end
+            rescue StandardError => e
+              handle_exception(e, level: :error, handled: true, model: model)
+            end
+          end
+
+          private
+
+          def model_present_locally?(model, models_path)
+            name, tag = model.split(':')
+            tag ||= 'latest'
+            manifest = File.join(models_path, 'manifests', 'registry.ollama.ai', 'library', name, tag)
+            File.exist?(manifest)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/legion/extensions/ollama/actors/model_worker.rb

@@ -75,10 +75,12 @@ module Legion
             base.merge(arguments: { 'x-priority' => consumer_priority })
           end
 
-          # Override queue to return a model-scoped queue bound with the precise
-          # routing key for this worker's (type, model) pair.
+          # Returns a queue CLASS (not instance) bound to the llm.request exchange
+          # with the routing key for this worker's (type, model) pair.
+          # The Subscription base class calls queue.new in initialize, so this must
+          # return a class, not an instance.
           def queue
-            @queue ||= build_and_bind_queue
+            @queue ||= build_queue_class
           end
 
           # Enrich every inbound message with the worker's own request_type and model
@@ -94,17 +96,22 @@ module Legion
 
           private
 
-          def build_and_bind_queue
+          def build_queue_class
             sanitised_model = @model_name.tr(':', '.')
             routing_key     = "llm.request.ollama.#{@request_type}.#{sanitised_model}"
+            exchange_class  = Transport::Exchanges::LlmRequest
 
-            queue_obj = Transport::Queues::ModelRequest.new(
-              request_type: @request_type,
-              model:        @model_name
-            )
-            exchange_obj = Transport::Exchanges::LlmRequest.new
-            queue_obj.bind(exchange_obj, routing_key: routing_key)
-            queue_obj
+            Class.new(Legion::Transport::Queue) do
+              define_method(:queue_name) { routing_key }
+              define_method(:queue_options) do
+                { durable: false, auto_delete: true, arguments: { 'x-max-priority' => 10 } }
+              end
+              define_method(:dlx_enabled) { false }
+              define_method(:initialize) do
+                super()
+                bind(exchange_class.new, routing_key: routing_key)
+              end
+            end
           end
         end
       end

data/lib/legion/extensions/ollama/transport.rb

@@ -12,13 +12,8 @@ module Legion
       module Transport
         extend Legion::Extensions::Transport if Legion::Extensions.const_defined?(:Transport, false)
 
-        # All queue-to-exchange bindings are established dynamically by
-        # Actor::ModelWorker#build_and_bind_queue at subscription time.
-        # This file only needs to declare the exchange so topology/infra mode
-        # can introspect the full routing graph.
-        def self.additional_e_to_q
-          []
-        end
+        # All queue-to-exchange bindings for fleet queues are established dynamically by
+        # Actor::ModelWorker at subscription time via build_queue_class.
       end
     end
   end

data/lib/legion/extensions/ollama/version.rb

@@ -3,7 +3,7 @@
 module Legion
   module Extensions
     module Ollama
-      VERSION = '0.3.2'
+      VERSION = '0.3.3'
     end
   end
 end

data/lib/legion/extensions/ollama.rb

@@ -18,10 +18,10 @@ require 'legion/extensions/ollama/client'
 # so the gem still works as a standalone HTTP client without any AMQP runtime.
 if Legion::Extensions.const_defined?(:Core, false)
   require 'legion/extensions/ollama/transport/exchanges/llm_request'
-  require 'legion/extensions/ollama/transport/queues/model_request'
   require 'legion/extensions/ollama/transport/messages/llm_response'
   require 'legion/extensions/ollama/transport'
   require 'legion/extensions/ollama/actors/model_worker'
+  require 'legion/extensions/ollama/actors/model_sync'
 end
 
 module Legion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lex-ollama
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Esity
@@ -56,6 +56,7 @@ files:
 - README.md
 - lex-ollama.gemspec
 - lib/legion/extensions/ollama.rb
+- lib/legion/extensions/ollama/actors/model_sync.rb
 - lib/legion/extensions/ollama/actors/model_worker.rb
 - lib/legion/extensions/ollama/client.rb
 - lib/legion/extensions/ollama/helpers/client.rb
@@ -72,7 +73,6 @@ files:
 - lib/legion/extensions/ollama/transport.rb
 - lib/legion/extensions/ollama/transport/exchanges/llm_request.rb
 - lib/legion/extensions/ollama/transport/messages/llm_response.rb
-- lib/legion/extensions/ollama/transport/queues/model_request.rb
 - lib/legion/extensions/ollama/version.rb
 homepage: https://github.com/LegionIO/lex-ollama
 licenses:

data/lib/legion/extensions/ollama/transport/queues/model_request.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module Extensions
-    module Ollama
-      module Transport
-        module Queues
-          # Parametric queue — one instance per (request_type, model) tuple.
-          #
-          # queue_name mirrors the routing key exactly so bindings are self-documenting
-          # in the RabbitMQ management UI, e.g.:
-          #   llm.request.ollama.embed.nomic-embed-text
-          #   llm.request.ollama.chat.qwen3.5.27b
-          #
-          # Queue strategy:
-          #   - classic (not quorum): quorum queues cannot be auto-delete
-          #   - auto_delete: true — queue deletes when last consumer disconnects + queue empties,
-          #     enabling basic.return feedback to publishers via mandatory: true
-          #   - x-max-priority: 10 — must be a queue argument at declaration time for classic
-          #     queues; policies handle max-length and overflow externally
-          class ModelRequest < Legion::Transport::Queue
-            def initialize(request_type:, model:, **)
-              @request_type = request_type.to_s
-              @model        = sanitise_model(model)
-              super(**)
-            end
-
-            def queue_name
-              "llm.request.ollama.#{@request_type}.#{@model}"
-            end
-
-            def queue_options
-              {
-                durable:     false,
-                auto_delete: true,
-                arguments:   { 'x-max-priority' => 10 }
-              }
-            end
-
-            # Disable dead-letter exchange provisioning. The base class
-            # default_options always adds x-dead-letter-exchange when
-            # dlx_enabled returns true. Fleet queues are ephemeral
-            # (auto-delete) and must not provision persistent DLX queues.
-            def dlx_enabled
-              false
-            end
-
-            private
-
-            def sanitise_model(name)
-              name.to_s.tr(':', '.')
-            end
-          end
-        end
-      end
-    end
-  end
-end