async-ollama 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e1e52839defa45793d0099a223261d94f3a5cdfc7d5ca1f859defc943608f65
-  data.tar.gz: e8f8c3aa9e16f368e7f0a68b7be2e66d7d899bc635e31f9f62bd09aa67a434f2
+  metadata.gz: b063f95dd3bfc375203e52136932e15e7fdb060c5e8c2c88714285679d4ed535
+  data.tar.gz: a431d19a4817acf9d77ab225f22dfe523d0e04826f4ad87e615bd7c6d22d20f9
 SHA512:
-  metadata.gz: 1b1266042797be83ef0317b42d155b72ff9431cb6368f9f0528aaab435d26e62ced79d326bd76d35a493b32a50c43753db404a3cb4c37e6e0e0a35b0fd5b4759
-  data.tar.gz: ca36a8d5d4762b65de815a8920a7bdf73b30be48a7cecc229d217da2d52566bd76d3909db8895a0f0d103366c38785454aeb29c5d9c454413561b1b7e4302e64
+  metadata.gz: ac83698f0c120ede1b595509da72e83ab81faffe50bed02e3aebf01e5b66579699d2329fbdaff0e0f087813677fc6f338029bccda9d62d0ed6726c26586e9973
+  data.tar.gz: 148408b29f5aafd3ce3d71c5ecd3f2eadbd496736893049e01701e52e214188912725a3ba13245b261d5c02e159725a29998493e7739aed6f8e0e0a08db0ad4b

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-eCԵI%m� �Rҫlhv8�,�����O���$�.��9�Ǘn�R���K?D'{MJ�
-��5�)K��G�[؉��`���<rFˎ�t!�����ve!�ZF�M\p�oƻ�����w�dD���H�?����Yfy+��O��we��^���M-�t�+LW���Xw;*�.��AT7��w��|Sᩆ�cn�q$��:�7�+D}o�2�]�C�N��W�S��Y#Zۘg����n��v:m0�g�Dx%��u,��2�8���r�7���A���"��M�0$vs�z��¹z1����B^�y��N4��j4�Ѿ
+a�,=oQ��y8J@\�T]�.mj
{]ăyp��1���z7,-!����e���ոX�U[C
U�(�+j��Rc͂3O���
+�A߆�&��ݴ%��?�y������/9�D�m�����njeUn�w��� �۳��Bɇ�8w�SMn�B6��IS��}��r}{t�s&J��<�_a��6��6��a�5'���}�ێ��E��&D�n�+� ���E���ѳ,P(�{��3?c�\�݇wȐ��H~�MIC�����8f�ws�g����5u/d`�Ъ�
.R5����U�

data/lib/async/ollama/client.rb

@@ -4,7 +4,9 @@
 # Copyright, 2024, by Samuel Williams.
 
 require "async/rest/resource"
+
 require_relative "generate"
+require_relative "models"
 
 module Async
 	module Ollama
@@ -19,7 +21,17 @@ module Async
 				options[:prompt] = prompt
 				options[:model] ||= "llama3"
 				
-				Generate.post(self.with(path: "/api/generate"), options, &block)
+				Generate.post(self.with(path: "/api/generate"), options) do |resource, response|
+					if block_given?
+						yield response
+					end
+					
+					Generate.new(resource, value: response.read, metadata: response.headers)
+				end
+			end
+			
+			def models
+				Models.get(self.with(path: "/api/tags"))
 			end
 		end
 	end

data/lib/async/ollama/models.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require "async/rest/representation"
+require_relative "wrapper"
+
+module Async
+	module Ollama
+		class Models < Async::REST::Representation[Wrapper]
+			def names
+				self.value[:models].map{|model| model[:name]}
+			end
+		end
+	end
+end

data/lib/async/ollama/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Ollama
-		VERSION = "0.2.0"
+		VERSION = "0.4.0"
 	end
 end

data/lib/async/ollama/wrapper.rb

@@ -85,7 +85,10 @@ module Async
 			end
 			
 			def parser_for(response)
-				case response.headers["content-type"]
+				content_type = response.headers["content-type"]
+				media_type = content_type.split(";").first
+				
+				case media_type
 				when APPLICATION_JSON
 					return Async::REST::Wrapper::JSON::Parser
 				when APPLICATION_JSON_STREAM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-ollama
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 description:
 email:
 executables: []
@@ -76,6 +76,7 @@ files:
 - lib/async/ollama.rb
 - lib/async/ollama/client.rb
 - lib/async/ollama/generate.rb
+- lib/async/ollama/models.rb
 - lib/async/ollama/version.rb
 - lib/async/ollama/wrapper.rb
 - license.md
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A asynchronous interface to the ollama chat service