classifier 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539130382c7ce45072e515ee9817f47fb1144af18498a81c27c7dda842477141
-  data.tar.gz: 1537f2c7c164ec70c14c7b314148fa81cfb947a93dfe328125082567c5a99a7e
+  metadata.gz: 527f52e23121cbda5ce138a74c200f473813ea306aa04f50bd74f2d1230ff45b
+  data.tar.gz: ca52b0412149e3e6bf3d885d12ef5485ab1a70d6dcc4cb659121733bfcced2da
 SHA512:
-  metadata.gz: 3bf1385063c020bb08097192417232a6dc3fce7a16a057bec27ccf62253d69809fedc692f597b7ab6c4e36e8236629188e37add798d883ed670a55cb02c37023
-  data.tar.gz: '0528f07ae03ab30b752c3242b747058956831900c55c1c5a858ab623525075806a52fc8b66236de0f4b959ce678f9a24204887434b19c8662860d06173b2634f'
+  metadata.gz: 9ddcb1c5c85229beef3b8b048f65fae551ae97ac032e51f07937470070f48cb2d56adca0bd30df1f981a93e44004e572a258c9ecf7dbfed26f8005ca52247714
+  data.tar.gz: 79ffe1a234a988c5d026740405c350f2222a15eaf6a562e4b1da39cf6bdf1aaea43dbfe85bfc55db9830684a10eea3c9f4df0eae4921374fe2d6ac0d4c7b7606

data/lib/classifier/cli.rb

@@ -95,6 +95,13 @@ module Classifier
           @options[:type] = type
         end
 
+        opts.on(
+          '--search TEXT',
+          'Search remote models by name/description, and local models by name only. Use quotes for multiword search'
+        ) do |text|
+          @options[:search] = text
+        end
+
         opts.on('-r', '--remote MODEL', 'Use remote model: name or @user/repo:name') do |model|
           @options[:remote] = model
         end
@@ -370,18 +377,49 @@ module Classifier
     end
 
     def list_remote_models
-      registry_arg = @args.shift
-      registry = parse_registry(registry_arg) || DEFAULT_REGISTRY
+      registry_or_model_arg = @args.shift
+      registry, model = detect_registry_and_model(registry_or_model_arg)
+      registry = parse_registry(registry) || DEFAULT_REGISTRY
       index = fetch_registry_index(registry)
 
       return if @exit_code != 0
 
-      if index['models'].empty?
+      models = index['models']
+
+      if model
+        info = models[model]
+        if info.nil?
+          @output << "No model #{model.inspect} found in registry"
+          return
+        end
+
+        type = info['type'] || 'unknown'
+        size = info['size'] || 'unknown'
+        desc = info['description'] || ''
+        categories = (info['categories'] || []).map(&:downcase).join(', ')
+        version = info['version'] || ''
+        author = info['author'] || ''
+        @output << format(
+          "Name: %<name>s\nDescription: %<desc>s\nType: %<type>s\n" \
+          "Categories: %<categories>s\nVersion: %<version>s\nAuthor: %<author>s\nSize: %<size>s",
+          name: model, desc: desc, type: type, categories: categories,
+          version: version, author: author, size: size
+        )
+        return
+      end
+
+      if @options[:search]
+        models = models.filter do |name, info|
+          [name, info['description']].any?(/#{Regexp.escape(@options[:search])}/i)
+        end
+      end
+
+      if models.empty?
         @output << 'No models found in registry'
         return
       end
 
-      index['models'].each do |name, info|
+      models.each do |name, info|
         type = info['type'] || 'unknown'
         size = info['size'] || 'unknown'
         desc = info['description'] || ''
@@ -390,6 +428,8 @@ module Classifier
     end
 
     def list_local_models
+      model_arg = @args.shift
+
       models_dir = File.join(CACHE_DIR, 'models')
 
       unless Dir.exist?(models_dir)
@@ -413,14 +453,43 @@ module Classifier
 
       models = default_models + custom_models #: Array[{name: String, registry: String?, path: String}]
 
+      models.each do |model|
+        model[:info] = load_model_info(model[:path])
+      end
+
+      if model_arg
+        model = models.find { |model| model[:name] == model_arg }
+        if model.nil?
+          @output << "No local model #{model_arg.inspect} found"
+          return
+        end
+        display_name = model[:registry] ? "@#{model[:registry]}:#{model[:name]}" : model[:name]
+        type = model.dig(:info, 'type') || 'unknown'
+        version = model.dig(:info, 'version')
+        categories = (model.dig(:info, 'categories') || {}).keys.map(&:downcase).join(', ')
+        size = File.size(model[:path])
+        @output << format(
+          "Name: %<name>s\nType: %<type>s\n" \
+          "Categories: %<categories>s\nVersion: %<version>s\nSize: %<size>s",
+          name: display_name, type: type, categories: categories,
+          version: version, size: human_size(size)
+        )
+        return
+      end
+
+      if @options[:search]
+        models = models.filter do |model|
+          [model[:name], model.dig(:info, 'description')].any?(/#{Regexp.escape(@options[:search])}/i)
+        end
+      end
+
       if models.empty?
         @output << 'No local models found'
         return
       end
 
       models.each do |model|
-        info = load_model_info(model[:path])
-        type = info['type'] || 'unknown'
+        type = model.dig(:info, 'type') || 'unknown'
         display_name = model[:registry] ? "@#{model[:registry]}:#{model[:name]}" : model[:name]
         size = File.size(model[:path])
         @output << format('%-30<name>s (%<type>s, %<size>s)', name: display_name, type: type, size: human_size(size))
@@ -800,6 +869,15 @@ module Classifier
       @output << 'Run "classifier --help" for full usage.'
     end
 
+    # @rbs (String?) -> [String?, String?]
+    def detect_registry_and_model(arg)
+      return nil, nil if arg.nil?
+      return *arg.split(':', 2) if arg.include?(':')
+      return nil, arg unless arg.start_with?('@')
+
+      [arg, nil]
+    end
+
     # Parse @user/repo format to extract registry
     # @rbs (String?) -> String?
     def parse_registry(arg)

data/lib/classifier/version.rb

@@ -1,3 +1,3 @@
 module Classifier
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.6.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classifier
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Lucas Carlson